Start update, apply API patches

1305 files changed, 609 insertions, 607 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index 209c94fcb4..bc1536801e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -67,7 +67,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.21.3+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.21.4+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")
diff --git a/gradle.properties b/gradle.properties
index 572feacb80..6adbe22386 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 group=io.papermc.paper
-version=1.21.3-R0.1-SNAPSHOT
-mcVersion=1.21.3
+version=1.21.4-R0.1-SNAPSHOT
+mcVersion=1.21.4
 
 # Set to true while updating Minecraft version
-updatingMinecraft=false
+updatingMinecraft=true
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 6cec7f2fe3..59b180fddd 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -27,7 +27,7 @@ index 5dd700a956e915c00b25d91dea8d6f285ddab72b..97e78e27ee0eea2c8b24886eeb19164d
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..7ac6af074d76b782ef14fe4690bb5b630ededa32
+index 0000000000000000000000000000000000000000..8ec976de73d8fe6e4d46007649f2c9089e8bdd9c
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,91 @@
@@ -46,11 +46,11 @@ index 0000000000000000000000000000000000000000..7ac6af074d76b782ef14fe4690bb5b63
 +
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
-+    api("com.google.guava:guava:32.1.2-jre")
-+    api("com.google.code.gson:gson:2.10.1")
++    api("com.google.guava:guava:33.3.1-jre")
++    api("com.google.code.gson:gson:2.11.0")
 +    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 +    api("org.yaml:snakeyaml:2.2")
-+    api("org.joml:joml:1.10.5")
++    api("org.joml:joml:1.10.8")
 +
 +    compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 +    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
@@ -100,7 +100,7 @@ index 0000000000000000000000000000000000000000..7ac6af074d76b782ef14fe4690bb5b63
 +    options.use()
 +    options.isDocFilesSubDirs = true
 +    options.links(
-+        "https://guava.dev/releases/32.1.2-jre/api/docs/",
++        "https://guava.dev/releases/33.3.1-jre/api/docs/",
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
@@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..7ac6af074d76b782ef14fe4690bb5b63
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index bdde86ea96da233c802e98dc203cb4cb7f8616b0..0000000000000000000000000000000000000000
+index 25a8f7daaf393f3306ca5c6c0c79d3de7bc983db..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,267 +0,0 @@
@@ -135,7 +135,7 @@ index bdde86ea96da233c802e98dc203cb4cb7f8616b0..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.21.3-R0.1-SNAPSHOT</version>
+-    <version>1.21.4-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -164,21 +164,21 @@ index bdde86ea96da233c802e98dc203cb4cb7f8616b0..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.google.guava</groupId>
 -            <artifactId>guava</artifactId>
--            <version>32.1.2-jre</version>
+-            <version>33.3.1-jre</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
 -        <dependency>
 -            <groupId>com.google.code.gson</groupId>
 -            <artifactId>gson</artifactId>
--            <version>2.10.1</version>
+-            <version>2.11.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
 -        <dependency>
 -            <groupId>org.joml</groupId>
 -            <artifactId>joml</artifactId>
--            <version>1.10.5</version>
+-            <version>1.10.8</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index 944fcfdff7..7a7812df82 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 7ac6af074d76b782ef14fe4690bb5b630ededa32..0b837b485bec96fa37ed65c18df97e55cecd0e9d 100644
+index 8ec976de73d8fe6e4d46007649f2c9089e8bdd9c..75768ac6674accfce35ab8f31994d538f4bca5a6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,15 +18,27 @@ dependencies {
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
      api("org.yaml:snakeyaml:2.2")
-     api("org.joml:joml:1.10.5")
+     api("org.joml:joml:1.10.8")
 +    // Paper start
 +    api("com.googlecode.json-simple:json-simple:1.1.1") {
 +        isTransitive = false // includes junit
@@ -39,14 +39,14 @@ index 7ac6af074d76b782ef14fe4690bb5b630ededa32..0b837b485bec96fa37ed65c18df97e55
      testImplementation("org.hamcrest:hamcrest:2.2")
 @@ -69,8 +81,13 @@ tasks.withType<Javadoc> {
      options.links(
-         "https://guava.dev/releases/32.1.2-jre/api/docs/",
+         "https://guava.dev/releases/33.3.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
          "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
 +        // Paper start - add missing javadoc links
-+        "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
-+        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
++        "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
++        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.1",
 +        "https://jspecify.dev/docs/api/",
 +        // Paper end
      )
diff --git a/patches/api/0003-Test-changes.patch b/patches/api/0003-Test-changes.patch
index 490c58d9f6..6c09a87496 100644
--- a/patches/api/0003-Test-changes.patch
+++ b/patches/api/0003-Test-changes.patch
@@ -14,7 +14,7 @@ Co-authored-by: Jake Potrebic <[email protected]>
 Co-authored-by: Yannick Lamprecht <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0b837b485bec96fa37ed65c18df97e55cecd0e9d..c7f660d52e1b5f085919a8aebf8476918705a391 100644
+index 75768ac6674accfce35ab8f31994d538f4bca5a6..5b6577b5cc6f383dda6b06dd6469e7339aa2c587 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,6 +11,18 @@ java {
@@ -35,7 +35,7 @@ index 0b837b485bec96fa37ed65c18df97e55cecd0e9d..c7f660d52e1b5f085919a8aebf847691
 +
  dependencies {
      // api dependencies are listed transitively to API consumers
-     api("com.google.guava:guava:32.1.2-jre")
+     api("com.google.guava:guava:33.3.1-jre")
 @@ -44,6 +56,7 @@ dependencies {
      testImplementation("org.hamcrest:hamcrest:2.2")
      testImplementation("org.mockito:mockito-core:5.14.1")
diff --git a/patches/api/0004-Code-Generation.patch b/patches/api/0004-Code-Generation.patch
index b5b2313958..7bbb37fc02 100644
--- a/patches/api/0004-Code-Generation.patch
+++ b/patches/api/0004-Code-Generation.patch
@@ -7,7 +7,7 @@ Currently includes generated key holder classes for types
 used in the Registry Modification API
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c7f660d52e1b5f085919a8aebf8476918705a391..89208fed89181f890bb7a2bb237ed744ec2aea96 100644
+index 5b6577b5cc6f383dda6b06dd6469e7339aa2c587..2a4b8a6b06ed3df1a5e4d90bc4e36c227347d027 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,6 +1,7 @@
@@ -398,13 +398,13 @@ index 0000000000000000000000000000000000000000..3e29f7007500582cdc3f84b91f11ebeb
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java/org/bukkit/MinecraftExperimental.java
-index b7845523e8587e13b86516c0012fe097d904846c..d92a75f610cb2a95203b3f22dc67bdbfb5c3405a 100644
+index a86b87e4c3332202e40e484c3f9c6562b419c70f..e996a758fc1e4ecfec68641733d69665f30792e8 100644
 --- a/src/main/java/org/bukkit/MinecraftExperimental.java
 +++ b/src/main/java/org/bukkit/MinecraftExperimental.java
-@@ -48,5 +48,10 @@ public @interface MinecraftExperimental {
+@@ -47,5 +47,10 @@ public @interface MinecraftExperimental {
+     @ApiStatus.Internal
      public enum Requires {
  
-         WINTER_DROP,
 +        // Paper start
 +        TRADE_REBALANCE,
 +        REDSTONE_EXPERIMENTS,
diff --git a/patches/api/0005-Add-FastUtil-to-Bukkit.patch b/patches/api/0005-Add-FastUtil-to-Bukkit.patch
index bba992a3cd..748e23457b 100644
--- a/patches/api/0005-Add-FastUtil-to-Bukkit.patch
+++ b/patches/api/0005-Add-FastUtil-to-Bukkit.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 89208fed89181f890bb7a2bb237ed744ec2aea96..1a80f7c7e7f4ae9857b732897dc2ee7cfc187626 100644
+index 2a4b8a6b06ed3df1a5e4d90bc4e36c227347d027..6180e0ee8e83d2a4799741348908b59c43a2efe1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -35,6 +35,7 @@ dependencies {
diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
index dd3e1b8626..e7ff86318c 100644
--- a/patches/api/0006-Adventure.patch
+++ b/patches/api/0006-Adventure.patch
@@ -8,7 +8,7 @@ Co-authored-by: Jake Potrebic <[email protected]>
 Co-authored-by: Yannick Lamprecht <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1a80f7c7e7f4ae9857b732897dc2ee7cfc187626..f57827e724bff2bf586b468cc4e5ba6a1901bd57 100644
+index 6180e0ee8e83d2a4799741348908b59c43a2efe1..a301926cd514bbc205af47fcbcb0c266c06468f6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,6 +11,18 @@ java {
@@ -32,16 +32,16 @@ index 1a80f7c7e7f4ae9857b732897dc2ee7cfc187626..f57827e724bff2bf586b468cc4e5ba6a
  val mockitoAgent = configurations.register("mockitoAgent")
 @@ -28,7 +40,11 @@ dependencies {
      // api dependencies are listed transitively to API consumers
-     api("com.google.guava:guava:32.1.2-jre")
-     api("com.google.code.gson:gson:2.10.1")
+     api("com.google.guava:guava:33.3.1-jre")
+     api("com.google.code.gson:gson:2.11.0")
 -    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 +    // Paper start - adventure
-+    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
++    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") {
 +        exclude("com.google.guava", "guava")
 +    }
 +    // Paper - adventure
      api("org.yaml:snakeyaml:2.2")
-     api("org.joml:joml:1.10.5")
+     api("org.joml:joml:1.10.8")
      // Paper start
 @@ -36,6 +52,13 @@ dependencies {
          isTransitive = false // includes junit
@@ -58,14 +58,14 @@ index 1a80f7c7e7f4ae9857b732897dc2ee7cfc187626..f57827e724bff2bf586b468cc4e5ba6a
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 @@ -113,15 +136,32 @@ tasks.withType<Javadoc> {
-         "https://guava.dev/releases/32.1.2-jre/api/docs/",
+         "https://guava.dev/releases/33.3.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
          "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
 -        "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
 +        // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
          // Paper start - add missing javadoc links
-         "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
-         "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
+         "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
+         "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.1",
          "https://jspecify.dev/docs/api/",
          // Paper end
 +        // Paper start
@@ -1496,7 +1496,7 @@ index 18a53194483410c4d5ad35f901c90d44efaeef60..aff43d77f31d81b82e5fc5fea6272dda
          String getDisplayName();
  
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 4204a7dac18c60f177a5f70693388cd4ddc3bc0c..04e890be72b18259f1af2833879b4d9af51b1f02 100644
+index fab510afe4fa67d3171e23d739765095916197cb..779fd6dd572dea41e7e22464c9c6068a0fb71b9d 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
 @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
@@ -1508,7 +1508,7 @@ index 4204a7dac18c60f177a5f70693388cd4ddc3bc0c..04e890be72b18259f1af2833879b4d9a
  
      Sound AMBIENT_BASALT_DELTAS_ADDITIONS = getSound("ambient.basalt_deltas.additions");
      Sound AMBIENT_BASALT_DELTAS_LOOP = getSound("ambient.basalt_deltas.loop");
-@@ -1698,4 +1698,11 @@ public interface Sound extends OldEnum<Sound>, Keyed {
+@@ -1713,4 +1713,11 @@ public interface Sound extends OldEnum<Sound>, Keyed {
      static Sound[] values() {
          return Lists.newArrayList(Registry.SOUNDS).toArray(new Sound[0]);
      }
@@ -4713,10 +4713,10 @@ index 9bab73c3c2ca759b8e1c7d07d98cc593c961666a..f0c6943da3f783101ca647b75b3230fa
              throw new UnsupportedOperationException("Not supported yet.");
          }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b9c310322 100644
+index 69d6de6e9618dd27f5ba73b931f8455912caf060..77f0e0a9e991f65b89909d0307fd93c3ecd9d8ac 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -44,6 +44,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -45,6 +45,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       */
      boolean hasDisplayName();
  
@@ -4741,7 +4741,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      /**
       * Gets the display name that is set.
       * <p>
-@@ -51,7 +69,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -52,7 +70,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * before calling this method.
       *
       * @return the display name that is set
@@ -4751,7 +4751,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      @NotNull
      String getDisplayName();
  
-@@ -59,7 +79,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -60,7 +80,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Sets the display name.
       *
       * @param name the name to set
@@ -4761,7 +4761,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      void setDisplayName(@Nullable String name);
  
      /**
-@@ -72,6 +94,32 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -73,6 +95,32 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       */
      boolean hasItemName();
  
@@ -4794,7 +4794,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      /**
       * Gets the item name that is set.
       * <br>
-@@ -82,7 +130,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -83,7 +131,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * calling this method.
       *
       * @return the item name that is set
@@ -4804,7 +4804,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      @NotNull
      String getItemName();
  
-@@ -93,7 +143,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -94,7 +144,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * anvil, is not styled with italics, and does not show labels.
       *
       * @param name the name to set
@@ -4814,7 +4814,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      void setItemName(@Nullable String name);
  
      /**
-@@ -134,6 +186,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -135,6 +187,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       */
      boolean hasLore();
  
@@ -4839,7 +4839,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      /**
       * Gets the lore that is set.
       * <p>
-@@ -141,7 +211,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -142,7 +212,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * calling this method.
       *
       * @return a list of lore that is set
@@ -4849,7 +4849,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      @Nullable
      List<String> getLore();
  
-@@ -150,7 +222,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -151,7 +223,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Removes lore when given null.
       *
       * @param lore the lore that will be set
@@ -4881,10 +4881,10 @@ index 12595536080ffe09df2b6ecdb83d846f50100d38..9fc47c879ee6b8edf2503f20e4736c29
  public interface WritableBookMeta extends ItemMeta {
  
 diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
-index 5fc9aaac8baaf185d8e0d4fa7012dc4e13e485b3..804cb7162b34225d5dd84aada283de568d7d6592 100644
+index ebfd6f5523205cfc932e3d6b351ff26da855fb15..cc38bee3c412bef4767f08407c0f5559a113fce5 100644
 --- a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
 +++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
-@@ -57,4 +57,21 @@ public interface TrimMaterial extends Keyed, Translatable {
+@@ -61,4 +61,21 @@ public interface TrimMaterial extends Keyed, Translatable {
      private static TrimMaterial getTrimMaterial(@NotNull String key) {
          return Registry.TRIM_MATERIAL.getOrThrow(NamespacedKey.minecraft(key));
      }
diff --git a/patches/api/0008-Use-ASM-for-event-executors.patch b/patches/api/0008-Use-ASM-for-event-executors.patch
index 6e84c5e82a..901608bafe 100644
--- a/patches/api/0008-Use-ASM-for-event-executors.patch
+++ b/patches/api/0008-Use-ASM-for-event-executors.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f57827e724bff2bf586b468cc4e5ba6a1901bd57..783513d3c7ea143997f2eb1a1b53826e51a51079 100644
+index a301926cd514bbc205af47fcbcb0c266c06468f6..36660956b058b3a79fed6932c3c267e157f2951b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -59,6 +59,9 @@ dependencies {
diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch
index 2d734f3019..84710e830f 100644
--- a/patches/api/0009-Paper-Plugins.patch
+++ b/patches/api/0009-Paper-Plugins.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 783513d3c7ea143997f2eb1a1b53826e51a51079..5ee8db3fcf3d3ac1c8b998b227aff0965960896a 100644
+index 36660956b058b3a79fed6932c3c267e157f2951b..feb047d20178f957fb48388250303d7d3348a116 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -64,7 +64,7 @@ dependencies {
diff --git a/patches/api/0011-Timings-v2.patch b/patches/api/0011-Timings-v2.patch
index 5f377339ff..00348af95d 100644
--- a/patches/api/0011-Timings-v2.patch
+++ b/patches/api/0011-Timings-v2.patch
@@ -2859,7 +2859,7 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fed32ada5a5ba6906c0f8e854ad71fd691fe5811..ad4e37b2ce25c5a1d23d663511fff137ce2f29cb 100644
+index 6391011464ac0c95d4da7fb9c698f35c58b40922..a327c71f110fc0330a3a43ab118565d35801eb32 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -870,7 +870,6 @@ public final class Bukkit {
@@ -2871,7 +2871,7 @@ index fed32ada5a5ba6906c0f8e854ad71fd691fe5811..ad4e37b2ce25c5a1d23d663511fff137
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 862f18d72deb1cb56de3f3f31275297a03d9ba0a..c11d3686ff770b25b7fd165426f0bfaa224a5916 100644
+index 01f8e0811f8b337acac31819a85bb44b189b3c21..a1bffe44764fc3e1bb96bf014c56025b0bde7507 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1978,6 +1978,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2933,7 +2933,7 @@ index 0000000000000000000000000000000000000000..45ed63797b13e114bf3795c80a6c3967
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index f3cdf13f22aa789ee8cc235b61fda4035b254219..17d3da22e8fcdf73a587b17a0cdac3b23ded3567 100644
+index 6686d025222dc50156347a1757c88da02f882eec..cee16db367907cfa4b432dc6969f403321a855ea 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -33,7 +33,16 @@ public abstract class Command {
@@ -3450,7 +3450,7 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cab45a41e54599588007c9b02a23d1b148dd89f1..205455c3a4ff9664e978814c839f8f2190a180e2 100644
+index 64d32c377d0303ed28011a5f002274de3c16b383..a06daeeee71a5ca58fbc1e13453d9116eadbcac2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2771,7 +2771,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3474,7 +3474,7 @@ index cab45a41e54599588007c9b02a23d1b148dd89f1..205455c3a4ff9664e978814c839f8f21
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 46c7be5fa69f13900860b9944523beea16f2409b..f97669c8b58bc287fc289eeb098836ae314b053a 100644
+index d6f3c8da8bae1f70e0f9bee3e688a04801a3b546..b03f3e0ce9fdb0bb587cf1a1c10b8cfaa2eab09e 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -381,7 +381,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3537,7 +3537,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..f97669c8b58bc287fc289eeb098836ae
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index ab04ffe4cd05315a2ee0f64c553b4c674740eb7f..de6b6188587fd254ab96cbc1f95fda2056d9cbe2 100644
+index 70ac93d420d0a8528428a3d038a2ef6a86d2fddd..2e4a0a66151b358cc89d8eea26002f9fda16ee48 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -55,7 +55,6 @@ public final class JavaPluginLoader implements PluginLoader {
diff --git a/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 1faeb90190..5a2340eb8f 100644
--- a/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8d729fb196d83e01e4652fb1f77f5cab7b57cc31..d978c72cdbc10792f852a4ba372518073893d02b 100644
+index a327c71f110fc0330a3a43ab118565d35801eb32..60ad479817c95aef809f73c6688cd6b2a0bb91df 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -83,6 +83,20 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index 8d729fb196d83e01e4652fb1f77f5cab7b57cc31..d978c72cdbc10792f852a4ba37251807
       * Attempts to set the {@link Server} singleton.
       * <p>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 57c9b560c77a56588870598acb543469040ceec1..8949b8e29ae7f412481291630a5cb7b5b8809842 100644
+index a1bffe44764fc3e1bb96bf014c56025b0bde7507..f5005063c33d5e7ac030c4d43cb042c18c799284 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -68,6 +68,18 @@ import org.jetbrains.annotations.Nullable;
@@ -55,7 +55,7 @@ index 57c9b560c77a56588870598acb543469040ceec1..8949b8e29ae7f412481291630a5cb7b5
       * Used for all administrative messages, such as an operator using a
       * command.
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index f97669c8b58bc287fc289eeb098836ae314b053a..2c77b6ab388bd689acb8d84ec62bd5df1eb9373e 100644
+index b03f3e0ce9fdb0bb587cf1a1c10b8cfaa2eab09e..48b66054913c8b53e6e7fd34615c2ab54727693f 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -117,9 +117,22 @@ public final class SimplePluginManager implements PluginManager {
@@ -82,7 +82,7 @@ index f97669c8b58bc287fc289eeb098836ae314b053a..2c77b6ab388bd689acb8d84ec62bd5df
          }
          Preconditions.checkArgument(directory != null, "Directory cannot be null");
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index de6b6188587fd254ab96cbc1f95fda2056d9cbe2..eaefbb00e9993d54906cc8cf35cf753c0d6c7707 100644
+index 2e4a0a66151b358cc89d8eea26002f9fda16ee48..b412aaf08901d169ac9fc89b36f9d6ccb95c53d3 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -93,7 +93,7 @@ public final class JavaPluginLoader implements PluginLoader {
diff --git a/patches/api/0013-Player-affects-spawning-API.patch b/patches/api/0013-Player-affects-spawning-API.patch
index ebafa9cc70..3a62dc90c9 100644
--- a/patches/api/0013-Player-affects-spawning-API.patch
+++ b/patches/api/0013-Player-affects-spawning-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 22de066aef71ad2cf135d5b6f5d6f224de5fcd2d..1c25725a2abb36a81b1821102daee447c7170197 100644
+index a06daeeee71a5ca58fbc1e13453d9116eadbcac2..bc64083c02bce93a22521173c9430eb5469ba8a6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2623,6 +2623,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0014-Add-getTPS-method.patch b/patches/api/0014-Add-getTPS-method.patch
index be2e74075a..b97e3f7743 100644
--- a/patches/api/0014-Add-getTPS-method.patch
+++ b/patches/api/0014-Add-getTPS-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 027e96c0e42d701417e16acaa5470d836146ffa6..d0f618136bf5e1f2dcafc9f7c01cebf0f285f20c 100644
+index 60ad479817c95aef809f73c6688cd6b2a0bb91df..e4f7ff41d7205994fef87989a7955d7b8fe4d7f4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2132,6 +2132,17 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index 027e96c0e42d701417e16acaa5470d836146ffa6..d0f618136bf5e1f2dcafc9f7c01cebf0
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f2cab649bc0771254c7aa9ef0e3f47b4d86b329d..aecba92a6842fba3642bb2596239489230629439 100644
+index f5005063c33d5e7ac030c4d43cb042c18c799284..4f15cc4bcc07d3061dd94b20fc77f549ddfcbb6b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1815,6 +1815,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0015-Expose-server-build-information.patch b/patches/api/0015-Expose-server-build-information.patch
index 1865aaa0f5..a5cae3c9f3 100644
--- a/patches/api/0015-Expose-server-build-information.patch
+++ b/patches/api/0015-Expose-server-build-information.patch
@@ -234,7 +234,7 @@ index 0000000000000000000000000000000000000000..7915a70d676b1205dcae39259f670af2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5780003631beae773231afe3afc6b834bfe1f84d..a005d5f8879262c763d8c4fbd09b9a99810d5e8c 100644
+index e4f7ff41d7205994fef87989a7955d7b8fe4d7f4..75e0c5b884363be03876103e0d66e67de03c4856 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -110,13 +110,26 @@ public final class Bukkit {
@@ -295,7 +295,7 @@ index 5780003631beae773231afe3afc6b834bfe1f84d..a005d5f8879262c763d8c4fbd09b9a99
       * Gets a view of all currently logged in players. This {@linkplain
       * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ba28d9f3213ca4b5f15178dc637bff37a8896edc..8a07f21eeb04fb54032ce377a1478f60303e1824 100644
+index 4f15cc4bcc07d3061dd94b20fc77f549ddfcbb6b..2ed640d5a0027f7a94a5cf4555741c27c9b1b3a4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -120,6 +120,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -316,7 +316,7 @@ index ba28d9f3213ca4b5f15178dc637bff37a8896edc..8a07f21eeb04fb54032ce377a1478f60
       * Gets a view of all currently logged in players. This {@linkplain
       * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index e320729782245b5511cd744c417141508020fd26..8b5e4756d1c80e55be166dbe1faf57799f9cc03b 100644
+index aec092e019667d53faf3e7352799772804d5d260..012b46c82d9d06d1d2da8da626fc5cde6e9e2ca4 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -156,4 +156,13 @@ public interface UnsafeValues {
diff --git a/patches/api/0016-Entity-Origin-API.patch b/patches/api/0016-Entity-Origin-API.patch
index ff7c566968..ca30d1d77f 100644
--- a/patches/api/0016-Entity-Origin-API.patch
+++ b/patches/api/0016-Entity-Origin-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c78fb359bd28b8dc1ba242642ec612e856525993..4e1fb0974d061d5bb64899cac576318d2e6f8bf6 100644
+index d7f95863922bf332c674d538eb187015fadae9d8..411297f66520774a4072c9e15aa9bdf03a527208 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -791,5 +791,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -25,7 +25,7 @@ index c78fb359bd28b8dc1ba242642ec612e856525993..4e1fb0974d061d5bb64899cac576318d
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index d96fd494b523491fcf1ac54d164351fd487f65d6..ae1ce2ee2deb82f3f4144ec54b3ba119b437c5e9 100644
+index 5d7d940cdad7915efa639b8940a17dc97b60ecd8..315dcf9da29e077a819f602ebf1c76286164b264 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -126,4 +126,15 @@ public interface FallingBlock extends Entity {
diff --git a/patches/api/0017-Add-view-distance-API.patch b/patches/api/0017-Add-view-distance-API.patch
index abf7dbde0a..562b99a9f1 100644
--- a/patches/api/0017-Add-view-distance-API.patch
+++ b/patches/api/0017-Add-view-distance-API.patch
@@ -8,7 +8,7 @@ Add per player no-tick, tick, and send view distances.
 Also add send/no-tick view distance to World.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff46469543688 100644
+index ed87e82eb0e30bdea6f7760bb80addcb3bbe59cc..683357f685b1d5f52151a5e78fc5265ebf9d32c2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2968,6 +2968,66 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -79,7 +79,7 @@ index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff464
       * Gets all generated structures that intersect the chunk at the given
       * coordinates. <br>
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1c25725a2abb36a81b1821102daee447c7170197..28e821ca1ec8ec3eba160ef2ed06ab1bb7387cae 100644
+index bc64083c02bce93a22521173c9430eb5469ba8a6..2073aca572a1b751e895373f32fffba0edf026a5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2637,6 +2637,82 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0019-Expose-server-CommandMap.patch b/patches/api/0019-Expose-server-CommandMap.patch
index 52fd4ca4e5..9fa19450c8 100644
--- a/patches/api/0019-Expose-server-CommandMap.patch
+++ b/patches/api/0019-Expose-server-CommandMap.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f5a014c23766f1373c0e6abd0c68c2aca097f73b..603adc3be2444c0a575c4027b963a7642a34d0ca 100644
+index 75e0c5b884363be03876103e0d66e67de03c4856..81b3800e86bcd20b47df13e9c9ef3a83abfcb7c6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2361,6 +2361,19 @@ public final class Bukkit {
@@ -29,7 +29,7 @@ index f5a014c23766f1373c0e6abd0c68c2aca097f73b..603adc3be2444c0a575c4027b963a764
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8c248efe16829c4715a9382c3e79d4a4594d193c..65ad3ee200d3899ac17abf55043857c9331add8b 100644
+index 2ed640d5a0027f7a94a5cf4555741c27c9b1b3a4..1b18d3916f3972675d9371ec5c6e020d70a723f6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1835,6 +1835,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index ab7a581845..9aa815bb77 100644
--- a/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 26f3ac9c15ff554becfe8ea53a48f67b2de60ed6..bd3fa2bcee24ab7e8f740722f55ed6294fdb294a 100644
+index 81b3800e86bcd20b47df13e9c9ef3a83abfcb7c6..1ada54827acfaacab0a32ae5d55def952547c352 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -472,6 +472,30 @@ public final class Bukkit {
@@ -41,7 +41,7 @@ index 26f3ac9c15ff554becfe8ea53a48f67b2de60ed6..bd3fa2bcee24ab7e8f740722f55ed629
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d78481bf17818415524f14417caf86d5684b2235..067eb3a5f5676f3b1b3f49a65df9c4054c48a1e7 100644
+index 1b18d3916f3972675d9371ec5c6e020d70a723f6..93d924c586803161820707af823c352f7c5d40e1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -383,6 +383,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -76,7 +76,7 @@ index d78481bf17818415524f14417caf86d5684b2235..067eb3a5f5676f3b1b3f49a65df9c405
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 28e821ca1ec8ec3eba160ef2ed06ab1bb7387cae..fefd6b8a4171c9ec3d2a09d1accb9f37d66aa5b9 100644
+index 2073aca572a1b751e895373f32fffba0edf026a5..17f55697d02d7b9c9b42c4b89a33db9207622a36 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1254,6 +1254,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0021-Add-exception-reporting-event.patch b/patches/api/0021-Add-exception-reporting-event.patch
index c592c2b2ee..c446fdb186 100644
--- a/patches/api/0021-Add-exception-reporting-event.patch
+++ b/patches/api/0021-Add-exception-reporting-event.patch
@@ -494,7 +494,7 @@ index 36fc2c35395c72f8b81a2a2f3265fd205384ce26..c7fa1d235cea78bda4656ed66b8d42b1
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 2c77b6ab388bd689acb8d84ec62bd5df1eb9373e..b878e7167cfcdea0e224c182b40abeadd339d3b3 100644
+index 48b66054913c8b53e6e7fd34615c2ab54727693f..001465eedafa51ac027a4db51cba6223edfe1171 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -528,7 +528,8 @@ public final class SimplePluginManager implements PluginManager {
diff --git a/patches/api/0024-Player-Tab-List-and-Title-APIs.patch b/patches/api/0024-Player-Tab-List-and-Title-APIs.patch
index 888137a8b5..07f2e6f801 100644
--- a/patches/api/0024-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/0024-Player-Tab-List-and-Title-APIs.patch
@@ -432,7 +432,7 @@ index 0000000000000000000000000000000000000000..20a028450667edf102b59b6b50ac6e89
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fefd6b8a4171c9ec3d2a09d1accb9f37d66aa5b9..2685a6fcda7afa23d3f5067af1d5d2fc89bdb0e6 100644
+index 17f55697d02d7b9c9b42c4b89a33db9207622a36..01fcff92daec5d4bf4b2b9213925cd2604cdec98 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1288,6 +1288,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0026-Complete-resource-pack-API.patch b/patches/api/0026-Complete-resource-pack-API.patch
index ab4274c827..ec794ae535 100644
--- a/patches/api/0026-Complete-resource-pack-API.patch
+++ b/patches/api/0026-Complete-resource-pack-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2685a6fcda7afa23d3f5067af1d5d2fc89bdb0e6..47a0d09b433024cd464737eced8a31f995b1ffaf 100644
+index 01fcff92daec5d4bf4b2b9213925cd2604cdec98..cb758b5907aa0c214123550fe14ccfdacbc6b208 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2252,6 +2252,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
index e387fca3da..0db1a8a7c0 100644
--- a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7d49ffba8e507762a61563b536dfbf93bffa644d..0360e070d9fbb45c84e0b95d4f4d2253202191a8 100644
+index 1ada54827acfaacab0a32ae5d55def952547c352..13fa39ed3d5ffa8a459d68d1e240e869ba42ac32 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2396,6 +2396,13 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 7d49ffba8e507762a61563b536dfbf93bffa644d..0360e070d9fbb45c84e0b95d4f4d2253
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 42ea960fe29a1638b9ef69bdd5c58caf963fe30a..b36b9bd8aa71ea5b9ea20d2752e6e59d33c9f978 100644
+index 93d924c586803161820707af823c352f7c5d40e1..6567d1746f5cf16c9f3518203dd9916ff916ca68 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2096,4 +2096,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0030-Custom-replacement-for-eaten-items.patch b/patches/api/0030-Custom-replacement-for-eaten-items.patch
index f7a9207fb3..90a7282148 100644
--- a/patches/api/0030-Custom-replacement-for-eaten-items.patch
+++ b/patches/api/0030-Custom-replacement-for-eaten-items.patch
@@ -5,7 +5,7 @@ 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 5c054eb531e3caf17c179aff6a712fb8c33d8f77..6110d0417340710333b44312d82c7bd5165a8954 100644
+index 36b16b6076321310b6ed60e515064e506b706b58..3208dedfb6769e3e8c2ebeb17c0e02d80adf233a 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 @@ -24,6 +24,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
diff --git a/patches/api/0037-Arrow-pickup-rule-API.patch b/patches/api/0037-Arrow-pickup-rule-API.patch
index 6bbf58b3d0..37a434e032 100644
--- a/patches/api/0037-Arrow-pickup-rule-API.patch
+++ b/patches/api/0037-Arrow-pickup-rule-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index 4d9938249684b7db01b78baf4eeeaa2e0638a963..493f81ba879d1eb29a32722da27e4ff7ce4c68a8 100644
+index 9cebf79b6217063fbce395b655261ee4ab0f4e45..c901990454ec930169b0dc561987bea101f9b6ae 100644
 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java
 +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
 @@ -186,4 +186,38 @@ public interface AbstractArrow extends Projectile {
diff --git a/patches/api/0040-Add-EntityZapEvent.patch b/patches/api/0040-Add-EntityZapEvent.patch
index a9b79bd56b..04fa98d81a 100644
--- a/patches/api/0040-Add-EntityZapEvent.patch
+++ b/patches/api/0040-Add-EntityZapEvent.patch
@@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..af2b1629f845ffe1559e7d580b482636
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0e0ed93b568fd2c0d8f6e359c31dc29cb0fa71c2..085337f3d3d6adef5fd4ecda133c607e4b77bd93 100644
+index c5aa91c68ec24e3d07d7cb18ac8a75c4a8f743ca..7119dc013f087be7e01fc3fedc4361f76b4edae7 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 @@ -12,14 +12,14 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
index 11a48949b0..18a95c3209 100644
--- a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0360e070d9fbb45c84e0b95d4f4d2253202191a8..41a645a040561d3dca83a3c1f2ca7cdfb4f7550b 100644
+index 13fa39ed3d5ffa8a459d68d1e240e869ba42ac32..5660aa59d33ef2387839b9a67637672e6412088e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2403,6 +2403,15 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 0360e070d9fbb45c84e0b95d4f4d2253202191a8..41a645a040561d3dca83a3c1f2ca7cdf
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b36b9bd8aa71ea5b9ea20d2752e6e59d33c9f978..72a472f048107181bc84599836fc2fc64c89ea8a 100644
+index 6567d1746f5cf16c9f3518203dd9916ff916ca68..2c0e3ce1e6bb9602e1af11711b573f0080aa6f4c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2098,4 +2098,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0045-Add-String-based-Action-Bar-API.patch b/patches/api/0045-Add-String-based-Action-Bar-API.patch
index c2b98dd46f..b96b2f3a31 100644
--- a/patches/api/0045-Add-String-based-Action-Bar-API.patch
+++ b/patches/api/0045-Add-String-based-Action-Bar-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 47a0d09b433024cd464737eced8a31f995b1ffaf..9513ce004101bd1bef90ca4a558f6b7c28d97adb 100644
+index cb758b5907aa0c214123550fe14ccfdacbc6b208..e014582d73fc821c0b6dcf19ae1f5dfdf510343c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1255,6 +1255,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 5253041ed0..aad79a70b3 100644
--- a/patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index dc604d6ab9dcf67fa0791539d18c2f890a814ed8..91fc11dda99de506be83d40df8929bf7cd8e8d85 100644
+index d08c5eb82eab8ad0ca7c8602b4d3d92fb0df02b3..6a1d563d1b7ea7e1060dfacfba98e4e1d4295790 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -344,4 +344,21 @@ public interface ArmorStand extends LivingEntity {
diff --git a/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch
index c5d20165c6..1913990a63 100644
--- a/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0a3a66e04f8785874f10a76603bff46469543688..9885fd1adc1f93a80d650e6d42dfa3a0b084db9f 100644
+index 683357f685b1d5f52151a5e78fc5265ebf9d32c2..e5d3ccf6e1bc87db1f5602214371c0e8ed4d5431 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -49,6 +49,33 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
index 059d99285e..338c9e637d 100644
--- a/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 41a645a040561d3dca83a3c1f2ca7cdfb4f7550b..0bd1480af001c86bc526875229f4ffa4e9945491 100644
+index 5660aa59d33ef2387839b9a67637672e6412088e..29e13fd7c94c5c50e81b804e6dffc8721164f1d1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2412,6 +2412,16 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index 41a645a040561d3dca83a3c1f2ca7cdfb4f7550b..0bd1480af001c86bc526875229f4ffa4
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 72a472f048107181bc84599836fc2fc64c89ea8a..376712ee54e06fbc9e5f11016ca7ba6d9ae42b32 100644
+index 2c0e3ce1e6bb9602e1af11711b573f0080aa6f4c..4225105fef7aee264b34d1687762b5fc8dccbc47 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2100,4 +2100,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -46,7 +46,7 @@ index 72a472f048107181bc84599836fc2fc64c89ea8a..376712ee54e06fbc9e5f11016ca7ba6d
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 17d3da22e8fcdf73a587b17a0cdac3b23ded3567..8a298b655f4eaf5116994f98572a20e83a23838c 100644
+index cee16db367907cfa4b432dc6969f403321a855ea..0ee08b6cd80e72ae67e1316ddbb58b7c1d47e5ce 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -107,7 +107,7 @@ public abstract class Command {
diff --git a/patches/api/0053-Fix-upstream-javadocs.patch b/patches/api/0053-Fix-upstream-javadocs.patch
index 9f99faa8ba..47f0cd7be5 100644
--- a/patches/api/0053-Fix-upstream-javadocs.patch
+++ b/patches/api/0053-Fix-upstream-javadocs.patch
@@ -98,10 +98,10 @@ index db6fcd635e295e561642d49941fd8e611247d38e..344b2b5d9207d2645bc5417d1ec00dd0
      MOTION_BLOCKING_NO_LEAVES,
      /**
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 13557f78a6853fdf0619f0479cab7591ddadf666..a1896780f312a91ab2330d2c850641d66143f23e 100644
+index bc23886a62312fc9e222ff2c6e7a7f325397d36a..ecf9f941e618608b98feaac46df3f10ec951c186 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -206,7 +206,7 @@ public enum Particle implements Keyed {
+@@ -207,7 +207,7 @@ public enum Particle implements Keyed {
      }
  
      /**
@@ -1622,10 +1622,10 @@ index 35c6594fd1040a1af1029e7260e5e3a9307b107d..d58719ee75bef8bc265bfc81bc5d88a4
      void addChargedProjectile(@NotNull ItemStack item);
  }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f83ec1c5ddce1a35b1c164b988f7fc6b9c310322..c81465e35808135329495fc4669d5616421451b7 100644
+index 77f0e0a9e991f65b89909d0307fd93c3ecd9d8ac..5cc1d77a09d2877992433b020ad2c591bb94d3fd 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -744,7 +744,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -767,7 +767,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * The returned component is a snapshot of its current state and does not
       * reflect a live view of what is on an item. After changing any value on
       * this component, it must be set with
@@ -1634,7 +1634,7 @@ index f83ec1c5ddce1a35b1c164b988f7fc6b9c310322..c81465e35808135329495fc4669d5616
       * to apply the changes.
       *
       * @return component
-@@ -753,7 +753,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -776,7 +776,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      JukeboxPlayableComponent getJukeboxPlayable();
  
      /**
@@ -1643,7 +1643,7 @@ index f83ec1c5ddce1a35b1c164b988f7fc6b9c310322..c81465e35808135329495fc4669d5616
       *
       * @param jukeboxPlayable new component
       */
-@@ -780,7 +780,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -803,7 +803,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Return an immutable copy of all {@link Attribute}s and their
       * {@link AttributeModifier}s for a given {@link EquipmentSlot}.<br>
diff --git a/patches/api/0057-Basic-PlayerProfile-API.patch b/patches/api/0057-Basic-PlayerProfile-API.patch
index 8752908957..5363667b46 100644
--- a/patches/api/0057-Basic-PlayerProfile-API.patch
+++ b/patches/api/0057-Basic-PlayerProfile-API.patch
@@ -337,7 +337,7 @@ index 0000000000000000000000000000000000000000..35341d8f1ac2d80f339084ef80d099a5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c900bde81d8f20ed4775228fbe767d7db62508fa..6c44f58551dda4129d37cce100a9c5b9c9810cca 100644
+index bacdb1742ecb98bb10651b0582500449bf904910..c351fb49a8d044312ca77f5cd85d939a95bdae20 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2424,6 +2424,89 @@ public final class Bukkit {
@@ -431,7 +431,7 @@ index c900bde81d8f20ed4775228fbe767d7db62508fa..6c44f58551dda4129d37cce100a9c5b9
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0588c6c8b30bfe6e1e8ab7e1523a8a9be6b11b6f..55d8602bb651f85b9d0a80ec015cec5e48948d44 100644
+index a506e618448c3bf4b56f54f8fe00d7158df29dd7..51bed70fdc7221f41035e13af1fba69b492507ac 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2108,5 +2108,80 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 7d21cf10f7..6620dcd792 100644
--- a/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
-index 951ea2cc763973655beedcba3c75332d3f297313..e528d811f651696069dbd2fd21c5ffad294b26af 100644
+index a73d1b9717bb6d745f909317474cf3b4380d5cb3..f5166bbf94d5fc24c10888a384003a5f8181ac69 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0059-Shoulder-Entities-Release-API.patch b/patches/api/0059-Shoulder-Entities-Release-API.patch
index 183b51f4d7..47ca7ce750 100644
--- a/patches/api/0059-Shoulder-Entities-Release-API.patch
+++ b/patches/api/0059-Shoulder-Entities-Release-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 46a076bd8dc2f5d1094899638ab255a5a31c2568..08cef0d9fc27d0c09472cfe7091330d95956d9eb 100644
+index c90a0a00be78200adf217e2b3a8302b59af3cf7c..b4452d18a530c4c4a9bc10f368aeced9430b42a2 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -377,6 +377,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
diff --git a/patches/api/0060-Entity-fromMobSpawner.patch b/patches/api/0060-Entity-fromMobSpawner.patch
index 83bd17a96e..368746d28a 100644
--- a/patches/api/0060-Entity-fromMobSpawner.patch
+++ b/patches/api/0060-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 539b3527d0c66611e21712f29b90fba939e661e3..6dad1a01264f7776ca6f31e621ea4fbb295efb5d 100644
+index 45d408f519767785b222c409170bbfecbd8d1931..ca81360956276047602958949148b6a70cc3e954 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -805,5 +805,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0063-Add-getI18NDisplayName-API.patch b/patches/api/0063-Add-getI18NDisplayName-API.patch
index ecdf3c006c..967541c44a 100644
--- a/patches/api/0063-Add-getI18NDisplayName-API.patch
+++ b/patches/api/0063-Add-getI18NDisplayName-API.patch
@@ -33,7 +33,7 @@ index d5342258086066d3b9ef404916bad8440f0cf0cd..333884bc8fe45c66d37a1bbcebc10ea6
 +    // Paper end - add getI18NDisplayName
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 730c42eddd38acec1cdbb19dfc8c675795d1e68d..da706fd72367b26b919ce08a5e118582020d4fbc 100644
+index a71a37e3833b6a339c4df8939768c2bd46a816a5..e2cc1ea49f5b7fa06ef388c922184835a84f9440 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -642,5 +642,20 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0064-ensureServerConversions-API.patch b/patches/api/0064-ensureServerConversions-API.patch
index 9d1a4cb932..1e727d00df 100644
--- a/patches/api/0064-ensureServerConversions-API.patch
+++ b/patches/api/0064-ensureServerConversions-API.patch
@@ -30,7 +30,7 @@ index 333884bc8fe45c66d37a1bbcebc10ea655d2055f..c1ec8efffd5ff2a4dcb1d761be9a431a
 +    // Paper end - ensure server conversions API
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index da706fd72367b26b919ce08a5e118582020d4fbc..29bc12cb3095282a31f01f08ac66c15b24f42524 100644
+index e2cc1ea49f5b7fa06ef388c922184835a84f9440..e66a958bc36ac774081d5e71966f312ebb8228d9 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -566,7 +566,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0065-LivingEntity-setKiller.patch b/patches/api/0065-LivingEntity-setKiller.patch
index 0c89dae9a6..a1106238d3 100644
--- a/patches/api/0065-LivingEntity-setKiller.patch
+++ b/patches/api/0065-LivingEntity-setKiller.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index b0fbad5de65c33710ec46734ad6c69ec9b2769d5..e6bdfd14bffa394cd717de7118de951a997f50b3 100644
+index 4b75a5e1ce788bc375d6147422e5bee6ef0c03be..055ba78f61dfa2d791361ae3b74611131e95dda7 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -365,6 +365,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
index a8be09e798..bb62002724 100644
--- a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5ee8db3fcf3d3ac1c8b998b227aff0965960896a..a65956b1fc2f4f1b1edf355682b5b54541ec9bce 100644
+index feb047d20178f957fb48388250303d7d3348a116..09e35d410f86fc6ed894c072b77a49f9bb4ce78d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,8 @@ java {
diff --git a/patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch
index 6e95f52cbd..e37dca393f 100644
--- a/patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -9,7 +9,7 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index bda4ab21b3ac2acbe328c0c6887c33283399971e..f3b3606dc5881e931853fc2631aad9ca9083474d 100644
+index f440da5941e11c30145175cf24162e1ba2b4e3cf..69d97a14715040263afec77d0ba623c2ac84062a 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -272,6 +272,16 @@ public interface Block extends Metadatable, Translatable {
diff --git a/patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch
index 383d46bfff..beac3b204c 100644
--- a/patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch
@@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..c84ce3fc874eea3d8f0b1cf5273996d9
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c8ba70f787a3460c1f9faaeaab086e9e43ecaf6f..1a6ddc4228ed4c26235cfe56b1e0a102c7aa320f 100644
+index 5b12fa8c41a18ddfe08d82c138c0f71106c89d4d..2c9a1378ec8da80e95f2e9e1f3a464ea7b17da93 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -58,7 +58,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0078-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0078-Ability-to-apply-mending-to-XP-API.patch
index b4e68511a4..b319f24029 100644
--- a/patches/api/0078-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/api/0078-Ability-to-apply-mending-to-XP-API.patch
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1a6ddc4228ed4c26235cfe56b1e0a102c7aa320f..0d92eac00ba883d696d45340feb808988be05c16 100644
+index 2c9a1378ec8da80e95f2e9e1f3a464ea7b17da93..fcb83800bc4cbaa96e5f190e0cf618542d8bb637 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1588,6 +1588,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0084-Add-ArmorStand-Item-Meta.patch b/patches/api/0084-Add-ArmorStand-Item-Meta.patch
index 36fe72fcef..db847081ce 100644
--- a/patches/api/0084-Add-ArmorStand-Item-Meta.patch
+++ b/patches/api/0084-Add-ArmorStand-Item-Meta.patch
@@ -95,10 +95,10 @@ index 0000000000000000000000000000000000000000..7e4acfff16db80a75e1ff2fee1972b16
 +    void setMarker(boolean marker);
 +}
 diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index 9a28c9dfe8dd5dd73f08ab4907db7f257719dc7e..88e1883dffb64974f5ec60acbf2828cfb9de9439 100644
+index 4f3579253e56bd868a084767854192863961d7c9..71c4f2cbf8310941b316357d0c799b1e31418d0f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemType.java
 +++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -1942,7 +1942,7 @@ public interface ItemType extends Keyed, Translatable {
+@@ -1903,7 +1903,7 @@ public interface ItemType extends Keyed, Translatable {
      ItemType.Typed<ItemMeta> RABBIT_STEW = getItemType("rabbit_stew");
      ItemType.Typed<ItemMeta> RABBIT_FOOT = getItemType("rabbit_foot");
      ItemType.Typed<ItemMeta> RABBIT_HIDE = getItemType("rabbit_hide");
diff --git a/patches/api/0088-Add-extended-PaperServerListPingEvent.patch b/patches/api/0088-Add-extended-PaperServerListPingEvent.patch
index b3c41b89b9..e1dce47f5b 100644
--- a/patches/api/0088-Add-extended-PaperServerListPingEvent.patch
+++ b/patches/api/0088-Add-extended-PaperServerListPingEvent.patch
@@ -534,7 +534,7 @@ index 0000000000000000000000000000000000000000..517d15238ed117f38bbd39f570874014
 +
 +}
 diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-index 72ebc29db42d08d1d0361dba462fc8a573fbf918..d351f62971f8f1317b3fc92f8b1d446e48149c3a 100644
+index 1cc5a0abce39c939398ce945dd916dc086888b13..e11b81e711093b1851449c0532bc5103abb1b81c 100644
 --- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
 +++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
 @@ -248,9 +248,11 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
diff --git a/patches/api/0089-Player.setPlayerProfile-API.patch b/patches/api/0089-Player.setPlayerProfile-API.patch
index fb9225d8d5..e24c398eea 100644
--- a/patches/api/0089-Player.setPlayerProfile-API.patch
+++ b/patches/api/0089-Player.setPlayerProfile-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index dcf6b2d04f9e1bc7466feda22069423d638fb4b3..da18fbc38976c601da7781b488449da7d724160f 100644
+index c351fb49a8d044312ca77f5cd85d939a95bdae20..c50b69ace8c7e92d0bb141b301c541ec1e382324 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1380,8 +1380,10 @@ public final class Bukkit {
@@ -43,7 +43,7 @@ index dcf6b2d04f9e1bc7466feda22069423d638fb4b3..da18fbc38976c601da7781b488449da7
          return server.createPlayerProfile(name);
      }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46221036bd 100644
+index 9f599e44c9519d8eaaedf2a11cce1637b0f23aec..2f404c6cefbbd842932620aa62750b343e90e41c 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -59,7 +59,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -56,7 +56,7 @@ index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46
      /**
       * Checks if this player has had their profile banned.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7a1b80e8d02f23c5d246c3032e5ced909f10bd41..01c052d90bbdad3fc374eb9c8e0a5133b8b624e8 100644
+index 51bed70fdc7221f41035e13af1fba69b492507ac..4c10cc9524c3001777c520a32c498108449980fb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1167,8 +1167,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -93,7 +93,7 @@ index 7a1b80e8d02f23c5d246c3032e5ced909f10bd41..01c052d90bbdad3fc374eb9c8e0a5133
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0d92eac00ba883d696d45340feb808988be05c16..357e12c91a710751dc5bf3138362c10e5a26db1e 100644
+index fcb83800bc4cbaa96e5f190e0cf618542d8bb637..3611ef03abe9c81cfb956c9957c57e7df05faf32 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3154,6 +3154,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0090-getPlayerUniqueId-API.patch b/patches/api/0090-getPlayerUniqueId-API.patch
index 4ded35b02d..18e98ba492 100644
--- a/patches/api/0090-getPlayerUniqueId-API.patch
+++ b/patches/api/0090-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index da18fbc38976c601da7781b488449da7d724160f..28b86658aea14b33470508944d8626b23c65bba2 100644
+index c50b69ace8c7e92d0bb141b301c541ec1e382324..4cdbcb96b358bc678255ae3852cef047a2df2457 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -753,6 +753,20 @@ public final class Bukkit {
@@ -34,7 +34,7 @@ index da18fbc38976c601da7781b488449da7d724160f..28b86658aea14b33470508944d8626b2
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 01c052d90bbdad3fc374eb9c8e0a5133b8b624e8..5c6c9f714097dfaead0093d752f1b373b70a75eb 100644
+index 4c10cc9524c3001777c520a32c498108449980fb..957bc4c3e4c1eb6a4d89b5e559f95b604ecf59c4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -633,6 +633,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch
index 62e9847bb6..403efbcaef 100644
--- a/patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch
@@ -8,7 +8,7 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index abbf3d6f11350ab2dd47a277771d9f46221036bd..a9d63b1630b05b86a0396355fcfee261bab96293 100644
+index 2f404c6cefbbd842932620aa62750b343e90e41c..11b470b07a8b5d9e7f87df5abe9bd4f5bf9f86ef 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -67,6 +67,73 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -86,7 +86,7 @@ index abbf3d6f11350ab2dd47a277771d9f46221036bd..a9d63b1630b05b86a0396355fcfee261
      /**
       * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ecc0bbf986b065620910f3592115c0f45e863b98..354beb974012fa83fdac0c9d28166016ace93070 100644
+index 949b34e9c9f8b4be48c09f80d78d9453f0ff0ee3..c65a1204c948df81664357524d9d1e6abafb7776 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1255,6 +1255,186 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0096-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0096-Additional-world.getNearbyEntities-API-s.patch
index 22aac2ff5b..fc6396519e 100644
--- a/patches/api/0096-Additional-world.getNearbyEntities-API-s.patch
+++ b/patches/api/0096-Additional-world.getNearbyEntities-API-s.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c4f2f03ec31998d486dad1d45ef83df3f77b5e28..9cf4823ddf1b8291e8c11c39c02c1fed58c18936 100644
+index 369e92f2b5e4b8fc7f5bf8a97058e827c91e4c59..79e5b429fe5660695e9fa603f8bc1fc1352b8950 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@
diff --git a/patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
index 419d066213..c88ced9f43 100644
--- a/patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -597,10 +597,10 @@ index 0000000000000000000000000000000000000000..6c405755f4507d6fbc6c3877c611a719
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index a1896780f312a91ab2330d2c850641d66143f23e..37e7862be843da4f48ac061fb1625854fd671b2a 100644
+index ecf9f941e618608b98feaac46df3f10ec951c186..605588eb0613dedec9cba696503a85abf1a8b280 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -205,6 +205,18 @@ public enum Particle implements Keyed {
+@@ -206,6 +206,18 @@ public enum Particle implements Keyed {
          return key;
      }
  
@@ -620,7 +620,7 @@ index a1896780f312a91ab2330d2c850641d66143f23e..37e7862be843da4f48ac061fb1625854
       * Options which can be applied to dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9cf4823ddf1b8291e8c11c39c02c1fed58c18936..44a74f15bea60ecd8380520e8faaea41a6c261c5 100644
+index 79e5b429fe5660695e9fa603f8bc1fc1352b8950..f1d59d22d805cfe5ac2707c88a917bf17ae38b96 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2948,7 +2948,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0103-PotionEffect-clone-methods.patch b/patches/api/0103-PotionEffect-clone-methods.patch
index d1fac16047..a59479b404 100644
--- a/patches/api/0103-PotionEffect-clone-methods.patch
+++ b/patches/api/0103-PotionEffect-clone-methods.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PotionEffect clone methods
 
 
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index 89d49ce1e9475bf2d3748e483360451359e8cef8..575156c089e45a3d6a43ca6b7adfbc7b473a60ab 100644
+index 6478faee913d9a3bee0beb83a2cc4ecfa4f8df90..0d60a1b740199783d3fcb775f190ee85bd84696b 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
 @@ -109,6 +109,33 @@ public class PotionEffect implements ConfigurationSerializable {
diff --git a/patches/api/0105-ItemStack-getMaxItemUseDuration.patch b/patches/api/0105-ItemStack-getMaxItemUseDuration.patch
index bb9d57e4e1..4b354180a6 100644
--- a/patches/api/0105-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/api/0105-ItemStack-getMaxItemUseDuration.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 29bc12cb3095282a31f01f08ac66c15b24f42524..f908c11ece7b3d1a52e21540999f36796237d590 100644
+index e66a958bc36ac774081d5e71966f312ebb8228d9..a3de566c8f0ea4dcdb158f9ef0876a3b14429140 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -670,5 +670,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0107-Make-shield-blocking-delay-configurable.patch b/patches/api/0107-Make-shield-blocking-delay-configurable.patch
index 10d09ee21c..e76852fc1e 100644
--- a/patches/api/0107-Make-shield-blocking-delay-configurable.patch
+++ b/patches/api/0107-Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e6bdfd14bffa394cd717de7118de951a997f50b3..2d4d93a4fc3f712a21bd61e203407f3a84e16310 100644
+index 055ba78f61dfa2d791361ae3b74611131e95dda7..d71fa7359619bca9fab4ecfb05af04b292416217 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -847,5 +847,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 21f357efaf..31d676c17b 100644
--- a/patches/api/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/patches/api/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-index 1a8366f6757431baaba4f3d48abea3cf0ec1f1ad..e4efcd757ca51a4edd396f55c812dbe89ffb68c7 100644
+index 8200ac4e2990d8751f9c5fb02bc5e173d59d7d94..85e2277efa62d8610979003b6d37bda4352e732e 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 @@ -22,7 +22,32 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
diff --git a/patches/api/0111-Add-entity-knockback-events.patch b/patches/api/0111-Add-entity-knockback-events.patch
index e8cdb9485d..046eb6ef37 100644
--- a/patches/api/0111-Add-entity-knockback-events.patch
+++ b/patches/api/0111-Add-entity-knockback-events.patch
@@ -280,7 +280,7 @@ index 3f17290c0863cc1d452bb50c524c18b6ab255d70..bd44bc5ed9e20148f9b2ab3d20491872
  
      private final Entity source;
 diff --git a/src/main/java/org/bukkit/event/entity/EntityKnockbackEvent.java b/src/main/java/org/bukkit/event/entity/EntityKnockbackEvent.java
-index 9355efbbd4625e34d6c9d26bcbd02272202dec79..753e6f30da4f3dc9d5ed7d1b40d30b602b8c8c9e 100644
+index 692c6010198b06dc56c31e0392a60dcc6cfe5800..0d465629ecd86ba796e99d35c0492597535cb258 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityKnockbackEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityKnockbackEvent.java
 @@ -11,7 +11,10 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0112-Expand-Explosions-API.patch b/patches/api/0112-Expand-Explosions-API.patch
index bc6d875f8f..6523f665b2 100644
--- a/patches/api/0112-Expand-Explosions-API.patch
+++ b/patches/api/0112-Expand-Explosions-API.patch
@@ -111,7 +111,7 @@ index df88bc77a3fa2506adf17eddc6300ac65774df6f..fe2e0939df61b1f59d12adf3f760f1d6
      /**
       * Returns a list of entities within a bounding box centered around a Location.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 44a74f15bea60ecd8380520e8faaea41a6c261c5..c2b5fdaace13c8bd46c073ac6d427fe411d96367 100644
+index f1d59d22d805cfe5ac2707c88a917bf17ae38b96..62a0e6efcc33f56b26fa917276ac09737d4bf362 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1424,6 +1424,104 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0113-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
index 0bfbef94ea..82dcd40cad 100644
--- a/patches/api/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/patches/api/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack API additions for quantity/flags/lore
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index f908c11ece7b3d1a52e21540999f36796237d590..d125d29759167996a90b7b69d92d944e80af22ab 100644
+index a3de566c8f0ea4dcdb158f9ef0876a3b14429140..080d9a9e26131eb43649104c3d59691308f79fe7 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -686,5 +686,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0114-LivingEntity-Active-Item-API.patch b/patches/api/0114-LivingEntity-Active-Item-API.patch
index 885fb3349a..f7f8f27483 100644
--- a/patches/api/0114-LivingEntity-Active-Item-API.patch
+++ b/patches/api/0114-LivingEntity-Active-Item-API.patch
@@ -9,7 +9,7 @@ such as a bow or eating food.
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 00b803cee96fef8830e5db8722c98ff14630fd2a..5acc8740d14b53aadef1aa4d63d3355149acd0e2 100644
+index 35d72d8ab78ca4095545fab54d6b440c040223eb..4d72da8b04c72f296bc3f8e00e54f4d79e531d44 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -367,7 +367,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -23,7 +23,7 @@ index 00b803cee96fef8830e5db8722c98ff14630fd2a..5acc8740d14b53aadef1aa4d63d33551
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 2d4d93a4fc3f712a21bd61e203407f3a84e16310..434ad8b07b6ee0b0919de8044d14fe3c789e203f 100644
+index d71fa7359619bca9fab4ecfb05af04b292416217..f8eb5527b4e0520712f4d8c329ba9d5dc4a4d206 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -202,15 +202,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0115-RangedEntity-API.patch b/patches/api/0115-RangedEntity-API.patch
index 087c06057f..abc8685ede 100644
--- a/patches/api/0115-RangedEntity-API.patch
+++ b/patches/api/0115-RangedEntity-API.patch
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..09c82908f63233febfe1e07fe756f1c3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/AbstractSkeleton.java b/src/main/java/org/bukkit/entity/AbstractSkeleton.java
-index e2fce218c6623b3c932c2782a66dea73dccd33f1..4f4f1e48cdaee0d845f60666569e48731be3fbb9 100644
+index 6ffacd3af2b03a403d80fa9a141a819cbde34fc6..2d81d077015fff47c5a5b64e2e1c74f962b4ceee 100644
 --- a/src/main/java/org/bukkit/entity/AbstractSkeleton.java
 +++ b/src/main/java/org/bukkit/entity/AbstractSkeleton.java
 @@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0116-Add-World.getEntity-UUID-API.patch b/patches/api/0116-Add-World.getEntity-UUID-API.patch
index b0b2aa8c6f..148debac20 100644
--- a/patches/api/0116-Add-World.getEntity-UUID-API.patch
+++ b/patches/api/0116-Add-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c2b5fdaace13c8bd46c073ac6d427fe411d96367..2053c92bc7e81b420ebf96cbd5f1275c514dd5f3 100644
+index 62a0e6efcc33f56b26fa917276ac09737d4bf362..002bfadfd4efa3d376a0a7bc5c752e8a02494eec 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -932,6 +932,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0117-InventoryCloseEvent-Reason-API.patch b/patches/api/0117-InventoryCloseEvent-Reason-API.patch
index 572f11d4e6..524199660e 100644
--- a/patches/api/0117-InventoryCloseEvent-Reason-API.patch
+++ b/patches/api/0117-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 5acc8740d14b53aadef1aa4d63d3355149acd0e2..6c2f01bf452d991faf40b995225bf7b7e49281df 100644
+index 4d72da8b04c72f296bc3f8e00e54f4d79e531d44..a7824c9f133f433cb9f98326348b4b6ae725a39d 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -187,6 +187,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
diff --git a/patches/api/0119-Entity-getChunk-API.patch b/patches/api/0119-Entity-getChunk-API.patch
index e0cdc1ee1f..939fdeba04 100644
--- a/patches/api/0119-Entity-getChunk-API.patch
+++ b/patches/api/0119-Entity-getChunk-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6dad1a01264f7776ca6f31e621ea4fbb295efb5d..48177547ec93fb5a807897a6fb472582a78f3978 100644
+index ca81360956276047602958949148b6a70cc3e954..45f06224d476551267e9b083985051ae9954d756 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
diff --git a/patches/api/0123-Allow-disabling-armour-stand-ticking.patch b/patches/api/0123-Allow-disabling-armour-stand-ticking.patch
index 1bb68e268b..d8e4a5f002 100644
--- a/patches/api/0123-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/api/0123-Allow-disabling-armour-stand-ticking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 7dc631ebd009f5f5c3ac1699c3f3515c47609c05..2ee3814a52945f541e049b621b9552f8ae9e261d 100644
+index c727b2d40efae8f08bdd159991afb8992568a58f..38538ad590f33c67cf63ed3bfb177e172f4dc43c 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -363,5 +363,21 @@ public interface ArmorStand extends LivingEntity {
diff --git a/patches/api/0129-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0129-Provide-Chunk-Coordinates-as-a-Long-API.patch
index 1d69849b56..1743caa347 100644
--- a/patches/api/0129-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/api/0129-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -44,7 +44,7 @@ index 20ed1c40437cbf8449dd4d7876086ccb6407b470..8764441ec1bae67a029b13c4c9824657
       * 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 2053c92bc7e81b420ebf96cbd5f1275c514dd5f3..11362777d834cad2265984c7aa493358105cbf68 100644
+index 002bfadfd4efa3d376a0a7bc5c752e8a02494eec..3dc2e420d8a6cf02fc4215d4d8056c44e829157f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -182,6 +182,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0132-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0132-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index 5498e1910c..66c02b2da0 100644
--- a/patches/api/0132-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/api/0132-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -50,7 +50,7 @@ index 56fd66a3fb5f6e33812d2981cd192d317453a0f5..12e1733d06471d0c2253ae846ee93a09
       * @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 11362777d834cad2265984c7aa493358105cbf68..c474f6f0f1d758507f53c6f1ffbe3e26883e1425 100644
+index 3dc2e420d8a6cf02fc4215d4d8056c44e829157f..eaa51337616746a7ee1407c1fdcb7246f9483a8b 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -99,6 +99,41 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -96,7 +96,7 @@ index 11362777d834cad2265984c7aa493358105cbf68..c474f6f0f1d758507f53c6f1ffbe3e26
       * Gets the highest non-empty (impassable) block at the given coordinates.
       *
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index f3b3606dc5881e931853fc2631aad9ca9083474d..bb3cf2c5e2acbcd7cf53ad8551a5b11fa6104ada 100644
+index 69d97a14715040263afec77d0ba623c2ac84062a..a5b03162e5c0484db57d0ce0e57e945840fe1357 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -156,6 +156,82 @@ public interface Block extends Metadatable, Translatable {
diff --git a/patches/api/0133-Slime-Pathfinder-Events.patch b/patches/api/0133-Slime-Pathfinder-Events.patch
index 36e665a7d1..9779ef7b21 100644
--- a/patches/api/0133-Slime-Pathfinder-Events.patch
+++ b/patches/api/0133-Slime-Pathfinder-Events.patch
@@ -205,7 +205,7 @@ index 0000000000000000000000000000000000000000..0ea085c4a1cf663e2333444cebda876d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
-index bfac874840cf1f36afba16ae4d176c5821a68cfb..335b92e7be49ae13b2a1140183650642063a4219 100644
+index 0a2d603bf6a3f60d3fa7d85df6ef2373fc93d848..26d09d2029d470343b2b70112cb1460945c026e7 100644
 --- a/src/main/java/org/bukkit/entity/Slime.java
 +++ b/src/main/java/org/bukkit/entity/Slime.java
 @@ -24,4 +24,20 @@ public interface Slime extends Mob, Enemy {
diff --git a/patches/api/0137-isChunkGenerated-API.patch b/patches/api/0137-isChunkGenerated-API.patch
index c379d6eb03..ed7a4601f8 100644
--- a/patches/api/0137-isChunkGenerated-API.patch
+++ b/patches/api/0137-isChunkGenerated-API.patch
@@ -37,7 +37,7 @@ index 12e1733d06471d0c2253ae846ee93a09140843cc..b02efba048be00e42502111fcdd22975
  
      /**
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c474f6f0f1d758507f53c6f1ffbe3e26883e1425..ba9ab1d46effe1e6c08cebddb8b856e2b294d7cb 100644
+index eaa51337616746a7ee1407c1fdcb7246f9483a8b..2986793d6e3e71ae900bbd3293af288d4ad0b503 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -248,6 +248,19 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0139-Async-Chunks-API.patch b/patches/api/0139-Async-Chunks-API.patch
index bda9be5732..422531ab39 100644
--- a/patches/api/0139-Async-Chunks-API.patch
+++ b/patches/api/0139-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 ba9ab1d46effe1e6c08cebddb8b856e2b294d7cb..1161c286aaaaad761c80ca97c25fd166365bb044 100644
+index 2986793d6e3e71ae900bbd3293af288d4ad0b503..9517091f601f362f80ff6062f53eff760f040e6c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -977,6 +977,509 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -522,7 +522,7 @@ index ba9ab1d46effe1e6c08cebddb8b856e2b294d7cb..1161c286aaaaad761c80ca97c25fd166
       * Get a list of all players in this World
       *
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 48177547ec93fb5a807897a6fb472582a78f3978..99e1f17fddf9cebe7057998d1635804c55f18312 100644
+index 45f06224d476551267e9b083985051ae9954d756..b808044403e6b38d1801aefde2176d630c747a64 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -168,6 +168,39 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0140-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0140-Add-ray-tracing-methods-to-LivingEntity.patch
index 673555fc8b..87ba02db17 100644
--- a/patches/api/0140-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/api/0140-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -78,7 +78,7 @@ index 0000000000000000000000000000000000000000..bb12061985cdffbacfa2d113beaa35b2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 434ad8b07b6ee0b0919de8044d14fe3c789e203f..09b0dd1b14e2848253c1d3bfecb98951764737ee 100644
+index f8eb5527b4e0520712f4d8c329ba9d5dc4a4d206..9ffa42e3d241dd209813cea993c8fcda72f1a935 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -85,6 +85,98 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0141-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0141-Expose-attack-cooldown-methods-for-Player.patch
index d8e3d59112..3087b96844 100644
--- a/patches/api/0141-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0141-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 354beb974012fa83fdac0c9d28166016ace93070..76ffe308ae2e3bc36c0e7e1a98adc4b307f4211f 100644
+index c65a1204c948df81664357524d9d1e6abafb7776..f84c55b9a93aae762ed28cc536eccbd7a503177a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3356,6 +3356,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0146-Material-API-additions.patch b/patches/api/0146-Material-API-additions.patch
index fa9a794cca..1703b81e1f 100644
--- a/patches/api/0146-Material-API-additions.patch
+++ b/patches/api/0146-Material-API-additions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index a53b79552a8a810ec0b1f1943e30c470217b26a9..6ebf024d5c2d5fc7253319b68ceed212de1cd73d 100644
+index b8d3b0c4738c5a2886d9728f396df1746ea4f859..9d1f82be4f23af37ccc6db65756f6dd3028c6837 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -134,6 +134,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -135,6 +135,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * An enum of all material IDs accepted by the official server and client
   */
@@ -16,7 +16,7 @@ index a53b79552a8a810ec0b1f1943e30c470217b26a9..6ebf024d5c2d5fc7253319b68ceed212
  public enum Material implements Keyed, Translatable {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -4846,6 +4847,22 @@ public enum Material implements Keyed, Translatable {
+@@ -4817,6 +4818,22 @@ public enum Material implements Keyed, Translatable {
          });
      }
  
diff --git a/patches/api/0147-Add-Material-Tags.patch b/patches/api/0147-Add-Material-Tags.patch
index 69e9e51ae8..49457e8365 100644
--- a/patches/api/0147-Add-Material-Tags.patch
+++ b/patches/api/0147-Add-Material-Tags.patch
@@ -1140,7 +1140,7 @@ index 0000000000000000000000000000000000000000..bc07aaa5a001f8b58d0603d5db88f9c5
 +        .ensureSize("WATER_BASED", 12).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 2877eba0017ab8f3d94ca40a5e575e80adf0952e..0eca6dc6bcd9bbcad0a98a5956091bec362f2db6 100644
+index fb7d8bb34561ef686c2b53175ba55b4b72a82674..8420fb1c6059ea9f782a47d18c465ba515765085 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/0149-Add-LivingEntity-getTargetEntity.patch b/patches/api/0149-Add-LivingEntity-getTargetEntity.patch
index 40667d692a..0a684b4e75 100644
--- a/patches/api/0149-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/api/0149-Add-LivingEntity-getTargetEntity.patch
@@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..caa56541c435a3d9103cb0220ab88563
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 09b0dd1b14e2848253c1d3bfecb98951764737ee..9e0137ea412ec8c65b2903a76499ba8222446ea3 100644
+index 9ffa42e3d241dd209813cea993c8fcda72f1a935..775f18abe007edc73ed60eb45f84bd79912f9331 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -175,6 +175,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0150-Add-sun-related-API.patch b/patches/api/0150-Add-sun-related-API.patch
index 7d03429481..e8ac87454d 100644
--- a/patches/api/0150-Add-sun-related-API.patch
+++ b/patches/api/0150-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 f314f8bc5c437c5703c1e093278d9046903ff2c8..a8fe8c2f4327f0bee60eeac565620117f3fde2ee 100644
+index 9517091f601f362f80ff6062f53eff760f040e6c..10e9981c9068c39dfdda5c9f82558d481288a8c6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1835,6 +1835,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0154-Make-the-default-permission-message-configurable.patch b/patches/api/0154-Make-the-default-permission-message-configurable.patch
index 44d7f35770..ff93cc28f7 100644
--- a/patches/api/0154-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0154-Make-the-default-permission-message-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 720f1cc07824fe6e46cdd8bbe8f5a9b15b9c816d..f9067281bd5f1ac11dcb9cc2e19f3c5f17face21 100644
+index 4cdbcb96b358bc678255ae3852cef047a2df2457..e0b22dd1124f02a78e5adfcf2179eadebff1dba6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2445,6 +2445,28 @@ public final class Bukkit {
@@ -38,7 +38,7 @@ index 720f1cc07824fe6e46cdd8bbe8f5a9b15b9c816d..f9067281bd5f1ac11dcb9cc2e19f3c5f
       * Creates a PlayerProfile for the specified uuid, with name as null.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f1d2776eab476aae60b5dd5cb7eeb41a2235825c..2719461e49a74f979d49dea9c664dfe3da8d2c8e 100644
+index 957bc4c3e4c1eb6a4d89b5e559f95b604ecf59c4..7b5f6091c8e930526a2a5346a02b52912c38e2af 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2127,6 +2127,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -66,7 +66,7 @@ index f1d2776eab476aae60b5dd5cb7eeb41a2235825c..2719461e49a74f979d49dea9c664dfe3
       * Creates a PlayerProfile for the specified uuid, with name as null.
       *
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 8a298b655f4eaf5116994f98572a20e83a23838c..03d2643d166824458c88a49f20270e93b14f3988 100644
+index 0ee08b6cd80e72ae67e1316ddbb58b7c1d47e5ce..92b905e5da3cb8f477bb17d848c3523781545ae3 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -192,10 +192,9 @@ public abstract class Command {
diff --git a/patches/api/0156-Add-more-Zombie-API.patch b/patches/api/0156-Add-more-Zombie-API.patch
index 38efc859d8..d3c4c2def3 100644
--- a/patches/api/0156-Add-more-Zombie-API.patch
+++ b/patches/api/0156-Add-more-Zombie-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index 336b3efaf0a8ed5a238e8b941193d690e8b72d71..c1a5b625ea602d751a8026d989882c60e80756c9 100644
+index c69eaf2ff582a6ec8a3b83daba2ab1e3a7bec7d3..ec6d6052bfd0deb431e9a71329169c97fa498bcd 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
 @@ -107,4 +107,60 @@ public interface Zombie extends Monster, Ageable {
diff --git a/patches/api/0157-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0157-Change-the-reserved-channel-check-to-be-sensible.patch
index 8975ff3c43..332cd2a1ac 100644
--- a/patches/api/0157-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/patches/api/0157-Change-the-reserved-channel-check-to-be-sensible.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Change the reserved channel check to be sensible
 
 
 diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
-index 1d061412cdafa28c6940c7433747ab1dabe23de1..6fda7f3aa68e76af64362e9afed70fc6a5e92986 100644
+index ed39f5116bdfba63f14aadfe81173fe2b68af4d7..8e96be6033e94d4f0bebb346ad222abe18d1f274 100644
 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 @@ -172,7 +172,7 @@ public class StandardMessenger implements Messenger {
diff --git a/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch
index 78e75fc75c..bbe19e09f6 100644
--- a/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch
@@ -9,7 +9,7 @@ Redirects some of upstream's APIs to these new methods to avoid
 usage of magic values and the deprecated RecipeChoice#getItemStack
 
 diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-index a98fc2ffdae1a2f8f3a312bed95268e105f7f791..91bfeffcdbe47208c7d0ddbe013cd0f11fddfa32 100644
+index 9ef4221742eea7e091f240e2721d5260d153c7c1..653837b5f3a5fb9e5aa806f8ef8ae56fb53cce02 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
 @@ -157,8 +157,6 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
@@ -22,7 +22,7 @@ index a98fc2ffdae1a2f8f3a312bed95268e105f7f791..91bfeffcdbe47208c7d0ddbe013cd0f1
      public static class ExactChoice implements RecipeChoice {
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index e9bac744c5b173e6767e2de8480a6697969fdbb0..fa03cf187db29896f5af046b311f67881aee0ff4 100644
+index 55f4a6efa7dfb64f131f735f92356d01e7cc775a..90b58219ca99dfd4368119183bb414e51c0f0dd1 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -180,6 +180,13 @@ public class ShapedRecipe extends CraftingRecipe {
@@ -40,7 +40,7 @@ index e9bac744c5b173e6767e2de8480a6697969fdbb0..fa03cf187db29896f5af046b311f6788
       * Get a copy of the ingredients map.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index a7513c1aa09b88e3f99e7db40661fd83e682de96..63a233cc819d8d6995d14b9dbfabc14d89af54cc 100644
+index a9d1f9fc129f757353b879fc5946c4b9299833ea..d4a9572a0fedee8993d32ca006a28a242d148e36 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -132,6 +132,40 @@ public class ShapelessRecipe extends CraftingRecipe {
diff --git a/patches/api/0164-Add-PlayerPostRespawnEvent.patch b/patches/api/0164-Add-PlayerPostRespawnEvent.patch
index 90bb07b46a..1f345dab80 100644
--- a/patches/api/0164-Add-PlayerPostRespawnEvent.patch
+++ b/patches/api/0164-Add-PlayerPostRespawnEvent.patch
@@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..e82446ec3d706c47ac9a544f70d0c19b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
-index c3d9d95be50eacb212108a01b612756f772956aa..03225d2b4c91caa58c2995d9cf0e7fb4663749ab 100644
+index d6b4c81ef51662ee6bbfa0579c07d97ebd0e22ae..7e765886179b08d6b2edb5319aeacc9e7db5b8c2 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
 @@ -8,6 +8,9 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch b/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch
index db12377963..f1dc0f15a6 100644
--- a/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch
+++ b/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch
@@ -14,7 +14,7 @@ Co-authored-by: Aurora <[email protected]>
 Co-authored-by: Jakub Zacek <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 99e1f17fddf9cebe7057998d1635804c55f18312..c3387a88a16cfd9157ade5d8a06eae2540a97288 100644
+index b808044403e6b38d1801aefde2176d630c747a64..cc1a619e54c2ce0ee49f81534c56d5b55aa5bfc2 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -857,5 +857,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -30,7 +30,7 @@ index 99e1f17fddf9cebe7057998d1635804c55f18312..c3387a88a16cfd9157ade5d8a06eae25
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-index 1e2bb345d19ebe03589d85bdab13021b6fa2ed98..6ff1988092de06f9d751cd40da521c2ed6e2e4bd 100644
+index 5d2597378d36ccace672db0768267d3499100cf1..361db256296d776c27e601c923b2cdc61967122b 100644
 --- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 @@ -206,6 +206,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
diff --git a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
index cecb58ef75..25e0de3a4d 100644
--- a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
@@ -272,10 +272,10 @@ index b02efba048be00e42502111fcdd2297529926666..fb4b6f0e908ffa50c3b2f8d04d9f3810
          if (this.world == null) {
              return null;
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb341c8eb3b 100644
+index 9d1f82be4f23af37ccc6db65756f6dd3028c6837..fe63fef02ee208a5fc52d30a27519a0506c58f8c 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4867,20 +4867,20 @@ public enum Material implements Keyed, Translatable {
+@@ -4838,20 +4838,20 @@ public enum Material implements Keyed, Translatable {
       * Do not use for any reason.
       *
       * @return ID of this material
@@ -300,7 +300,7 @@ index 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb3
      public boolean isLegacy() {
          return legacy;
      }
-@@ -4956,8 +4956,10 @@ public enum Material implements Keyed, Translatable {
+@@ -4927,8 +4927,10 @@ public enum Material implements Keyed, Translatable {
       * Gets the MaterialData class associated with this Material
       *
       * @return MaterialData associated with this Material
@@ -311,7 +311,7 @@ index 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb3
      public Class<? extends MaterialData> getData() {
          Preconditions.checkArgument(legacy, "Cannot get data class of Modern Material");
          return ctor.getDeclaringClass();
-@@ -5413,7 +5415,11 @@ public enum Material implements Keyed, Translatable {
+@@ -5384,7 +5386,11 @@ public enum Material implements Keyed, Translatable {
       * material.
       *
       * @return true if this material can be interacted with.
@@ -687,10 +687,10 @@ index dd1e7b71d7d332b3e22189c7e0eda6d47ec49e55..555d0492c2fcf85c1e2f95f145b974cb
  
      /**
 diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
-index aea98cddf2433fff6066124f880bb80e1c32fa17..f5b047345639cf8e55354cc514d18fd80ff1b712 100644
+index 04bbbaba10cdd7ce3c394692579605d66953ac01..95eb7d7718a74382289ac3a7b2d5fac4c9ec19a2 100644
 --- a/src/main/java/org/bukkit/block/BlockType.java
 +++ b/src/main/java/org/bukkit/block/BlockType.java
-@@ -3576,9 +3576,14 @@ public interface BlockType extends Keyed, Translatable {
+@@ -3551,9 +3551,14 @@ public interface BlockType extends Keyed, Translatable {
       * state as well. This method will return true if there is at least one
       * state in which additional interact handling is performed for the
       * block type.
@@ -809,10 +809,10 @@ index 3afe2787de576f7190d87c796bea0ab34dc30248..875817b807c9f515eb07b03cc85d3689
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 10c957a6bb6227d6c6109085a3b8c3fa5944277c..122ee01c4664617bb1b691d5ff24427abdbedcf2 100644
+index 896b87bfc39b82849e32398161269bffb0577efe..dc944ad75f04f5d2f72639615f64b5bb2d1b4117 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -428,9 +428,9 @@ public enum EntityType implements Keyed, Translatable {
+@@ -417,9 +417,9 @@ public enum EntityType implements Keyed, Translatable {
       *
       * @param name the entity type's name
       * @return the matching entity type or null
@@ -1748,10 +1748,10 @@ index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb6
      public ItemStack getInput() {
          return this.ingredient.getItemStack();
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484ac440cb3 100644
+index 5cc1d77a09d2877992433b020ad2c591bb94d3fd..eb14949da2b96aee75e3bba63af8176c5550a380 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -151,6 +151,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -152,6 +152,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Checks for existence of a localized name.
       *
@@ -1759,7 +1759,7 @@ index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484
       * @return true if this has a localized name
       * @deprecated meta no longer exists
       */
-@@ -163,6 +164,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -164,6 +165,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Plugins should check that hasLocalizedName() returns <code>true</code>
       * before calling this method.
       *
@@ -1767,7 +1767,7 @@ index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484
       * @return the localized name that is set
       * @deprecated meta no longer exists
       */
-@@ -173,6 +175,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -174,6 +176,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Sets the localized name.
       *
@@ -1775,7 +1775,7 @@ index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484
       * @param name the name to set
       * @deprecated meta no longer exists
       */
-@@ -749,7 +752,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -772,7 +775,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       *
       * @return component
       */
diff --git a/patches/api/0171-Add-BlockSoundGroup-interface.patch b/patches/api/0171-Add-BlockSoundGroup-interface.patch
index 76ed1fa86d..b66d3fc6f7 100644
--- a/patches/api/0171-Add-BlockSoundGroup-interface.patch
+++ b/patches/api/0171-Add-BlockSoundGroup-interface.patch
@@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..2bde2b7c960b321d0c1396212858c780
 +    Sound getFallSound();
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index e4393f2bd71308a58305cb870271d6a647ffcd92..e63fc428543498fc5a12856671d83f13f7de8442 100644
+index 2566c7bb9e770483abdd3398af13179dc747b682..c278e7a3da5989b0f41c571e3cb7579289795e95 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -616,4 +616,25 @@ public interface Block extends Metadatable, Translatable {
diff --git a/patches/api/0174-Expose-the-internal-current-tick.patch b/patches/api/0174-Expose-the-internal-current-tick.patch
index 8f2b1fb396..d68e63883e 100644
--- a/patches/api/0174-Expose-the-internal-current-tick.patch
+++ b/patches/api/0174-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 03e836b9c2e6d141396cfe4a0034c5dcdcaf9e90..7e4673f672233d69df4bf53244542daa7fdcac75 100644
+index 0d743a27e0955af7b1baee49ce7e62e993a0a8b8..f16f0a72a7b533106e1703197e370d67e13d77a3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2552,6 +2552,10 @@ public final class Bukkit {
@@ -20,7 +20,7 @@ index 03e836b9c2e6d141396cfe4a0034c5dcdcaf9e90..7e4673f672233d69df4bf53244542daa
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 44ebe899f4278b8f7422385710bdc180375475fd..df37ce5da240ead6841e72ebdfddf2cd55caa27b 100644
+index 03d6e69b1771b1aabc22d680d8123239f7863e20..b8f1ecb16e3e1d969873f99f3b029d9a12437bd9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2221,5 +2221,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0175-Improve-Block-breakNaturally-API.patch b/patches/api/0175-Improve-Block-breakNaturally-API.patch
index 2b4f718585..1ce6e632a2 100644
--- a/patches/api/0175-Improve-Block-breakNaturally-API.patch
+++ b/patches/api/0175-Improve-Block-breakNaturally-API.patch
@@ -10,7 +10,7 @@ Adds bool param to trigger exp drops for blocks
 Co-authored-by: William Blake Galbreath <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index e63fc428543498fc5a12856671d83f13f7de8442..745413357506fa7399f8ba44dfe222d1f0c919f1 100644
+index c278e7a3da5989b0f41c571e3cb7579289795e95..4e79dc21824e4b1f286c344b0733057be27fb6c5 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -481,6 +481,52 @@ public interface Block extends Metadatable, Translatable {
diff --git a/patches/api/0178-Entity-Jump-API.patch b/patches/api/0178-Entity-Jump-API.patch
index 6cd58f786f..eda3d309c7 100644
--- a/patches/api/0178-Entity-Jump-API.patch
+++ b/patches/api/0178-Entity-Jump-API.patch
@@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..b49b72608573ad5b98fc6e0070f6ef10
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index db7dafba43b50146a32d749ec043c5d548b0d6e3..c2352d75e02f7be27fcf9ea69df1bd104a2449bd 100644
+index 72b83dedf025ef971b89e2c6a19fd411488948b7..f9e2b5a7cd3db267d8f543898b9f6b00586d1b4a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1159,4 +1159,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0180-Add-tick-times-API.patch b/patches/api/0180-Add-tick-times-API.patch
index c1ab0fde97..d2c97d40a4 100644
--- a/patches/api/0180-Add-tick-times-API.patch
+++ b/patches/api/0180-Add-tick-times-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add tick times API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7e4673f672233d69df4bf53244542daa7fdcac75..57a9b5433ffb22017e24c9be4a2eeaa2f439bea8 100644
+index f16f0a72a7b533106e1703197e370d67e13d77a3..2e44d7e90015d713b952f49f06d3ba7744d1eb42 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2218,6 +2218,25 @@ public final class Bukkit {
@@ -35,7 +35,7 @@ index 7e4673f672233d69df4bf53244542daa7fdcac75..57a9b5433ffb22017e24c9be4a2eeaa2
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index df37ce5da240ead6841e72ebdfddf2cd55caa27b..940f36835b541931ece973636c2e07e1a3c0db5b 100644
+index b8f1ecb16e3e1d969873f99f3b029d9a12437bd9..6d4f181be4000803392a59d3a9314c1d70be7533 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1877,6 +1877,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0181-Expose-MinecraftServer-isRunning.patch b/patches/api/0181-Expose-MinecraftServer-isRunning.patch
index 785cd47bf1..3b469b93f4 100644
--- a/patches/api/0181-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0181-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 57a9b5433ffb22017e24c9be4a2eeaa2f439bea8..a5ab6b1af7da41ccab0ee0810e0ef35a74b3eaca 100644
+index 2e44d7e90015d713b952f49f06d3ba7744d1eb42..40d04b4ebecaa0cff8937451568d998a0dfae088 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2575,6 +2575,15 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 57a9b5433ffb22017e24c9be4a2eeaa2f439bea8..a5ab6b1af7da41ccab0ee0810e0ef35a
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 940f36835b541931ece973636c2e07e1a3c0db5b..1c45e65a3f2c09c1b22f7647ac1093582d4ba109 100644
+index 6d4f181be4000803392a59d3a9314c1d70be7533..90509d2e4c61de29611312c0864ef7622072d540 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2243,5 +2243,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0182-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0182-Add-Raw-Byte-ItemStack-Serialization.patch
index 1d4c5dfaea..2299065933 100644
--- a/patches/api/0182-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/api/0182-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -8,7 +8,7 @@ Serializes using NBT which is safer for server data migrations than bukkits form
 Co-authored-by: Nassim Jahnke <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 8b5e4756d1c80e55be166dbe1faf57799f9cc03b..66d29e7f4187309d4a55202d1bda4b94e42211b0 100644
+index 012b46c82d9d06d1d2da8da626fc5cde6e9e2ca4..739f117a0fd91ae98b5e5a39ae8e23feca0b741d 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -164,5 +164,9 @@ public interface UnsafeValues {
@@ -22,7 +22,7 @@ index 8b5e4756d1c80e55be166dbe1faf57799f9cc03b..66d29e7f4187309d4a55202d1bda4b94
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index e9c29fc1db686b80bc2477d78ec2b361b8600b9e..af09398e0864d338da530495bfd577db8adbe65a 100644
+index 132cf07816b0d356c94fa4e8b8bfefccce2de103..a919d50b31ed48a43bc47596eae44b3d05a417ee 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -661,6 +661,117 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0183-Add-Player-Client-Options-API.patch b/patches/api/0183-Add-Player-Client-Options-API.patch
index 02cbc4e48c..2217f1bba1 100644
--- a/patches/api/0183-Add-Player-Client-Options-API.patch
+++ b/patches/api/0183-Add-Player-Client-Options-API.patch
@@ -261,7 +261,7 @@ index 0000000000000000000000000000000000000000..5245955fb3466d2b89eaad4027d145eb
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 80e894e3d625cde14bfe881d2c367b43a4882cfd..2d3c8febbbab959433101fb9dfc1e0ff9deca192 100644
+index 70fef7c72b4ea24b8fd3bd99cb8f6f37b3b9832b..1a94a914894524b0087044227e9e692102e89e9e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3375,6 +3375,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0187-Add-Mob-Goal-API.patch b/patches/api/0187-Add-Mob-Goal-API.patch
index a3e0b80e22..9fe67d6441 100644
--- a/patches/api/0187-Add-Mob-Goal-API.patch
+++ b/patches/api/0187-Add-Mob-Goal-API.patch
@@ -210,7 +210,7 @@ index 0000000000000000000000000000000000000000..0203e7efbb8c729ed378c53c2630a523
 +    <T extends Mob> Collection<Goal<T>> getRunningGoalsWithout(T mob, GoalType type);
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a5ab6b1af7da41ccab0ee0810e0ef35a74b3eaca..1393e4b146bdbf55004b54a5fc96e88a7dd7b8f6 100644
+index 40d04b4ebecaa0cff8937451568d998a0dfae088..aca049c29cc7397a830883a45b4b24a33863e533 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2584,6 +2584,16 @@ public final class Bukkit {
@@ -231,7 +231,7 @@ index a5ab6b1af7da41ccab0ee0810e0ef35a74b3eaca..1393e4b146bdbf55004b54a5fc96e88a
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1c45e65a3f2c09c1b22f7647ac1093582d4ba109..89e51b10bd8d89e4bab608a7fb9b491e4e147c0a 100644
+index 90509d2e4c61de29611312c0864ef7622072d540..89208165cc6b864a9273c364ba4b2d6d86e3c31f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2250,5 +2250,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0190-Potential-bed-API.patch b/patches/api/0190-Potential-bed-API.patch
index a45ca6b835..7a11d211bc 100644
--- a/patches/api/0190-Potential-bed-API.patch
+++ b/patches/api/0190-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 6c2f01bf452d991faf40b995225bf7b7e49281df..92ceb765ccb80c3b09ac3ede9bcaad6219fabd3d 100644
+index a7824c9f133f433cb9f98326348b4b6ae725a39d..d87261e0500d34696a50e9d6d136ca844c9a2cea 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -308,6 +308,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
diff --git a/patches/api/0193-Support-components-in-ItemMeta.patch b/patches/api/0193-Support-components-in-ItemMeta.patch
index d66067471b..3bdc7615ad 100644
--- a/patches/api/0193-Support-components-in-ItemMeta.patch
+++ b/patches/api/0193-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 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290d1415357 100644
+index eb14949da2b96aee75e3bba63af8176c5550a380..0151a0523069b00a1cf682ad6b54142aaffcfaa6 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;
@@ -16,7 +16,7 @@ index 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290
  import org.bukkit.NamespacedKey;
  import org.bukkit.Tag;
  import org.bukkit.attribute.Attribute;
-@@ -75,6 +76,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -76,6 +77,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @NotNull
      String getDisplayName();
  
@@ -37,7 +37,7 @@ index 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290
      /**
       * Sets the display name.
       *
-@@ -84,6 +99,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -85,6 +100,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @Deprecated // Paper
      void setDisplayName(@Nullable String name);
  
@@ -54,7 +54,7 @@ index 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290
      /**
       * Checks for existence of an item name.
       * <br>
-@@ -220,6 +245,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -221,6 +246,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @Nullable
      List<String> getLore();
  
@@ -74,7 +74,7 @@ index 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290
      /**
       * Sets the lore for this item.
       * Removes lore when given null.
-@@ -230,6 +268,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -231,6 +269,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @Deprecated // Paper
      void setLore(@Nullable List<String> lore);
  
diff --git a/patches/api/0194-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0194-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
index 6c725bc833..f5b6d2a49c 100644
--- a/patches/api/0194-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/api/0194-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added 2 new TargetReasons for 1.16 mob behavior
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java b/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
-index c6e4d69eecd2789b1d78fe99fe590932e9758ba1..85b318d9ee56a3c22c6b7c9ac408f021e51cb609 100644
+index 808142232a722cb6466bac78d00dc55c18ebe109..ef2d1fe4f2fa7f35ef76f2b4e179050d07b7021a 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
 @@ -159,6 +159,14 @@ public class EntityTargetEvent extends EntityEvent implements Cancellable {
diff --git a/patches/api/0195-Add-entity-liquid-API.patch b/patches/api/0195-Add-entity-liquid-API.patch
index 60621425e7..0e82f061c9 100644
--- a/patches/api/0195-Add-entity-liquid-API.patch
+++ b/patches/api/0195-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 c3387a88a16cfd9157ade5d8a06eae2540a97288..3cddad9b83a89b243f7dc05c0c6a7f6d431bdceb 100644
+index cc1a619e54c2ce0ee49f81534c56d5b55aa5bfc2..c09064e066435f87fa108552ca7e87ccded0fccf 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -863,5 +863,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0198-Brand-support.patch b/patches/api/0198-Brand-support.patch
index 42971e5ae7..c048bd6f36 100644
--- a/patches/api/0198-Brand-support.patch
+++ b/patches/api/0198-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2d3c8febbbab959433101fb9dfc1e0ff9deca192..54d33be1297a6a4646635ca09cae1f0a2d3fb7fa 100644
+index 1a94a914894524b0087044227e9e692102e89e9e..644c20bcf6bba3f581e15cec21a1295b3dc50d43 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3488,6 +3488,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0200-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0200-Add-playPickupItemAnimation-to-LivingEntity.patch
index 9147c42dbf..d75641f553 100644
--- a/patches/api/0200-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0200-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index c2352d75e02f7be27fcf9ea69df1bd104a2449bd..88d6a5aaf2a686186fab4916480a04f6503d887c 100644
+index f9e2b5a7cd3db267d8f543898b9f6b00586d1b4a..e37ae6f7641c813c916618a60d97679125ebc16e 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1181,4 +1181,29 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0202-Add-methods-to-get-translation-keys.patch b/patches/api/0202-Add-methods-to-get-translation-keys.patch
index 47ea45569b..9428781d37 100644
--- a/patches/api/0202-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0202-Add-methods-to-get-translation-keys.patch
@@ -144,10 +144,10 @@ index b3211a705acc26449675727823aa42ae6bacac4f..8b6584fae0a9d5cccbe350d889fa8b4a
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 3913d0392131375d3e3b34c9da3dbbb341c8eb3b..5f10237b57909d8e457f831392a1629f9854987f 100644
+index fe63fef02ee208a5fc52d30a27519a0506c58f8c..8509519ec0d5509f45e43f28b5bb55d953cebb14 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -135,7 +135,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -136,7 +136,7 @@ import org.jetbrains.annotations.Nullable;
   * An enum of all material IDs accepted by the official server and client
   */
  @SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
@@ -156,7 +156,7 @@ index 3913d0392131375d3e3b34c9da3dbbb341c8eb3b..5f10237b57909d8e457f831392a1629f
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
      STONE(22948),
-@@ -4863,6 +4863,17 @@ public enum Material implements Keyed, Translatable {
+@@ -4834,6 +4834,17 @@ public enum Material implements Keyed, Translatable {
      }
      // Paper end
  
@@ -174,7 +174,7 @@ index 3913d0392131375d3e3b34c9da3dbbb341c8eb3b..5f10237b57909d8e457f831392a1629f
      /**
       * Do not use for any reason.
       *
-@@ -5612,9 +5623,11 @@ public enum Material implements Keyed, Translatable {
+@@ -5583,9 +5594,11 @@ public enum Material implements Keyed, Translatable {
       * material
       * @see #getBlockTranslationKey()
       * @see #getItemTranslationKey()
@@ -251,10 +251,10 @@ index 951c23491390c2c8693d415598ef2de712189220..21f9998b472dc18eb308554f5cdf467f
      /**
       * Maximum health of an Entity.
 diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
-index f46932a12f46895ae10b63f7fbb54750da1bd2ba..b352886e697a1c9869226b583da5240592575064 100644
+index f04aa0300b240f78b56c389fb2851aa4d16fc724..739fef949defca7b6bf4e6b3e079446c24d9b34c 100644
 --- a/src/main/java/org/bukkit/block/Biome.java
 +++ b/src/main/java/org/bukkit/block/Biome.java
-@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
   * There may be additional biomes present in the server, for example from a {@link DataPack}
   * which can be accessed via {@link Registry#BIOME}.
   */
@@ -263,7 +263,7 @@ index f46932a12f46895ae10b63f7fbb54750da1bd2ba..b352886e697a1c9869226b583da52405
  
      Biome OCEAN = getBiome("ocean");
      Biome PLAINS = getBiome("plains");
-@@ -131,4 +131,11 @@ public interface Biome extends OldEnum<Biome>, Keyed {
+@@ -127,4 +127,11 @@ public interface Biome extends OldEnum<Biome>, Keyed {
      static Biome[] values() {
          return Lists.newArrayList(Registry.BIOME).toArray(new Biome[0]);
      }
@@ -302,7 +302,7 @@ index 4e79dc21824e4b1f286c344b0733057be27fb6c5..afed7dfcbc878c19d3821dde77d6ade0
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
-index f5b047345639cf8e55354cc514d18fd80ff1b712..1b026f88d3c231ca38dbe0c1b86124c1e8e2f8cf 100644
+index 95eb7d7718a74382289ac3a7b2d5fac4c9ec19a2..f0c3343e2006f244bb1f99c269bcbaa357feb25f 100644
 --- a/src/main/java/org/bukkit/block/BlockType.java
 +++ b/src/main/java/org/bukkit/block/BlockType.java
 @@ -129,7 +129,7 @@ import org.jetbrains.annotations.Nullable;
@@ -314,7 +314,7 @@ index f5b047345639cf8e55354cc514d18fd80ff1b712..1b026f88d3c231ca38dbe0c1b86124c1
  
      /**
       * Typed represents a subtype of {@link BlockType}s that have a known block
-@@ -3641,4 +3641,13 @@ public interface BlockType extends Keyed, Translatable {
+@@ -3616,4 +3616,13 @@ public interface BlockType extends Keyed, Translatable {
      @Nullable
      @Deprecated(since = "1.20.6")
      Material asMaterial();
@@ -374,10 +374,10 @@ index 865ab3d2015e114d3cac72e0e26e4086a3913b38..f4422da4ebb0dc6551305f3e8468817e
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 122ee01c4664617bb1b691d5ff24427abdbedcf2..5f06ccac0983dacd6a8c54b073c2dc786b373366 100644
+index dc944ad75f04f5d2f72639615f64b5bb2d1b4117..459af298c4e149c3c96cca088f6a3d0db1cf6192 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -45,7 +45,7 @@ import org.jetbrains.annotations.Contract;
+@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Contract;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
@@ -386,7 +386,7 @@ index 122ee01c4664617bb1b691d5ff24427abdbedcf2..5f06ccac0983dacd6a8c54b073c2dc78
  
      // These strings MUST match the strings in nms.EntityTypes and are case sensitive.
      /**
-@@ -474,10 +474,22 @@ public enum EntityType implements Keyed, Translatable {
+@@ -463,10 +463,22 @@ public enum EntityType implements Keyed, Translatable {
  
      @Override
      @NotNull
@@ -554,10 +554,10 @@ index a919d50b31ed48a43bc47596eae44b3d05a417ee..665fe4b551abcd33a4c9bab69746200c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index 3ca11be42a07466ab96bff304dc90cf73cbf1f0d..767f7a1912743133d1a5d98783260a2ff51f99c6 100644
+index 71c4f2cbf8310941b316357d0c799b1e31418d0f..ab5d544942b7a5387998353614a33ca692edb50e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemType.java
 +++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -48,7 +48,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
   * changes may occur. Do not use this API in plugins.
   */
  @ApiStatus.Internal
@@ -566,7 +566,7 @@ index 3ca11be42a07466ab96bff304dc90cf73cbf1f0d..767f7a1912743133d1a5d98783260a2f
  
      /**
       * Typed represents a subtype of {@link ItemType}s that have a known item meta type
-@@ -2448,4 +2448,13 @@ public interface ItemType extends Keyed, Translatable {
+@@ -2409,4 +2409,13 @@ public interface ItemType extends Keyed, Translatable {
      @Nullable
      @Deprecated(since = "1.20.6")
      Material asMaterial();
diff --git a/patches/api/0204-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0204-Add-additional-open-container-api-to-HumanEntity.patch
index 8fc602cf55..ada16dc286 100644
--- a/patches/api/0204-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/api/0204-Add-additional-open-container-api-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 92ceb765ccb80c3b09ac3ede9bcaad6219fabd3d..25f671863e23fdb674c55f3e1f50b1f195ca5469 100644
+index d87261e0500d34696a50e9d6d136ca844c9a2cea..3859b12fad09cd181a914d152a9928d5bb720ca2 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -182,6 +182,92 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
diff --git a/patches/api/0205-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0205-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index a9993be897..c2b3732d25 100644
--- a/patches/api/0205-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/api/0205-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 66d29e7f4187309d4a55202d1bda4b94e42211b0..33acd8e0993b1f02a14794f55d0cf568a85a099e 100644
+index 739f117a0fd91ae98b5e5a39ae8e23feca0b741d..bd3567e9b0617c19a92090c8ab6baf17a715073a 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -168,5 +168,12 @@ public interface UnsafeValues {
diff --git a/patches/api/0206-Entity-isTicking.patch b/patches/api/0206-Entity-isTicking.patch
index 29ed59961e..994973ceba 100644
--- a/patches/api/0206-Entity-isTicking.patch
+++ b/patches/api/0206-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 3cddad9b83a89b243f7dc05c0c6a7f6d431bdceb..acf0fd930c4a20e5c8e38f5183dd3479acece7ae 100644
+index c09064e066435f87fa108552ca7e87ccded0fccf..0342fbc83bf462017f86d0dda9f49e595a8066b3 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -898,5 +898,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0208-Player-elytra-boost-API.patch b/patches/api/0208-Player-elytra-boost-API.patch
index c5f8ae83d7..0d817a36f5 100644
--- a/patches/api/0208-Player-elytra-boost-API.patch
+++ b/patches/api/0208-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 54d33be1297a6a4646635ca09cae1f0a2d3fb7fa..d2b74718998761a3f1a1a07547eb49661d5431df 100644
+index 644c20bcf6bba3f581e15cec21a1295b3dc50d43..30d209eb19d891d32fa8dba36270a6bf7fba60b7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3382,6 +3382,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0209-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0209-Add-getOfflinePlayerIfCached-String.patch
index f105fefb0c..a2b786d669 100644
--- a/patches/api/0209-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0209-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 1a671331ec4ab21430d7d52e9a4f45510ef39944..e0f652117e585882693736de8165ae9c689e1d68 100644
+index aca049c29cc7397a830883a45b4b24a33863e533..0fdce89f60fd66613cf41d962358f530cf75b905 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1374,6 +1374,27 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index 1a671331ec4ab21430d7d52e9a4f45510ef39944..e0f652117e585882693736de8165ae9c
       * Gets the player by the given UUID, regardless if they are offline or
       * online.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7dbd9b32e96c015e3ed757ea0fa7e2bfcf4af85e..90111a9ae0b7bdd6e46e869398dc6b9898b5f87e 100644
+index 89208165cc6b864a9273c364ba4b2d6d86e3c31f..f0e7333c33132d71069e9eccd9d32a39fac8596f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1161,6 +1161,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0214-Add-Destroy-Speed-API.patch b/patches/api/0214-Add-Destroy-Speed-API.patch
index d6e08a09df..b79ab15ff0 100644
--- a/patches/api/0214-Add-Destroy-Speed-API.patch
+++ b/patches/api/0214-Add-Destroy-Speed-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 25db31b2e9a6d75f0c59f75237842f9ad7d1c350..75c2aadb0a2baebe8b2625ad11b16380285d65c5 100644
+index afed7dfcbc878c19d3821dde77d6ade084ccf271..4666f47666ec50dc47e783f7bd4412148d3a5380 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -690,4 +690,31 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0215-Add-LivingEntity-clearActiveItem.patch b/patches/api/0215-Add-LivingEntity-clearActiveItem.patch
index 57fefd81de..41ac39910a 100644
--- a/patches/api/0215-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0215-Add-LivingEntity-clearActiveItem.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 88d6a5aaf2a686186fab4916480a04f6503d887c..784da48ffc63bc932caafe58cf56ad30e7a86be6 100644
+index e37ae6f7641c813c916618a60d97679125ebc16e..14a569f49a6fc1ff2d1c366516c09d3ba7da8fb0 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1071,6 +1071,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0217-More-lightning-API.patch b/patches/api/0217-More-lightning-API.patch
index c4924dcdf2..e96fd964b7 100644
--- a/patches/api/0217-More-lightning-API.patch
+++ b/patches/api/0217-More-lightning-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More lightning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
-index 5afeb2f6c82e8f752229462c2d7846f6ae7a4b44..924ee7fcc3f87eb8553ef473a7d9671f0f469dd1 100644
+index 608628b6328e4235fe2be0e4189babb5188361aa..fb2a9b10b7db074f275ef654643d9a5dd1284947 100644
 --- a/src/main/java/org/bukkit/entity/LightningStrike.java
 +++ b/src/main/java/org/bukkit/entity/LightningStrike.java
 @@ -22,7 +22,9 @@ public interface LightningStrike extends Entity {
diff --git a/patches/api/0220-Expose-LivingEntity-hurt-direction.patch b/patches/api/0220-Expose-LivingEntity-hurt-direction.patch
index 1ee818c76f..b1a91da4c2 100644
--- a/patches/api/0220-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0220-Expose-LivingEntity-hurt-direction.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 25f671863e23fdb674c55f3e1f50b1f195ca5469..b9c19abe26c100558c4a0388d65c2316261ee1d3 100644
+index 3859b12fad09cd181a914d152a9928d5bb720ca2..551b2a85745382ea6e0038088e6229260bfea067 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -356,6 +356,16 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -26,7 +26,7 @@ index 25f671863e23fdb674c55f3e1f50b1f195ca5469..b9c19abe26c100558c4a0388d65c2316
       * Check whether a cooldown is active on the specified item.
       *
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 784da48ffc63bc932caafe58cf56ad30e7a86be6..49352ed3928163c6322634b8e6f1d3dd8caa5e74 100644
+index 14a569f49a6fc1ff2d1c366516c09d3ba7da8fb0..a50b0b83708794e86ba83d1d2337296deb351da6 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1211,4 +1211,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0221-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0221-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 00552e9137..efae0208b4 100644
--- a/patches/api/0221-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0221-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
-index fd6b83f1f9bb2e25613e3f88e497b9d57d393937..ced77de350fa53889439e945336343a1cca5b9ba 100644
+index 567e331f6c0e403cac1d6a7c2d86ed0cd540ca7d..dad760bbbcc7dd25143e0267318a6820f1d60a73 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
 @@ -42,6 +42,12 @@ public class PlayerBedEnterEvent extends PlayerEvent implements Cancellable {
diff --git a/patches/api/0224-Additional-Block-Material-API-s.patch b/patches/api/0224-Additional-Block-Material-API-s.patch
index 98a66a166c..61083bcc66 100644
--- a/patches/api/0224-Additional-Block-Material-API-s.patch
+++ b/patches/api/0224-Additional-Block-Material-API-s.patch
@@ -9,7 +9,7 @@ process to do this in the Bukkit API
 Adds API for buildable, replaceable, burnable too.
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 75c2aadb0a2baebe8b2625ad11b16380285d65c5..36e177757624c4fc7835e253d3b2dd773f50f43d 100644
+index 4666f47666ec50dc47e783f7bd4412148d3a5380..53b8bbe9717e64fa7f9acf3611121218ff92902b 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -439,6 +439,42 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0225-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0225-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9021d13c24..074017d57b 100644
--- a/patches/api/0225-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0225-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API to get Material from Boats and Minecarts
 
 
 diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java
-index dbdd2c1ad74a4d56e282736cd06d6937701f2e5c..a0fb3c44405f6362f8a1613661d507e448f7ba6b 100644
+index b77e4ed7f5aa98d0947bc5f626535341c4014d95..9e8224d7e0a83a6252a32d352b9db55a9079325e 100644
 --- a/src/main/java/org/bukkit/entity/Boat.java
 +++ b/src/main/java/org/bukkit/entity/Boat.java
 @@ -181,4 +181,14 @@ public interface Boat extends Vehicle {
diff --git a/patches/api/0227-Zombie-API-breaking-doors.patch b/patches/api/0227-Zombie-API-breaking-doors.patch
index 05fc193f72..3057ef7963 100644
--- a/patches/api/0227-Zombie-API-breaking-doors.patch
+++ b/patches/api/0227-Zombie-API-breaking-doors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie API - breaking doors
 
 
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index c1a5b625ea602d751a8026d989882c60e80756c9..0a7d4d3f776a72b345d746c583e4c32267929b54 100644
+index ec6d6052bfd0deb431e9a71329169c97fa498bcd..5b9e1af021a755f490b53952e5d0bc896971f928 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
 @@ -100,8 +100,10 @@ public interface Zombie extends Monster, Ageable {
diff --git a/patches/api/0234-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0234-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index c25fbd796f..6f5c58daeb 100644
--- a/patches/api/0234-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/api/0234-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API to get exact interaction point in PlayerInteractEvent
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
-index ed72095b5cf669d9f25852e8ef772a710c54012a..ddea08e4de2198a0a7565e2fd7a05571ed48f27b 100644
+index 35e0df9fc0338c7c6b8e178ee533cd7833ee66f1..69c800d367d36c8730781b89e3530a75487d000a 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
 @@ -1,5 +1,6 @@
diff --git a/patches/api/0235-Add-sendOpLevel-API.patch b/patches/api/0235-Add-sendOpLevel-API.patch
index c64ed185a2..9ec83d648e 100644
--- a/patches/api/0235-Add-sendOpLevel-API.patch
+++ b/patches/api/0235-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d2b74718998761a3f1a1a07547eb49661d5431df..a03ac5f230521cde2278222de8157f78a152f6a6 100644
+index 30d209eb19d891d32fa8dba36270a6bf7fba60b7..e827e8e6a346a6e4b33a9f155e92264955a4a496 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3401,6 +3401,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0236-Add-RegistryAccess-for-managing-registries.patch b/patches/api/0236-Add-RegistryAccess-for-managing-registries.patch
index 06d8e6d23f..acf5d0ee29 100644
--- a/patches/api/0236-Add-RegistryAccess-for-managing-registries.patch
+++ b/patches/api/0236-Add-RegistryAccess-for-managing-registries.patch
@@ -191,7 +191,7 @@ index 80e3e64f47ac55a4978c9e5b430e2f2d1c871d1b..ac68dfce754dc7e014bb31bba32d9b24
          final RegistryKey<T> registryKey = createInternal(key);
          REGISTRY_KEYS.add(registryKey);
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3470755c65a2db38e679adc35d3d43f7fef5468d..1fe3a5e2f5c15fddfbcd503a061ebf7502907b8c 100644
+index 0fdce89f60fd66613cf41d962358f530cf75b905..4000d3484516f235c6e41eb5bb90c0420754ce23 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2434,8 +2434,11 @@ public final class Bukkit {
@@ -207,10 +207,10 @@ index 3470755c65a2db38e679adc35d3d43f7fef5468d..1fe3a5e2f5c15fddfbcd503a061ebf75
          return server.getRegistry(tClass);
      }
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 37e7862be843da4f48ac061fb1625854fd671b2a..cdc09d18088af3100cb731702edb7e6bffdeb502 100644
+index 605588eb0613dedec9cba696503a85abf1a8b280..ddbcd977e3ac701a94679bdbfe632d5e8898df1a 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -162,28 +162,23 @@ public enum Particle implements Keyed {
+@@ -163,28 +163,23 @@ public enum Particle implements Keyed {
  
      private final NamespacedKey key;
      private final Class<?> dataType;
@@ -493,7 +493,7 @@ index b4f297f90e3c1deaa1fc3f4418418588ab19b6c5..d03bdf6617ce66950e335f0afb52c19b
          private final Class<T> type;
          private final Map<NamespacedKey, T> map;
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6bc43f3a5748a1b83aa4c4d462df3cbc9220c267..cad9c18dbe56ffcef377f0b1162bc880fc56aa6c 100644
+index f0e7333c33132d71069e9eccd9d32a39fac8596f..7204e7046cb76f715f294822dff7deb069a3c802 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2077,8 +2077,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0241-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0241-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index f85f2a4f26..40ce38551f 100644
--- a/patches/api/0241-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0241-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -56,7 +56,7 @@ 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 075af9c1c179bcc2f0e7cb4db4e0d54d6d58ce5c..d63bd62606763d0902ea800f0c35a1cfd07fc8ec 100644
+index e6b4ffea8835e248431fe8594eac136c11bf6be0..ade7b268934019e9134a660d88e977f8146ecbc0 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
 @@ -17,8 +17,15 @@ public class PlayerUnleashEntityEvent extends EntityUnleashEvent implements Canc
diff --git a/patches/api/0247-Add-missing-effects.patch b/patches/api/0247-Add-missing-effects.patch
index 708d50753f..dfd7ffb6ed 100644
--- a/patches/api/0247-Add-missing-effects.patch
+++ b/patches/api/0247-Add-missing-effects.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing effects
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..8a346d7a4ce07e0a73d7a1d1370321d4fb538547 100644
+index d63395e588ec0d2ce7303379c9bee56cf7c33064..e013d83fb31469e1579510c0a661360823bedee7 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
 @@ -97,7 +97,7 @@ public enum Effect {
diff --git a/patches/api/0248-Expose-Tracked-Players.patch b/patches/api/0248-Expose-Tracked-Players.patch
index 5648d1402c..9279703d0d 100644
--- a/patches/api/0248-Expose-Tracked-Players.patch
+++ b/patches/api/0248-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 acf0fd930c4a20e5c8e38f5183dd3479acece7ae..c7364a6c266aba9568f491fe0794fa593ada224d 100644
+index 0342fbc83bf462017f86d0dda9f49e595a8066b3..8521a9ae4d4427ef9cdbb1b8c67dd6ba81d1f5d9 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -903,5 +903,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0252-Add-Block-isValidTool.patch b/patches/api/0252-Add-Block-isValidTool.patch
index 570bef69c6..871c1ca2ea 100644
--- a/patches/api/0252-Add-Block-isValidTool.patch
+++ b/patches/api/0252-Add-Block-isValidTool.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Block#isValidTool
 Deprecated for removal
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 36e177757624c4fc7835e253d3b2dd773f50f43d..9b0a3b4a62387d07143341756b858e15e61a9c03 100644
+index 53b8bbe9717e64fa7f9acf3611121218ff92902b..bd50ec2a93800af9ce663fd10ecf74ae011a6715 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -232,6 +232,19 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0253-Expand-world-key-API.patch b/patches/api/0253-Expand-world-key-API.patch
index a22199d327..65b04a5871 100644
--- a/patches/api/0253-Expand-world-key-API.patch
+++ b/patches/api/0253-Expand-world-key-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fbe14c327ee9c1ac07893853ca7c699e81225281..b558fa73dbcf3747690933e6aadf7061a0de2630 100644
+index 4000d3484516f235c6e41eb5bb90c0420754ce23..34e4493286c36a27715ad72201751c692abc9481 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -865,6 +865,29 @@ public final class Bukkit {
@@ -67,7 +67,7 @@ index 27eff0826d5b5b48697fefd9571886e7bbce74b1..d8b1fa79dc24138dc71e32c14bda71c1
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 943f8881ea23481ea5d5125b6ec7c9c6f763f0b0..42930006b6425b5d82233e4ffe7025ce5397b277 100644
+index 7204e7046cb76f715f294822dff7deb069a3c802..db7aa3a1967d6c093f5fd22443238b566a035835 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -726,6 +726,28 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -100,7 +100,7 @@ index 943f8881ea23481ea5d5125b6ec7c9c6f763f0b0..42930006b6425b5d82233e4ffe7025ce
       * Create a new virtual {@link WorldBorder}.
       * <p>
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 33acd8e0993b1f02a14794f55d0cf568a85a099e..e924f313cead4cb0a9d73f5be8bc69b654293ddf 100644
+index bd3567e9b0617c19a92090c8ab6baf17a715073a..1dea15bc75b2de1aadb7e769394df5160fc079e5 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -175,5 +175,10 @@ public interface UnsafeValues {
diff --git a/patches/api/0254-Improve-Item-Rarity-API.patch b/patches/api/0254-Improve-Item-Rarity-API.patch
index 6914d28cf8..7152f31b07 100644
--- a/patches/api/0254-Improve-Item-Rarity-API.patch
+++ b/patches/api/0254-Improve-Item-Rarity-API.patch
@@ -43,10 +43,10 @@ index 0000000000000000000000000000000000000000..f1cd5a4f37eee8975ac3d0421b524afc
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 8820dd330cee4f8463f2f39f84d4be0762558368..39277b3113a3bd0736330773e3c5c1f747773b55 100644
+index 8509519ec0d5509f45e43f28b5bb55d953cebb14..efeda14f1caebd6be8695cf9a2a8d920a3db45a2 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4874,6 +4874,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4845,6 +4845,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      }
      // Paper end - add Translatable
  
@@ -110,7 +110,7 @@ index e7931f73f10fe35ebd5fe4a04b036d53bb117ebd..cbce835ed6d44e5b8c9aaae4e36a77f8
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 60eec8a12f01562678732bcf38ac407e70d74965..45fc5fab3817a8d9e1c83bcfb0add9eba023abfe 100644
+index 665fe4b551abcd33a4c9bab69746200c3a150cae..06207f1527e8afe8bb786410c9659bb92792ea6f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -994,5 +994,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
@@ -132,10 +132,10 @@ index 60eec8a12f01562678732bcf38ac407e70d74965..45fc5fab3817a8d9e1c83bcfb0add9eb
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index 49e5a9ea7cf5e4d7a4333d2cffa4e44b1a436403..d049aec3865c0eaa570ffe4234f02ff13d77e542 100644
+index ab5d544942b7a5387998353614a33ca692edb50e..9f0f788cc81e8fc0b45bdd97e284d5a9785e7e8c 100644
 --- a/src/main/java/org/bukkit/inventory/ItemType.java
 +++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -2457,4 +2457,13 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
+@@ -2418,4 +2418,13 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
      @Override
      @NotNull String getTranslationKey();
      // Paper end - add Translatable
diff --git a/patches/api/0255-Expose-protocol-version.patch b/patches/api/0255-Expose-protocol-version.patch
index f1037f03a8..810f5b3004 100644
--- a/patches/api/0255-Expose-protocol-version.patch
+++ b/patches/api/0255-Expose-protocol-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index e924f313cead4cb0a9d73f5be8bc69b654293ddf..ce9bbe4a9010ca31ace1f0b7fb67eab0f13ac97d 100644
+index 1dea15bc75b2de1aadb7e769394df5160fc079e5..989a7e624dca442f1c989bb766e4c16a75e87333 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -180,5 +180,12 @@ public interface UnsafeValues {
diff --git a/patches/api/0256-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0256-add-isDeeplySleeping-to-HumanEntity.patch
index 29f430175b..b86f5d0885 100644
--- a/patches/api/0256-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0256-add-isDeeplySleeping-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index b9c19abe26c100558c4a0388d65c2316261ee1d3..36b48bfff60ecc3d49f9f6575a91dd6b73ecf1ab 100644
+index 551b2a85745382ea6e0038088e6229260bfea067..10576d39e019c0ca6bbd07b889a4580b2883d875 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -366,6 +366,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
diff --git a/patches/api/0258-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0258-add-get-set-drop-chance-to-EntityEquipment.patch
index d75f180c94..45f3bf6ed5 100644
--- a/patches/api/0258-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0258-add-get-set-drop-chance-to-EntityEquipment.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add get-set drop chance to EntityEquipment
 
 
 diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-index 127302aa7c22f59438de66fffa0b03ae84a2a8ad..1b34286fb6cbedb3841c84c499eb626f61885126 100644
+index 97c8b338f83f409a652fbaec5105e98b8af751e2..6a94bdba82e183b6509b4bff711dbbeed245a9ba 100644
 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
 +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
 @@ -527,4 +527,34 @@ public interface EntityEquipment {
diff --git a/patches/api/0260-More-World-API.patch b/patches/api/0260-More-World-API.patch
index 72e7008eb5..7efbed6e02 100644
--- a/patches/api/0260-More-World-API.patch
+++ b/patches/api/0260-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 7ef12976430272d814374ee066e975457111b7f3..b22530070b95667e2b548ef1e68e536a5b8ee138 100644
+index 85900b9f41379d9c8366ae9f2f9e94f54f504ffb..8084bb2d8f3983e10de9123b74627ed04d8b5255 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -3848,6 +3848,72 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0270-Add-basic-Datapack-API.patch b/patches/api/0270-Add-basic-Datapack-API.patch
index 69299c631d..7b503aebe5 100644
--- a/patches/api/0270-Add-basic-Datapack-API.patch
+++ b/patches/api/0270-Add-basic-Datapack-API.patch
@@ -206,7 +206,7 @@ index 0000000000000000000000000000000000000000..0dfd101f01d16cc38f21831ca8736334
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 885c83ba1d94460cb72b177c2cff1afdaa8696bc..f81250ff8fd0fe8caa780719624b8d9c731fe188 100644
+index 34e4493286c36a27715ad72201751c692abc9481..46b678da746fb8ff65e77811499ee341093a65e8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -328,9 +328,11 @@ public final class Bukkit {
@@ -237,10 +237,10 @@ index 885c83ba1d94460cb72b177c2cff1afdaa8696bc..f81250ff8fd0fe8caa780719624b8d9c
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 39277b3113a3bd0736330773e3c5c1f747773b55..c18fb0c9a6635a67041ba7499e8b2f97ce9a76d4 100644
+index efeda14f1caebd6be8695cf9a2a8d920a3db45a2..5ae5c59f9375f10f2f035567b1bba8d3645f71fa 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -5683,6 +5683,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5654,6 +5654,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       * @param world the world to check
       * @return true if this material can be used in this World.
       */
@@ -249,7 +249,7 @@ index 39277b3113a3bd0736330773e3c5c1f747773b55..c18fb0c9a6635a67041ba7499e8b2f97
          if (isItem()) {
              return Bukkit.getDataPackManager().isEnabledByFeature(asItemType(), world);
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a85281b4099fe26b8e27b76d3dac6ee917c48c75..5b0aee3b7956d07a45eefa24e57dac674882f8ff 100644
+index db7aa3a1967d6c093f5fd22443238b566a035835..5ca4543587043f964175435654b9e00c9dadffd5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -267,9 +267,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -277,10 +277,10 @@ index a85281b4099fe26b8e27b76d3dac6ee917c48c75..5b0aee3b7956d07a45eefa24e57dac67
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index a5e5c252405a7b940afbb6715abcda7ec9007dd3..1f241e74c256eb3e824a029798f623ad9d38efe2 100644
+index 459af298c4e149c3c96cca088f6a3d0db1cf6192..fd5d1ad0334b574fca951555ce647436257d9b19 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -496,6 +496,7 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
+@@ -485,6 +485,7 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
       * @param world the world to check
       * @return true if this EntityType can be used to spawn an Entity for this World.
       */
diff --git a/patches/api/0272-ItemStack-repair-check-API.patch b/patches/api/0272-ItemStack-repair-check-API.patch
index 149c1f2852..b23413a920 100644
--- a/patches/api/0272-ItemStack-repair-check-API.patch
+++ b/patches/api/0272-ItemStack-repair-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index ce9bbe4a9010ca31ace1f0b7fb67eab0f13ac97d..5015cfe26522468ac7decbf6205d654c0e60207b 100644
+index 989a7e624dca442f1c989bb766e4c16a75e87333..218adc63a0c0037f764942af184b30ebabff697d 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -187,5 +187,15 @@ public interface UnsafeValues {
@@ -25,7 +25,7 @@ index ce9bbe4a9010ca31ace1f0b7fb67eab0f13ac97d..5015cfe26522468ac7decbf6205d654c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 45fc5fab3817a8d9e1c83bcfb0add9eba023abfe..ea50697a8dcdf87be046569b75fcc53ec870ca3e 100644
+index 06207f1527e8afe8bb786410c9659bb92792ea6f..c33a866a03cc8e6235dd8bff6259dcb1e1bbb11f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -1006,5 +1006,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0275-ItemStack-editMeta.patch b/patches/api/0275-ItemStack-editMeta.patch
index 7361918ba9..b90aa42dc0 100644
--- a/patches/api/0275-ItemStack-editMeta.patch
+++ b/patches/api/0275-ItemStack-editMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack#editMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ea50697a8dcdf87be046569b75fcc53ec870ca3e..1d1731776af5f59cd9e6bd07cb3b9fab5073ef66 100644
+index c33a866a03cc8e6235dd8bff6259dcb1e1bbb11f..86404d3b8b4862cd1f140617cae93aa69df122ca 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -574,6 +574,50 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0277-Improve-item-default-attribute-API.patch b/patches/api/0277-Improve-item-default-attribute-API.patch
index 5fd65d7219..1499e68a9a 100644
--- a/patches/api/0277-Improve-item-default-attribute-API.patch
+++ b/patches/api/0277-Improve-item-default-attribute-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Improve item default attribute API
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index c18fb0c9a6635a67041ba7499e8b2f97ce9a76d4..3b344a49c26e9f4b3a7ae54ecb90da7c08d0ad49 100644
+index 5ae5c59f9375f10f2f035567b1bba8d3645f71fa..e8985981deb7d23ec624781725c4a05cc9cc94e7 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4889,6 +4889,23 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4860,6 +4860,23 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      }
      // Paper end - item rarity API
  
@@ -32,7 +32,7 @@ index c18fb0c9a6635a67041ba7499e8b2f97ce9a76d4..3b344a49c26e9f4b3a7ae54ecb90da7c
      /**
       * Do not use for any reason.
       *
-@@ -5596,13 +5613,34 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5567,13 +5584,34 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
          }
      }
  
@@ -72,10 +72,10 @@ index c18fb0c9a6635a67041ba7499e8b2f97ce9a76d4..3b344a49c26e9f4b3a7ae54ecb90da7c
       *
       * @param slot the {@link EquipmentSlot} to check
 diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index d049aec3865c0eaa570ffe4234f02ff13d77e542..7a1a0aebbfdaac6b6af41236d4a00512244b58fa 100644
+index 9f0f788cc81e8fc0b45bdd97e284d5a9785e7e8c..af30d6e619ae3c3556611a36229f676b34baeb0e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemType.java
 +++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -2407,6 +2407,21 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
+@@ -2368,6 +2368,21 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
  //    @NotNull
  //    EquipmentSlot getEquipmentSlot();
  
diff --git a/patches/api/0280-Add-PlayerKickEvent-causes.patch b/patches/api/0280-Add-PlayerKickEvent-causes.patch
index 5520442f07..b4e2db753a 100644
--- a/patches/api/0280-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0280-Add-PlayerKickEvent-causes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a03ac5f230521cde2278222de8157f78a152f6a6..ff5a0d2b6a070c85545b00cf41c51b8d9cce8d0d 100644
+index e827e8e6a346a6e4b33a9f155e92264955a4a496..68c470b9504a8b731606a1d297de223235b55cb9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -335,6 +335,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0284-Add-more-line-of-sight-methods.patch b/patches/api/0284-Add-more-line-of-sight-methods.patch
index 43d0fda624..f5c861f8ae 100644
--- a/patches/api/0284-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0284-Add-more-line-of-sight-methods.patch
@@ -23,7 +23,7 @@ index d8b1fa79dc24138dc71e32c14bda71c1d570ed88..b68367f123f029c3ff47eab6bfabd7a8
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 49352ed3928163c6322634b8e6f1d3dd8caa5e74..2eb6f650610ca1a9b9fca49e453f79e08944be75 100644
+index a50b0b83708794e86ba83d1d2337296deb351da6..5db673a0572163574c41bd7827572372411142ed 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -622,6 +622,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0288-Adds-PlayerArmSwingEvent.patch b/patches/api/0288-Adds-PlayerArmSwingEvent.patch
index 5fb447f69b..3398568431 100644
--- a/patches/api/0288-Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/0288-Adds-PlayerArmSwingEvent.patch
@@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..84dfb8da90c5f21d0f8899eca57bcb8b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java b/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
-index eb722a1e3b987b86fae2fa8346606fa15fada26f..11c27b1a4a749e129ed4b2d906c315d97a4b66e7 100644
+index 1f2d3b3e9748eec04b5514376599c9233f65b736..0c7e3a0c4d77a8e11f96b9c498dbf2917ad2d981 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
 @@ -7,6 +7,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0291-Stinger-API.patch b/patches/api/0291-Stinger-API.patch
index a12c525d76..7d015b5c3d 100644
--- a/patches/api/0291-Stinger-API.patch
+++ b/patches/api/0291-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index c0772f72768846cffd065c53de7326f9fe6386a2..f7a3dd62ae5e492a7bccf8167cec0fc560499fa2 100644
+index c2ed2245604fcb638450d4aa00d8045685ce294d..292b8d0370723f019fb90a8b86300fa631bee683 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -451,6 +451,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0303-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0303-Add-methods-to-find-targets-for-lightning-strikes.patch
index dd357bfe8c..ffb2f027aa 100644
--- a/patches/api/0303-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0303-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 ce1f3ffbab6a8dc8395e3a5b74a7874bb6b38aa9..90270582b75705e42b4690cadb6d15de3188d98f 100644
+index 8084bb2d8f3983e10de9123b74627ed04d8b5255..a8939bb5815fbc2926907bb3e8921f86255abd93 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -692,6 +692,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0304-Get-entity-default-attributes.patch b/patches/api/0304-Get-entity-default-attributes.patch
index d330cf091c..92815605ef 100644
--- a/patches/api/0304-Get-entity-default-attributes.patch
+++ b/patches/api/0304-Get-entity-default-attributes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Get entity default attributes
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 5015cfe26522468ac7decbf6205d654c0e60207b..1a4a42991449f30db0f702e7ddeac950e4a805ac 100644
+index 218adc63a0c0037f764942af184b30ebabff697d..4cd43815c317cfa1dd0ac15fb469d601aee42e60 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -197,5 +197,22 @@ public interface UnsafeValues {
@@ -32,10 +32,10 @@ index 5015cfe26522468ac7decbf6205d654c0e60207b..1a4a42991449f30db0f702e7ddeac950
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 1f241e74c256eb3e824a029798f623ad9d38efe2..9e115cec6232b22760e91ade671f81461c0c0364 100644
+index fd5d1ad0334b574fca951555ce647436257d9b19..6bc514af551374a9c6f2f2a8dbcb35a0a543a23f 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -488,6 +488,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
+@@ -477,6 +477,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
          Preconditions.checkArgument(this != UNKNOWN, "UNKNOWN entities do not have translation keys");
          return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
      }
diff --git a/patches/api/0308-Fix-issues-with-mob-conversion.patch b/patches/api/0308-Fix-issues-with-mob-conversion.patch
index f451d967b6..75899f3346 100644
--- a/patches/api/0308-Fix-issues-with-mob-conversion.patch
+++ b/patches/api/0308-Fix-issues-with-mob-conversion.patch
@@ -32,7 +32,7 @@ index 83a9e06fe91bdfe74e771b170966c70e4c47893c..452a8e73fa084f29f3b96793d642bd8e
      public void setConversionTime(int time);
  
 diff --git a/src/main/java/org/bukkit/entity/PiglinAbstract.java b/src/main/java/org/bukkit/entity/PiglinAbstract.java
-index 87f4b7ad7c0a95a7123d142fa023c5da5c760341..eb2d6db81525d807d42b4c864d1340616424e6d9 100644
+index 9c4c1a4ab37403303c395db2764134abb10206d5..41aeb01f75380f5f40a8c0eb3f52ec3d9cade04d 100644
 --- a/src/main/java/org/bukkit/entity/PiglinAbstract.java
 +++ b/src/main/java/org/bukkit/entity/PiglinAbstract.java
 @@ -31,14 +31,17 @@ public interface PiglinAbstract extends Monster, Ageable {
diff --git a/patches/api/0309-Add-hasCollision-methods-to-various-places.patch b/patches/api/0309-Add-hasCollision-methods-to-various-places.patch
index d9455d45a6..09f465abcc 100644
--- a/patches/api/0309-Add-hasCollision-methods-to-various-places.patch
+++ b/patches/api/0309-Add-hasCollision-methods-to-various-places.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add hasCollision methods to various places
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 3b344a49c26e9f4b3a7ae54ecb90da7c08d0ad49..615eb24ffdd8f6d55ccd4f21760b809c1098bc68 100644
+index e8985981deb7d23ec624781725c4a05cc9cc94e7..b28ab97ff80c9e7af85d8830f26fd0f252082541 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4906,6 +4906,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4877,6 +4877,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      }
      // Paper end - item default attributes API
  
@@ -31,7 +31,7 @@ index 3b344a49c26e9f4b3a7ae54ecb90da7c08d0ad49..615eb24ffdd8f6d55ccd4f21760b809c
       * Do not use for any reason.
       *
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 9b0a3b4a62387d07143341756b858e15e61a9c03..cfa49e21feec7226e83e97e1053388f854b70337 100644
+index bd50ec2a93800af9ce663fd10ecf74ae011a6715..7f9acd155c1b275145ba53a41b7513dc8cc00531 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -486,6 +486,13 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
@@ -49,7 +49,7 @@ index 9b0a3b4a62387d07143341756b858e15e61a9c03..cfa49e21feec7226e83e97e1053388f8
  
      /**
 diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index f4a739d8022d19a7ae0ee9bf93eb5c4846b4bd40..94e1278340c0d9d2be9edc68f645414380aab353 100644
+index 555d0492c2fcf85c1e2f95f145b974cb75bc5ecc..ee4cbbc584ec1a10c62464a7abb3ea5da656ffc0 100644
 --- a/src/main/java/org/bukkit/block/BlockState.java
 +++ b/src/main/java/org/bukkit/block/BlockState.java
 @@ -245,4 +245,13 @@ public interface BlockState extends Metadatable {
@@ -67,10 +67,10 @@ index f4a739d8022d19a7ae0ee9bf93eb5c4846b4bd40..94e1278340c0d9d2be9edc68f6454143
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
-index aebd34785bb2070389ad2e2803fa9ff803b318c5..c080c2a3323d19cb3d549aa0fe6c164666d7da75 100644
+index f0c3343e2006f244bb1f99c269bcbaa357feb25f..a2376f08c836d727995987a640a47f8f3a7b0c11 100644
 --- a/src/main/java/org/bukkit/block/BlockType.java
 +++ b/src/main/java/org/bukkit/block/BlockType.java
-@@ -3650,4 +3650,13 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran
+@@ -3625,4 +3625,13 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran
      @Override
      @NotNull String getTranslationKey();
      // Paper end - add Translatable
diff --git a/patches/api/0311-Add-API-for-resetting-a-single-score.patch b/patches/api/0311-Add-API-for-resetting-a-single-score.patch
index 14142e8f6c..a071aa88f7 100644
--- a/patches/api/0311-Add-API-for-resetting-a-single-score.patch
+++ b/patches/api/0311-Add-API-for-resetting-a-single-score.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add API for resetting a single score
 It was only possible to reset all scores for a specific entry, instead of resetting only specific scores.
 
 diff --git a/src/main/java/org/bukkit/scoreboard/Score.java b/src/main/java/org/bukkit/scoreboard/Score.java
-index 8579c4f5e877a0db6df52094f2f2d82920f3c869..1eaa9a93f8eff5f18a6cce2d74f21eb19db273c8 100644
+index 787bb91b48e3ed798e85ba57c8b218c0082bc85c..48a1654a2dd8da82cb91bcfa4b3a523f88323568 100644
 --- a/src/main/java/org/bukkit/scoreboard/Score.java
 +++ b/src/main/java/org/bukkit/scoreboard/Score.java
 @@ -73,4 +73,14 @@ public interface Score {
diff --git a/patches/api/0312-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0312-Add-Raw-Byte-Entity-Serialization.patch
index 820ac462d8..381f5dd0d5 100644
--- a/patches/api/0312-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0312-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 1a4a42991449f30db0f702e7ddeac950e4a805ac..2d612f2c6b483eec6fbc7ad35d5d878359db4770 100644
+index 4cd43815c317cfa1dd0ac15fb469d601aee42e60..5be89089da4e8230dc7aa078712428189f38d9f9 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -169,6 +169,14 @@ public interface UnsafeValues {
@@ -24,7 +24,7 @@ index 1a4a42991449f30db0f702e7ddeac950e4a805ac..2d612f2c6b483eec6fbc7ad35d5d8783
       * Creates and returns the next EntityId available.
       * <p>
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 827574b3eff9b912500b092ca081e7163677695e..18fa592f9159a5377eeac8325c0b8e16f74be7b8 100644
+index 3b40c63a380e519ecae2e272754a53aff5aebd9a..464668496f5a611ae78bd5f6392915ec384862ac 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -946,5 +946,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0317-Entity-powdered-snow-API.patch b/patches/api/0317-Entity-powdered-snow-API.patch
index 648ddec205..ca7af1d0e5 100644
--- a/patches/api/0317-Entity-powdered-snow-API.patch
+++ b/patches/api/0317-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 18fa592f9159a5377eeac8325c0b8e16f74be7b8..5b49ac1e3f1f03675f9aa13acd8061adb6ad5cc3 100644
+index 464668496f5a611ae78bd5f6392915ec384862ac..97b8ac9ae8ebe0f074f5f1f806d9415b8122400c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -973,5 +973,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -22,7 +22,7 @@ index 18fa592f9159a5377eeac8325c0b8e16f74be7b8..5b49ac1e3f1f03675f9aa13acd8061ad
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index e0ccc090a0be507ced4d5669491311e410f60a67..472a71ca8dad0d49f0723e5fdf58bf00a55190f2 100644
+index 0944d920301d8cd5ec3960454129f7d1c15ee6d4..ce04c03ba5f67e02faf10ed8aaef4d51fbf2b190 100644
 --- a/src/main/java/org/bukkit/entity/Skeleton.java
 +++ b/src/main/java/org/bukkit/entity/Skeleton.java
 @@ -41,6 +41,16 @@ public interface Skeleton extends AbstractSkeleton {
diff --git a/patches/api/0321-System-prop-for-default-config-comment-parsing.patch b/patches/api/0321-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..9b8176aef8 100644
--- a/patches/api/0321-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0321-System-prop-for-default-config-comment-parsing.patch
@@ -7,7 +7,7 @@ Allows for certain legacy plugins to continue to work without changing
 by setting `Paper.parseYamlCommentsByDefault` to false
 
 diff --git a/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java b/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
-index c71f8a7b96fc5abc499802a79fcb3b0771de021c..121dbbf163588690d0678ae73a6ab8edf82f8367 100644
+index 4bff5d18d9ae62c6c55869c66efc2bc481a0cc18..800a34710c2b85dc2a58f2e15ba910c7ee717c08 100644
 --- a/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
 +++ b/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
 @@ -15,7 +15,10 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0323-Multiple-Entries-with-Scoreboards.patch b/patches/api/0323-Multiple-Entries-with-Scoreboards.patch
index 920c2f117e..a1e9b23e68 100644
--- a/patches/api/0323-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0323-Multiple-Entries-with-Scoreboards.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Multiple Entries with Scoreboards
 
 
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index dff76db4a4c37c760144f00c1aa8f2bcac45ba1f..cacb58d25c249e2ecd6083ed0f30d5ffb345220a 100644
+index c500de6ed19bdf732f7bedbedb19a4b37ca343f8..c34d9ab72928d5f58339025d717ec840a4d8cf2c 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -309,6 +309,60 @@ public interface Team extends net.kyori.adventure.audience.ForwardingAudience {
diff --git a/patches/api/0325-Multi-Block-Change-API.patch b/patches/api/0325-Multi-Block-Change-API.patch
index f7cb304e6e..5b0180c266 100644
--- a/patches/api/0325-Multi-Block-Change-API.patch
+++ b/patches/api/0325-Multi-Block-Change-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Multi Block Change API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ff5a0d2b6a070c85545b00cf41c51b8d9cce8d0d..99bad852128f499f8f71552399c49f373d51cf9c 100644
+index 68c470b9504a8b731606a1d297de223235b55cb9..db3a1e9170aeada5fe738975124861d79e82e2d1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -977,6 +977,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0327-Freeze-Tick-Lock-API.patch b/patches/api/0327-Freeze-Tick-Lock-API.patch
index c40323bc40..7e573b5966 100644
--- a/patches/api/0327-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0327-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 5b49ac1e3f1f03675f9aa13acd8061adb6ad5cc3..f51f3f04ba9efe15f68620c5531b502710078b6e 100644
+index 97b8ac9ae8ebe0f074f5f1f806d9415b8122400c..fe3f59390ee45a289ae6dbb398ce7954fab717d5 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -327,6 +327,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0329-More-PotionEffectType-API.patch b/patches/api/0329-More-PotionEffectType-API.patch
index 1a0cc24f7c..736dc6f9a8 100644
--- a/patches/api/0329-More-PotionEffectType-API.patch
+++ b/patches/api/0329-More-PotionEffectType-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More PotionEffectType API
 
 
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index 46dce7c2a543f6b165975565ea9d40654a132b9b..ae76b0d2b84dda5eefb9ffd9d76383408f67fbe3 100644
+index d03bdf6617ce66950e335f0afb52c19b2e2a14e2..b2bd12736d08fe72128142af4ca2022da8309f6d 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
 @@ -367,6 +367,15 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
@@ -25,7 +25,7 @@ index 46dce7c2a543f6b165975565ea9d40654a132b9b..ae76b0d2b84dda5eefb9ffd9d7638340
       * Get the object by its key.
       *
 diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
-index e2d1d26b9debbe1ef852f0260180200a916a7db7..d02bb37768404422969d8b93e009960d0a693a93 100644
+index 6375eed0ef4f8e897a00b4f77fb45b354888e74e..5f32728fad44c3c5f3f5382b0ad6fd9b1ef5e0fd 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
 @@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
@@ -96,7 +96,7 @@ index e2d1d26b9debbe1ef852f0260180200a916a7db7..d02bb37768404422969d8b93e009960d
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java b/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
-index a613debb03f6440583f57dd1adb7bb1bebbd636b..718f216c9153a5f03b91ce1de9ee9574e867e32b 100644
+index 6861d1cfcedb6d72c2c425bad205342aac8e33a1..7acdeb9054e128c452ea8610d8b39a35627c56bf 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
 @@ -19,4 +19,41 @@ public abstract class PotionEffectTypeWrapper extends PotionEffectType {
diff --git a/patches/api/0330-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0330-API-for-creating-command-sender-which-forwards-feedb.patch
index 2fdc723ece..5c606e2d0b 100644
--- a/patches/api/0330-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0330-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for creating command sender which forwards feedback
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index be68351555bde59a4e55bf1bad261e9f6bc9f704..e2d3e42b403dce454988c3ae3e44bcd89337b1cf 100644
+index 46b678da746fb8ff65e77811499ee341093a65e8..a9d1a9a5223148ea134ed146d059ec9edb922f03 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1595,6 +1595,20 @@ public final class Bukkit {
@@ -30,7 +30,7 @@ index be68351555bde59a4e55bf1bad261e9f6bc9f704..e2d3e42b403dce454988c3ae3e44bcd8
       * Gets the folder that contains all of the various {@link World}s.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 45693e6c02eac37eb609cd3c59253a949a6ca4c0..5dd7ce5c008c852dbeb0474a70e9357230406318 100644
+index 5ca4543587043f964175435654b9e00c9dadffd5..06cc09298abcefaacd7a6987c32e5bd86653e719 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1349,6 +1349,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0332-Add-GameEvent-tags.patch b/patches/api/0332-Add-GameEvent-tags.patch
index d976b18139..961174f6e8 100644
--- a/patches/api/0332-Add-GameEvent-tags.patch
+++ b/patches/api/0332-Add-GameEvent-tags.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add GameEvent tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 0eca6dc6bcd9bbcad0a98a5956091bec362f2db6..42f0501ae6a2d9297bdd9bb9ab2fbb02abb881f5 100644
+index 8420fb1c6059ea9f782a47d18c465ba515765085..961a36e03df968898590c95573cee04083988e32 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -1411,6 +1411,25 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -1427,6 +1427,25 @@ public interface Tag<T extends Keyed> extends Keyed {
       */
      Tag<EntityType> ENTITY_TYPES_REDIRECTABLE_PROJECTILE = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("redirectable_projectile"), EntityType.class);
  
diff --git a/patches/api/0339-Add-getComputedBiome-API.patch b/patches/api/0339-Add-getComputedBiome-API.patch
index a51469e977..fefb8c693e 100644
--- a/patches/api/0339-Add-getComputedBiome-API.patch
+++ b/patches/api/0339-Add-getComputedBiome-API.patch
@@ -51,7 +51,7 @@ index b68367f123f029c3ff47eab6bfabd7a894a99da4..44ee56a5956cc17194c767a0c1071a2a
       * Sets the {@link Biome} at the given {@link Location}.
       *
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index cfa49e21feec7226e83e97e1053388f854b70337..f7d999d702151b50fd6ed956b59645ae2820fd27 100644
+index 7f9acd155c1b275145ba53a41b7513dc8cc00531..b47804da74e143b8d3665c3ec7dd9d858eee6a6b 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -375,10 +375,22 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0340-Add-enchantWithLevels-API.patch b/patches/api/0340-Add-enchantWithLevels-API.patch
index 744a7aa963..5b88a184cd 100644
--- a/patches/api/0340-Add-enchantWithLevels-API.patch
+++ b/patches/api/0340-Add-enchantWithLevels-API.patch
@@ -70,7 +70,7 @@ index 579a9037b656bef9fb65c6da03611e981492074a..e1986aea72bb1f1ba2ea76f3ba53f274
 +    // Paper end - enchantWithLevels API
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 1d1731776af5f59cd9e6bd07cb3b9fab5073ef66..9b2a62dc3da6718a3e8b39b4fb8bee3781e800cb 100644
+index 86404d3b8b4862cd1f140617cae93aa69df122ca..e9b88bb759af1a5c926d3d4c30a333e7720519cd 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -678,6 +678,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0349-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0349-Add-method-isTickingWorlds-to-Bukkit.patch
index e41abd2d60..e328c2a076 100644
--- a/patches/api/0349-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0349-Add-method-isTickingWorlds-to-Bukkit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit.
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 22021582b2f490ea2db87f2d3fe8a99b44d4f457..adc95cd1486791787950533ef8e4baaf5d3827cc 100644
+index 9be54f481a14bc917b465fdef3c2695d8ee64880..629d062b76ff4186cc5c824b1bdcafe3667b50fe 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -809,12 +809,26 @@ public final class Bukkit {
@@ -56,7 +56,7 @@ index 22021582b2f490ea2db87f2d3fe8a99b44d4f457..adc95cd1486791787950533ef8e4baaf
       * @param world the world to unload
       * @param save whether to save the chunks before unloading
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 178e91f3ad918c1a5600d6e9a14a21d478f7e1df..0648130a6ce2e08d96b05fde1cfd58c2bb24ae07 100644
+index 0da9cee02e2a77e16e3bfaec2197bfc567f5580a..3f21dfaaa8a6575c9f9b0d33b60fb9913fec8987 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -679,34 +679,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0352-Add-Player-getFishHook.patch b/patches/api/0352-Add-Player-getFishHook.patch
index 340b5b119e..fc0e0e4157 100644
--- a/patches/api/0352-Add-Player-getFishHook.patch
+++ b/patches/api/0352-Add-Player-getFishHook.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Player#getFishHook
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 36b48bfff60ecc3d49f9f6575a91dd6b73ecf1ab..488604ba1a516b477693877c74712e4a45624a8b 100644
+index 10576d39e019c0ca6bbd07b889a4580b2883d875..188c8e27d724a1593dc586b58c7dcb74a1b3d926 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -425,6 +425,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
diff --git a/patches/api/0353-More-Teleport-API.patch b/patches/api/0353-More-Teleport-API.patch
index 84e42259e2..7a4a14cfda 100644
--- a/patches/api/0353-More-Teleport-API.patch
+++ b/patches/api/0353-More-Teleport-API.patch
@@ -154,7 +154,7 @@ index 0000000000000000000000000000000000000000..9dbbe1f3cfda3b1862fd9cf1ef985332
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index f51f3f04ba9efe15f68620c5531b502710078b6e..8bada7f7f0200103edc415ad003132d96ae09607 100644
+index fe3f59390ee45a289ae6dbb398ce7954fab717d5..b39ade088062c5e636915f09b7094bc27bac1fcf 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -192,7 +192,7 @@ index f51f3f04ba9efe15f68620c5531b502710078b6e..8bada7f7f0200103edc415ad003132d9
       * Teleports this entity to the given location. If this entity is riding a
       * vehicle, it will be dismounted prior to teleportation.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 99bad852128f499f8f71552399c49f373d51cf9c..4371ac4683604919782f6268756dff4f05695a40 100644
+index db3a1e9170aeada5fe738975124861d79e82e2d1..7d39bf96ac7dd7530d236fc7bff5126b08a7d38a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3561,6 +3561,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0355-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0355-Custom-Chat-Completion-Suggestions-API.patch
index 5c217eaf6b..5be45fe692 100644
--- a/patches/api/0355-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0355-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4371ac4683604919782f6268756dff4f05695a40..761e7982d022eddd1adee6f2536fa93c4a9f67ea 100644
+index 7d39bf96ac7dd7530d236fc7bff5126b08a7d38a..460ac4d102f3e2f0162fd1e489b0866b74f776f1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3445,6 +3445,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0356-Collision-API.patch b/patches/api/0356-Collision-API.patch
index ce2e084b64..0248530e50 100644
--- a/patches/api/0356-Collision-API.patch
+++ b/patches/api/0356-Collision-API.patch
@@ -25,7 +25,7 @@ index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8bada7f7f0200103edc415ad003132d96ae09607..9f4498a955279b8b5c418609801fd09444a1efb5 100644
+index b39ade088062c5e636915f09b7094bc27bac1fcf..2b4058dace5d071f60a9629f81c2323ee8c6d109 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -1023,4 +1023,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0357-Block-Ticking-API.patch b/patches/api/0357-Block-Ticking-API.patch
index 57271e628e..fa6fe2a810 100644
--- a/patches/api/0357-Block-Ticking-API.patch
+++ b/patches/api/0357-Block-Ticking-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Block Ticking API
 
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index f7d999d702151b50fd6ed956b59645ae2820fd27..0efd8bb70ebdb86372022c9e12ec89f229ab3b52 100644
+index b47804da74e143b8d3665c3ec7dd9d858eee6a6b..b7530e7f389fdc6d815bdff0949fca4b14298c07 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -593,6 +593,41 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0358-Add-NamespacedKey-biome-methods.patch b/patches/api/0358-Add-NamespacedKey-biome-methods.patch
index 20a2934887..4eab10357b 100644
--- a/patches/api/0358-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0358-Add-NamespacedKey-biome-methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 2d612f2c6b483eec6fbc7ad35d5d878359db4770..b2ab190a73946ad2a5750c2408036cc3641e23f8 100644
+index 5be89089da4e8230dc7aa078712428189f38d9f9..3328ae3bab6b4929506a518d6426b81594b1b300 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -223,4 +223,37 @@ public interface UnsafeValues {
diff --git a/patches/api/0361-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0361-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 2f0f5483e8..08a6f15997 100644
--- a/patches/api/0361-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0361-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose codepoint limit in YamlConfigOptions, and increase
 
 
 diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
-index 9ae41b2bd454274a15abbd557ac397724e58d184..018c20fefeee43970c8c5b5d5f2ad9c297eeccb3 100644
+index b76cf252f44ca858d96b1af52cb38bc801d5f3c1..ed81e850b22b83ac872707daf3c7d5d0cac6176b 100644
 --- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
 +++ b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
 @@ -98,6 +98,7 @@ public class YamlConfiguration extends FileConfiguration {
@@ -18,7 +18,7 @@ index 9ae41b2bd454274a15abbd557ac397724e58d184..018c20fefeee43970c8c5b5d5f2ad9c2
          MappingNode node;
          try (Reader reader = new UnicodeReader(new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8)))) {
 diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java b/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
-index 3f7f6caf5fcf38b65c282cd83b93e45a272b138f..5d0ec7436f4487c686473248f332689224156fd5 100644
+index 3f69667e6bb89eb1cfdf43598be73640063b2006..6e43fbbe7b43ab5700bb0066b40337b2e47f6c6a 100644
 --- a/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
 +++ b/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
 @@ -12,6 +12,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0362-Add-getDrops-to-BlockState.patch b/patches/api/0362-Add-getDrops-to-BlockState.patch
index b28d1d5381..bb0a24c65e 100644
--- a/patches/api/0362-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0362-Add-getDrops-to-BlockState.patch
@@ -7,7 +7,7 @@ Originally added isPreferredTool to BlockData but
 upstream added that.
 
 diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index 94e1278340c0d9d2be9edc68f645414380aab353..8c7c8c0e54682dc4276109d19d92394cdd4bc189 100644
+index ee4cbbc584ec1a10c62464a7abb3ea5da656ffc0..3bcdb02f8f6081dcd7f15dc86587d4b790aa4496 100644
 --- a/src/main/java/org/bukkit/block/BlockState.java
 +++ b/src/main/java/org/bukkit/block/BlockState.java
 @@ -253,5 +253,41 @@ public interface BlockState extends Metadatable {
diff --git a/patches/api/0364-Elder-Guardian-appearance-API.patch b/patches/api/0364-Elder-Guardian-appearance-API.patch
index 5adec1def7..a0e9bd6ffd 100644
--- a/patches/api/0364-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0364-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 761e7982d022eddd1adee6f2536fa93c4a9f67ea..404f448cf1488a9fa5aeebeeba5d51e9a5427bc7 100644
+index 460ac4d102f3e2f0162fd1e489b0866b74f776f1..c676524280cc091998859fe1945d06bb7f26560d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3625,6 +3625,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0366-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0366-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index 178ca5316c..b66bb330f3 100644
--- a/patches/api/0366-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0366-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f7a3dd62ae5e492a7bccf8167cec0fc560499fa2..4ed60d7eae1b1c8980f8844b33151fd7c53207c2 100644
+index 292b8d0370723f019fb90a8b86300fa631bee683..be91821c47ff582576eb845610c3bde7e65ed8b3 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1341,4 +1341,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0367-Add-entity-knockback-API.patch b/patches/api/0367-Add-entity-knockback-API.patch
index 0dbd403581..73dd5f3658 100644
--- a/patches/api/0367-Add-entity-knockback-API.patch
+++ b/patches/api/0367-Add-entity-knockback-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4ed60d7eae1b1c8980f8844b33151fd7c53207c2..86c5ceddc722d28261f8a6d8368400fe2731aaf0 100644
+index be91821c47ff582576eb845610c3bde7e65ed8b3..8ee3f82049541041623c10940bdda1746200b1e6 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1361,4 +1361,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0371-Add-Player-Warden-Warning-API.patch b/patches/api/0371-Add-Player-Warden-Warning-API.patch
index 81dbe64546..3b23da2225 100644
--- a/patches/api/0371-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0371-Add-Player-Warden-Warning-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Player Warden Warning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 404f448cf1488a9fa5aeebeeba5d51e9a5427bc7..17d69b6808e581dd69f93d7cb646ca43608b40df 100644
+index c676524280cc091998859fe1945d06bb7f26560d..8873f0eb1451cd4e8801b75e8bd477eae588e73b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3641,6 +3641,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0374-ItemStack-damage-API.patch b/patches/api/0374-ItemStack-damage-API.patch
index e48a903a65..56fe1421a7 100644
--- a/patches/api/0374-ItemStack-damage-API.patch
+++ b/patches/api/0374-ItemStack-damage-API.patch
@@ -8,7 +8,7 @@ to simulate damage done to an itemstack and all
 the logic associated with damaging them
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 86c5ceddc722d28261f8a6d8368400fe2731aaf0..9f3e2903c955f2a5d1b25825c49188df62d20cef 100644
+index 8ee3f82049541041623c10940bdda1746200b1e6..fd4d74a637a93c85a057e867b8c07e574916175a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1375,4 +1375,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -66,7 +66,7 @@ index 86c5ceddc722d28261f8a6d8368400fe2731aaf0..9f3e2903c955f2a5d1b25825c49188df
 +    // Paper end - ItemStack damage API
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 9b2a62dc3da6718a3e8b39b4fb8bee3781e800cb..e39c9167bd66c528c09b256f15cc6c58666f0ca0 100644
+index e9b88bb759af1a5c926d3d4c30a333e7720519cd..6393e5249b4469b1c8ebfb05a0f09572d116c40f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -1090,5 +1090,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0376-Friction-API.patch b/patches/api/0376-Friction-API.patch
index 8dc2a95910..8c1155dd71 100644
--- a/patches/api/0376-Friction-API.patch
+++ b/patches/api/0376-Friction-API.patch
@@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5
      /**
       * Gets the item stack associated with this item drop.
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9f3e2903c955f2a5d1b25825c49188df62d20cef..016529563381a674db8050cb328f9e8f16e72e93 100644
+index fd4d74a637a93c85a057e867b8c07e574916175a..8cc4ab8f560f5db9cf7f58233578838945a52deb 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
@@ -72,7 +72,7 @@ index 9f3e2903c955f2a5d1b25825c49188df62d20cef..016529563381a674db8050cb328f9e8f
      /**
       * Gets the height of the living entity's eyes above its Location.
 diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java
-index 148d8cddba48a886eddef72a3de63d5eaa15949f..52cac73b7680806299a92013bbf959ecacac824f 100644
+index c3c94a5694f1e8d79e5acc45af1cd2e0fa6a621f..0e4163c9358dc2dc6b8b0aca1da0f59c805e47f4 100644
 --- a/src/main/java/org/bukkit/entity/Minecart.java
 +++ b/src/main/java/org/bukkit/entity/Minecart.java
 @@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0380-Add-Sneaking-API-for-Entities.patch b/patches/api/0380-Add-Sneaking-API-for-Entities.patch
index ccee097cf0..638560281f 100644
--- a/patches/api/0380-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0380-Add-Sneaking-API-for-Entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 9f4498a955279b8b5c418609801fd09444a1efb5..6dcaf7e9bc9afb708ab569e82f27c87833450ff1 100644
+index 2b4058dace5d071f60a9629f81c2323ee8c6d109..9cfffc02da491450c080cdd80e96f60921518fb9 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -823,6 +823,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -35,7 +35,7 @@ index 9f4498a955279b8b5c418609801fd09444a1efb5..6dcaf7e9bc9afb708ab569e82f27c878
       * Get the category of spawn to which this entity belongs.
       *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 17d69b6808e581dd69f93d7cb646ca43608b40df..9faabe1dcfd69d8dfbefab98f23d8f0b6700e9b2 100644
+index 8873f0eb1451cd4e8801b75e8bd477eae588e73b..acb65c90ad87b35c00fafc4e60803adc13af1225 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -475,6 +475,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0382-Flying-Fall-Damage-API.patch b/patches/api/0382-Flying-Fall-Damage-API.patch
index f0e6b1e6ca..8144d7e6d5 100644
--- a/patches/api/0382-Flying-Fall-Damage-API.patch
+++ b/patches/api/0382-Flying-Fall-Damage-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9faabe1dcfd69d8dfbefab98f23d8f0b6700e9b2..1f9e9beb9c36d8885e0c4f19e324f26521634ed3 100644
+index acb65c90ad87b35c00fafc4e60803adc13af1225..4e15db5b6dacc784d6893874295dbd9b84595011 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1948,6 +1948,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0384-Win-Screen-API.patch b/patches/api/0384-Win-Screen-API.patch
index 8911de9fcb..03a11e325b 100644
--- a/patches/api/0384-Win-Screen-API.patch
+++ b/patches/api/0384-Win-Screen-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1f9e9beb9c36d8885e0c4f19e324f26521634ed3..dd4ce1d68962ec668db7c687c1e4764db52bc04f 100644
+index 4e15db5b6dacc784d6893874295dbd9b84595011..c2d49ff3aee971598451734f95144ac5dbbf131a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1287,6 +1287,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0385-Add-Entity-Body-Yaw-API.patch b/patches/api/0385-Add-Entity-Body-Yaw-API.patch
index 17277b2e80..aba64c1266 100644
--- a/patches/api/0385-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0385-Add-Entity-Body-Yaw-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Entity Body Yaw API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6dcaf7e9bc9afb708ab569e82f27c87833450ff1..a76e537c9b3b9519cd46894c90b750f012182be9 100644
+index 9cfffc02da491450c080cdd80e96f60921518fb9..0ca7cb73c4007647841ed6a78c8949fcc3ed97ff 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -1041,6 +1041,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -53,7 +53,7 @@ index 6dcaf7e9bc9afb708ab569e82f27c87833450ff1..a76e537c9b3b9519cd46894c90b750f0
  
      // Paper start - Collision API
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 016529563381a674db8050cb328f9e8f16e72e93..c610731928ac9b01b111a7ccf0340ad59fcfb867 100644
+index 8cc4ab8f560f5db9cf7f58233578838945a52deb..8375ec85b78378f6ebc0a970fb0df205feb984e7 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1424,4 +1424,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0393-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0393-Add-method-to-remove-all-active-potion-effects.patch
index a9d228f158..cbbc90e94a 100644
--- a/patches/api/0393-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0393-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index c610731928ac9b01b111a7ccf0340ad59fcfb867..4aab0144601788a7902c9fdabb68744d9e33a345 100644
+index 8375ec85b78378f6ebc0a970fb0df205feb984e7..7cc29c7a9e2c30feaedaab188024387e12f51c75 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0394-Folia-scheduler-and-owned-region-API.patch b/patches/api/0394-Folia-scheduler-and-owned-region-API.patch
index d464b8041e..6017268d79 100644
--- a/patches/api/0394-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0394-Folia-scheduler-and-owned-region-API.patch
@@ -499,7 +499,7 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7919a001e5b5886a3d0fb64913064bc9607a2102..42beeecad288a7600d4906877932ccd701ed7cc2 100644
+index 629d062b76ff4186cc5c824b1bdcafe3667b50fe..5170f7ba71d8a09f2b4ae0d945c758fd4ae4130f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2696,6 +2696,164 @@ public final class Bukkit {
@@ -668,7 +668,7 @@ index 7919a001e5b5886a3d0fb64913064bc9607a2102..42beeecad288a7600d4906877932ccd7
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2801f4b27bb77e2d5698f82dd14c4a92d2f4392c..ecfe4f0079038e0a4541ac71ab590ac18108d1d3 100644
+index 3f21dfaaa8a6575c9f9b0d33b60fb9913fec8987..d05ea34d8f58b475628157a7bd2ba0143e9a6c36 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2351,4 +2351,138 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -811,7 +811,7 @@ index 2801f4b27bb77e2d5698f82dd14c4a92d2f4392c..ecfe4f0079038e0a4541ac71ab590ac1
 +    // Paper end - Folia region threading API
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a76e537c9b3b9519cd46894c90b750f012182be9..4580c7613fac4f1eeccc2be2d15497cec5868736 100644
+index 0ca7cb73c4007647841ed6a78c8949fcc3ed97ff..e196b66c02b5ba9ca35df804182f9b7ab4f7b45c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -1101,4 +1101,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0396-More-Sign-Block-API.patch b/patches/api/0396-More-Sign-Block-API.patch
index 57b372521c..d01d603716 100644
--- a/patches/api/0396-More-Sign-Block-API.patch
+++ b/patches/api/0396-More-Sign-Block-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] More Sign Block API
 Co-authored-by: SoSeDiK <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java
-index 1fdb1144949adc3a2b5cbc3aca94d2f8e0c6d9ee..340e3adcc57227f2e570826681ea81b9159805de 100644
+index be36f722c7e465fae09ae7c99d92bfa032b66cc3..859217e0109beb555e2357d806be96b53471955d 100644
 --- a/src/main/java/org/bukkit/block/Sign.java
 +++ b/src/main/java/org/bukkit/block/Sign.java
 @@ -182,9 +182,58 @@ public interface Sign extends TileState, Colorable {
diff --git a/patches/api/0399-API-for-updating-recipes-on-clients.patch b/patches/api/0399-API-for-updating-recipes-on-clients.patch
index 4a98cf2e1e..68ba48ebf4 100644
--- a/patches/api/0399-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0399-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 50efe16bb80c618c3dfae03b70c8c165183af8ec..52c601328bbf5c1642aa620c8bb466a9d2d231be 100644
+index 5170f7ba71d8a09f2b4ae0d945c758fd4ae4130f..886c1aab96bd34739665c22793217f3f41ba92d0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1004,6 +1004,26 @@ public final class Bukkit {
@@ -82,7 +82,7 @@ index 50efe16bb80c618c3dfae03b70c8c165183af8ec..52c601328bbf5c1642aa620c8bb466a9
       * Gets a list of command aliases defined in the server properties.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1b8d6a3333a4fa9155b79644e683e2343c134e12..8ba2fbaab7428a42b506fd000fbc162f68ddaed1 100644
+index d05ea34d8f58b475628157a7bd2ba0143e9a6c36..897d659e45d1a32c1bdaf8e0941f00597261a0b9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -853,6 +853,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0401-Fix-custom-statistic-criteria-creation.patch b/patches/api/0401-Fix-custom-statistic-criteria-creation.patch
index bfa683fb84..06e1015bba 100644
--- a/patches/api/0401-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0401-Fix-custom-statistic-criteria-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix custom statistic criteria creation
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index b2ab190a73946ad2a5750c2408036cc3641e23f8..cfafd64ee39a6448e382f9903b8c462f3c454d3f 100644
+index 3328ae3bab6b4929506a518d6426b81594b1b300..8e0877321edb26e1dbdb3570a62814d06c0616af 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -256,4 +256,6 @@ public interface UnsafeValues {
diff --git a/patches/api/0403-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0403-API-for-an-entity-s-scoreboard-name.patch
index 1fb9128be8..c7f79f6235 100644
--- a/patches/api/0403-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0403-API-for-an-entity-s-scoreboard-name.patch
@@ -7,7 +7,7 @@ Was obtainable through different methods, but you had to use different
 methods depending on the implementation of Entity you were working with.
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 4580c7613fac4f1eeccc2be2d15497cec5868736..efd8108cee65e7b1a227ebb6c33f3c92eb4cea24 100644
+index e196b66c02b5ba9ca35df804182f9b7ab4f7b45c..ee5a27ba09ec4100dbedab4f190cf74549ce858e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -1112,4 +1112,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch
index a832ca9f1d..5edb856e19 100644
--- a/patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 52c601328bbf5c1642aa620c8bb466a9d2d231be..c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2 100644
+index 886c1aab96bd34739665c22793217f3f41ba92d0..c3c76dd82b209f6720afc51622aeb3fd92f1c0c2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -949,9 +949,6 @@ public final class Bukkit {
@@ -84,7 +84,7 @@ index 52c601328bbf5c1642aa620c8bb466a9d2d231be..c8fa12acaf52cd3923a7a8702ccc50cf
      /**
       * Reloads the server, refreshing settings and plugin information.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8ba2fbaab7428a42b506fd000fbc162f68ddaed1..50ffca9bccfb582d58ccb13f0decf66e5d91aef3 100644
+index 897d659e45d1a32c1bdaf8e0941f00597261a0b9..1b968953fdf470bff32122bd06c4f83f27b97383 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -817,16 +817,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0405-Add-Listing-API-for-Player.patch b/patches/api/0405-Add-Listing-API-for-Player.patch
index 3135969fe0..bd09b03dc0 100644
--- a/patches/api/0405-Add-Listing-API-for-Player.patch
+++ b/patches/api/0405-Add-Listing-API-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Listing API for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index baf7ff3b23be8dd80d2e59299a6ec8f9ce1053df..e128750b1175ab8bbe9b23fdd931665262c8d75e 100644
+index ad8e53bc528f6a078c85962fb85956bd97d67703..094c2056f4124dbb1caa0a5e962933b653d950a9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2078,6 +2078,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0407-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0407-Fix-NPE-on-Boat-getStatus.patch
index 985aab9f2b..03398ef0e7 100644
--- a/patches/api/0407-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0407-Fix-NPE-on-Boat-getStatus.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix NPE on Boat getStatus
 
 
 diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java
-index a0fb3c44405f6362f8a1613661d507e448f7ba6b..7076870c1abfa0edef33e00c39514aa413920f59 100644
+index 9e8224d7e0a83a6252a32d352b9db55a9079325e..219a2f06c57c8a64052c372a62892389a98f9ae1 100644
 --- a/src/main/java/org/bukkit/entity/Boat.java
 +++ b/src/main/java/org/bukkit/entity/Boat.java
 @@ -175,6 +175,7 @@ public interface Boat extends Vehicle {
diff --git a/patches/api/0408-Expand-Pose-API.patch b/patches/api/0408-Expand-Pose-API.patch
index a7ac9f7567..cdc5e59a2a 100644
--- a/patches/api/0408-Expand-Pose-API.patch
+++ b/patches/api/0408-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index efd8108cee65e7b1a227ebb6c33f3c92eb4cea24..725ef320f929d5e3d141c1ed3246d73a7d741f31 100644
+index ee5a27ba09ec4100dbedab4f190cf74549ce858e..e56808a884a4fda9a891468a787b3dff9303debc 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -840,6 +840,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0415-Add-OfflinePlayer-isConnected.patch b/patches/api/0415-Add-OfflinePlayer-isConnected.patch
index 08e2f91095..126881d0fd 100644
--- a/patches/api/0415-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0415-Add-OfflinePlayer-isConnected.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add OfflinePlayer#isConnected
 This adds an alternative to OfflinePlayer#isOnline that returns true only if the same instance of the player is still online. This is generally more useful than isOnline as it allows you to determine if you have an instance of a Player that still exists. If a player relogs an old Player instance becomes unlinked leading to e.g. messages sent to the old player no longer arriving despite isOnline returning true. Checking against isConnected is more useful there to discard invalid instances.
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 299d1cc510d24541c6bb47d02db0b6a86fb1d0eb..3993fecec5b4c2bbd77e175a168afcad571ce4d1 100644
+index a8003b4796b3f80986043a9dbc2e6ad08a1bb4d7..18720a965b814d02e783d5039da90af0e966025d 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -24,10 +24,26 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
diff --git a/patches/api/0417-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0417-Allow-proper-checking-of-empty-item-stacks.patch
index 0fe58e0369..b413b7e7e7 100644
--- a/patches/api/0417-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0417-Allow-proper-checking-of-empty-item-stacks.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow proper checking of empty item stacks
 This adds a method to check if an item stack is empty or not. This mirrors vanilla's implementation of the same method.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index e39c9167bd66c528c09b256f15cc6c58666f0ca0..773780811a24aa1c1591257a993e30f2d99da436 100644
+index 6393e5249b4469b1c8ebfb05a0f09572d116c40f..bcead776776665fc7558ee11f928d842bd2e3da5 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -1104,5 +1104,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0419-Add-player-idle-duration-API.patch b/patches/api/0419-Add-player-idle-duration-API.patch
index ac250c0760..b64d0bcece 100644
--- a/patches/api/0419-Add-player-idle-duration-API.patch
+++ b/patches/api/0419-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e128750b1175ab8bbe9b23fdd931665262c8d75e..4297a893799fe39b80029b97f6b5581d543afa8a 100644
+index 094c2056f4124dbb1caa0a5e962933b653d950a9..d84fe3e439f3b190b7bbec15f406cc3a393dccfc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3782,6 +3782,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0421-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0421-Add-predicate-for-blocks-when-raytracing.patch
index b2f0a44527..507244270d 100644
--- a/patches/api/0421-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0421-Add-predicate-for-blocks-when-raytracing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate for blocks when raytracing
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 24eaf74420f6fbd4f0a0f13b719f57b50696aef3..9a473448427b48038e097796459ff0352f5a54cc 100644
+index 8bfa8db3d0fdbe0c26e3b327d134c6c0af6be206..3cb0aecf582b3d1c5195fca9160780ad5e98155a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1686,6 +1686,27 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0423-Attribute-Modifier-API-improvements.patch b/patches/api/0423-Attribute-Modifier-API-improvements.patch
index d4b0442c30..7384a7ae3b 100644
--- a/patches/api/0423-Attribute-Modifier-API-improvements.patch
+++ b/patches/api/0423-Attribute-Modifier-API-improvements.patch
@@ -70,7 +70,7 @@ index f08ee26cc4d479e1bfc5264b8cbe721315de91f2..f1fa86ddf1f50a357c9e94cc61261d8c
       * Remove a modifier from this instance.
       *
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index 8c53ac6b4381f3cf8b5e989c8b2a3ba77bd4e475..def473b6424da1e81448bd492b7fef46691eaf8c 100644
+index b90af00a8eb83d4c1b183fbc4f1e9eae84c9074b..4ad09a2673ce573b63d133635a772197a2062901 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
 @@ -48,6 +48,12 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
diff --git a/patches/api/0425-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0425-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 88ecd35099..64f385ece0 100644
--- a/patches/api/0425-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0425-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
@@ -9,7 +9,7 @@ By removing this check we avoid unnecessarily allocating useless `ItemMeta` obje
 This is a leftover from when checking for the item's durability was "free" because the durability was stored in the `ItemStack` itself, this [was changed in Minecraft 1.13](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/f8b2086d60942eb2cd7ac25a2a1408cb790c222c#src/main/java/org/bukkit/inventory/ItemStack.java).
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 773780811a24aa1c1591257a993e30f2d99da436..e6c69a54e0c1dc511fe5769f869dcecb13e04ed3 100644
+index bcead776776665fc7558ee11f928d842bd2e3da5..c3ae09dc66119cb2873201fb2975ad5e0f8237d2 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -307,7 +307,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0426-Add-Structure-check-API.patch b/patches/api/0426-Add-Structure-check-API.patch
index 43073fe8f4..3923a385a3 100644
--- a/patches/api/0426-Add-Structure-check-API.patch
+++ b/patches/api/0426-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 86fd5f3d322b6203f02ca7c427ccd56336b93fc0..16570c3c7ed5e7ad25f20c1034f7b966d6e694da 100644
+index 3cb0aecf582b3d1c5195fca9160780ad5e98155a..1796615065c8a6d06450d1b9c389804e804c4327 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -78,6 +78,30 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0427-Experimental-annotations-change.patch b/patches/api/0427-Experimental-annotations-change.patch
index 77ab53a191..8570aa9c75 100644
--- a/patches/api/0427-Experimental-annotations-change.patch
+++ b/patches/api/0427-Experimental-annotations-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Experimental annotations change
 
 
 diff --git a/src/main/java/org/bukkit/FeatureFlag.java b/src/main/java/org/bukkit/FeatureFlag.java
-index 5c33daf443691cf0a584ecc5f8546cbcc2f2dfa3..79144c8594ea5cbd57e94cd60642459832b94181 100644
+index 54859fc5d8a14d26f22b57373045408d84766595..dd157b650aa7ac759d156ced30fa7514d34c43ed 100644
 --- a/src/main/java/org/bukkit/FeatureFlag.java
 +++ b/src/main/java/org/bukkit/FeatureFlag.java
 @@ -29,6 +29,7 @@ public interface FeatureFlag extends Keyed {
@@ -16,11 +16,8 @@ index 5c33daf443691cf0a584ecc5f8546cbcc2f2dfa3..79144c8594ea5cbd57e94cd606424598
      public static final FeatureFlag TRADE_REBALANCE = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("trade_rebalance"));
  
      /**
-@@ -39,10 +40,13 @@ public interface FeatureFlag extends Keyed {
-     @Deprecated(since = "1.21")
-     public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
- 
-+    @ApiStatus.Experimental // Paper - add missing annotation
+@@ -47,8 +48,10 @@ public interface FeatureFlag extends Keyed {
+     @Deprecated(since = "1.21.4")
      public static final FeatureFlag WINTER_DROP = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("winter_drop"));
  
 +    @ApiStatus.Experimental // Paper - add missing annotation
diff --git a/patches/api/0428-Add-more-scoreboard-API.patch b/patches/api/0428-Add-more-scoreboard-API.patch
index 201af36b0c..34e12e5b96 100644
--- a/patches/api/0428-Add-more-scoreboard-API.patch
+++ b/patches/api/0428-Add-more-scoreboard-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more scoreboard API
 
 
 diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
-index a193ffabb05160b462dee1ba8f687fdbc84405b6..bd4d84cbf220ab02f09ece97873bbf0bdf7a45ba 100644
+index d6d52bc9185e8a1581ccfa57df3550bc12d9872a..d8a249bb2dd8ab96962897c2a52f40ea288f7bd6 100644
 --- a/src/main/java/org/bukkit/scoreboard/Objective.java
 +++ b/src/main/java/org/bukkit/scoreboard/Objective.java
 @@ -175,4 +175,24 @@ public interface Objective {
@@ -34,7 +34,7 @@ index a193ffabb05160b462dee1ba8f687fdbc84405b6..bd4d84cbf220ab02f09ece97873bbf0b
 +    // Paper end - add more score API
  }
 diff --git a/src/main/java/org/bukkit/scoreboard/Score.java b/src/main/java/org/bukkit/scoreboard/Score.java
-index 1eaa9a93f8eff5f18a6cce2d74f21eb19db273c8..5b6f243492d55d2db0d6944dc6daca9b181551d6 100644
+index 48a1654a2dd8da82cb91bcfa4b3a523f88323568..a3b482e07bb3dceb9b81d66c7208556a0bedd948 100644
 --- a/src/main/java/org/bukkit/scoreboard/Score.java
 +++ b/src/main/java/org/bukkit/scoreboard/Score.java
 @@ -83,4 +83,50 @@ public interface Score {
diff --git a/patches/api/0429-Improve-Registry.patch b/patches/api/0429-Improve-Registry.patch
index 196c4ee4dd..96e3965ecd 100644
--- a/patches/api/0429-Improve-Registry.patch
+++ b/patches/api/0429-Improve-Registry.patch
@@ -41,7 +41,7 @@ index d24bf449f58fd7c1b8ffab8dbc42f9f1fef8c4ef..a53e59e030aea65a99806d5b0375cbb4
       * Get a painting by its numeric ID
       *
 diff --git a/src/main/java/org/bukkit/MusicInstrument.java b/src/main/java/org/bukkit/MusicInstrument.java
-index f87364de1bf24ee78e0d823d9081a5f352934405..36de4124e977bc8f3cefb2650cdf47f83d5b0d73 100644
+index 3b107e35f006cb1a0745778d99dab0783c67d4d8..d41892af5253623112fb3f8c53958c7914609e30 100644
 --- a/src/main/java/org/bukkit/MusicInstrument.java
 +++ b/src/main/java/org/bukkit/MusicInstrument.java
 @@ -47,6 +47,27 @@ public abstract class MusicInstrument implements Keyed, net.kyori.adventure.tran
@@ -170,10 +170,10 @@ index b2bd12736d08fe72128142af4ca2022da8309f6d..c3d49f9c640eb390f507f9521a389cb7
      }
  }
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 04e890be72b18259f1af2833879b4d9af51b1f02..fd9bd4b0bca5a5b10ae38de79b7121fd4de7298c 100644
+index 779fd6dd572dea41e7e22464c9c6068a0fb71b9d..70d6dedcad934be38ec5dc3807ec946b0fe3b649 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
-@@ -1689,6 +1689,16 @@ public interface Sound extends OldEnum<Sound>, Keyed, net.kyori.adventure.sound.
+@@ -1704,6 +1704,16 @@ public interface Sound extends OldEnum<Sound>, Keyed, net.kyori.adventure.sound.
          return sound;
      }
  
@@ -190,7 +190,7 @@ index 04e890be72b18259f1af2833879b4d9af51b1f02..fd9bd4b0bca5a5b10ae38de79b7121fd
      /**
       * @return an array of all known sounds.
       * @deprecated use {@link Registry#iterator()}.
-@@ -1700,6 +1710,11 @@ public interface Sound extends OldEnum<Sound>, Keyed, net.kyori.adventure.sound.
+@@ -1715,6 +1725,11 @@ public interface Sound extends OldEnum<Sound>, Keyed, net.kyori.adventure.sound.
      }
  
      // Paper start
@@ -203,7 +203,7 @@ index 04e890be72b18259f1af2833879b4d9af51b1f02..fd9bd4b0bca5a5b10ae38de79b7121fd
      default net.kyori.adventure.key.@NotNull Key key() {
          return this.getKey();
 diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java
-index eaf6cd758344eeba29f00f822a50c93704af8bda..ae05025f39283a8dddd5703473322d75157de713 100644
+index b6aa112ffcf43c8854e4060a83117cdc311c937d..4620b39b3257a29f964f94a2ddef9c46a365baa1 100644
 --- a/src/main/java/org/bukkit/block/banner/PatternType.java
 +++ b/src/main/java/org/bukkit/block/banner/PatternType.java
 @@ -56,6 +56,23 @@ public interface PatternType extends OldEnum<PatternType>, Keyed {
@@ -260,10 +260,10 @@ index 20a7fd27ba3a029d58dd18ad9b470ffaed8c9578..b6920f834f8f5992214734abd093af54
 +    // Paper end - deprecate getKey
  }
 diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
-index 804cb7162b34225d5dd84aada283de568d7d6592..9e6fc714c494ebf98da75d030a2dc75746c37138 100644
+index cc38bee3c412bef4767f08407c0f5559a113fce5..7e8a4b4ec625072cb4aff1f9e113d9d0c162dc8c 100644
 --- a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
 +++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
-@@ -74,4 +74,25 @@ public interface TrimMaterial extends Keyed, Translatable {
+@@ -78,4 +78,25 @@ public interface TrimMaterial extends Keyed, Translatable {
      @Deprecated(forRemoval = true)
      @org.jetbrains.annotations.NotNull String getTranslationKey();
      // Paper end - adventure
diff --git a/patches/api/0430-Add-experience-points-API.patch b/patches/api/0430-Add-experience-points-API.patch
index 5581883301..8951bfce95 100644
--- a/patches/api/0430-Add-experience-points-API.patch
+++ b/patches/api/0430-Add-experience-points-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add experience points API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4297a893799fe39b80029b97f6b5581d543afa8a..b3b6cdf5491397e0e802ac91f5805d560ed5d88a 100644
+index d84fe3e439f3b190b7bbec15f406cc3a393dccfc..a7a4e5423cedb67bcdf02738be62bdf83e748b82 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1947,6 +1947,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0431-Add-missing-InventoryType.patch b/patches/api/0431-Add-missing-InventoryType.patch
index 3735af5696..d3d0cd5458 100644
--- a/patches/api/0431-Add-missing-InventoryType.patch
+++ b/patches/api/0431-Add-missing-InventoryType.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing InventoryType
 Upstream did not add a DECORATED_POT inventory type
 
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index b4fe8108e8b36b8ce859cdd4a5b557034f923c85..7184f80899206bedeac387e9f8a35482801efd4b 100644
+index e0d73d432cd31da35a72b479c854f2124c63ebe5..81118a91c2e22e02a1f774d1cc4d3e97064087ce 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
 @@ -145,6 +145,12 @@ public enum InventoryType {
diff --git a/patches/api/0433-Add-HiddenPotionEffect-API.patch b/patches/api/0433-Add-HiddenPotionEffect-API.patch
index 03c31e4ff8..1e0c0ad367 100644
--- a/patches/api/0433-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0433-Add-HiddenPotionEffect-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4aab0144601788a7902c9fdabb68744d9e33a345..51a428473e702be3ab79bd1e579d1114f747791b 100644
+index 7cc29c7a9e2c30feaedaab188024387e12f51c75..ac86962fa3c0fb0c3138e98bd89d73b467a5fb60 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -29,7 +29,7 @@ index 4aab0144601788a7902c9fdabb68744d9e33a345..51a428473e702be3ab79bd1e579d1114
       * @param effects the effects to add
       * @return whether all of the effects could be added
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index 575156c089e45a3d6a43ca6b7adfbc7b473a60ab..704b6d615e7490d433b703f5a6a8d3c40aa6425e 100644
+index 0d60a1b740199783d3fcb775f190ee85bd84696b..ab8f3c089ff50f4414d4c35810e65b2e73e2f678 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
 @@ -28,6 +28,7 @@ public class PotionEffect implements ConfigurationSerializable {
diff --git a/patches/api/0435-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0435-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 93ba48c77c..0701be14b5 100644
--- a/patches/api/0435-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0435-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Return null for empty String in NamespacedKey.fromString
 
 
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index cbdaa121dbc1876d0cd55f4b7b57f283ecaa8f1a..7ff6d60deb129e23b2a4d772aee123eb6c0b6433 100644
+index ceb1009252e25e244baab9208b7494666aebc508..6d266c111bfa2bd51338e03ed740f6ac81ed07c7 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -90,7 +90,7 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap
diff --git a/patches/api/0437-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0437-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..1004281c9a 100644
--- a/patches/api/0437-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0437-Expose-LootTable-of-DecoratedPot.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LootTable of DecoratedPot
 
 
 diff --git a/src/main/java/org/bukkit/block/DecoratedPot.java b/src/main/java/org/bukkit/block/DecoratedPot.java
-index f76230e0bba49639fc2e70ee32a53e3a9182f217..feae34e459523d17a10b673bbec28abcac9cdadd 100644
+index a04df8105a462eac3a4a8eb04eac70fdd979d0e3..8c0e946ead8b7d9e2e6e94b0533564eb26653092 100644
 --- a/src/main/java/org/bukkit/block/DecoratedPot.java
 +++ b/src/main/java/org/bukkit/block/DecoratedPot.java
 @@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0439-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0439-Add-api-for-spawn-egg-texture-colors.patch
index a239d4c100..cce28b1bfa 100644
--- a/patches/api/0439-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0439-Add-api-for-spawn-egg-texture-colors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add api for spawn egg texture colors
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index cfafd64ee39a6448e382f9903b8c462f3c454d3f..94913f522d3c060c609f6ec7d7b0d92ea5587fc8 100644
+index 8e0877321edb26e1dbdb3570a62814d06c0616af..ffe382002c66d7d3fc539c3269261ca1fab4aa2a 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -258,4 +258,17 @@ public interface UnsafeValues {
diff --git a/patches/api/0440-Add-Lifecycle-Event-system.patch b/patches/api/0440-Add-Lifecycle-Event-system.patch
index 5dfac8ef46..60bb62f8ce 100644
--- a/patches/api/0440-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0440-Add-Lifecycle-Event-system.patch
@@ -546,7 +546,7 @@ index 0000000000000000000000000000000000000000..f70814de0d6c40b2c1c9921b8abdd116
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 94913f522d3c060c609f6ec7d7b0d92ea5587fc8..a0b02efdb3beed93cb1656e840f24cb98f5fd555 100644
+index ffe382002c66d7d3fc539c3269261ca1fab4aa2a..159e96b1eedb0c97b624c338fefa1783336483e3 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -271,4 +271,12 @@ public interface UnsafeValues {
diff --git a/patches/api/0441-ItemStack-Tooltip-API.patch b/patches/api/0441-ItemStack-Tooltip-API.patch
index a3c4cf2de9..d774981904 100644
--- a/patches/api/0441-ItemStack-Tooltip-API.patch
+++ b/patches/api/0441-ItemStack-Tooltip-API.patch
@@ -110,7 +110,7 @@ index 0000000000000000000000000000000000000000..a649b90dfac6000c01579a48234a1138
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index a0b02efdb3beed93cb1656e840f24cb98f5fd555..b503b5e13c51580367d53939ad4c19a7718c22ce 100644
+index 159e96b1eedb0c97b624c338fefa1783336483e3..ff155bd22a6ea7f59dbf91c9280a653917b5010f 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -279,4 +279,6 @@ public interface UnsafeValues {
@@ -121,7 +121,7 @@ index a0b02efdb3beed93cb1656e840f24cb98f5fd555..b503b5e13c51580367d53939ad4c19a7
 +    @NotNull java.util.List<net.kyori.adventure.text.Component> computeTooltipLines(@NotNull ItemStack itemStack, @NotNull io.papermc.paper.inventory.tooltip.TooltipContext tooltipContext, @Nullable org.bukkit.entity.Player player); // Paper - expose itemstack tooltip lines
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index e6c69a54e0c1dc511fe5769f869dcecb13e04ed3..49390979cc0c68b8e719f2a2ce9e7d193c747959 100644
+index c3ae09dc66119cb2873201fb2975ad5e0f8237d2..0e6103628673130139363b53d23d3432deff5c50 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -1124,4 +1124,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0444-add-number-format-api.patch b/patches/api/0444-add-number-format-api.patch
index 8d36669b0a..ac3ce0b6ba 100644
--- a/patches/api/0444-add-number-format-api.patch
+++ b/patches/api/0444-add-number-format-api.patch
@@ -175,7 +175,7 @@ index 0000000000000000000000000000000000000000..e288beb1596f2d4e7e602364955da4e8
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
-index bd4d84cbf220ab02f09ece97873bbf0bdf7a45ba..1750f97d2122e6e597b9549df8f6fa74bf5e2e2d 100644
+index d8a249bb2dd8ab96962897c2a52f40ea288f7bd6..d1016ee4282321d99734a251edfd93facb9b903f 100644
 --- a/src/main/java/org/bukkit/scoreboard/Objective.java
 +++ b/src/main/java/org/bukkit/scoreboard/Objective.java
 @@ -195,4 +195,22 @@ public interface Objective {
@@ -202,7 +202,7 @@ index bd4d84cbf220ab02f09ece97873bbf0bdf7a45ba..1750f97d2122e6e597b9549df8f6fa74
 +    // Paper end - number format api
  }
 diff --git a/src/main/java/org/bukkit/scoreboard/Score.java b/src/main/java/org/bukkit/scoreboard/Score.java
-index 5b6f243492d55d2db0d6944dc6daca9b181551d6..fba8e475c1f1a410c44a95fcc474cce19e0f515c 100644
+index a3b482e07bb3dceb9b81d66c7208556a0bedd948..3600804874843975eb12b84b71b6848c68b2a244 100644
 --- a/src/main/java/org/bukkit/scoreboard/Score.java
 +++ b/src/main/java/org/bukkit/scoreboard/Score.java
 @@ -129,4 +129,26 @@ public interface Score {
diff --git a/patches/api/0445-improve-BanList-types.patch b/patches/api/0445-improve-BanList-types.patch
index bfb2a6a550..70d8b83c87 100644
--- a/patches/api/0445-improve-BanList-types.patch
+++ b/patches/api/0445-improve-BanList-types.patch
@@ -56,7 +56,7 @@ index 0000000000000000000000000000000000000000..26d4df3cbf8d31790218095bb7fb1a17
 +record BanListTypeImpl<T>(Class<T> typeClass) implements BanListType<T> {
 +}
 diff --git a/src/main/java/org/bukkit/BanList.java b/src/main/java/org/bukkit/BanList.java
-index a77c0411a68a9bad33ddfb335b7a996a843e478c..739d9d3ec789e58c10c8d818a9ca59ce447600d5 100644
+index 60aea29d51a8ad499401f94a7c326d9b415b6a3a..bd06fe7cb5bf3268feae52d37357dca82206b991 100644
 --- a/src/main/java/org/bukkit/BanList.java
 +++ b/src/main/java/org/bukkit/BanList.java
 @@ -16,7 +16,9 @@ public interface BanList<T> {
@@ -70,7 +70,7 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..739d9d3ec789e58c10c8d818a9ca59ce
          /**
           * Banned player names
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2..e20e4239a5a1f952e1c70e899549989d5e42f73c 100644
+index c3c76dd82b209f6720afc51622aeb3fd92f1c0c2..8ab94f8189ebd9d4158231871abdebec399deb2c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1663,11 +1663,27 @@ public final class Bukkit {
@@ -102,7 +102,7 @@ index c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2..e20e4239a5a1f952e1c70e899549989d
      /**
       * Gets a set containing all player operators.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 50ffca9bccfb582d58ccb13f0decf66e5d91aef3..6246251caf2c6f025c824b8e7a944b8d48751fa1 100644
+index 1b968953fdf470bff32122bd06c4f83f27b97383..e187bb03006e84f08ca09c33ea182a76ae2d9d39 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1425,10 +1425,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0447-Fix-DamageSource-API.patch b/patches/api/0447-Fix-DamageSource-API.patch
index efe4403e2c..eec753daa5 100644
--- a/patches/api/0447-Fix-DamageSource-API.patch
+++ b/patches/api/0447-Fix-DamageSource-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageSource API
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
-index 6b24d1281cb8f0253430c9c1a1323e2670bb9c93..8ea4be529400b34df3d31b0f17c2d145345523d9 100644
+index 341f99550d077c60306e8a246a254b768ebbeb48..31a36ed3baf44c961173c6dd10d69055e3597897 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
 @@ -60,6 +60,20 @@ public class EntityDamageByEntityEvent extends EntityDamageEvent {
diff --git a/patches/api/0449-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0449-Clone-mutables-to-prevent-unexpected-issues.patch
index 86b3ab4bcf..50f9f8e25d 100644
--- a/patches/api/0449-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/patches/api/0449-Clone-mutables-to-prevent-unexpected-issues.patch
@@ -11,7 +11,7 @@ immutable types for simple things Location, Vector, and
 others.
 
 diff --git a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
-index 08d09c2a92d8aa6adf6610cc05905d58a76fce1f..c74ac0cb004aa219ce2f761969a4bb46cb7c9160 100644
+index 31fd64187fc5bd50a5ba36b3b68001ce6ff2211c..f5923049bfd0478938dafa76287db76f8a4c29f9 100644
 --- a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
 @@ -102,7 +102,7 @@ public class BlockCanBuildEvent extends BlockEvent {
diff --git a/patches/api/0451-Deprecate-ItemStack-setType.patch b/patches/api/0451-Deprecate-ItemStack-setType.patch
index 84fbcf3899..edfbdb9d0a 100644
--- a/patches/api/0451-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0451-Deprecate-ItemStack-setType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate ItemStack#setType
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 49390979cc0c68b8e719f2a2ce9e7d193c747959..82a66820311cfd918ea322f57df97e3a56e79c1d 100644
+index 0e6103628673130139363b53d23d3432deff5c50..4bb051af04d7e76853309386eb4ee43a00813c58 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -143,8 +143,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0453-API-for-checking-sent-chunks.patch b/patches/api/0453-API-for-checking-sent-chunks.patch
index 0c353a8070..ce630de11f 100644
--- a/patches/api/0453-API-for-checking-sent-chunks.patch
+++ b/patches/api/0453-API-for-checking-sent-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for checking sent chunks
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b3b6cdf5491397e0e802ac91f5805d560ed5d88a..20db14b3075d70b34eab16ca6332a2e674b34e75 100644
+index a7a4e5423cedb67bcdf02738be62bdf83e748b82..f007c82bb8cab84856930e654d77610242501589 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3844,6 +3844,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0455-More-Raid-API.patch b/patches/api/0455-More-Raid-API.patch
index 4df004960a..ac5714cfba 100644
--- a/patches/api/0455-More-Raid-API.patch
+++ b/patches/api/0455-More-Raid-API.patch
@@ -39,7 +39,7 @@ index 983a8c20a06d2b509602b27f49c090598b8ecc42..fa98599e3eee37bf68f0e9813497c718
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ba57efc267e78d28c67648b0e994ffca3b8a8823..bb70a797ea5f0db5bd9f2397944687530b0d1cf3 100644
+index 1796615065c8a6d06450d1b9c389804e804c4327..e2573ede859a536dfbb487b3f237caff742b0b30 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -4164,6 +4164,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0457-Fix-ItemFlags.patch b/patches/api/0457-Fix-ItemFlags.patch
index 3ca141cfa5..75f8c497f2 100644
--- a/patches/api/0457-Fix-ItemFlags.patch
+++ b/patches/api/0457-Fix-ItemFlags.patch
@@ -47,7 +47,7 @@ index 5b8dac777bb1640dc00bbe98feb6460c36eebb98..1af15fd327e0613cd1a179bd7fef1e83
      /**
       * Setting to show/hide item-specific information, including, but not limited to:
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 82a66820311cfd918ea322f57df97e3a56e79c1d..77edc2e1c5c865db7e101aaa186657ac85edfed9 100644
+index 4bb051af04d7e76853309386eb4ee43a00813c58..10b913490eaba71849f896754dfcb62b4b114e2c 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -588,6 +588,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0462-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0462-Added-API-to-get-player-ha-proxy-address.patch
index 79b1804796..d1e0188a7b 100644
--- a/patches/api/0462-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/api/0462-Added-API-to-get-player-ha-proxy-address.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added API to get player ha proxy address
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 20db14b3075d70b34eab16ca6332a2e674b34e75..82e92579f899ab3b86c748ba01860262b8ffa17f 100644
+index f007c82bb8cab84856930e654d77610242501589..0387eb02575cd2f20061f92c2ba5432f16b014b2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -267,6 +267,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0464-Brigadier-based-command-API.patch b/patches/api/0464-Brigadier-based-command-API.patch
index 2c385974e0..122fa83683 100644
--- a/patches/api/0464-Brigadier-based-command-API.patch
+++ b/patches/api/0464-Brigadier-based-command-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Brigadier based command API
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a65956b1fc2f4f1b1edf355682b5b54541ec9bce..e29e5024fa693baae469d47fe77b57118f14627c 100644
+index 09e35d410f86fc6ed894c072b77a49f9bb4ce78d..e8ae482b69fae0a162de2332e6baf39f2a807f3f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -39,6 +39,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
@@ -15,8 +15,8 @@ index a65956b1fc2f4f1b1edf355682b5b54541ec9bce..e29e5024fa693baae469d47fe77b5711
  dependencies {
 +    api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api
      // api dependencies are listed transitively to API consumers
-     api("com.google.guava:guava:32.1.2-jre")
-     api("com.google.code.gson:gson:2.10.1")
+     api("com.google.guava:guava:33.3.1-jre")
+     api("com.google.code.gson:gson:2.11.0")
 @@ -106,9 +107,33 @@ sourceSets {
      }
  }
@@ -1957,7 +1957,7 @@ index f70814de0d6c40b2c1c9921b8abdd1162e1d3995..ab6b262cf0d2d17962ed012b2ea7b8f1
      @ApiStatus.Internal
      static <E extends LifecycleEvent> LifecycleEventType.Monitorable<Plugin, E> plugin(final String name) {
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 03d2643d166824458c88a49f20270e93b14f3988..0a26fffe9b1e5080b5639767a03af11006108b4a 100644
+index 92b905e5da3cb8f477bb17d848c3523781545ae3..74384a56eebbce41d431db2507c55eddbcf50a41 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -520,4 +520,9 @@ public abstract class Command {
diff --git a/patches/api/0465-Fix-issues-with-recipe-API.patch b/patches/api/0465-Fix-issues-with-recipe-API.patch
index f8c42742cb..9bb7b08285 100644
--- a/patches/api/0465-Fix-issues-with-recipe-API.patch
+++ b/patches/api/0465-Fix-issues-with-recipe-API.patch
@@ -128,7 +128,7 @@ index 39f9766a03d420340d79841197f75c8b1dd49f4a..4e59f5176fd6cf92457ad750081c253a
          }
      }
 diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-index 91bfeffcdbe47208c7d0ddbe013cd0f11fddfa32..f1aa67997f904953742e8895e49341c2f73d44a2 100644
+index 653837b5f3a5fb9e5aa806f8ef8ae56fb53cce02..922bb69b5f218e489a6dd5e0f207743c1f1d3d35 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
 @@ -22,6 +22,19 @@ import org.jetbrains.annotations.NotNull;
@@ -231,7 +231,7 @@ index 91bfeffcdbe47208c7d0ddbe013cd0f11fddfa32..f1aa67997f904953742e8895e49341c2
      }
  }
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 295d82dd73b600e9436d2bbec0e11dbeaf78bbf4..c0105d716985acef497d60b5c631a56b4ca5847b 100644
+index af540a218d92ca44f5f1bdecdb9ca9f89a7b1ef2..f0268829c79701bbe6ecb097885dd371aff215ca 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -178,14 +178,15 @@ public class ShapedRecipe extends CraftingRecipe {
@@ -253,7 +253,7 @@ index 295d82dd73b600e9436d2bbec0e11dbeaf78bbf4..c0105d716985acef497d60b5c631a56b
      // Paper end
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 3bf5064cd6ceb05ea98b18993da46c67be140115..79db6dbc0367de2eaa397674624c765d5aeb8fa5 100644
+index 449f1ea47f8e5d8aa09e0db3dbfe75a6c05158ef..e6531108766875adf1bbe279582efe9b7743ad3e 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -132,7 +132,7 @@ public class ShapelessRecipe extends CraftingRecipe {
@@ -275,7 +275,7 @@ index 3bf5064cd6ceb05ea98b18993da46c67be140115..79db6dbc0367de2eaa397674624c765d
              ingredients.add(new RecipeChoice.ExactChoice(item));
          }
 diff --git a/src/main/java/org/bukkit/inventory/SmithingRecipe.java b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
-index ee462ca9fd3e0ddcdb0fffd5dba91d82fa6ad08f..0fb110a995bddcdf09b1902784e43cbe67510fba 100644
+index eb1c83455e198ff9d6334499be1a865db8e03a2c..75dc0b05d3cd91ec7bb04588e9d1b480f9d458f7 100644
 --- a/src/main/java/org/bukkit/inventory/SmithingRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
 @@ -45,12 +45,13 @@ public class SmithingRecipe implements Recipe, Keyed {
diff --git a/patches/api/0467-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0467-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8a0f6e9468..50728455db 100644
--- a/patches/api/0467-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/api/0467-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow Bukkit plugin to use Paper PluginLoader API
 
 
 diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
-index c5465431ce35d264d8510af45e73d058b333c60b..a857e46fa6f0c212db93193e1fdd8b0ea9c33c38 100644
+index d24dc9dfe169089f26d1844d73b98b3d78fa9452..6dfd51996893ca82b11a540cc18234e0b504f7ba 100644
 --- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
 +++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
 @@ -260,6 +260,13 @@ public final class PluginDescriptionFile implements io.papermc.paper.plugin.conf
diff --git a/patches/api/0468-General-ItemMeta-fixes.patch b/patches/api/0468-General-ItemMeta-fixes.patch
index c6e38d89da..c4c0a4ab53 100644
--- a/patches/api/0468-General-ItemMeta-fixes.patch
+++ b/patches/api/0468-General-ItemMeta-fixes.patch
@@ -112,10 +112,10 @@ index ff6818b6d9e0207eafdd749928f33aeac3f27191..992f39da07bafe9769effaa7dc6adc01
       * Checks to see if this item has a maximum amount of damage.
       *
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index afdcc2d67d55f2f07c913816e1f5b290d1415357..3fdba38fd5e75ddcbfca9cee70a606bfa4a539bf 100644
+index 0151a0523069b00a1cf682ad6b54142aaffcfaa6..7cfdeaafa31b0659cc51848346f5105eb82f8ec4 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -328,7 +328,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -351,7 +351,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Sets the enchantable. Higher values allow higher enchantments.
       *
@@ -124,7 +124,7 @@ index afdcc2d67d55f2f07c913816e1f5b290d1415357..3fdba38fd5e75ddcbfca9cee70a606bf
       */
      void setEnchantable(@Nullable Integer enchantable);
  
-@@ -877,8 +877,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -900,8 +900,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
  
      /**
       * Set all {@link Attribute}s and their {@link AttributeModifier}s.
diff --git a/patches/api/0472-Introduce-registry-entry-and-builders.patch b/patches/api/0472-Introduce-registry-entry-and-builders.patch
index 9220cd4bb6..7528cb4dc3 100644
--- a/patches/api/0472-Introduce-registry-entry-and-builders.patch
+++ b/patches/api/0472-Introduce-registry-entry-and-builders.patch
@@ -600,7 +600,7 @@ index 91ae9c0d3ec55ce417d4b447bf3d1b0d0c174b5e..40deffbd0930508bb04e9aedfd62ad21
      }
  }
 diff --git a/src/main/java/org/bukkit/GameEvent.java b/src/main/java/org/bukkit/GameEvent.java
-index cb5f7dfcdbbb548d93ad21c215ba35a9e142a7b2..e2c632afdf555418dd1dc6ad6c5d197670e2211a 100644
+index 8d8d2d710a291bd6442d019cc2c33a9c9a8ceb65..ac2601db7390062b50068170f5301d53cc991e4f 100644
 --- a/src/main/java/org/bukkit/GameEvent.java
 +++ b/src/main/java/org/bukkit/GameEvent.java
 @@ -141,4 +141,22 @@ public abstract class GameEvent implements Keyed {
@@ -627,10 +627,10 @@ index cb5f7dfcdbbb548d93ad21c215ba35a9e142a7b2..e2c632afdf555418dd1dc6ad6c5d1976
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index 7a1a0aebbfdaac6b6af41236d4a00512244b58fa..ef3a30d5cca29c7a7c546791be3c333e63e425f4 100644
+index af30d6e619ae3c3556611a36229f676b34baeb0e..c65ba431cd37e75e0cfa081bff1c24e5db5c19be 100644
 --- a/src/main/java/org/bukkit/inventory/ItemType.java
 +++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
   * official replacement for the aforementioned enum. Entirely incompatible
   * changes may occur. Do not use this API in plugins.
   */
diff --git a/patches/api/0474-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/api/0474-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index 0c48106249..5ff0c7cf8e 100644
--- a/patches/api/0474-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/api/0474-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
@@ -201,7 +201,7 @@ index 0000000000000000000000000000000000000000..05bc2ac326fb58ea429cee825520e70f
 +    PersistentDataContainerView getPersistentDataContainer();
 +}
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 6fc8bddfcabca8c363e0d9f958f0ce7bc39099f1..7f63a3a37eb06049bd5de10466c6dd96cb5dd4ee 100644
+index f9f4f59461ee572ae28e24c22384d4586251a9a7..a55ff2ecfbae8465eccdd0d9f10be2b0f3f7643f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0477-Fix-PickupStatus-getting-reset.patch b/patches/api/0477-Fix-PickupStatus-getting-reset.patch
index 6473947708..0fdcec0d8e 100644
--- a/patches/api/0477-Fix-PickupStatus-getting-reset.patch
+++ b/patches/api/0477-Fix-PickupStatus-getting-reset.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PickupStatus getting reset
 
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index 9bf4b86e730f3d066f6ebfd4e516caf78145479e..c6466b22f37beae2ca78d90feaceacd9fb124267 100644
+index 88b8f2e81cdd22e5e879832c9223a770df7e9f42..e63353ff70c0a9b20156bdb674bf6bc529212855 100644
 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java
 +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
 @@ -272,4 +272,14 @@ public interface AbstractArrow extends Projectile {
diff --git a/patches/api/0478-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0478-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 61318cd604..c31c3a1007 100644
--- a/patches/api/0478-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0478-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -201,7 +201,7 @@ index 0000000000000000000000000000000000000000..c976995a0fceaf0cbddd399906a86674
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 7ff6d60deb129e23b2a4d772aee123eb6c0b6433..52a2763773b234c581b2dcc6f0584f8d8b0fbc60 100644
+index 6d266c111bfa2bd51338e03ed740f6ac81ed07c7..d71531c384c57ea44d1e1fbe394214c1b0cee0a4 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
@@ -228,10 +228,10 @@ index 7ff6d60deb129e23b2a4d772aee123eb6c0b6433..52a2763773b234c581b2dcc6f0584f8d
          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 3fdba38fd5e75ddcbfca9cee70a606bfa4a539bf..66219e3855aef885341132a7456af54cf315475f 100644
+index 7cfdeaafa31b0659cc51848346f5105eb82f8ec4..2f0a775a6754554b00ad9140886da9b0101acaf5 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -1010,4 +1010,98 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -1033,4 +1033,98 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @SuppressWarnings("javadoc")
      @NotNull
      ItemMeta clone();
diff --git a/patches/api/0479-Improve-StandardMessenger-exception-messages.patch b/patches/api/0479-Improve-StandardMessenger-exception-messages.patch
index db8286512a..ae8c9e76a5 100644
--- a/patches/api/0479-Improve-StandardMessenger-exception-messages.patch
+++ b/patches/api/0479-Improve-StandardMessenger-exception-messages.patch
@@ -21,7 +21,7 @@ index 80ef8a2a342ff9dc16c98b5254cadd539f6ea0d9..ea73d9cd9d9d84731c083089d0b9913b
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
-index 6fda7f3aa68e76af64362e9afed70fc6a5e92986..230ecf9f9752b0369da3ba7aa6ce68b34a0814c5 100644
+index 8e96be6033e94d4f0bebb346ad222abe18d1f274..7449d2f7876545bc598725ccdd0a327e601869ed 100644
 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 @@ -496,19 +496,26 @@ public class StandardMessenger implements Messenger {
diff --git a/patches/api/0480-Add-even-more-Enchantment-API.patch b/patches/api/0480-Add-even-more-Enchantment-API.patch
index 7da290c673..5e0590b404 100644
--- a/patches/api/0480-Add-even-more-Enchantment-API.patch
+++ b/patches/api/0480-Add-even-more-Enchantment-API.patch
@@ -7,7 +7,7 @@ In a separate patch because it uses RegistryKeySet which
 is after the previous "more enchant api" patch.
 
 diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index ddd44191c67c1926e615edabb82ed0b592fbee09..43e306584988e39a6daca78c621a937acdce48a1 100644
+index fa20a0f13bb91955e2928b46c99ddaf0c4418d15..a824ac90e78d3d7f90b01397270e54422d88e8b9 100644
 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java
 +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
 @@ -432,6 +432,56 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
diff --git a/patches/api/0481-Leashable-API.patch b/patches/api/0481-Leashable-API.patch
index b84951d969..65f560d0eb 100644
--- a/patches/api/0481-Leashable-API.patch
+++ b/patches/api/0481-Leashable-API.patch
@@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..7e687535d1a622ddf25e3ece387dbfd5
 +    boolean setLeashHolder(@Nullable Entity holder);
 +}
 diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java
-index 7076870c1abfa0edef33e00c39514aa413920f59..574574dc4f54a4ce32e7c97f2fbeb92a4991d353 100644
+index 219a2f06c57c8a64052c372a62892389a98f9ae1..aedfdf41d4fce01412498be9b896c09b2649d500 100644
 --- a/src/main/java/org/bukkit/entity/Boat.java
 +++ b/src/main/java/org/bukkit/entity/Boat.java
 @@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch b/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch
index 2d9016eb36..70a87660d6 100644
--- a/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch
+++ b/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch
@@ -71,10 +71,10 @@ index 21f9998b472dc18eb308554f5cdf467f6675f2f0..521f035409ee61a9ad73d39bec938f29
          return Lists.newArrayList(Registry.ATTRIBUTE).toArray(new Attribute[0]);
      }
 diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
-index b352886e697a1c9869226b583da5240592575064..464f8f81ba907a61588e4ab869e4f8269830195a 100644
+index 739fef949defca7b6bf4e6b3e079446c24d9b34c..1b9f7a7759e59e0294f379dc6388f400010faa2f 100644
 --- a/src/main/java/org/bukkit/block/Biome.java
 +++ b/src/main/java/org/bukkit/block/Biome.java
-@@ -97,7 +97,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
+@@ -93,7 +93,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
       *
       * @deprecated Biome is no longer an enum, custom biomes will have their own biome instance.
       */
@@ -83,7 +83,7 @@ index b352886e697a1c9869226b583da5240592575064..464f8f81ba907a61588e4ab869e4f826
      Biome CUSTOM = Bukkit.getUnsafe().getCustomBiome();
  
      @NotNull
-@@ -111,7 +111,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
+@@ -107,7 +107,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
       * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead.
       */
      @NotNull
@@ -92,7 +92,7 @@ index b352886e697a1c9869226b583da5240592575064..464f8f81ba907a61588e4ab869e4f826
      static Biome valueOf(@NotNull String name) {
          if ("CUSTOM".equals(name)) {
              return Biome.CUSTOM;
-@@ -127,7 +127,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
+@@ -123,7 +123,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
       * @deprecated use {@link Registry#iterator()}.
       */
      @NotNull
@@ -102,7 +102,7 @@ index b352886e697a1c9869226b583da5240592575064..464f8f81ba907a61588e4ab869e4f826
          return Lists.newArrayList(Registry.BIOME).toArray(new Biome[0]);
      }
 diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java
-index ae05025f39283a8dddd5703473322d75157de713..390f831f00c530a3d0a6f07f3e75aad0ec9a30db 100644
+index 4620b39b3257a29f964f94a2ddef9c46a365baa1..24b58ed80f3dd7c6b35bb18071000af845d18ba4 100644
 --- a/src/main/java/org/bukkit/block/banner/PatternType.java
 +++ b/src/main/java/org/bukkit/block/banner/PatternType.java
 @@ -126,7 +126,7 @@ public interface PatternType extends OldEnum<PatternType>, Keyed {
@@ -208,7 +208,7 @@ index bc7137eb802d4613d042fba5fd97eca54a6eea29..1db3742024e9cd1b70af2d52b4b756a5
              return Lists.newArrayList(Registry.VILLAGER_PROFESSION).toArray(new Profession[0]);
          }
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index 6c33fbf720a2e11655e254aeb516e08831c2adf4..eb73f3224e7d2314c4209a3743a37bdae2395670 100644
+index 8d00f58883222fac4c3bef62eafa7bcbdedc896d..7f5682c80ff25142e7c8fa14e03b4a62fc5c01d3 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java
 +++ b/src/main/java/org/bukkit/map/MapCursor.java
 @@ -373,7 +373,7 @@ public final class MapCursor {
diff --git a/patches/api/0484-Add-FeatureFlag-API.patch b/patches/api/0484-Add-FeatureFlag-API.patch
index 211e999df1..caa54e6b34 100644
--- a/patches/api/0484-Add-FeatureFlag-API.patch
+++ b/patches/api/0484-Add-FeatureFlag-API.patch
@@ -104,7 +104,7 @@ index 0000000000000000000000000000000000000000..0955699df65ccbb8711cfa48f0b34d5a
 +    @Unmodifiable Set<FeatureFlag> getFeatureFlags();
 +}
 diff --git a/src/main/java/org/bukkit/FeatureFlag.java b/src/main/java/org/bukkit/FeatureFlag.java
-index 79144c8594ea5cbd57e94cd60642459832b94181..15e2d70732751187b66d6737c2178eb92870b561 100644
+index dd157b650aa7ac759d156ced30fa7514d34c43ed..c170d9ae97006c5c46efdcb5e9304ed99f43fcd8 100644
 --- a/src/main/java/org/bukkit/FeatureFlag.java
 +++ b/src/main/java/org/bukkit/FeatureFlag.java
 @@ -1,17 +1,24 @@
@@ -162,14 +162,19 @@ index 79144c8594ea5cbd57e94cd60642459832b94181..15e2d70732751187b66d6737c2178eb9
  
      /**
       * <strong>AVAILABLE BETWEEN VERSIONS:</strong> 1.20.5 - 1.20.6
-@@ -38,15 +46,31 @@ public interface FeatureFlag extends Keyed {
+@@ -38,7 +46,7 @@ public interface FeatureFlag extends Keyed {
       * @deprecated not available since 1.21
       */
      @Deprecated(since = "1.21")
 -    public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
 +    FeatureFlag UPDATE_121 = deprecated("update_1_21");
  
-     @ApiStatus.Experimental // Paper - add missing annotation
+     /**
+      * <strong>AVAILABLE BETWEEN VERSIONS:</strong> 1.21.2 - 1.21.3
+@@ -46,12 +54,28 @@ public interface FeatureFlag extends Keyed {
+      * @deprecated not available since 1.21.4
+      */
+     @Deprecated(since = "1.21.4")
 -    public static final FeatureFlag WINTER_DROP = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("winter_drop"));
 +    FeatureFlag WINTER_DROP = create("winter_drop");
  
@@ -259,7 +264,7 @@ index 6b1cb9c49b44b2137c20018d2644310f9727fa7f..98fe2763dcb45e1a89629c01098569fa
      /**
       * Do not use, method will get removed, and the plugin won't run
 diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
-index 80e98f444c64b6106bad98c26c0293c298c2fbbf..e795eacd86e15d8f7db3ad834c85bbf54cb3cf91 100644
+index a2376f08c836d727995987a640a47f8f3a7b0c11..10fb9624ff54f1b767d54781e4fa8af13855d93d 100644
 --- a/src/main/java/org/bukkit/block/BlockType.java
 +++ b/src/main/java/org/bukkit/block/BlockType.java
 @@ -129,7 +129,7 @@ import org.jetbrains.annotations.Nullable;
@@ -271,7 +276,7 @@ index 80e98f444c64b6106bad98c26c0293c298c2fbbf..e795eacd86e15d8f7db3ad834c85bbf5
  
      /**
       * Typed represents a subtype of {@link BlockType}s that have a known block
-@@ -3629,7 +3629,9 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran
+@@ -3604,7 +3604,9 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran
       *
       * @param world the world to check
       * @return true if this BlockType can be used in this World.
@@ -282,10 +287,10 @@ index 80e98f444c64b6106bad98c26c0293c298c2fbbf..e795eacd86e15d8f7db3ad834c85bbf5
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 4d82a7b88c713222383b16be29bddf889d0d6edb..348f82b2be6cace6bd74802e8ebc36a712addfc6 100644
+index 6bc514af551374a9c6f2f2a8dbcb35a0a543a23f..0251ec12e819565db2ca9e7e87f5c06566f54e1d 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -45,7 +45,7 @@ import org.jetbrains.annotations.Contract;
+@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Contract;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
@@ -308,10 +313,10 @@ index 5067f1371433cccd3287af7f03e152f2c3c1ece3..e0cb282541548ac3bd24cce86b3413f5
      /**
       * Gets the unique name of this world
 diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index 79d99a915d8ec16e4a50a58752f15bb2ed6f453f..5981e6f2c15d4eaa524817fad4af621d03128630 100644
+index c65ba431cd37e75e0cfa081bff1c24e5db5c19be..5fbe84dc41a19717c73f88050c4fa476ab5aecd7 100644
 --- a/src/main/java/org/bukkit/inventory/ItemType.java
 +++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -48,7 +48,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
   * changes may occur. Do not use this API in plugins.
   */
  @ApiStatus.Experimental // Paper - already required for registry builders
@@ -320,7 +325,7 @@ index 79d99a915d8ec16e4a50a58752f15bb2ed6f453f..5981e6f2c15d4eaa524817fad4af621d
  
      /**
       * Typed represents a subtype of {@link ItemType}s that have a known item meta type
-@@ -2451,7 +2451,9 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
+@@ -2412,7 +2412,9 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
       *
       * @param world the world to check
       * @return true if this ItemType can be used in this World.
diff --git a/patches/api/0486-Item-serialization-as-json.patch b/patches/api/0486-Item-serialization-as-json.patch
index eae7e05be8..cd5b921565 100644
--- a/patches/api/0486-Item-serialization-as-json.patch
+++ b/patches/api/0486-Item-serialization-as-json.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item serialization as json
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index e8dc8a6abebf6c31cb095ca3646eb4909e42f105..a491dc40093e19b8d1900443ad613223fd7f3119 100644
+index 98fe2763dcb45e1a89629c01098569fa477593cb..d0de7ce3c3a73863fada71d9e8d7b3ccee98ad8e 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -168,6 +168,36 @@ public interface UnsafeValues {
diff --git a/patches/api/0487-create-TileStateInventoryHolder.patch b/patches/api/0487-create-TileStateInventoryHolder.patch
index eafc877be4..8fcd8c1b1a 100644
--- a/patches/api/0487-create-TileStateInventoryHolder.patch
+++ b/patches/api/0487-create-TileStateInventoryHolder.patch
@@ -125,7 +125,7 @@ index a67ee0cb0cd2cbab8dab375e2fe44168c250bcb7..8dbe4eec3df797d178237ad9d55f90af
 +    // Paper - moved to TileStateInventoryHolder
  }
 diff --git a/src/main/java/org/bukkit/block/DecoratedPot.java b/src/main/java/org/bukkit/block/DecoratedPot.java
-index feae34e459523d17a10b673bbec28abcac9cdadd..091f971698a924be1111b4cedb71c869e565b14d 100644
+index 8c0e946ead8b7d9e2e6e94b0533564eb26653092..14f432aa75fb56221bd522f43bc42548ec4fcef2 100644
 --- a/src/main/java/org/bukkit/block/DecoratedPot.java
 +++ b/src/main/java/org/bukkit/block/DecoratedPot.java
 @@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0488-Add-enchantWithLevels-with-enchantment-registry-set.patch b/patches/api/0488-Add-enchantWithLevels-with-enchantment-registry-set.patch
index 1978c0b073..ddcb49f40a 100644
--- a/patches/api/0488-Add-enchantWithLevels-with-enchantment-registry-set.patch
+++ b/patches/api/0488-Add-enchantWithLevels-with-enchantment-registry-set.patch
@@ -31,7 +31,7 @@ index e1986aea72bb1f1ba2ea76f3ba53f274b6aac899..0a814c1f65afc00034a454e3ff720d26
 +    // Paper end - enchantWithLevels with tag specification
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 7f63a3a37eb06049bd5de10466c6dd96cb5dd4ee..b59222b8c262545d100a9fd28b3bf1d2a4cf4eb0 100644
+index a55ff2ecfbae8465eccdd0d9f10be2b0f3f7643f..3c4e83494dfe0f5fdbbcf2d8ee12fb05d92821ed 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -678,6 +678,23 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0489-Improve-entity-effect-API.patch b/patches/api/0489-Improve-entity-effect-API.patch
index 6ec450bcea..95d238f818 100644
--- a/patches/api/0489-Improve-entity-effect-API.patch
+++ b/patches/api/0489-Improve-entity-effect-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve entity effect API
 
 
 diff --git a/src/main/java/org/bukkit/EntityEffect.java b/src/main/java/org/bukkit/EntityEffect.java
-index 5341957b10cccd7bce5a7595699b1d90412a01d0..ef0acab253db878f1edee51b585fd1b20ef9161d 100644
+index d7ccccdf3f5e2c572efd528a92e240ec6ea60028..51d51638b7220f886c8415581869df8708e72fef 100644
 --- a/src/main/java/org/bukkit/EntityEffect.java
 +++ b/src/main/java/org/bukkit/EntityEffect.java
 @@ -112,11 +112,25 @@ public enum EntityEffect {
@@ -104,7 +104,7 @@ index 5341957b10cccd7bce5a7595699b1d90412a01d0..ef0acab253db878f1edee51b585fd1b2
      private final byte data;
      private final Class<? extends Entity> applicable;
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 725ef320f929d5e3d141c1ed3246d73a7d741f31..d0ae8a94db20281d3664d74718c65234eb2e5f83 100644
+index e56808a884a4fda9a891468a787b3dff9303debc..19272cff8d6d040e95b2644d70acdac606e06c16 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -1159,4 +1159,17 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -126,7 +126,7 @@ index 725ef320f929d5e3d141c1ed3246d73a7d741f31..d0ae8a94db20281d3664d74718c65234
 +    // Paper end - broadcast hurt animation
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 82e92579f899ab3b86c748ba01860262b8ffa17f..95f0b3186e313c7fbd5c8531d52b82a69e525f94 100644
+index 0387eb02575cd2f20061f92c2ba5432f16b014b2..fac4aec289e07231d80a9890653432f688355afa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3899,4 +3899,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0492-Void-damage-configuration-API.patch b/patches/api/0492-Void-damage-configuration-API.patch
index 6863ef168c..8a7331b06f 100644
--- a/patches/api/0492-Void-damage-configuration-API.patch
+++ b/patches/api/0492-Void-damage-configuration-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Void damage configuration API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b462f2a9f7b6acbdc826d093b1de826ca682f25b..7a439c99fc4c5ee17d674460c8e58a9fe0c64e02 100644
+index e2573ede859a536dfbb487b3f237caff742b0b30..bef54a6c8290e09cbaac20b03dde8dfb902c96b0 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -52,6 +52,54 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0493-Add-Offline-PDC-API.patch b/patches/api/0493-Add-Offline-PDC-API.patch
index 32bafdb4b3..53abfa226b 100644
--- a/patches/api/0493-Add-Offline-PDC-API.patch
+++ b/patches/api/0493-Add-Offline-PDC-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Offline PDC API
 
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 3993fecec5b4c2bbd77e175a168afcad571ce4d1..a028f2fe541491729856051780b33dba07832fb6 100644
+index 18720a965b814d02e783d5039da90af0e966025d..5622fe3165baad8138c22cfc016ed6c3834cf702 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0495-DataComponent-API.patch b/patches/api/0495-DataComponent-API.patch
index 8f469a9141..188e6f30ae 100644
--- a/patches/api/0495-DataComponent-API.patch
+++ b/patches/api/0495-DataComponent-API.patch
@@ -3847,10 +3847,10 @@ index 0000000000000000000000000000000000000000..9e892621354c784632204559f9fdf082
 +    T filtered();
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 615eb24ffdd8f6d55ccd4f21760b809c1098bc68..c7ce8fa1ff9feda66d5a4e497112a24ff51c9d2b 100644
+index b28ab97ff80c9e7af85d8830f26fd0f252082541..e89edabd36a6755912694d8a8700da4ebe5c5829 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -137,7 +137,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -138,7 +138,7 @@ import org.jetbrains.annotations.Nullable;
  @SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
  public enum Material implements Keyed, Translatable, net.kyori.adventure.translation.Translatable { // Paper
      //<editor-fold desc="Materials" defaultstate="collapsed">
@@ -3859,7 +3859,7 @@ index 615eb24ffdd8f6d55ccd4f21760b809c1098bc68..c7ce8fa1ff9feda66d5a4e497112a24f
      STONE(22948),
      GRANITE(21091),
      POLISHED_GRANITE(5477),
-@@ -5784,6 +5784,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5755,6 +5755,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       */
      @ApiStatus.Internal
      @Nullable
@@ -3867,7 +3867,7 @@ index 615eb24ffdd8f6d55ccd4f21760b809c1098bc68..c7ce8fa1ff9feda66d5a4e497112a24f
      public ItemType asItemType() {
          return itemType.get();
      }
-@@ -5796,7 +5797,47 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5767,7 +5768,47 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       */
      @ApiStatus.Internal
      @Nullable
@@ -3928,7 +3928,7 @@ index 87907918c42b11780b285b6d82e7297628a07376..d55c33ca14257be5005520e18e465da8
       * Get the object by its key.
       *
 diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
-index ed534fe4983873a2d5f623f0d9d5e3ce254615eb..f019d490794b49d21057820bab047e2f909934a1 100644
+index 10fb9624ff54f1b767d54781e4fa8af13855d93d..a340e78a4371b033d6afd2a7ccdf8292b24237b4 100644
 --- a/src/main/java/org/bukkit/block/BlockType.java
 +++ b/src/main/java/org/bukkit/block/BlockType.java
 @@ -128,7 +128,7 @@ import org.jetbrains.annotations.Nullable;
@@ -3941,7 +3941,7 @@ index ed534fe4983873a2d5f623f0d9d5e3ce254615eb..f019d490794b49d21057820bab047e2f
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index b59222b8c262545d100a9fd28b3bf1d2a4cf4eb0..6e4ca7d95953a25c0aaafd35e54ef9254a1b5f0b 100644
+index 3c4e83494dfe0f5fdbbcf2d8ee12fb05d92821ed..8c9654cd19af8b28fa276a55c5060eb389e60c1c 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -1137,4 +1137,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
@@ -4131,10 +4131,10 @@ index b59222b8c262545d100a9fd28b3bf1d2a4cf4eb0..6e4ca7d95953a25c0aaafd35e54ef925
 +    // Paper end - data component API
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index 72803c00e4af576f286d2af34bf300ee554a7f3c..2a3c4f055d0e4ef009caed95152570660ab100d5 100644
+index 5fbe84dc41a19717c73f88050c4fa476ab5aecd7..3450c635077d37ff78b0b136a991ef66770e5530 100644
 --- a/src/main/java/org/bukkit/inventory/ItemType.java
 +++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -2483,4 +2483,33 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
+@@ -2444,4 +2444,33 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
       */
      @Nullable ItemRarity getItemRarity();
      // Paper end - expand ItemRarity API
diff --git a/patches/api/0496-Optimise-color-distance-check-in-MapPalette-by-remov.patch b/patches/api/0496-Optimise-color-distance-check-in-MapPalette-by-remov.patch
index 0c3fea12ea..6ba5e0d484 100644
--- a/patches/api/0496-Optimise-color-distance-check-in-MapPalette-by-remov.patch
+++ b/patches/api/0496-Optimise-color-distance-check-in-MapPalette-by-remov.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise color distance check in MapPalette by removing
 
 
 diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index c80faa079eca1564847070f0338fc98024639829..55a46db9d73885ea967ac929013906b687e476bb 100644
+index 448f37249d21ecb321f53956878fe62293ed34ae..6995f9cc08d162e3adcd3a28f6bfa6d329661999 100644
 --- a/src/main/java/org/bukkit/map/MapPalette.java
 +++ b/src/main/java/org/bukkit/map/MapPalette.java
 @@ -29,14 +29,19 @@ public final class MapPalette {
diff --git a/patches/api/0497-Fix-incorrect-invulnerability-damage-reduction.patch b/patches/api/0497-Fix-incorrect-invulnerability-damage-reduction.patch
index 63a5ca94e0..3982785107 100644
--- a/patches/api/0497-Fix-incorrect-invulnerability-damage-reduction.patch
+++ b/patches/api/0497-Fix-incorrect-invulnerability-damage-reduction.patch
@@ -27,7 +27,7 @@ Instead, this patch makes use of the DamageModifier API, implementing
 the last-damage-reduction as a DamageModifier.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
-index ef5b2a0f18c1c126db0b0c4a4d2a57483680665a..73aa5dc079ecb1c38c55ae1916b12edf81b723f5 100644
+index 4e6b1c263904c9871b2c15c3c9cbdc4a1fa4a285..d1a5424ff3b289f1c82449ef6d88eb52665df41b 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
 @@ -247,6 +247,7 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
diff --git a/patches/api/0498-API-to-check-if-the-server-is-sleeping.patch b/patches/api/0498-API-to-check-if-the-server-is-sleeping.patch
index 554f30ae5a..ee99082604 100644
--- a/patches/api/0498-API-to-check-if-the-server-is-sleeping.patch
+++ b/patches/api/0498-API-to-check-if-the-server-is-sleeping.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API to check if the server is sleeping
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index dcd2699654c8848b985309f3739b4967515e41c7..7266d29ab6bb246e6daaa643951417123d42abcb 100644
+index e187bb03006e84f08ca09c33ea182a76ae2d9d39..0731b4dd74c9e203f966c03dd2cb3a3bd4d9df69 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2591,4 +2591,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0499-API-to-allow-disallow-tick-sleeping.patch b/patches/api/0499-API-to-allow-disallow-tick-sleeping.patch
index dc8203d43f..cc3f0ec3ac 100644
--- a/patches/api/0499-API-to-allow-disallow-tick-sleeping.patch
+++ b/patches/api/0499-API-to-allow-disallow-tick-sleeping.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API to allow/disallow tick sleeping
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7266d29ab6bb246e6daaa643951417123d42abcb..a92bd4da6788f1331a4838ab5760baec2dc6e8ec 100644
+index 0731b4dd74c9e203f966c03dd2cb3a3bd4d9df69..ad816538b30079c62d5e1eb98c6f4b61e12e8d47 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2597,5 +2597,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/unapplied/server/0451-Fix-harming-potion-dupe.patch b/patches/removed/1.21.3/0451-Fix-harming-potion-dupe.patch
index b184bf641c..b184bf641c 100644
--- a/patches/unapplied/server/0451-Fix-harming-potion-dupe.patch
+++ b/patches/removed/1.21.3/0451-Fix-harming-potion-dupe.patch
diff --git a/patches/unapplied/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/removed/1.21.3/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index c591371af8..c591371af8 100644
--- a/patches/unapplied/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/removed/1.21.3/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/unapplied/server/9999-Optimise-nearby-player-retrieval.patch b/patches/removed/1.21.3/9999-Optimise-nearby-player-retrieval.patch
index d3e18e7c39..d3e18e7c39 100644
--- a/patches/unapplied/server/9999-Optimise-nearby-player-retrieval.patch
+++ b/patches/removed/1.21.3/9999-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/0002-Remap-fixes.patch b/patches/unapplied/server/0002-Remap-fixes.patch
index d7cff4215b..d7cff4215b 100644
--- a/patches/server/0002-Remap-fixes.patch
+++ b/patches/unapplied/server/0002-Remap-fixes.patch
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/unapplied/server/0003-Build-system-changes.patch
index a20de6d780..a20de6d780 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/unapplied/server/0003-Build-system-changes.patch
diff --git a/patches/server/0004-Test-changes.patch b/patches/unapplied/server/0004-Test-changes.patch
index 2065edd4c2..2065edd4c2 100644
--- a/patches/server/0004-Test-changes.patch
+++ b/patches/unapplied/server/0004-Test-changes.patch
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/unapplied/server/0005-Paper-config-files.patch
index bd72b5facf..bd72b5facf 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/unapplied/server/0005-Paper-config-files.patch
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/unapplied/server/0006-MC-Dev-fixes.patch
index 6c9bb2f227..6c9bb2f227 100644
--- a/patches/server/0006-MC-Dev-fixes.patch
+++ b/patches/unapplied/server/0006-MC-Dev-fixes.patch
diff --git a/patches/server/0007-ConcurrentUtil.patch b/patches/unapplied/server/0007-ConcurrentUtil.patch
index b285b3c6e3..b285b3c6e3 100644
--- a/patches/server/0007-ConcurrentUtil.patch
+++ b/patches/unapplied/server/0007-ConcurrentUtil.patch
diff --git a/patches/server/0008-CB-fixes.patch b/patches/unapplied/server/0008-CB-fixes.patch
index 8170779c37..8170779c37 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/unapplied/server/0008-CB-fixes.patch
diff --git a/patches/server/0009-MC-Utils.patch b/patches/unapplied/server/0009-MC-Utils.patch
index 5688fb2dd1..5688fb2dd1 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/unapplied/server/0009-MC-Utils.patch
diff --git a/patches/server/0010-Adventure.patch b/patches/unapplied/server/0010-Adventure.patch
index 77613c7c61..77613c7c61 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/unapplied/server/0010-Adventure.patch
diff --git a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
index 9eaddf3d66..509d074579 100644
--- a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/unapplied/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -266,7 +266,7 @@ index 8323f135d6bf2e1f12525e05094ffa3f2420e7e1..a143ea1e58464a3122fbd8ccafe417bd
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index daf20aa9a83a2583c0c61a4123cc2e528d19801d..afb67956031f4bcccee12f0ece4bb8a7e6f02cfc 100644
+index 2e6259e1d07892cb4fbcc81de069b75144d6f533..8e369a3e5c8e89891787a97ec9c29b2b64018dc1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -161,7 +161,7 @@ import com.mojang.serialization.Dynamic;
diff --git a/patches/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 82bd1e5d98..2273bec36a 100644
--- a/patches/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/unapplied/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ad49cd6db794dc42dda6f72204d5f232aafde797..ec71e5a0fa0190b54828da9688281e72b21f733e 100644
+index 99e44684a3f6340ed3c0f73c690a9d4d51872f0d..0edae14596ffef85e894925fd5eb826641d8b9f1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -36,7 +36,7 @@ dependencies {
diff --git a/patches/server/0013-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0013-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 4f654facd6..4f654facd6 100644
--- a/patches/server/0013-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/unapplied/server/0013-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 1c279a80e0..53f8b576ff 100644
--- a/patches/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/unapplied/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ec71e5a0fa0190b54828da9688281e72b21f733e..3fb47580cd8de02574905384e455d87224864407 100644
+index 0edae14596ffef85e894925fd5eb826641d8b9f1..5596168e6c8d6adc139475130b4c843a709be92c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -47,6 +47,7 @@ dependencies {
diff --git a/patches/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index da0087b69e..ffd7a162f7 100644
--- a/patches/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/unapplied/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3fb47580cd8de02574905384e455d87224864407..653b48c1bc28af6f88ec3bdd11b2d1a683dd3465 100644
+index 5596168e6c8d6adc139475130b4c843a709be92c..dd7900a126ab35ed00af5653a35d361d175f6f76 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -60,6 +60,7 @@ dependencies {
diff --git a/patches/server/0016-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0016-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 0fdcde78a6..0fdcde78a6 100644
--- a/patches/server/0016-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/server/0016-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0017-Paper-command.patch b/patches/unapplied/server/0017-Paper-command.patch
index 58246e59fd..58246e59fd 100644
--- a/patches/server/0017-Paper-command.patch
+++ b/patches/unapplied/server/0017-Paper-command.patch
diff --git a/patches/server/0018-Paper-Metrics.patch b/patches/unapplied/server/0018-Paper-Metrics.patch
index 9ad0f5d70e..9ad0f5d70e 100644
--- a/patches/server/0018-Paper-Metrics.patch
+++ b/patches/unapplied/server/0018-Paper-Metrics.patch
diff --git a/patches/server/0019-Paper-Plugins.patch b/patches/unapplied/server/0019-Paper-Plugins.patch
index 71fc842f89..9b55f84f9d 100644
--- a/patches/server/0019-Paper-Plugins.patch
+++ b/patches/unapplied/server/0019-Paper-Plugins.patch
@@ -7257,7 +7257,7 @@ index 9bd6056bba6ba48bada7e9cd5883b0a171b0bbc4..7399358f18dc7869fbfe414186cf1841
              Bootstrap.validate();
              Util.startTimerHackThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4ec8731a48f81aff33c7d8bcfe00dea263735e48..600e865688b423d9bb4338f413dc28418ba37748 100644
+index 118c8b227133639427c1da84b93fcaa865fd6d02..542ff64ce0cb93a9f996fa0a65e8dde7ed39c3a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -280,7 +280,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0020-Plugin-remapping.patch b/patches/unapplied/server/0020-Plugin-remapping.patch
index b4c402e45d..eca49f442a 100644
--- a/patches/server/0020-Plugin-remapping.patch
+++ b/patches/unapplied/server/0020-Plugin-remapping.patch
@@ -1553,7 +1553,7 @@ index 0000000000000000000000000000000000000000..badff5d6ae6dd8d209c82bc7e8afe370
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index afb67956031f4bcccee12f0ece4bb8a7e6f02cfc..3322865949fe5ddaab2dffc39260b75093f0f204 100644
+index 8e369a3e5c8e89891787a97ec9c29b2b64018dc1..e3e8af2d47c06f1e00799fbac8e49bcc87c23916 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -657,6 +657,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0021-Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/0021-Hook-into-CB-plugin-rewrites.patch
index 213edbe281..213edbe281 100644
--- a/patches/server/0021-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/unapplied/server/0021-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch b/patches/unapplied/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch
index d04608c8b2..d04608c8b2 100644
--- a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch
+++ b/patches/unapplied/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch
diff --git a/patches/server/0023-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0023-Further-improve-server-tick-loop.patch
index 806c3faf9b..dfde87b3ad 100644
--- a/patches/server/0023-Further-improve-server-tick-loop.patch
+++ b/patches/unapplied/server/0023-Further-improve-server-tick-loop.patch
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3322865949fe5ddaab2dffc39260b75093f0f204..4a573e8b7cd90f65c190982662e92a11f79a1d3e 100644
+index e3e8af2d47c06f1e00799fbac8e49bcc87c23916..af42531b825458e22963f5419015197dd127e4bc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -307,7 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0024-Remove-Spigot-timings.patch b/patches/unapplied/server/0024-Remove-Spigot-timings.patch
index 70af5840ee..a48e332699 100644
--- a/patches/server/0024-Remove-Spigot-timings.patch
+++ b/patches/unapplied/server/0024-Remove-Spigot-timings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove Spigot timings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4a573e8b7cd90f65c190982662e92a11f79a1d3e..709c6361aa5eb78071ce9d0f2a65ce8a56af1443 100644
+index af42531b825458e22963f5419015197dd127e4bc..047cbaf7699b38764fb104d272328fbfa2714cd2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -203,7 +203,6 @@ import org.bukkit.craftbukkit.Main;
@@ -808,7 +808,7 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 24631135f90bb74bf829160ed079e152573666a2..f7833cd528797ba46b001db5208c29eb11ae2529 100644
+index 361d138f36e6eb25c225b1278fc73f045f0fc72f..0370e0f199d572f868212c077e76ed97c8730c5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2809,6 +2809,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -827,7 +827,7 @@ index 24631135f90bb74bf829160ed079e152573666a2..f7833cd528797ba46b001db5208c29eb
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 6effe47b32a8551aa6f6b11bc0315714a119e199..2c36d0796714997191c6540c34a9df60718065f6 100644
+index a7b53187a24d11b8c91e8c50eeb907aca60891cb..0385aa1e5cced22bbafdabca1b63599db1f5d3f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -413,9 +413,7 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/patches/server/0025-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0025-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 5e58214e0f..5f4aea9a21 100644
--- a/patches/server/0025-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/server/0025-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5650b4cfcd4008ac7f351d5bfb1fb8cc81da4caa..db7cad60c8f805dd1b4089673f5f9d073a429a67 100644
+index 4d80804c0992d8fe90526b9f3ce858ec710e7361..16d2b3e59b8a6ef65b411afb9d94c61e6d797e36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -461,6 +461,35 @@ public final class CraftServer implements Server {
@@ -47,7 +47,7 @@ index 5650b4cfcd4008ac7f351d5bfb1fb8cc81da4caa..db7cad60c8f805dd1b4089673f5f9d07
          if (type == PluginLoadOrder.STARTUP) {
              this.helpMap.clear();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4a99cf5a146abe0d2b40ffc1189fdc5540f14d55..03790abcc3474999db6d8986e50ebc2caf6eba0c 100644
+index b6e449c2f29b0a201e5e7495de81d21a19f67a25..99bc6e3d472edc0a0182e7b53286cb6a0170ae80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -160,6 +160,12 @@ public class Main {
diff --git a/patches/server/0026-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0026-Support-components-in-ItemMeta.patch
index e9fa61498e..b5de302fd2 100644
--- a/patches/server/0026-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/server/0026-Support-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 626fe2af05fecd41b777b5dd5decbedb2f17b43a..1c943638bfbda8281d2c9038e9024591823e2b5e 100644
+index bae8b6486d8adb9be035e2f6f697d2d35ec0e67e..2c4822d56c1d9204785159e33fd3582885aa6266 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1114,11 +1114,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0027-Configurable-cactus-bamboo-and-reed-growth-height.patch b/patches/unapplied/server/0027-Configurable-cactus-bamboo-and-reed-growth-height.patch
index e5e4b807ee..e5e4b807ee 100644
--- a/patches/server/0027-Configurable-cactus-bamboo-and-reed-growth-height.patch
+++ b/patches/unapplied/server/0027-Configurable-cactus-bamboo-and-reed-growth-height.patch
diff --git a/patches/server/0028-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0028-Configurable-baby-zombie-movement-speed.patch
index a7c6ba5835..a7c6ba5835 100644
--- a/patches/server/0028-Configurable-baby-zombie-movement-speed.patch
+++ b/patches/unapplied/server/0028-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0029-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0029-Configurable-fishing-time-ranges.patch
index 4599ac587d..4599ac587d 100644
--- a/patches/server/0029-Configurable-fishing-time-ranges.patch
+++ b/patches/unapplied/server/0029-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0030-Allow-nerfed-mobs-to-jump.patch b/patches/unapplied/server/0030-Allow-nerfed-mobs-to-jump.patch
index 9aa6c3381e..9aa6c3381e 100644
--- a/patches/server/0030-Allow-nerfed-mobs-to-jump.patch
+++ b/patches/unapplied/server/0030-Allow-nerfed-mobs-to-jump.patch
diff --git a/patches/server/0031-Add-configurable-entity-despawn-distances.patch b/patches/unapplied/server/0031-Add-configurable-entity-despawn-distances.patch
index f2d77f7042..f2d77f7042 100644
--- a/patches/server/0031-Add-configurable-entity-despawn-distances.patch
+++ b/patches/unapplied/server/0031-Add-configurable-entity-despawn-distances.patch
diff --git a/patches/server/0032-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0032-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 1fc91e5693..1fc91e5693 100644
--- a/patches/server/0032-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/unapplied/server/0032-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0033-Expose-server-build-information.patch b/patches/unapplied/server/0033-Expose-server-build-information.patch
index ef5f90d7d0..258a0822bd 100644
--- a/patches/server/0033-Expose-server-build-information.patch
+++ b/patches/unapplied/server/0033-Expose-server-build-information.patch
@@ -11,7 +11,7 @@ Co-authored-by: Jake Potrebic <[email protected]>
 Co-authored-by: masmc05 <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7aee6d9849f0a9c64db0368d2faa03c0633a72a4..40afa9e2cfb4518e9050ccac739aec3215f95d56 100644
+index 8d05216e246bfaec5945cdd55d08b6a388a769e8..cb100e337521fd278893ec775606f128717105f7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,4 +1,5 @@
@@ -533,7 +533,7 @@ index 0000000000000000000000000000000000000000..790bad0494454ca12ee152e3de6da3da
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 709c6361aa5eb78071ce9d0f2a65ce8a56af1443..b86d8a3756cb8c1adb1aceda57f60b0ccdb3f659 100644
+index 047cbaf7699b38764fb104d272328fbfa2714cd2..e763b89dac66c36f43afaf45f5226f34bd119ceb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -45,7 +45,6 @@ import java.util.Set;
diff --git a/patches/server/0034-Player-affects-spawning-API.patch b/patches/unapplied/server/0034-Player-affects-spawning-API.patch
index 8439cb2b0a..a80bbb3584 100644
--- a/patches/server/0034-Player-affects-spawning-API.patch
+++ b/patches/unapplied/server/0034-Player-affects-spawning-API.patch
@@ -135,7 +135,7 @@ index f689b2ca0ebc15c099f36ebfd14e455bda540296..fb043d67eaa6336fc0b5d62774b8f110
          for (Player player : this.players()) {
              if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f7833cd528797ba46b001db5208c29eb11ae2529..2be8dc983d008cb3da597f3aabd5efc0df51f9e8 100644
+index 0370e0f199d572f868212c077e76ed97c8730c5e..511858181de22ec8e5835b92cd132d86ed9af921 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2452,6 +2452,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0035-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0035-Only-refresh-abilities-if-needed.patch
index 330dfcd491..1f09d0a3e4 100644
--- a/patches/server/0035-Only-refresh-abilities-if-needed.patch
+++ b/patches/unapplied/server/0035-Only-refresh-abilities-if-needed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2be8dc983d008cb3da597f3aabd5efc0df51f9e8..5600dce95548ffffa1a338f9c9f6d682d30cf02f 100644
+index 511858181de22ec8e5835b92cd132d86ed9af921..698cabdc8f2613293abd42fb5b09dfbed6e3c448 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2120,12 +2120,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0036-Entity-Origin-API.patch b/patches/unapplied/server/0036-Entity-Origin-API.patch
index 89116c4edf..89116c4edf 100644
--- a/patches/server/0036-Entity-Origin-API.patch
+++ b/patches/unapplied/server/0036-Entity-Origin-API.patch
diff --git a/patches/server/0037-Prevent-block-entity-and-entity-crashes.patch b/patches/unapplied/server/0037-Prevent-block-entity-and-entity-crashes.patch
index 7226372683..7226372683 100644
--- a/patches/server/0037-Prevent-block-entity-and-entity-crashes.patch
+++ b/patches/unapplied/server/0037-Prevent-block-entity-and-entity-crashes.patch
diff --git a/patches/server/0038-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0038-Configurable-top-of-nether-void-damage.patch
index 07e4a617c7..c3eab8560e 100644
--- a/patches/server/0038-Configurable-top-of-nether-void-damage.patch
+++ b/patches/unapplied/server/0038-Configurable-top-of-nether-void-damage.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable top of nether void damage
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 57960530e15f0e4b8fb40b725ff03aaf8ce6ffac..2828ef013fe2c35292990cccd824a76a5551c952 100644
+index a753bcd3a40c5169866845eb7155646b25e40732..01f38f356ea3be7baaec83dd3c45bff5e181539a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -721,7 +721,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0039-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0039-Check-online-mode-before-converting-and-renaming-pla.patch
index 70183b1722..70183b1722 100644
--- a/patches/server/0039-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/unapplied/server/0039-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0040-Add-more-entities-to-activation-range-ignore-list.patch b/patches/unapplied/server/0040-Add-more-entities-to-activation-range-ignore-list.patch
index f7bf86db8b..f7bf86db8b 100644
--- a/patches/server/0040-Add-more-entities-to-activation-range-ignore-list.patch
+++ b/patches/unapplied/server/0040-Add-more-entities-to-activation-range-ignore-list.patch
diff --git a/patches/server/0041-Configurable-end-credits.patch b/patches/unapplied/server/0041-Configurable-end-credits.patch
index 3514b6e2ef..3514b6e2ef 100644
--- a/patches/server/0041-Configurable-end-credits.patch
+++ b/patches/unapplied/server/0041-Configurable-end-credits.patch
diff --git a/patches/server/0042-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0042-Fix-lag-from-explosions-processing-dead-entities.patch
index 9dc78a5f91..9dc78a5f91 100644
--- a/patches/server/0042-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/unapplied/server/0042-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0043-Optimize-explosions.patch b/patches/unapplied/server/0043-Optimize-explosions.patch
index 8da9daff57..f7ca52b35d 100644
--- a/patches/server/0043-Optimize-explosions.patch
+++ b/patches/unapplied/server/0043-Optimize-explosions.patch
@@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b86d8a3756cb8c1adb1aceda57f60b0ccdb3f659..43c7014b51f1f46a0e52f0595e85636767ed92ff 100644
+index e763b89dac66c36f43afaf45f5226f34bd119ceb..8acfb0a70bf7bf5611b217ebf0177746c8f95abd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1611,6 +1611,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0044-Disable-explosion-knockback.patch b/patches/unapplied/server/0044-Disable-explosion-knockback.patch
index 21d2161c67..21d2161c67 100644
--- a/patches/server/0044-Disable-explosion-knockback.patch
+++ b/patches/unapplied/server/0044-Disable-explosion-knockback.patch
diff --git a/patches/server/0045-Disable-thunder.patch b/patches/unapplied/server/0045-Disable-thunder.patch
index 7c2ce40c67..7c2ce40c67 100644
--- a/patches/server/0045-Disable-thunder.patch
+++ b/patches/unapplied/server/0045-Disable-thunder.patch
diff --git a/patches/server/0046-Disable-ice-and-snow.patch b/patches/unapplied/server/0046-Disable-ice-and-snow.patch
index 406de2d6a1..406de2d6a1 100644
--- a/patches/server/0046-Disable-ice-and-snow.patch
+++ b/patches/unapplied/server/0046-Disable-ice-and-snow.patch
diff --git a/patches/server/0047-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0047-Configurable-mob-spawner-tick-rate.patch
index a3dc9ff7d3..a3dc9ff7d3 100644
--- a/patches/server/0047-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/unapplied/server/0047-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0048-Use-null-Locale-by-default.patch b/patches/unapplied/server/0048-Use-null-Locale-by-default.patch
index 0ffa4b3c95..da75362ea4 100644
--- a/patches/server/0048-Use-null-Locale-by-default.patch
+++ b/patches/unapplied/server/0048-Use-null-Locale-by-default.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use null Locale by default
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4303bde198050cd037f006234d269af406606eff..911ec630c5925b160cc05f99f0d5bb5ac46384bb 100644
+index e941b2f989333932e81cf7d04f70d0e7aad89432..8c98f241d1bc113e2b9ba1045eb251dc3c66f9f6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -261,7 +261,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -36,7 +36,7 @@ index 4303bde198050cd037f006234d269af406606eff..911ec630c5925b160cc05f99f0d5bb5a
              this.server.server.getPluginManager().callEvent(event);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5600dce95548ffffa1a338f9c9f6d682d30cf02f..17a5b37a7591274a45a6818144b62b5cd1412a40 100644
+index 698cabdc8f2613293abd42fb5b09dfbed6e3c448..2715662a638c15ecb5034f443c64157bfa93c2aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2450,7 +2450,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0049-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0049-Add-BeaconEffectEvent.patch
index ce80109f25..ce80109f25 100644
--- a/patches/server/0049-Add-BeaconEffectEvent.patch
+++ b/patches/unapplied/server/0049-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0050-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0050-Configurable-container-update-tick-rate.patch
index 02f5fc8fd0..12e81f67ab 100644
--- a/patches/server/0050-Configurable-container-update-tick-rate.patch
+++ b/patches/unapplied/server/0050-Configurable-container-update-tick-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 911ec630c5925b160cc05f99f0d5bb5ac46384bb..78e4f07019e3231fbaa3f23bcdc8846e2d79ae18 100644
+index 8c98f241d1bc113e2b9ba1045eb251dc3c66f9f6..a06a2c5acb677b2495fab223dfbde293dffca096 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -295,6 +295,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0051-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0051-Use-UserCache-for-player-heads.patch
index b7c3f11a27..b7c3f11a27 100644
--- a/patches/server/0051-Use-UserCache-for-player-heads.patch
+++ b/patches/unapplied/server/0051-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0052-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0052-Disable-spigot-tick-limiters.patch
index 2872d59fb9..2872d59fb9 100644
--- a/patches/server/0052-Disable-spigot-tick-limiters.patch
+++ b/patches/unapplied/server/0052-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0053-Fix-spawn-location-event-changing-location.patch b/patches/unapplied/server/0053-Fix-spawn-location-event-changing-location.patch
index 15086ed363..cc20e90b16 100644
--- a/patches/server/0053-Fix-spawn-location-event-changing-location.patch
+++ b/patches/unapplied/server/0053-Fix-spawn-location-event-changing-location.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix spawn location event changing location
 public net.minecraft.world.entity.Entity setRot(FF)V
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 56f046bac04205a813441907058c4ce21982d927..50b1e493a9adfa687dc22c66044c6aa243340b3f 100644
+index 8daa027a94602d7d556cf4fbfc8fcd97caf6bd98..7782f26764ef79968b1e2f5e1f27f1162ed122de 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -234,7 +234,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0054-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0054-Configurable-Disabling-Cat-Chest-Detection.patch
index 410ee5115f..410ee5115f 100644
--- a/patches/server/0054-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/unapplied/server/0054-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0055-Improve-Player-chat-API-handling.patch b/patches/unapplied/server/0055-Improve-Player-chat-API-handling.patch
index 8c63e9bdb4..8547d7afe7 100644
--- a/patches/server/0055-Improve-Player-chat-API-handling.patch
+++ b/patches/unapplied/server/0055-Improve-Player-chat-API-handling.patch
@@ -38,7 +38,7 @@ index fddc6b5abbad66ebe556ff8565c38c60b7883fce..55d61a4c93233c0d3994e75f41e29065
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2bfa790a9f0ca07217c9d9f7dd916950d859530c..ec0d7e44235378380b7180ca1a9ca56b14dac1c7 100644
+index e4335bfc98272c5499651977625e1f0ca671fbec..a0a0fa7de47402f1820618da5c6582dd894676cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -936,7 +936,7 @@ public final class CraftServer implements Server {
@@ -51,7 +51,7 @@ index 2bfa790a9f0ca07217c9d9f7dd916950d859530c..ec0d7e44235378380b7180ca1a9ca56b
          if (this.commandMap.dispatch(sender, commandLine)) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 17a5b37a7591274a45a6818144b62b5cd1412a40..51bf9e36ec13af09240c329e40391d79f715a021 100644
+index 2715662a638c15ecb5034f443c64157bfa93c2aa..4db8f28709dcfdcdae8565e15e4871b7827ef96a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -563,7 +563,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0056-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0056-All-chunks-are-slime-spawn-chunks-toggle.patch
index 7afface4f6..454765e6e5 100644
--- a/patches/server/0056-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/unapplied/server/0056-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -18,7 +18,7 @@ index 7b45d1b706550d7d0a0267f30fb0b86813edfeb3..131fce812eb0dcdebab02b529ed18e81
              if (random.nextInt(10) == 0 && flag && pos.getY() < 40) {
                  return checkMobSpawnRules(type, world, spawnReason, pos, random);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 19f165b855a0ca10732fd43c7ee093b11e535471..91d2b6eaa2af0abb1bdf11849f0fd59660f765dd 100644
+index d54e0ab739ad33b8222d9ea2766e2a893154ee26..d3b2d71a570b90d58dd7d00ce625b0169c106190 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -218,7 +218,7 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0057-Expose-server-CommandMap.patch b/patches/unapplied/server/0057-Expose-server-CommandMap.patch
index bc0e6fd63e..4eafe19d32 100644
--- a/patches/server/0057-Expose-server-CommandMap.patch
+++ b/patches/unapplied/server/0057-Expose-server-CommandMap.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ec0d7e44235378380b7180ca1a9ca56b14dac1c7..63573ec7e8f855a1afd892c9615a45c1bc742ac1 100644
+index a0a0fa7de47402f1820618da5c6582dd894676cd..e8528943c4c2f5c03a6a83d68133bace86b7901a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2182,6 +2182,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch
index dc513f3e96..dc513f3e96 100644
--- a/patches/server/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/unapplied/server/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0059-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0059-Player-Tab-List-and-Title-APIs.patch
index 79923e2cfc..770cea03c7 100644
--- a/patches/server/0059-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/unapplied/server/0059-Player-Tab-List-and-Title-APIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 51bf9e36ec13af09240c329e40391d79f715a021..e3b8cc11a5523614594f1c3a144991fa70227e57 100644
+index 4db8f28709dcfdcdae8565e15e4871b7827ef96a..be1208d209c29006b040f06f378e7dd031651971 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -393,6 +393,98 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0060-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0060-Add-configurable-portal-search-radius.patch
index 9307176401..9307176401 100644
--- a/patches/server/0060-Add-configurable-portal-search-radius.patch
+++ b/patches/unapplied/server/0060-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0061-Add-velocity-warnings.patch b/patches/unapplied/server/0061-Add-velocity-warnings.patch
index aafd524684..3e32e12869 100644
--- a/patches/server/0061-Add-velocity-warnings.patch
+++ b/patches/unapplied/server/0061-Add-velocity-warnings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 63573ec7e8f855a1afd892c9615a45c1bc742ac1..bb562ada45b828c79d83afdd1687edd32cbaf1dc 100644
+index e8528943c4c2f5c03a6a83d68133bace86b7901a..3422b2978eb69c537c19abacbb10ce8a5423756a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -305,6 +305,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0062-Add-exception-reporting-event.patch b/patches/unapplied/server/0062-Add-exception-reporting-event.patch
index 52fe575b57..7f45893a66 100644
--- a/patches/server/0062-Add-exception-reporting-event.patch
+++ b/patches/unapplied/server/0062-Add-exception-reporting-event.patch
@@ -171,7 +171,7 @@ index 15f273aa592828719de6e092d79a407dc8652dfe..b24e8255ab18eb5b2e4968aa62aa3d72
                  try {
                      filechannel.close();
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 2c36d0796714997191c6540c34a9df60718065f6..0c0115ccd8541ac62975f4759b4e2083ac560332 100644
+index 0385aa1e5cced22bbafdabca1b63599db1f5d3f6..152c816efbd633210ff308ef56f5d0cda6edb1b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -415,20 +415,25 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/patches/server/0063-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0063-Disable-Scoreboards-for-non-players-by-default.patch
index fbca7a5ea1..ca8895ce93 100644
--- a/patches/server/0063-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/unapplied/server/0063-Disable-Scoreboards-for-non-players-by-default.patch
@@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2828ef013fe2c35292990cccd824a76a5551c952..0c2389e73e98ec48ed636f616a36e6e1cefa7b93 100644
+index 01f38f356ea3be7baaec83dd3c45bff5e181539a..10195d04c9ca9e5f79e9c423fba5dc33fa538f3a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3058,6 +3058,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 6da97b4baa..6da97b4baa 100644
--- a/patches/server/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/unapplied/server/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0065-Complete-resource-pack-API.patch b/patches/unapplied/server/0065-Complete-resource-pack-API.patch
index f330036b94..a39f24e8f8 100644
--- a/patches/server/0065-Complete-resource-pack-API.patch
+++ b/patches/unapplied/server/0065-Complete-resource-pack-API.patch
@@ -22,7 +22,7 @@ index 99f89854e43ed6742dc9ac1624fa7140b4594b3b..d4527831f66bf1c55e6273c7f8923d6e
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e3b8cc11a5523614594f1c3a144991fa70227e57..e904d8558c425d3b2027053f4083999f0deb36fb 100644
+index be1208d209c29006b040f06f378e7dd031651971..5c5dc66c7d6019121907801f6b32db765a6cd020 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -213,6 +213,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0066-Default-loading-permissions.yml-before-plugins.patch
index 45510139a9..45510139a9 100644
--- a/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/unapplied/server/0066-Default-loading-permissions.yml-before-plugins.patch
diff --git a/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0067-Allow-Reloading-of-Custom-Permissions.patch
index 9b62fef16d..9b62fef16d 100644
--- a/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/unapplied/server/0067-Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/0068-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0068-Remove-Metadata-on-reload.patch
index 61752107c6..61752107c6 100644
--- a/patches/server/0068-Remove-Metadata-on-reload.patch
+++ b/patches/unapplied/server/0068-Remove-Metadata-on-reload.patch
diff --git a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0069-Handle-Item-Meta-Inconsistencies.patch
index fd76315859..2535840f40 100644
--- a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/unapplied/server/0069-Handle-Item-Meta-Inconsistencies.patch
@@ -149,7 +149,7 @@ index 101eea3452c9e387e770b716543c3a4f17b9a737..aea09533fada5bd3d42e2cc147921167
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.world.item.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index b02149d371b3b65537655f8e9713428e19bbc180..d9bbeb08cb58b1fbea5c6aab8f926236639e031d 100644
+index 2c4822d56c1d9204785159e33fd3582885aa6266..cd4c0d691f65cc04ef7a72c7e8c0ead33047ff36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList;
diff --git a/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index f59a8a6609..a48b481fcd 100644
--- a/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/unapplied/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index a4a932c9b0ad8f83c32bb06428c74d5b4c1741d1..a1b1c6385d3a1fbe38f5ae4471b8e4f6ef2c80b3 100644
+index 4e055d09711fefdbb8bdc17190610691261fdf78..eb9a82c8c0e342d2afb21c64da32412ce3a0be76 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -379,7 +379,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0071-Add-World-Util-Methods.patch b/patches/unapplied/server/0071-Add-World-Util-Methods.patch
index 4c7b9c4d27..4c7b9c4d27 100644
--- a/patches/server/0071-Add-World-Util-Methods.patch
+++ b/patches/unapplied/server/0071-Add-World-Util-Methods.patch
diff --git a/patches/server/0072-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0072-Custom-replacement-for-eaten-items.patch
index bc3c20320f..bc3c20320f 100644
--- a/patches/server/0072-Custom-replacement-for-eaten-items.patch
+++ b/patches/unapplied/server/0072-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 3095ce36ae..d06c28b081 100644
--- a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/unapplied/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -44,7 +44,7 @@ index 21a356b3c7d3dec73e5c8feaa4afda479a7ec1a2..cd7837935003775688281882b19f0808
  
      protected void internalSetAbsorptionAmount(float absorptionAmount) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e904d8558c425d3b2027053f4083999f0deb36fb..d578d65883f23cc4aaa5b0a7cf1fc88bb337f3a5 100644
+index 5c5dc66c7d6019121907801f6b32db765a6cd020..2664daa2ae772b2ad63bdab8942bcaeda0e457bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2365,6 +2365,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0074-Use-a-Shared-Random-for-Entities.patch
index d26d24c577..d26d24c577 100644
--- a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/unapplied/server/0074-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
index 3133546f85..3133546f85 100644
--- a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/unapplied/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index dbfa5d5506..445614f05a 100644
--- a/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/unapplied/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
 Saves on some object allocation and processing when no plugin listens to this
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 43c7014b51f1f46a0e52f0595e85636767ed92ff..0db5bd55b738baa51f5f2790d398a22b802ae070 100644
+index 8acfb0a70bf7bf5611b217ebf0177746c8f95abd..221e9f3c91f15a7d93b54952d7140267c10366aa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1584,6 +1584,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch
index 0a0bf28ff8..0a0bf28ff8 100644
--- a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/unapplied/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0078-Configurable-Chunk-Inhabited-Time.patch
index d5d3a231fc..d5d3a231fc 100644
--- a/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/unapplied/server/0078-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0079-EntityPathfindEvent.patch b/patches/unapplied/server/0079-EntityPathfindEvent.patch
index f852d81661..f852d81661 100644
--- a/patches/server/0079-EntityPathfindEvent.patch
+++ b/patches/unapplied/server/0079-EntityPathfindEvent.patch
diff --git a/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch
index c8504969b8..c8504969b8 100644
--- a/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/unapplied/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0081-Do-not-load-chunks-for-Pathfinding.patch
index f67f87234b..f67f87234b 100644
--- a/patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/unapplied/server/0081-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0082-Add-PlayerUseUnknownEntityEvent.patch
index d895ad4117..d895ad4117 100644
--- a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/server/0082-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0083-Configurable-random-tick-rates-for-blocks.patch b/patches/unapplied/server/0083-Configurable-random-tick-rates-for-blocks.patch
index f55ff2c310..f55ff2c310 100644
--- a/patches/server/0083-Configurable-random-tick-rates-for-blocks.patch
+++ b/patches/unapplied/server/0083-Configurable-random-tick-rates-for-blocks.patch
diff --git a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 9af9af8eb8..9af9af8eb8 100644
--- a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/unapplied/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0085-Optimize-DataBits.patch b/patches/unapplied/server/0085-Optimize-DataBits.patch
index fa5c0b02f0..fa5c0b02f0 100644
--- a/patches/server/0085-Optimize-DataBits.patch
+++ b/patches/unapplied/server/0085-Optimize-DataBits.patch
diff --git a/patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 4a2793dc00..4a2793dc00 100644
--- a/patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/unapplied/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0087-Configurable-Player-Collision.patch b/patches/unapplied/server/0087-Configurable-Player-Collision.patch
index e8bd9c9ec1..08615f2d7f 100644
--- a/patches/server/0087-Configurable-Player-Collision.patch
+++ b/patches/unapplied/server/0087-Configurable-Player-Collision.patch
@@ -18,7 +18,7 @@ index 9a1a961eabd4362c171da78c6be82c867f3696a4..1d0c473442b5c72245c356054440323e
              ComponentSerialization.TRUSTED_STREAM_CODEC.encode(buf, this.playerPrefix);
              ComponentSerialization.TRUSTED_STREAM_CODEC.encode(buf, this.playerSuffix);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0db5bd55b738baa51f5f2790d398a22b802ae070..351dbb35a9ba0ce52cd5e182ef6dd8c3d54c28f6 100644
+index 221e9f3c91f15a7d93b54952d7140267c10366aa..81b770626cbc1285a947e314fc76327c0cb9d83e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -653,6 +653,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 33ef52f088..33ef52f088 100644
--- a/patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0089-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0089-Configurable-RCON-IP-address.patch
index 21e0b530fd..21e0b530fd 100644
--- a/patches/server/0089-Configurable-RCON-IP-address.patch
+++ b/patches/unapplied/server/0089-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch
index 0b3f78d7b9..0b3f78d7b9 100644
--- a/patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0091-Add-ability-to-configure-frosted_ice-properties.patch
index 5fe3cf9ede..5fe3cf9ede 100644
--- a/patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/unapplied/server/0091-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0092-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0092-remove-null-possibility-for-getServer-singleton.patch
index fff623da10..746cf3e777 100644
--- a/patches/server/0092-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/unapplied/server/0092-remove-null-possibility-for-getServer-singleton.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 351dbb35a9ba0ce52cd5e182ef6dd8c3d54c28f6..04b57bc2f99adcd65cd21350effe066af2e806df 100644
+index 81b770626cbc1285a947e314fc76327c0cb9d83e..135509f4be308179226fa1518e9070977f6cad56 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -203,6 +203,7 @@ import org.bukkit.event.server.ServerLoadEvent;
diff --git a/patches/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index e8fe46f840..e8fe46f840 100644
--- a/patches/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/unapplied/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0094-LootTable-API-and-replenishable-lootables.patch b/patches/unapplied/server/0094-LootTable-API-and-replenishable-lootables.patch
index 373db66b1f..373db66b1f 100644
--- a/patches/server/0094-LootTable-API-and-replenishable-lootables.patch
+++ b/patches/unapplied/server/0094-LootTable-API-and-replenishable-lootables.patch
diff --git a/patches/server/0095-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0095-System-property-for-disabling-watchdoge.patch
index 4a35e21392..4a35e21392 100644
--- a/patches/server/0095-System-property-for-disabling-watchdoge.patch
+++ b/patches/unapplied/server/0095-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0096-Async-GameProfileCache-saving.patch b/patches/unapplied/server/0096-Async-GameProfileCache-saving.patch
index d01cb4aed3..04eeb44729 100644
--- a/patches/server/0096-Async-GameProfileCache-saving.patch
+++ b/patches/unapplied/server/0096-Async-GameProfileCache-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Async GameProfileCache saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 04b57bc2f99adcd65cd21350effe066af2e806df..12c8a4f79abf2c2c15bd271cff4c4ca800e0625a 100644
+index 135509f4be308179226fa1518e9070977f6cad56..76d9f12e0c2d54ed35cee6a4463d982682d4d641 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1011,7 +1011,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0097-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0097-Optional-TNT-doesn-t-move-in-water.patch
index 4c44ca39c9..4c44ca39c9 100644
--- a/patches/server/0097-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/unapplied/server/0097-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0098-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0098-Faster-redstone-torch-rapid-clock-removal.patch
index 9d7f0e9161..9d7f0e9161 100644
--- a/patches/server/0098-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/unapplied/server/0098-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0099-Add-server-name-parameter.patch b/patches/unapplied/server/0099-Add-server-name-parameter.patch
index 72580c8f34..72580c8f34 100644
--- a/patches/server/0099-Add-server-name-parameter.patch
+++ b/patches/unapplied/server/0099-Add-server-name-parameter.patch
diff --git a/patches/server/0100-Fix-global-sound-handling.patch b/patches/unapplied/server/0100-Fix-global-sound-handling.patch
index 303eeb7fe1..303eeb7fe1 100644
--- a/patches/server/0100-Fix-global-sound-handling.patch
+++ b/patches/unapplied/server/0100-Fix-global-sound-handling.patch
diff --git a/patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
index 1c6ee84de8..1c6ee84de8 100644
--- a/patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/unapplied/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index d99e7ec08b..d99e7ec08b 100644
--- a/patches/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/unapplied/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0103-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0103-Add-setting-for-proxy-online-mode-status.patch
index 43b3f70650..43b3f70650 100644
--- a/patches/server/0103-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/unapplied/server/0103-Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/0104-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0104-Optimise-BlockState-s-hashCode-equals.patch
index 057a037d89..057a037d89 100644
--- a/patches/server/0104-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/unapplied/server/0104-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0105-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0105-Configurable-packet-in-spam-threshold.patch
index b28e858037..b28e858037 100644
--- a/patches/server/0105-Configurable-packet-in-spam-threshold.patch
+++ b/patches/unapplied/server/0105-Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/0106-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0106-Configurable-flying-kick-messages.patch
index 00bd532614..00bd532614 100644
--- a/patches/server/0106-Configurable-flying-kick-messages.patch
+++ b/patches/unapplied/server/0106-Configurable-flying-kick-messages.patch
diff --git a/patches/server/0107-Add-EntityZapEvent.patch b/patches/unapplied/server/0107-Add-EntityZapEvent.patch
index c788e393ec..c788e393ec 100644
--- a/patches/server/0107-Add-EntityZapEvent.patch
+++ b/patches/unapplied/server/0107-Add-EntityZapEvent.patch
diff --git a/patches/server/0108-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch b/patches/unapplied/server/0108-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
index bf9d10bb7e..bf9d10bb7e 100644
--- a/patches/server/0108-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
+++ b/patches/unapplied/server/0108-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0109-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0109-Cache-user-authenticator-threads.patch
index 471804336a..471804336a 100644
--- a/patches/server/0109-Cache-user-authenticator-threads.patch
+++ b/patches/unapplied/server/0109-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0110-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0110-Allow-Reloading-of-Command-Aliases.patch
index 0984a8f80e..0984a8f80e 100644
--- a/patches/server/0110-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/server/0110-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0111-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0111-Add-source-to-PlayerExpChangeEvent.patch
index cb2ac725a2..cb2ac725a2 100644
--- a/patches/server/0111-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/server/0111-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0112-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0112-Add-ProjectileCollideEvent.patch
index 2b0113c50b..2b0113c50b 100644
--- a/patches/server/0112-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/server/0112-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0113-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0113-Prevent-Pathfinding-out-of-World-Border.patch
index 21235871ad..21235871ad 100644
--- a/patches/server/0113-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/unapplied/server/0113-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0114-Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/unapplied/server/0114-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
index 526301e39d..526301e39d 100644
--- a/patches/server/0114-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
+++ b/patches/unapplied/server/0114-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
diff --git a/patches/server/0115-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0115-Bound-Treasure-Maps-to-World-Border.patch
index 0444bae2ba..0444bae2ba 100644
--- a/patches/server/0115-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/unapplied/server/0115-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0116-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0116-Configurable-Cartographer-Treasure-Maps.patch
index 1ca587b32e..1ca587b32e 100644
--- a/patches/server/0116-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/unapplied/server/0116-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0117-Add-API-methods-to-control-if-armor-stands-can-move.patch b/patches/unapplied/server/0117-Add-API-methods-to-control-if-armor-stands-can-move.patch
index e79a04b269..e79a04b269 100644
--- a/patches/server/0117-Add-API-methods-to-control-if-armor-stands-can-move.patch
+++ b/patches/unapplied/server/0117-Add-API-methods-to-control-if-armor-stands-can-move.patch
diff --git a/patches/server/0118-String-based-Action-Bar-API.patch b/patches/unapplied/server/0118-String-based-Action-Bar-API.patch
index 028bc2e2c0..56ae9b2920 100644
--- a/patches/server/0118-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/server/0118-String-based-Action-Bar-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d578d65883f23cc4aaa5b0a7cf1fc88bb337f3a5..bf8453b2fa3549c827bff784b0d98aa827053634 100644
+index 2664daa2ae772b2ad63bdab8942bcaeda0e457bc..4a3836a645f3efac6f9d4fd4cbaa3eb2e23bb4b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -395,6 +395,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0119-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch
index 3fe8b5e902..3fe8b5e902 100644
--- a/patches/server/0119-Properly-fix-item-duplication-bug.patch
+++ b/patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0120-Firework-API-s.patch b/patches/unapplied/server/0120-Firework-API-s.patch
index 5efca78eb3..5efca78eb3 100644
--- a/patches/server/0120-Firework-API-s.patch
+++ b/patches/unapplied/server/0120-Firework-API-s.patch
diff --git a/patches/server/0121-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0121-PlayerTeleportEndGatewayEvent.patch
index c86ce687bf..c86ce687bf 100644
--- a/patches/server/0121-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0121-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
index 1c9bd827bd..58b18fa417 100644
--- a/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -20,7 +20,7 @@ index 943c14b26cf5b1c9f9ea1acec058cecac3b93bf7..e5eac1977f77b7ce1112bfe7ac1b77d9
      private final List<TickingBlockEntity> pendingBlockEntityTickers = Lists.newArrayList();
      private boolean tickingBlockEntities;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 67f9a3ff28014235754121363e7a622787092bfb..ecdfe2d1e9ddc16034523619aa304a451269763b 100644
+index 5612f66ec7b0e927824d5503b15dc28af0dfb168..9ad27a6908ac07d87dc0453b61f69d3b3037a971 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -169,6 +169,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0123-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0123-Enforce-Sync-Player-Saves.patch
index c0c144111c..c0c144111c 100644
--- a/patches/server/0123-Enforce-Sync-Player-Saves.patch
+++ b/patches/unapplied/server/0123-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0124-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0124-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 50161ad69f..50161ad69f 100644
--- a/patches/server/0124-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/server/0124-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0125-Cap-Entity-Collisions.patch b/patches/unapplied/server/0125-Cap-Entity-Collisions.patch
index abbc967c00..abbc967c00 100644
--- a/patches/server/0125-Cap-Entity-Collisions.patch
+++ b/patches/unapplied/server/0125-Cap-Entity-Collisions.patch
diff --git a/patches/server/0126-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0126-Remove-CraftScheduler-Async-Task-Debugger.patch
index 08692be694..08692be694 100644
--- a/patches/server/0126-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/unapplied/server/0126-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0127-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0127-Properly-handle-async-calls-to-restart-the-server.patch
index 7f67872d21..5af027525d 100644
--- a/patches/server/0127-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/unapplied/server/0127-Properly-handle-async-calls-to-restart-the-server.patch
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 12c8a4f79abf2c2c15bd271cff4c4ca800e0625a..d69d759de22726f4a825cb5e485670aefe05df4a 100644
+index 76d9f12e0c2d54ed35cee6a4463d982682d4d641..fc5176447b4e54aafdd9f2806ffbdce02bc20c9b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -247,6 +247,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 7160cf1fcd..7160cf1fcd 100644
--- a/patches/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/unapplied/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/0129-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0129-Add-configuration-option-to-prevent-player-names-fro.patch
index fb0fd629d5..fb0fd629d5 100644
--- a/patches/server/0129-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/server/0129-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0130-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0130-provide-a-configurable-option-to-disable-creeper-lin.patch
index c55f4a428d..c55f4a428d 100644
--- a/patches/server/0130-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/unapplied/server/0130-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0131-Item-canEntityPickup.patch b/patches/unapplied/server/0131-Item-canEntityPickup.patch
index d68202e1be..d68202e1be 100644
--- a/patches/server/0131-Item-canEntityPickup.patch
+++ b/patches/unapplied/server/0131-Item-canEntityPickup.patch
diff --git a/patches/server/0132-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0132-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 081b08fc3a..081b08fc3a 100644
--- a/patches/server/0132-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/unapplied/server/0132-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0133-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0133-PlayerAttemptPickupItemEvent.patch
index 11b2bbe078..11b2bbe078 100644
--- a/patches/server/0133-PlayerAttemptPickupItemEvent.patch
+++ b/patches/unapplied/server/0133-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 11222ddf7d..11222ddf7d 100644
--- a/patches/server/0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/unapplied/server/0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0135-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0135-Basic-PlayerProfile-API.patch
index a81f8d765a..a81f8d765a 100644
--- a/patches/server/0135-Basic-PlayerProfile-API.patch
+++ b/patches/unapplied/server/0135-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0136-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0136-Add-UnknownCommandEvent.patch
index aba283df9e..aba283df9e 100644
--- a/patches/server/0136-Add-UnknownCommandEvent.patch
+++ b/patches/unapplied/server/0136-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0137-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0137-Shoulder-Entities-Release-API.patch
index 3c6d15f323..3c6d15f323 100644
--- a/patches/server/0137-Shoulder-Entities-Release-API.patch
+++ b/patches/unapplied/server/0137-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0138-Profile-Lookup-Events.patch b/patches/unapplied/server/0138-Profile-Lookup-Events.patch
index 8a3c9a944e..8a3c9a944e 100644
--- a/patches/server/0138-Profile-Lookup-Events.patch
+++ b/patches/unapplied/server/0138-Profile-Lookup-Events.patch
diff --git a/patches/server/0139-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0139-Block-player-logins-during-server-shutdown.patch
index d3fdf86a58..d3fdf86a58 100644
--- a/patches/server/0139-Block-player-logins-during-server-shutdown.patch
+++ b/patches/unapplied/server/0139-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0140-Entity-fromMobSpawner.patch b/patches/unapplied/server/0140-Entity-fromMobSpawner.patch
index dc193e5905..dc193e5905 100644
--- a/patches/server/0140-Entity-fromMobSpawner.patch
+++ b/patches/unapplied/server/0140-Entity-fromMobSpawner.patch
diff --git a/patches/server/0141-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0141-Improve-the-Saddle-API-for-Horses.patch
index ddf19f0208..ddf19f0208 100644
--- a/patches/server/0141-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/unapplied/server/0141-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0142-ensureServerConversions-API.patch b/patches/unapplied/server/0142-ensureServerConversions-API.patch
index 8c69d762bc..8c69d762bc 100644
--- a/patches/server/0142-ensureServerConversions-API.patch
+++ b/patches/unapplied/server/0142-ensureServerConversions-API.patch
diff --git a/patches/server/0143-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0143-Implement-getI18NDisplayName.patch
index 32d65af2dc..32d65af2dc 100644
--- a/patches/server/0143-Implement-getI18NDisplayName.patch
+++ b/patches/unapplied/server/0143-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0144-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0144-ProfileWhitelistVerifyEvent.patch
index 335095baa9..335095baa9 100644
--- a/patches/server/0144-ProfileWhitelistVerifyEvent.patch
+++ b/patches/unapplied/server/0144-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0145-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0145-Fix-this-stupid-bullshit.patch
index 066446b1cb..066446b1cb 100644
--- a/patches/server/0145-Fix-this-stupid-bullshit.patch
+++ b/patches/unapplied/server/0145-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0146-LivingEntity-setKiller.patch b/patches/unapplied/server/0146-LivingEntity-setKiller.patch
index 1a07e6b288..1a07e6b288 100644
--- a/patches/server/0146-LivingEntity-setKiller.patch
+++ b/patches/unapplied/server/0146-LivingEntity-setKiller.patch
diff --git a/patches/server/0147-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0147-Ocelot-despawns-should-honor-nametags-and-leash.patch
index ac704548ec..ac704548ec 100644
--- a/patches/server/0147-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/unapplied/server/0147-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0148-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0148-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index e27bff4361..e27bff4361 100644
--- a/patches/server/0148-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/unapplied/server/0148-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0149-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0149-Allow-specifying-a-custom-authentication-servers-dow.patch
index 49defd6c90..49defd6c90 100644
--- a/patches/server/0149-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/unapplied/server/0149-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0150-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0150-Add-PlayerJumpEvent.patch
index 6e1404774e..6e1404774e 100644
--- a/patches/server/0150-Add-PlayerJumpEvent.patch
+++ b/patches/unapplied/server/0150-Add-PlayerJumpEvent.patch
diff --git a/patches/server/0151-handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/0151-handle-ServerboundKeepAlivePacket-async.patch
index db2c92f2c3..db2c92f2c3 100644
--- a/patches/server/0151-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/unapplied/server/0151-handle-ServerboundKeepAlivePacket-async.patch
diff --git a/patches/server/0152-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0152-Expose-client-protocol-version-and-virtual-host.patch
index 2c7a6a7911..8b7e39a071 100644
--- a/patches/server/0152-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/server/0152-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index 7ae4279768b70a4fdc8f4438898871a17c8fe402..582bbb376c75ab5bf737f3015ce8ad45
  
      private void beginLogin(ClientIntentionPacket packet, boolean transfer) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bf8453b2fa3549c827bff784b0d98aa827053634..63499a4fa349b3fa61040244db8be2d5d2569b96 100644
+index 4a3836a645f3efac6f9d4fd4cbaa3eb2e23bb4b9..24339928fc75bc227a15921fb0a197a003ba0e5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -341,6 +341,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0153-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0153-revert-serverside-behavior-of-keepalives.patch
index 78c569400b..78c569400b 100644
--- a/patches/server/0153-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/unapplied/server/0153-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0154-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0154-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index af85833106..af85833106 100644
--- a/patches/server/0154-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/unapplied/server/0154-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0155-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0155-Add-PlayerArmorChangeEvent.patch
index cd83cc1481..cd83cc1481 100644
--- a/patches/server/0155-Add-PlayerArmorChangeEvent.patch
+++ b/patches/unapplied/server/0155-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0156-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0156-Prevent-logins-from-being-processed-when-the-player-.patch
index 95804a7b7c..95804a7b7c 100644
--- a/patches/server/0156-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/unapplied/server/0156-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0157-Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/unapplied/server/0157-Fix-MC-117075-Block-entity-unload-lag-spike.patch
index 12f777016d..12f777016d 100644
--- a/patches/server/0157-Fix-MC-117075-Block-entity-unload-lag-spike.patch
+++ b/patches/unapplied/server/0157-Fix-MC-117075-Block-entity-unload-lag-spike.patch
diff --git a/patches/server/0158-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0158-use-CB-BlockState-implementations-for-captured-block.patch
index 983ff7742b..983ff7742b 100644
--- a/patches/server/0158-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/unapplied/server/0158-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0159-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0159-API-to-get-a-BlockState-without-a-snapshot.patch
index 97e12295c9..97e12295c9 100644
--- a/patches/server/0159-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/server/0159-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0160-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0160-AsyncTabCompleteEvent.patch
index e02cf2d105..e02cf2d105 100644
--- a/patches/server/0160-AsyncTabCompleteEvent.patch
+++ b/patches/unapplied/server/0160-AsyncTabCompleteEvent.patch
diff --git a/patches/server/0161-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0161-PlayerPickupExperienceEvent.patch
index a07fa0d160..a07fa0d160 100644
--- a/patches/server/0161-PlayerPickupExperienceEvent.patch
+++ b/patches/unapplied/server/0161-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0162-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0162-Ability-to-apply-mending-to-XP-API.patch
index 590dfbe627..cecc6533cf 100644
--- a/patches/server/0162-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/unapplied/server/0162-Ability-to-apply-mending-to-XP-API.patch
@@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 63499a4fa349b3fa61040244db8be2d5d2569b96..128fcd537783986d816dae6d1ce2afb7af07d45a 100644
+index 24339928fc75bc227a15921fb0a197a003ba0e5c..8b9fdcbea2dd31ca2d79b31cc389afdc792a9423 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1665,7 +1665,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0163-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0163-PlayerNaturallySpawnCreaturesEvent.patch
index b510c92555..b510c92555 100644
--- a/patches/server/0163-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/unapplied/server/0163-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0164-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0164-Add-setPlayerProfile-API-for-Skulls.patch
index 3b0eaf2557..3b0eaf2557 100644
--- a/patches/server/0164-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/unapplied/server/0164-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0165-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0165-PreCreatureSpawnEvent.patch
index 0f7306bfc5..0f7306bfc5 100644
--- a/patches/server/0165-PreCreatureSpawnEvent.patch
+++ b/patches/unapplied/server/0165-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0166-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0166-Fill-Profile-Property-Events.patch
index 0c89bc936a..0c89bc936a 100644
--- a/patches/server/0166-Fill-Profile-Property-Events.patch
+++ b/patches/unapplied/server/0166-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0167-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0167-Add-PlayerAdvancementCriterionGrantEvent.patch
index af41f90a89..af41f90a89 100644
--- a/patches/server/0167-Add-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/unapplied/server/0167-Add-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0168-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0168-Add-ArmorStand-Item-Meta.patch
index 9c2b77fa50..9c2b77fa50 100644
--- a/patches/server/0168-Add-ArmorStand-Item-Meta.patch
+++ b/patches/unapplied/server/0168-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0169-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0169-Extend-Player-Interact-cancellation.patch
index 430e2a5e62..430e2a5e62 100644
--- a/patches/server/0169-Extend-Player-Interact-cancellation.patch
+++ b/patches/unapplied/server/0169-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0170-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0170-Tameable-getOwnerUniqueId-API.patch
index 8ef9a7ad54..8ef9a7ad54 100644
--- a/patches/server/0170-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/unapplied/server/0170-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0171-Toggleable-player-crits.patch b/patches/unapplied/server/0171-Toggleable-player-crits.patch
index 3a3f237d57..3a3f237d57 100644
--- a/patches/server/0171-Toggleable-player-crits.patch
+++ b/patches/unapplied/server/0171-Toggleable-player-crits.patch
diff --git a/patches/server/0172-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0172-Disable-Explicit-Network-Manager-Flushing.patch
index 583fa8e586..583fa8e586 100644
--- a/patches/server/0172-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/unapplied/server/0172-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0173-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0173-Implement-extended-PaperServerListPingEvent.patch
index b9db1ac1ec..f229293b86 100644
--- a/patches/server/0173-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/server/0173-Implement-extended-PaperServerListPingEvent.patch
@@ -170,7 +170,7 @@ index 0000000000000000000000000000000000000000..30a19d10869f73d67b794e8e4c035bc5
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d69d759de22726f4a825cb5e485670aefe05df4a..762c62923bbf38d59f65038222ff7923f3292d33 100644
+index fc5176447b4e54aafdd9f2806ffbdce02bc20c9b..5e8a9801ff92c8fab9c5cb5a5888ebe9144b331d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,6 +3,9 @@ package net.minecraft.server;
diff --git a/patches/server/0174-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/unapplied/server/0174-Add-more-fields-to-AsyncPreLoginEvent.patch
index 685fda6db8..685fda6db8 100644
--- a/patches/server/0174-Add-more-fields-to-AsyncPreLoginEvent.patch
+++ b/patches/unapplied/server/0174-Add-more-fields-to-AsyncPreLoginEvent.patch
diff --git a/patches/server/0175-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0175-Player.setPlayerProfile-API.patch
index 155a82385a..af417f4286 100644
--- a/patches/server/0175-Player.setPlayerProfile-API.patch
+++ b/patches/unapplied/server/0175-Player.setPlayerProfile-API.patch
@@ -64,7 +64,7 @@ index 818df09e9245b5d89b4180b1eaa51470b7539341..f6b2ca92fd3510a76cbf56d0ea55aa6c
  
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 128fcd537783986d816dae6d1ce2afb7af07d45a..32eeca2467189c6c97f7da5529d4fe9375e8a848 100644
+index 8b9fdcbea2dd31ca2d79b31cc389afdc792a9423..2f956a9148601fec4bbf9502d692811a8bf47c55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -254,11 +254,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0176-getPlayerUniqueId-API.patch b/patches/unapplied/server/0176-getPlayerUniqueId-API.patch
index 5214138b6e..5214138b6e 100644
--- a/patches/server/0176-getPlayerUniqueId-API.patch
+++ b/patches/unapplied/server/0176-getPlayerUniqueId-API.patch
diff --git a/patches/server/0177-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0177-Improved-Async-Task-Scheduler.patch
index 82d5ebd660..82d5ebd660 100644
--- a/patches/server/0177-Improved-Async-Task-Scheduler.patch
+++ b/patches/unapplied/server/0177-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0178-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0178-Make-legacy-ping-handler-more-reliable.patch
index e9431bd1eb..e9431bd1eb 100644
--- a/patches/server/0178-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/unapplied/server/0178-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0179-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0179-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 5265180dd5..5265180dd5 100644
--- a/patches/server/0179-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/unapplied/server/0179-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0180-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0180-Flag-to-disable-the-channel-limit.patch
index 867f7c6540..c38b29f20b 100644
--- a/patches/server/0180-Flag-to-disable-the-channel-limit.patch
+++ b/patches/unapplied/server/0180-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 32eeca2467189c6c97f7da5529d4fe9375e8a848..a4333eae8aa2ae3fefdc8a765a4434c36e123b12 100644
+index 2f956a9148601fec4bbf9502d692811a8bf47c55..a94927944ebf952c8621c2cc4f4506eb934f0bfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0181-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0181-Add-openSign-method-to-HumanEntity.patch
index c90098c049..c90098c049 100644
--- a/patches/server/0181-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/unapplied/server/0181-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0182-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0182-Configurable-sprint-interruption-on-attack.patch
index 1fe54fe26f..1fe54fe26f 100644
--- a/patches/server/0182-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/unapplied/server/0182-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0183-EndermanEscapeEvent.patch b/patches/unapplied/server/0183-EndermanEscapeEvent.patch
index cd9bf53000..cd9bf53000 100644
--- a/patches/server/0183-EndermanEscapeEvent.patch
+++ b/patches/unapplied/server/0183-EndermanEscapeEvent.patch
diff --git a/patches/server/0184-Enderman.teleportRandomly.patch b/patches/unapplied/server/0184-Enderman.teleportRandomly.patch
index aeb2e69493..aeb2e69493 100644
--- a/patches/server/0184-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/server/0184-Enderman.teleportRandomly.patch
diff --git a/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch
index 532ff4941f..532ff4941f 100644
--- a/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0186-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0186-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 9b28d06fce..9b28d06fce 100644
--- a/patches/server/0186-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/unapplied/server/0186-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0187-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0187-EndermanAttackPlayerEvent.patch
index 7ec73bf7df..7ec73bf7df 100644
--- a/patches/server/0187-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/server/0187-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0188-WitchConsumePotionEvent.patch b/patches/unapplied/server/0188-WitchConsumePotionEvent.patch
index d63befdcdb..d63befdcdb 100644
--- a/patches/server/0188-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/server/0188-WitchConsumePotionEvent.patch
diff --git a/patches/server/0189-WitchThrowPotionEvent.patch b/patches/unapplied/server/0189-WitchThrowPotionEvent.patch
index fc4a2c07db..fc4a2c07db 100644
--- a/patches/server/0189-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/server/0189-WitchThrowPotionEvent.patch
diff --git a/patches/server/0190-WitchReadyPotionEvent.patch b/patches/unapplied/server/0190-WitchReadyPotionEvent.patch
index 5275662a1d..5275662a1d 100644
--- a/patches/server/0190-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/server/0190-WitchReadyPotionEvent.patch
diff --git a/patches/server/0191-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0191-ItemStack-getMaxItemUseDuration.patch
index d3f513e3a9..d3f513e3a9 100644
--- a/patches/server/0191-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/server/0191-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0192-Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0192-Add-EntityTeleportEndGatewayEvent.patch
index 6431091971..6431091971 100644
--- a/patches/server/0192-Add-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0192-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0193-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0193-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 70526b8bcb..70526b8bcb 100644
--- a/patches/server/0193-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/unapplied/server/0193-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0194-Improve-CraftEntity-and-CraftPlayer-equals-and-hashC.patch b/patches/unapplied/server/0194-Improve-CraftEntity-and-CraftPlayer-equals-and-hashC.patch
index fd7f24c4f3..3a0c761449 100644
--- a/patches/server/0194-Improve-CraftEntity-and-CraftPlayer-equals-and-hashC.patch
+++ b/patches/unapplied/server/0194-Improve-CraftEntity-and-CraftPlayer-equals-and-hashC.patch
@@ -53,7 +53,7 @@ index 0480fbeffd19011d3cd63021225f376c464b480c..d6241e2db362de034ae610694c49c188
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a4333eae8aa2ae3fefdc8a765a4434c36e123b12..48fce5964c49f30f705d11bbbabae49ad9a606c7 100644
+index a94927944ebf952c8621c2cc4f4506eb934f0bfa..b79d02ecccc74120f5e40cfc0542c8ac8c1f5909 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -626,22 +626,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0195-Configurable-LootPool-luck-formula.patch b/patches/unapplied/server/0195-Configurable-LootPool-luck-formula.patch
index 33c95e3339..33c95e3339 100644
--- a/patches/server/0195-Configurable-LootPool-luck-formula.patch
+++ b/patches/unapplied/server/0195-Configurable-LootPool-luck-formula.patch
diff --git a/patches/server/0196-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0196-Print-Error-details-when-failing-to-save-player-data.patch
index 0885ca8d10..0885ca8d10 100644
--- a/patches/server/0196-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/unapplied/server/0196-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0197-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0197-Make-shield-blocking-delay-configurable.patch
index 87567dd988..87567dd988 100644
--- a/patches/server/0197-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/server/0197-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0198-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0198-Improve-EntityShootBowEvent.patch
index 213e6f61c1..213e6f61c1 100644
--- a/patches/server/0198-Improve-EntityShootBowEvent.patch
+++ b/patches/unapplied/server/0198-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0199-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0199-PlayerReadyArrowEvent.patch
index 8d16572d48..8d16572d48 100644
--- a/patches/server/0199-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/server/0199-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0200-Add-entity-knockback-events.patch b/patches/unapplied/server/0200-Add-entity-knockback-events.patch
index d13ddac4e7..54b98a893f 100644
--- a/patches/server/0200-Add-entity-knockback-events.patch
+++ b/patches/unapplied/server/0200-Add-entity-knockback-events.patch
@@ -225,7 +225,7 @@ index df0cfd316d24e285f927c713ab1f9a912857928c..ba0ea4d6b67c9c52f170e0235e4b972a
                                      Level world = this.level();
  
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index a1b1c6385d3a1fbe38f5ae4471b8e4f6ef2c80b3..78053060dbff7f8a859f9fecb356491f497eed7e 100644
+index eb9a82c8c0e342d2afb21c64da32412ce3a0be76..94fdfaa209406c23fc292982d1221c3ee82eea27 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -553,7 +553,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0201-Expand-Explosions-API.patch b/patches/unapplied/server/0201-Expand-Explosions-API.patch
index c005daa850..43d296102f 100644
--- a/patches/server/0201-Expand-Explosions-API.patch
+++ b/patches/unapplied/server/0201-Expand-Explosions-API.patch
@@ -54,7 +54,7 @@ index 9f37d7284c81d529551107e2836627977efabd65..d1878f597c3d8119e9b248f4fe8af435
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bb407fe2a2f65d8bb73024b3c33025808a50f6e3..ec32a4c6d55784c27390ccdf3f90362eacd15eb2 100644
+index 51e5cd3e56487c3438d9b4ab1670e551790967ac..18c92df4fd68bf5374608dc34517e48ce0fb428a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -777,6 +777,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0202-LivingEntity-Active-Item-API.patch b/patches/unapplied/server/0202-LivingEntity-Active-Item-API.patch
index f7de817b6b..f7de817b6b 100644
--- a/patches/server/0202-LivingEntity-Active-Item-API.patch
+++ b/patches/unapplied/server/0202-LivingEntity-Active-Item-API.patch
diff --git a/patches/server/0203-RangedEntity-API.patch b/patches/unapplied/server/0203-RangedEntity-API.patch
index 2b548743e2..2b548743e2 100644
--- a/patches/server/0203-RangedEntity-API.patch
+++ b/patches/unapplied/server/0203-RangedEntity-API.patch
diff --git a/patches/server/0204-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0204-Add-config-to-disable-ender-dragon-legacy-check.patch
index 7c711b2484..7c711b2484 100644
--- a/patches/server/0204-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/unapplied/server/0204-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0205-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0205-Implement-World.getEntity-UUID-API.patch
index 3e3ff89c36..608b54079b 100644
--- a/patches/server/0205-Implement-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/server/0205-Implement-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ec32a4c6d55784c27390ccdf3f90362eacd15eb2..4ca004c9f94fdcfa56a3c151a45a534271b20909 100644
+index 18c92df4fd68bf5374608dc34517e48ce0fb428a..8f231f693882a770bdc810b1e117eb31ef1ddadb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1130,6 +1130,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0206-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0206-InventoryCloseEvent-Reason-API.patch
index 5307753ead..179c54a7fa 100644
--- a/patches/server/0206-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/server/0206-InventoryCloseEvent-Reason-API.patch
@@ -165,7 +165,7 @@ index 6d4e0a90c70f7a66450cbb18ebec1d7bf9200af2..5ff159be1a6dfb4b1a5b9aa1e435d294
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 48fce5964c49f30f705d11bbbabae49ad9a606c7..b8a453e3e54a205d703bb1f4602686606c0f0f4d 100644
+index b79d02ecccc74120f5e40cfc0542c8ac8c1f5909..5239ce2d507f48effc4f3e2bc462d9caef5caa92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1278,7 +1278,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0207-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0207-Vex-get-setSummoner-API.patch
index 9c014ff1fc..9c014ff1fc 100644
--- a/patches/server/0207-Vex-get-setSummoner-API.patch
+++ b/patches/unapplied/server/0207-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0208-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0208-add-more-information-to-Entity.toString.patch
index 8541967ffd..8541967ffd 100644
--- a/patches/server/0208-add-more-information-to-Entity.toString.patch
+++ b/patches/unapplied/server/0208-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0209-EnderDragon-Events.patch b/patches/unapplied/server/0209-EnderDragon-Events.patch
index f78c44aab2..f78c44aab2 100644
--- a/patches/server/0209-EnderDragon-Events.patch
+++ b/patches/unapplied/server/0209-EnderDragon-Events.patch
diff --git a/patches/server/0210-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0210-PlayerElytraBoostEvent.patch
index 3042206c20..3042206c20 100644
--- a/patches/server/0210-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/server/0210-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0211-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0211-PlayerLaunchProjectileEvent.patch
index de1f0193b6..de1f0193b6 100644
--- a/patches/server/0211-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/server/0211-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0212-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0212-Improve-BlockPosition-inlining.patch
index e1e44f61f0..e1e44f61f0 100644
--- a/patches/server/0212-Improve-BlockPosition-inlining.patch
+++ b/patches/unapplied/server/0212-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0213-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0213-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 8f032f18fa..8f032f18fa 100644
--- a/patches/server/0213-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/unapplied/server/0213-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0214-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0214-Vanished-players-don-t-have-rights.patch
index 4d196bf7d1..4d196bf7d1 100644
--- a/patches/server/0214-Vanished-players-don-t-have-rights.patch
+++ b/patches/unapplied/server/0214-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0215-Allow-disabling-armor-stand-ticking.patch b/patches/unapplied/server/0215-Allow-disabling-armor-stand-ticking.patch
index 52031cba6b..52031cba6b 100644
--- a/patches/server/0215-Allow-disabling-armor-stand-ticking.patch
+++ b/patches/unapplied/server/0215-Allow-disabling-armor-stand-ticking.patch
diff --git a/patches/server/0216-SkeletonHorse-Additions.patch b/patches/unapplied/server/0216-SkeletonHorse-Additions.patch
index 2b721231ef..2b721231ef 100644
--- a/patches/server/0216-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/server/0216-SkeletonHorse-Additions.patch
diff --git a/patches/server/0217-Expand-ArmorStand-API.patch b/patches/unapplied/server/0217-Expand-ArmorStand-API.patch
index 8e53f0be90..8e53f0be90 100644
--- a/patches/server/0217-Expand-ArmorStand-API.patch
+++ b/patches/unapplied/server/0217-Expand-ArmorStand-API.patch
diff --git a/patches/server/0218-AnvilDamageEvent.patch b/patches/unapplied/server/0218-AnvilDamageEvent.patch
index 2364b6084c..2364b6084c 100644
--- a/patches/server/0218-AnvilDamageEvent.patch
+++ b/patches/unapplied/server/0218-AnvilDamageEvent.patch
diff --git a/patches/server/0219-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0219-Add-TNTPrimeEvent.patch
index 4cf9d43050..4cf9d43050 100644
--- a/patches/server/0219-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/server/0219-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0220-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0220-Break-up-and-make-tab-spam-limits-configurable.patch
index 92f889e9c0..92f889e9c0 100644
--- a/patches/server/0220-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/unapplied/server/0220-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0221-Fix-NBT-type-issues.patch b/patches/unapplied/server/0221-Fix-NBT-type-issues.patch
index bae1fe4393..bae1fe4393 100644
--- a/patches/server/0221-Fix-NBT-type-issues.patch
+++ b/patches/unapplied/server/0221-Fix-NBT-type-issues.patch
diff --git a/patches/server/0222-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0222-Remove-unnecessary-itemmeta-handling.patch
index d573a1e6f9..d573a1e6f9 100644
--- a/patches/server/0222-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/unapplied/server/0222-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 15dfd12d29..15dfd12d29 100644
--- a/patches/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/unapplied/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0224-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0224-Add-Early-Warning-Feature-to-WatchDog.patch
index 5b529f749d..21a0005a08 100644
--- a/patches/server/0224-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/unapplied/server/0224-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 762c62923bbf38d59f65038222ff7923f3292d33..c4d8918a7accbe5eb3035b4ec3b423f30c613d60 100644
+index 5e8a9801ff92c8fab9c5cb5a5888ebe9144b331d..af20a16e18673a629fc3033d8e7e07eba855b1c7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1120,6 +1120,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0225-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0225-Use-ConcurrentHashMap-in-JsonList.patch
index 75fd866138..75fd866138 100644
--- a/patches/server/0225-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/unapplied/server/0225-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0226-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0226-Use-a-Queue-for-Queueing-Commands.patch
index 8ee1b6a200..8ee1b6a200 100644
--- a/patches/server/0226-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/unapplied/server/0226-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0227-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/unapplied/server/0227-Ability-to-get-block-entities-from-a-chunk-without-s.patch
index 77ed848f4c..27cc8f2412 100644
--- a/patches/server/0227-Ability-to-get-block-entities-from-a-chunk-without-s.patch
+++ b/patches/unapplied/server/0227-Ability-to-get-block-entities-from-a-chunk-without-s.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to get block entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 91d2b6eaa2af0abb1bdf11849f0fd59660f765dd..b2d85abb6c9c725955d972cd6895440849213fdf 100644
+index d3b2d71a570b90d58dd7d00ce625b0169c106190..be44b03527bd17344f5d835ba9d0b47e4b55d45f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -174,6 +174,13 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0228-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0228-Optimize-BlockPosition-helper-methods.patch
index 5c3a739bd0..5c3a739bd0 100644
--- a/patches/server/0228-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/unapplied/server/0228-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0229-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/0229-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index 0ed98b85c4..0ed98b85c4 100644
--- a/patches/server/0229-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/unapplied/server/0229-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0230-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0230-Slime-Pathfinder-Events.patch
index b24fcc8b0b..b24fcc8b0b 100644
--- a/patches/server/0230-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/server/0230-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0231-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0231-Configurable-speed-for-water-flowing-over-lava.patch
index 5b45a51e5f..5b45a51e5f 100644
--- a/patches/server/0231-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/unapplied/server/0231-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0232-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0232-Optimize-CraftBlockData-Creation.patch
index d66c9bf468..d66c9bf468 100644
--- a/patches/server/0232-Optimize-CraftBlockData-Creation.patch
+++ b/patches/unapplied/server/0232-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0233-Optimize-MappedRegistry.patch b/patches/unapplied/server/0233-Optimize-MappedRegistry.patch
index 967e274d5b..967e274d5b 100644
--- a/patches/server/0233-Optimize-MappedRegistry.patch
+++ b/patches/unapplied/server/0233-Optimize-MappedRegistry.patch
diff --git a/patches/server/0234-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0234-Add-PhantomPreSpawnEvent.patch
index 3398693ce4..3398693ce4 100644
--- a/patches/server/0234-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/server/0234-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0235-Add-More-Creeper-API.patch b/patches/unapplied/server/0235-Add-More-Creeper-API.patch
index 04605aa213..04605aa213 100644
--- a/patches/server/0235-Add-More-Creeper-API.patch
+++ b/patches/unapplied/server/0235-Add-More-Creeper-API.patch
diff --git a/patches/server/0236-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0236-Inventory-removeItemAnySlot.patch
index f1cf07d2eb..f1cf07d2eb 100644
--- a/patches/server/0236-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/server/0236-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0237-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0237-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index ab6a007442..26aafc757e 100644
--- a/patches/server/0237-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/unapplied/server/0237-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4ca004c9f94fdcfa56a3c151a45a534271b20909..55f2305ceebe2307796fe22d62d51ec2215b98b0 100644
+index 8f231f693882a770bdc810b1e117eb31ef1ddadb..269853764c75382e921e0846c4dc3001bac0395c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -431,7 +431,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0238-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0238-Add-ray-tracing-methods-to-LivingEntity.patch
index c5fccadff5..c5fccadff5 100644
--- a/patches/server/0238-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/server/0238-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0239-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0239-Expose-attack-cooldown-methods-for-Player.patch
index b4bdf91b2a..1d6a1224bf 100644
--- a/patches/server/0239-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/unapplied/server/0239-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b8a453e3e54a205d703bb1f4602686606c0f0f4d..549bc20645706faa65f6307d295cb028f53b2607 100644
+index 5239ce2d507f48effc4f3e2bc462d9caef5caa92..b9e325d32fabe77fe1ebd0d8b988db594b154284 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2995,6 +2995,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0240-Improve-death-events.patch b/patches/unapplied/server/0240-Improve-death-events.patch
index 9060d69916..0dd0b2b8ce 100644
--- a/patches/server/0240-Improve-death-events.patch
+++ b/patches/unapplied/server/0240-Improve-death-events.patch
@@ -420,7 +420,7 @@ index 2caba38a50b7ea535337a3540aa5272d4a9f1878..e20565cf256aacd012a1722c5ebbf901
          // CraftBukkit end
          this.gameEvent(GameEvent.ENTITY_DIE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 549bc20645706faa65f6307d295cb028f53b2607..c74b3abba82679594d9f3966979771c16e5f98f3 100644
+index b9e325d32fabe77fe1ebd0d8b988db594b154284..054892e472636d1a5c7f06c46ee28ebe4736f24d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2532,7 +2532,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0241-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0241-Allow-chests-to-be-placed-with-NBT-data.patch
index 4b282589d9..4b282589d9 100644
--- a/patches/server/0241-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/unapplied/server/0241-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0242-Mob-Pathfinding-API.patch b/patches/unapplied/server/0242-Mob-Pathfinding-API.patch
index 638eb9310c..638eb9310c 100644
--- a/patches/server/0242-Mob-Pathfinding-API.patch
+++ b/patches/unapplied/server/0242-Mob-Pathfinding-API.patch
diff --git a/patches/server/0243-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/unapplied/server/0243-Prevent-various-interactions-from-causing-chunk-load.patch
index a2789a6dfa..a2789a6dfa 100644
--- a/patches/server/0243-Prevent-various-interactions-from-causing-chunk-load.patch
+++ b/patches/unapplied/server/0243-Prevent-various-interactions-from-causing-chunk-load.patch
diff --git a/patches/server/0244-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0244-Prevent-mob-spawning-from-loading-generating-chunks.patch
index e9d396eb02..e9d396eb02 100644
--- a/patches/server/0244-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/unapplied/server/0244-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0245-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0245-Implement-furnace-cook-speed-multiplier-API.patch
index 3a04c8b1ea..3a04c8b1ea 100644
--- a/patches/server/0245-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/unapplied/server/0245-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0246-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0246-Honor-EntityAgeable.ageLock.patch
index aaaf81b894..aaaf81b894 100644
--- a/patches/server/0246-Honor-EntityAgeable.ageLock.patch
+++ b/patches/unapplied/server/0246-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0247-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0247-Configurable-connection-throttle-kick-message.patch
index ed8fbcb06d..ed8fbcb06d 100644
--- a/patches/server/0247-Configurable-connection-throttle-kick-message.patch
+++ b/patches/unapplied/server/0247-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0248-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0248-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 8426fd78fd..8426fd78fd 100644
--- a/patches/server/0248-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/unapplied/server/0248-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0249-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0249-PreSpawnerSpawnEvent.patch
index d10c136bb8..d10c136bb8 100644
--- a/patches/server/0249-PreSpawnerSpawnEvent.patch
+++ b/patches/unapplied/server/0249-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0250-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0250-Add-LivingEntity-getTargetEntity.patch
index 7a6786a2ee..7a6786a2ee 100644
--- a/patches/server/0250-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/unapplied/server/0250-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0251-Add-sun-related-API.patch b/patches/unapplied/server/0251-Add-sun-related-API.patch
index 65a25e657d..280661a416 100644
--- a/patches/server/0251-Add-sun-related-API.patch
+++ b/patches/unapplied/server/0251-Add-sun-related-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add sun related API
 public net.minecraft.world.entity.Mob isSunBurnTick()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 55f2305ceebe2307796fe22d62d51ec2215b98b0..a526c27ab0b4ea8ed70d338accce63d028901fd2 100644
+index 269853764c75382e921e0846c4dc3001bac0395c..74b65238eb4fe53d361ab70447c1be385b5a3951 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -755,6 +755,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0252-Turtle-API.patch b/patches/unapplied/server/0252-Turtle-API.patch
index bf96743cf2..bf96743cf2 100644
--- a/patches/server/0252-Turtle-API.patch
+++ b/patches/unapplied/server/0252-Turtle-API.patch
diff --git a/patches/server/0253-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0253-Call-player-spectator-target-events-and-improve-impl.patch
index a5b2f09843..a5b2f09843 100644
--- a/patches/server/0253-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/unapplied/server/0253-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0254-Add-more-Witch-API.patch b/patches/unapplied/server/0254-Add-more-Witch-API.patch
index c250557de6..c250557de6 100644
--- a/patches/server/0254-Add-more-Witch-API.patch
+++ b/patches/unapplied/server/0254-Add-more-Witch-API.patch
diff --git a/patches/server/0255-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0255-Check-Drowned-for-Villager-Aggression-Config.patch
index 34b444c109..34b444c109 100644
--- a/patches/server/0255-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/unapplied/server/0255-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch
index a382aa3965..a382aa3965 100644
--- a/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/unapplied/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0257-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0257-Reset-players-airTicks-on-respawn.patch
index 1755009e76..1755009e76 100644
--- a/patches/server/0257-Reset-players-airTicks-on-respawn.patch
+++ b/patches/unapplied/server/0257-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index d871ee76b6..d871ee76b6 100644
--- a/patches/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/unapplied/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 5096a0a4a5..5096a0a4a5 100644
--- a/patches/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/unapplied/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0260-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0260-Optimize-World-Time-Updates.patch
index d133543642..9ef59882f0 100644
--- a/patches/server/0260-Optimize-World-Time-Updates.patch
+++ b/patches/unapplied/server/0260-Optimize-World-Time-Updates.patch
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b54c1ecf3384fba741fa6334caee498b83887508..13aa191235ac6bb1d00d89ae29c750595cc6be78 100644
+index 2a4f8075867a302afd98bdf9ac8b11622c29082d..9a9291282f7ec99be9badf8b32fab5f0ea0f1037 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1603,10 +1603,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0261-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0261-Restore-custom-InventoryHolder-support.patch
index 2830a3ac08..2830a3ac08 100644
--- a/patches/server/0261-Restore-custom-InventoryHolder-support.patch
+++ b/patches/unapplied/server/0261-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0262-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0262-Fix-SpongeAbsortEvent-handling.patch
index 5fb5190058..5fb5190058 100644
--- a/patches/server/0262-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/unapplied/server/0262-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
index 3c5725587c..3c5725587c 100644
--- a/patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0264-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0264-Make-the-default-permission-message-configurable.patch
index c4e4a36cfc..c4e4a36cfc 100644
--- a/patches/server/0264-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/server/0264-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0265-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0265-force-entity-dismount-during-teleportation.patch
index 3cd8ed1fac..3cd8ed1fac 100644
--- a/patches/server/0265-force-entity-dismount-during-teleportation.patch
+++ b/patches/unapplied/server/0265-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0266-Add-more-Zombie-API.patch b/patches/unapplied/server/0266-Add-more-Zombie-API.patch
index f018f7e612..f018f7e612 100644
--- a/patches/server/0266-Add-more-Zombie-API.patch
+++ b/patches/unapplied/server/0266-Add-more-Zombie-API.patch
diff --git a/patches/server/0267-Book-size-limits.patch b/patches/unapplied/server/0267-Book-size-limits.patch
index 8e4d723b12..8e4d723b12 100644
--- a/patches/server/0267-Book-size-limits.patch
+++ b/patches/unapplied/server/0267-Book-size-limits.patch
diff --git a/patches/server/0268-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0268-Add-PlayerConnectionCloseEvent.patch
index 30540debea..30540debea 100644
--- a/patches/server/0268-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/unapplied/server/0268-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0269-Replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0269-Replace-OfflinePlayer-getLastPlayed.patch
index 646e79bbdf..37ad223e8b 100644
--- a/patches/server/0269-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/unapplied/server/0269-Replace-OfflinePlayer-getLastPlayed.patch
@@ -106,7 +106,7 @@ index f6b2ca92fd3510a76cbf56d0ea55aa6caaf12ba1..e0d342a0ddd140b342f7af138c71596c
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c74b3abba82679594d9f3966979771c16e5f98f3..b118f3214d4ab039e09da04019117a0085e47dcc 100644
+index 054892e472636d1a5c7f06c46ee28ebe4736f24d..5cdd18e071f069adc8137561c164bd533dea7c7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 809a66aefa..809a66aefa 100644
--- a/patches/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/unapplied/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/unapplied/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 4f525f0809..9a7359c010 100644
--- a/patches/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/unapplied/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b118f3214d4ab039e09da04019117a0085e47dcc..b3b13f1baea0b170fd4f1546689aad40f53d3c27 100644
+index 5cdd18e071f069adc8137561c164bd533dea7c7c..7c7f66ea38babab7b04e76d14e19cc0dac9c4b54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -229,8 +229,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0272-BlockDestroyEvent.patch b/patches/unapplied/server/0272-BlockDestroyEvent.patch
index 6e560f06f5..6e560f06f5 100644
--- a/patches/server/0272-BlockDestroyEvent.patch
+++ b/patches/unapplied/server/0272-BlockDestroyEvent.patch
diff --git a/patches/server/0273-Async-command-map-building.patch b/patches/unapplied/server/0273-Async-command-map-building.patch
index 5fb46253e8..5fb46253e8 100644
--- a/patches/server/0273-Async-command-map-building.patch
+++ b/patches/unapplied/server/0273-Async-command-map-building.patch
diff --git a/patches/server/0274-Brigadier-Mojang-API.patch b/patches/unapplied/server/0274-Brigadier-Mojang-API.patch
index 9925490b27..9925490b27 100644
--- a/patches/server/0274-Brigadier-Mojang-API.patch
+++ b/patches/unapplied/server/0274-Brigadier-Mojang-API.patch
diff --git a/patches/server/0275-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0275-Limit-Client-Sign-length-more.patch
index adfa39c698..adfa39c698 100644
--- a/patches/server/0275-Limit-Client-Sign-length-more.patch
+++ b/patches/unapplied/server/0275-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0276-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0276-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 2409c16a72..2409c16a72 100644
--- a/patches/server/0276-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/unapplied/server/0276-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch b/patches/unapplied/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch
index bdf01442fe..bdf01442fe 100644
--- a/patches/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch
+++ b/patches/unapplied/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch
diff --git a/patches/server/0278-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0278-Fire-event-on-GS4-query.patch
index 6468ff12c1..6468ff12c1 100644
--- a/patches/server/0278-Fire-event-on-GS4-query.patch
+++ b/patches/unapplied/server/0278-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0279-Add-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0279-Add-PlayerPostRespawnEvent.patch
index a2ffa8e647..a2ffa8e647 100644
--- a/patches/server/0279-Add-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/server/0279-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0280-Server-Tick-Events.patch b/patches/unapplied/server/0280-Server-Tick-Events.patch
index 5def36634a..f137fe9a78 100644
--- a/patches/server/0280-Server-Tick-Events.patch
+++ b/patches/unapplied/server/0280-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0f1a7b649d398a875b57746530242e3ced595bfd..59bd596a140b4b389c5b73adaab94323759abfc2 100644
+index feb45369b41b597fd603c12f3da23759923b6a6d..2690048e2ac612f0d1261bcdecf5f745ebbddec2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1481,6 +1481,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0281-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0281-PlayerDeathEvent-getItemsToKeep.patch
index 2f8fa65443..2f8fa65443 100644
--- a/patches/server/0281-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/unapplied/server/0281-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0282-Optimize-Captured-BlockEntity-Lookup.patch b/patches/unapplied/server/0282-Optimize-Captured-BlockEntity-Lookup.patch
index 4dedbb8d9c..4dedbb8d9c 100644
--- a/patches/server/0282-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/unapplied/server/0282-Optimize-Captured-BlockEntity-Lookup.patch
diff --git a/patches/server/0283-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0283-Mob-Spawner-API-Enhancements.patch
index c549ce98b1..c549ce98b1 100644
--- a/patches/server/0283-Mob-Spawner-API-Enhancements.patch
+++ b/patches/unapplied/server/0283-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0284-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0284-Fix-CB-call-to-changed-postToMainThread-method.patch
index 9c45be140f..9c45be140f 100644
--- a/patches/server/0284-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/unapplied/server/0284-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0285-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0285-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index d0f13edcc4..d0f13edcc4 100644
--- a/patches/server/0285-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/unapplied/server/0285-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0286-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0286-Implement-CraftBlockSoundGroup.patch
index 84bba66813..84bba66813 100644
--- a/patches/server/0286-Implement-CraftBlockSoundGroup.patch
+++ b/patches/unapplied/server/0286-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0287-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0287-Expose-the-internal-current-tick.patch
index 093771806c..093771806c 100644
--- a/patches/server/0287-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/server/0287-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0288-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0288-Show-blockstate-location-if-we-failed-to-read-it.patch
index 55deba82c5..55deba82c5 100644
--- a/patches/server/0288-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/unapplied/server/0288-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0289-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0289-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 9b920bb3ec..9b920bb3ec 100644
--- a/patches/server/0289-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/unapplied/server/0289-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0290-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0290-Configurable-projectile-relative-velocity.patch
index 93e1cc2d7d..93e1cc2d7d 100644
--- a/patches/server/0290-Configurable-projectile-relative-velocity.patch
+++ b/patches/unapplied/server/0290-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0291-offset-item-frame-ticking.patch b/patches/unapplied/server/0291-offset-item-frame-ticking.patch
index f8748a09cc..f8748a09cc 100644
--- a/patches/server/0291-offset-item-frame-ticking.patch
+++ b/patches/unapplied/server/0291-offset-item-frame-ticking.patch
diff --git a/patches/server/0292-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0292-Prevent-consuming-the-wrong-itemstack.patch
index 3a31b4866f..3a31b4866f 100644
--- a/patches/server/0292-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/unapplied/server/0292-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0293-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0293-Dont-send-unnecessary-sign-update.patch
index cccd627a78..cccd627a78 100644
--- a/patches/server/0293-Dont-send-unnecessary-sign-update.patch
+++ b/patches/unapplied/server/0293-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0294-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0294-Add-option-to-disable-pillager-patrols.patch
index dd3c57ff12..dd3c57ff12 100644
--- a/patches/server/0294-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/unapplied/server/0294-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0295-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0295-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 82277a287f..82277a287f 100644
--- a/patches/server/0295-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/unapplied/server/0295-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0296-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0296-Duplicate-UUID-Resolve-Option.patch
index b42bece1fc..b42bece1fc 100644
--- a/patches/server/0296-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/unapplied/server/0296-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0297-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0297-PlayerDeathEvent-shouldDropExperience.patch
index 2b8ecf9f4c..2b8ecf9f4c 100644
--- a/patches/server/0297-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/server/0297-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch
index ce7ab4dd4d..ce7ab4dd4d 100644
--- a/patches/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/unapplied/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0299-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0299-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index cf3afd7040..cf3afd7040 100644
--- a/patches/server/0299-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/unapplied/server/0299-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch
index 1f06a4645d..1f06a4645d 100644
--- a/patches/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/unapplied/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0301-Fix-item-EAR-ticks.patch b/patches/unapplied/server/0301-Fix-item-EAR-ticks.patch
index daff062c2e..daff062c2e 100644
--- a/patches/server/0301-Fix-item-EAR-ticks.patch
+++ b/patches/unapplied/server/0301-Fix-item-EAR-ticks.patch
diff --git a/patches/server/0302-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0302-Optimize-call-to-getFluid-for-explosions.patch
index b6eb87bb5e..b6eb87bb5e 100644
--- a/patches/server/0302-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/unapplied/server/0302-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0303-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0303-Guard-against-serializing-mismatching-chunk-coordina.patch
index 26436c7223..26436c7223 100644
--- a/patches/server/0303-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/unapplied/server/0303-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0304-Alternative-item-despawn-rate.patch b/patches/unapplied/server/0304-Alternative-item-despawn-rate.patch
index ba7e9db85d..ba7e9db85d 100644
--- a/patches/server/0304-Alternative-item-despawn-rate.patch
+++ b/patches/unapplied/server/0304-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0305-Tracking-Range-Improvements.patch b/patches/unapplied/server/0305-Tracking-Range-Improvements.patch
index 3377d904f2..57687092a0 100644
--- a/patches/server/0305-Tracking-Range-Improvements.patch
+++ b/patches/unapplied/server/0305-Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index ebe6c631d772cf41038701aafbe4e0bbb024f7f5..bf9e2851bdc77339bde1fd15c1bad66b8f9e3193 100644
+index e211cd62b9381df353c0921bfaa6ad63f251a6ac..9baec6e78bdebd9b38b3f12e4fba99f9ad039c1e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1592,6 +1592,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index cf391a4f9f..cf391a4f9f 100644
--- a/patches/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/unapplied/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0307-Improve-Block-breakNaturally-API.patch b/patches/unapplied/server/0307-Improve-Block-breakNaturally-API.patch
index 55dcdabf64..55dcdabf64 100644
--- a/patches/server/0307-Improve-Block-breakNaturally-API.patch
+++ b/patches/unapplied/server/0307-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0308-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0308-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 45e56cdb47..45e56cdb47 100644
--- a/patches/server/0308-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/unapplied/server/0308-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0309-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0309-Add-debug-for-sync-chunk-loads.patch
index 224d9b01ef..224d9b01ef 100644
--- a/patches/server/0309-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/unapplied/server/0309-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0310-Improve-java-version-check.patch b/patches/unapplied/server/0310-Improve-java-version-check.patch
index f25e71069d..f25e71069d 100644
--- a/patches/server/0310-Improve-java-version-check.patch
+++ b/patches/unapplied/server/0310-Improve-java-version-check.patch
diff --git a/patches/server/0311-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0311-Add-ThrownEggHatchEvent.patch
index 4f5c62f3e6..4f5c62f3e6 100644
--- a/patches/server/0311-Add-ThrownEggHatchEvent.patch
+++ b/patches/unapplied/server/0311-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0312-Entity-Jump-API.patch b/patches/unapplied/server/0312-Entity-Jump-API.patch
index c4fbb06bf0..c4fbb06bf0 100644
--- a/patches/server/0312-Entity-Jump-API.patch
+++ b/patches/unapplied/server/0312-Entity-Jump-API.patch
diff --git a/patches/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch
index a5fe2fd06d..a5fe2fd06d 100644
--- a/patches/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/unapplied/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0314-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0314-Make-the-GUI-graph-fancier.patch
index 25e1012aa6..25e1012aa6 100644
--- a/patches/server/0314-Make-the-GUI-graph-fancier.patch
+++ b/patches/unapplied/server/0314-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0315-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0315-add-hand-to-BlockMultiPlaceEvent.patch
index b9b59dc0c9..b9b59dc0c9 100644
--- a/patches/server/0315-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/unapplied/server/0315-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0316-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0316-Validate-tripwire-hook-placement-before-update.patch
index b607c1afe9..b607c1afe9 100644
--- a/patches/server/0316-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/unapplied/server/0316-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 8991de1b70..8991de1b70 100644
--- a/patches/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/unapplied/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0318-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0318-Configurable-chance-of-villager-zombie-infection.patch
index e26452bb88..e26452bb88 100644
--- a/patches/server/0318-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/unapplied/server/0318-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0319-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0319-Optimise-Chunk-getFluid.patch
index b81a71067c..b81a71067c 100644
--- a/patches/server/0319-Optimise-Chunk-getFluid.patch
+++ b/patches/unapplied/server/0319-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch
index d6e5084490..d6e5084490 100644
--- a/patches/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/unapplied/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0321-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0321-Add-tick-times-API-and-mspt-command.patch
index 7f28662cab..0a4e7fd4e5 100644
--- a/patches/server/0321-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/unapplied/server/0321-Add-tick-times-API-and-mspt-command.patch
@@ -125,7 +125,7 @@ index 72f2e81b9905a0d57ed8e2a88578f62d5235c456..7b58b2d6297800c2dcdbf7539e5ab8e7
  
      public static void registerCommands(final MinecraftServer server) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 59bd596a140b4b389c5b73adaab94323759abfc2..e07b25d5e633d2dcc6e9850afd7b8aa0287ec6bc 100644
+index 2690048e2ac612f0d1261bcdecf5f745ebbddec2..7a4ab569090c758f6d707173aa68dd4de87f3654 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -263,6 +263,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0322-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0322-Expose-MinecraftServer-isRunning.patch
index 7a4ecb699a..7a4ecb699a 100644
--- a/patches/server/0322-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/server/0322-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch
index 70ced2037c..70ced2037c 100644
--- a/patches/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch
index da308c4970..da308c4970 100644
--- a/patches/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/unapplied/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index b9679f9f48..b9679f9f48 100644
--- a/patches/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/unapplied/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0326-Do-not-allow-Vexes-to-load-chunks.patch b/patches/unapplied/server/0326-Do-not-allow-Vexes-to-load-chunks.patch
index 0bc83a1344..0bc83a1344 100644
--- a/patches/server/0326-Do-not-allow-Vexes-to-load-chunks.patch
+++ b/patches/unapplied/server/0326-Do-not-allow-Vexes-to-load-chunks.patch
diff --git a/patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index f9e919de80..41397d9f6a 100644
--- a/patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/unapplied/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index bf9e2851bdc77339bde1fd15c1bad66b8f9e3193..48e848e407e4e78e05c35a5cb2393bccc6de3a4f 100644
+index 9baec6e78bdebd9b38b3f12e4fba99f9ad039c1e..914e9e0af7533cbf487ea0413da447d5eb8d527b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1292,6 +1292,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0328-Don-t-tick-dead-players.patch b/patches/unapplied/server/0328-Don-t-tick-dead-players.patch
index a283819a3e..a283819a3e 100644
--- a/patches/server/0328-Don-t-tick-dead-players.patch
+++ b/patches/unapplied/server/0328-Don-t-tick-dead-players.patch
diff --git a/patches/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 068a5a06f9..068a5a06f9 100644
--- a/patches/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/unapplied/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0330-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0330-Don-t-move-existing-players-to-world-spawn.patch
index e7da8ffb65..e7da8ffb65 100644
--- a/patches/server/0330-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/unapplied/server/0330-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0331-Optimize-Pathfinding.patch b/patches/unapplied/server/0331-Optimize-Pathfinding.patch
index 76c7c6e423..76c7c6e423 100644
--- a/patches/server/0331-Optimize-Pathfinding.patch
+++ b/patches/unapplied/server/0331-Optimize-Pathfinding.patch
diff --git a/patches/server/0332-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0332-Reduce-Either-Optional-allocation.patch
index d42e0ac184..d42e0ac184 100644
--- a/patches/server/0332-Reduce-Either-Optional-allocation.patch
+++ b/patches/unapplied/server/0332-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0333-Reduce-memory-footprint-of-CompoundTag.patch b/patches/unapplied/server/0333-Reduce-memory-footprint-of-CompoundTag.patch
index c29c346e90..c29c346e90 100644
--- a/patches/server/0333-Reduce-memory-footprint-of-CompoundTag.patch
+++ b/patches/unapplied/server/0333-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0334-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0334-Prevent-opening-inventories-when-frozen.patch
index bcbb0054b2..bcbb0054b2 100644
--- a/patches/server/0334-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/unapplied/server/0334-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch
index 2ee05c9c08..2ee05c9c08 100644
--- a/patches/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/unapplied/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0336-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0336-Implement-Player-Client-Options-API.patch
index c86f538e70..16b7e0f349 100644
--- a/patches/server/0336-Implement-Player-Client-Options-API.patch
+++ b/patches/unapplied/server/0336-Implement-Player-Client-Options-API.patch
@@ -133,7 +133,7 @@ index 0c68c0a9ec9b353b353eff0c36af2993df5f59b3..eebf44c7124c4f48b6d48562a00633b1
          this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b3b13f1baea0b170fd4f1546689aad40f53d3c27..59e291d7552e20b960faa7d679cf69981458c139 100644
+index 7c7f66ea38babab7b04e76d14e19cc0dac9c4b54..574bcdd1d10c0341afc324822d9cd28af3fc2fdd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -658,6 +658,30 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 0db5556d5a..0db5556d5a 100644
--- a/patches/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/unapplied/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/unapplied/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index 1196295511..40a942f17c 100644
--- a/patches/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/unapplied/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -31,7 +31,7 @@ delays anymore.
 public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 48e848e407e4e78e05c35a5cb2393bccc6de3a4f..2a216485522a63298e239074ef5bdfa1101fa9d6 100644
+index 914e9e0af7533cbf487ea0413da447d5eb8d527b..69f54e812794b23e5f54606da86f71163f5f0bbe 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1299,6 +1299,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 6c67ce040e..6c67ce040e 100644
--- a/patches/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/unapplied/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch
index 83513aec23..83513aec23 100644
--- a/patches/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/unapplied/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch
index cafa4896df..cafa4896df 100644
--- a/patches/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/unapplied/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0342-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0342-Add-phantom-creative-and-insomniac-controls.patch
index eed8a10b78..eed8a10b78 100644
--- a/patches/server/0342-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/unapplied/server/0342-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0343-Fix-item-duplication-and-teleport-issues.patch b/patches/unapplied/server/0343-Fix-item-duplication-and-teleport-issues.patch
index 8b468ae1a2..8b468ae1a2 100644
--- a/patches/server/0343-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/unapplied/server/0343-Fix-item-duplication-and-teleport-issues.patch
diff --git a/patches/server/0344-Villager-Restocks-API.patch b/patches/unapplied/server/0344-Villager-Restocks-API.patch
index 4ad766705c..4ad766705c 100644
--- a/patches/server/0344-Villager-Restocks-API.patch
+++ b/patches/unapplied/server/0344-Villager-Restocks-API.patch
diff --git a/patches/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 6b1b7c3df3..6b1b7c3df3 100644
--- a/patches/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/unapplied/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index d9be497c9d..d9be497c9d 100644
--- a/patches/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/unapplied/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0347-misc-debugging-dumps.patch b/patches/unapplied/server/0347-misc-debugging-dumps.patch
index 5ef4a9efba..1f99d1c3dc 100644
--- a/patches/server/0347-misc-debugging-dumps.patch
+++ b/patches/unapplied/server/0347-misc-debugging-dumps.patch
@@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..479bb92d159f33c54c2d9c39d8a63aa9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index c847fbdb6f52386570eb4c070fcc01d39cc52151..a7eb2a37a81a414dcb19319c075faefe0382aeba 100644
+index 642d5c6849debc5a266605b0df30d55222339438..b34abf66c7dc756e88e08637af976f7794144d06 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -345,7 +345,7 @@ public class Commands {
@@ -49,7 +49,7 @@ index c847fbdb6f52386570eb4c070fcc01d39cc52151..a7eb2a37a81a414dcb19319c075faefe
                  StackTraceElement[] astacktraceelement = exception.getStackTrace();
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e07b25d5e633d2dcc6e9850afd7b8aa0287ec6bc..52cf2b4de3f544790f6372cbfffb0429ea311818 100644
+index 7a4ab569090c758f6d707173aa68dd4de87f3654..c84a5bdbea0497231c78c9a0230cdf70e30a2ff3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -929,6 +929,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0348-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0348-Prevent-teleporting-dead-entities.patch
index 3f17b011a4..3f17b011a4 100644
--- a/patches/server/0348-Prevent-teleporting-dead-entities.patch
+++ b/patches/unapplied/server/0348-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0349-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0349-Implement-Mob-Goal-API.patch
index d4a5da1492..d4a5da1492 100644
--- a/patches/server/0349-Implement-Mob-Goal-API.patch
+++ b/patches/unapplied/server/0349-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0350-Add-villager-reputation-API.patch b/patches/unapplied/server/0350-Add-villager-reputation-API.patch
index f08d60eeae..f08d60eeae 100644
--- a/patches/server/0350-Add-villager-reputation-API.patch
+++ b/patches/unapplied/server/0350-Add-villager-reputation-API.patch
diff --git a/patches/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/unapplied/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch
index 41ff454c98..41ff454c98 100644
--- a/patches/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch
+++ b/patches/unapplied/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch
diff --git a/patches/server/0352-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0352-Fix-PotionEffect-ignores-icon-flag.patch
index 9dff9c741c..9dff9c741c 100644
--- a/patches/server/0352-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/unapplied/server/0352-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0353-Potential-bed-API.patch b/patches/unapplied/server/0353-Potential-bed-API.patch
index e4dbfa304f..e4dbfa304f 100644
--- a/patches/server/0353-Potential-bed-API.patch
+++ b/patches/unapplied/server/0353-Potential-bed-API.patch
diff --git a/patches/server/0354-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0354-Wait-for-Async-Tasks-during-shutdown.patch
index 77c0ef6db8..e26fbcde1f 100644
--- a/patches/server/0354-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/unapplied/server/0354-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 52cf2b4de3f544790f6372cbfffb0429ea311818..3d2c70ab9938555c976588b0a98901d57876e51e 100644
+index c84a5bdbea0497231c78c9a0230cdf70e30a2ff3..c2ba34f6d5765fd8574a61825a6aab8fdd98a0f2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -955,6 +955,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index 1a72e117f5..1a72e117f5 100644
--- a/patches/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/unapplied/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0356-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0356-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0356-Add-option-for-console-having-all-permissions.patch
+++ b/patches/unapplied/server/0356-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0357-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0357-Fix-villager-trading-demand-MC-163962.patch
index bd7b6c4273..bd7b6c4273 100644
--- a/patches/server/0357-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/unapplied/server/0357-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0358-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0358-Maps-shouldn-t-load-chunks.patch
index 450ca270e1..450ca270e1 100644
--- a/patches/server/0358-Maps-shouldn-t-load-chunks.patch
+++ b/patches/unapplied/server/0358-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index fa9145353c..fa9145353c 100644
--- a/patches/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/unapplied/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0360-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0360-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 72996a4bdc..2b6515bcf7 100644
--- a/patches/server/0360-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/unapplied/server/0360-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix CraftScheduler#runTaskTimerAsynchronously(Plugin,
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 7de4db0099b380c81d6a809a298d580f0f6e4acc..a700dac93499650fdaa0af06ff77607ffa4dbbb2 100644
+index 4f2eafbc012b7f9bdbe409d266fdb467ec788de6..20760e08b3d9aba86969b886b46deec5b125bf1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -196,7 +196,7 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/patches/server/0361-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0361-Fix-piston-physics-inconsistency-MC-188840.patch
index aca7ba66df..aca7ba66df 100644
--- a/patches/server/0361-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/unapplied/server/0361-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0362-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0362-Fix-missing-chunks-due-to-integer-overflow.patch
index e7af97469b..e7af97469b 100644
--- a/patches/server/0362-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/unapplied/server/0362-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0363-Prevent-position-desync-causing-tp-exploit.patch b/patches/unapplied/server/0363-Prevent-position-desync-causing-tp-exploit.patch
index 8b73d196cf..8b73d196cf 100644
--- a/patches/server/0363-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/unapplied/server/0363-Prevent-position-desync-causing-tp-exploit.patch
diff --git a/patches/server/0364-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch
index e5f25132df..e5f25132df 100644
--- a/patches/server/0364-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0365-Add-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0365-Add-PlayerRecipeBookClickEvent.patch
index 8083914a42..8083914a42 100644
--- a/patches/server/0365-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/unapplied/server/0365-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0366-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0366-Hide-sync-chunk-writes-behind-flag.patch
index 8703d3b68a..8703d3b68a 100644
--- a/patches/server/0366-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/unapplied/server/0366-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0367-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0367-Add-permission-for-command-blocks.patch
index 0a7fb386cc..0a7fb386cc 100644
--- a/patches/server/0367-Add-permission-for-command-blocks.patch
+++ b/patches/unapplied/server/0367-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0368-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/unapplied/server/0368-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index 2b16e5d032..2b16e5d032 100644
--- a/patches/server/0368-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/unapplied/server/0368-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index ec9498320e..9f8d3ba3ec 100644
--- a/patches/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/unapplied/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -104,7 +104,7 @@ index ca8eb3216c4331a95ab44f923f6b49641662505f..9905555f249db72649bde8401835dd81
              for (SpawnCategory spawnCategory : SpawnCategory.values()) {
                  if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a526c27ab0b4ea8ed70d338accce63d028901fd2..d4d893d6472c5e46da83203be7cdaecf22376f1a 100644
+index 74b65238eb4fe53d361ab70447c1be385b5a3951..a42e7a70accff20aa5a7142e8cb136fec9d05236 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1170,7 +1170,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0370-Paper-dumpitem-command.patch b/patches/unapplied/server/0370-Paper-dumpitem-command.patch
index 3c84400215..3c84400215 100644
--- a/patches/server/0370-Paper-dumpitem-command.patch
+++ b/patches/unapplied/server/0370-Paper-dumpitem-command.patch
diff --git a/patches/server/0371-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0371-Improve-Legacy-Component-serialization-size.patch
index e52764c13c..e52764c13c 100644
--- a/patches/server/0371-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/unapplied/server/0371-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0372-Add-BlockStateMeta-clearBlockState.patch b/patches/unapplied/server/0372-Add-BlockStateMeta-clearBlockState.patch
index 426769212c..426769212c 100644
--- a/patches/server/0372-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/unapplied/server/0372-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0373-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0373-Convert-legacy-attributes-in-Item-Meta.patch
index fcb2004735..1e6448aecc 100644
--- a/patches/server/0373-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/unapplied/server/0373-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,7 +30,7 @@ index de40e522960469b98f987bd688489740446d9f85..5678d2007d5adf45dec0638c5dd848b6
      public CraftAttributeMap(AttributeMap handle) {
          this.handle = handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index d9bbeb08cb58b1fbea5c6aab8f926236639e031d..43d1f278a56ff344ddf4e5d70471485b393a3b1d 100644
+index cd4c0d691f65cc04ef7a72c7e8c0ead33047ff36..f93870955c83505432c352f627cd105dfa4e5b78 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -810,7 +810,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0374-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0374-Do-not-accept-invalid-client-settings.patch
index ba6f03a6ba..ba6f03a6ba 100644
--- a/patches/server/0374-Do-not-accept-invalid-client-settings.patch
+++ b/patches/unapplied/server/0374-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0375-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/0375-Improve-fix-EntityTargetLivingEntityEvent.patch
index 2777b41e11..2777b41e11 100644
--- a/patches/server/0375-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/unapplied/server/0375-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0376-Add-entity-liquid-API.patch b/patches/unapplied/server/0376-Add-entity-liquid-API.patch
index e7b8d36eb5..e7b8d36eb5 100644
--- a/patches/server/0376-Add-entity-liquid-API.patch
+++ b/patches/unapplied/server/0376-Add-entity-liquid-API.patch
diff --git a/patches/server/0377-Add-PrepareResultEvent.patch b/patches/unapplied/server/0377-Add-PrepareResultEvent.patch
index 6f987bb449..6f987bb449 100644
--- a/patches/server/0377-Add-PrepareResultEvent.patch
+++ b/patches/unapplied/server/0377-Add-PrepareResultEvent.patch
diff --git a/patches/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index c4d04af351..c4d04af351 100644
--- a/patches/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/unapplied/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0379-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0379-Fix-arrows-never-despawning-MC-125757.patch
index ed2c8a3409..4831b2e07c 100644
--- a/patches/server/0379-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/unapplied/server/0379-Fix-arrows-never-despawning-MC-125757.patch
@@ -9,7 +9,7 @@ instead of getting stuck in a never despawn state (bubble columns,
 etc).
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 78053060dbff7f8a859f9fecb356491f497eed7e..bc167c21f82ad09952f6cdbf1016523062890f8b 100644
+index 94fdfaa209406c23fc292982d1221c3ee82eea27..220c687a9543b84d994c4f238757737c9337227a 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -242,6 +242,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0380-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0380-Thread-Safe-Vanilla-Command-permission-checking.patch
index 475b277470..475b277470 100644
--- a/patches/server/0380-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/unapplied/server/0380-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index bd520de151..bd520de151 100644
--- a/patches/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/unapplied/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 0bd1007497..0bd1007497 100644
--- a/patches/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/unapplied/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0383-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0383-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index ef009ef823..ef009ef823 100644
--- a/patches/server/0383-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/unapplied/server/0383-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0384-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0384-Optimize-NetworkManager-Exception-Handling.patch
index 8626e3b900..8626e3b900 100644
--- a/patches/server/0384-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/unapplied/server/0384-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0385-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0385-Fix-some-rails-connecting-improperly.patch
index c22d4e1fdf..c22d4e1fdf 100644
--- a/patches/server/0385-Fix-some-rails-connecting-improperly.patch
+++ b/patches/unapplied/server/0385-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0386-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0386-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0386-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/unapplied/server/0386-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0387-Brand-support.patch b/patches/unapplied/server/0387-Brand-support.patch
index 30d4a00324..5421dd59d3 100644
--- a/patches/server/0387-Brand-support.patch
+++ b/patches/unapplied/server/0387-Brand-support.patch
@@ -57,7 +57,7 @@ index b9fbaddcc8239bf737fdea51790f678306e511eb..9a8b08d4b70b8890961e4af7ce6e870a
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8cfcd8797d056be07b09ec9627bc35bf75eb0d2d..f0872343921628714aa503c52089115ae814ae7d 100644
+index 574bcdd1d10c0341afc324822d9cd28af3fc2fdd..ee510171f58aca1ca18053fbd5a55cc2ab23a422 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3156,6 +3156,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch
index 64c59dce17..64c59dce17 100644
--- a/patches/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/unapplied/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0389-Don-t-require-FACING-data.patch b/patches/unapplied/server/0389-Don-t-require-FACING-data.patch
index 2cec1e5276..2cec1e5276 100644
--- a/patches/server/0389-Don-t-require-FACING-data.patch
+++ b/patches/unapplied/server/0389-Don-t-require-FACING-data.patch
diff --git a/patches/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 4d44f56cd4..640371d615 100644
--- a/patches/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/unapplied/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -19,7 +19,7 @@ index 161b556e5c5f3719b5623e71876a2250abc7f391..9a6a9508673edcb2eda8b3e4802fd950
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d4d893d6472c5e46da83203be7cdaecf22376f1a..4667115d0dbb7b170187b108586bdbb9d5bdb4d5 100644
+index a42e7a70accff20aa5a7142e8cb136fec9d05236..8d2d5cae4de522676cc4764f8b36f93744f3c890 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -243,12 +243,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0391-Add-moon-phase-API.patch b/patches/unapplied/server/0391-Add-moon-phase-API.patch
index 2fcd34c334..2fcd34c334 100644
--- a/patches/server/0391-Add-moon-phase-API.patch
+++ b/patches/unapplied/server/0391-Add-moon-phase-API.patch
diff --git a/patches/server/0392-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0392-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 3bdfea31f7..3bdfea31f7 100644
--- a/patches/server/0392-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/unapplied/server/0392-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0393-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0393-Prevent-headless-pistons-from-being-created.patch
index 1cbd0b1c6c..1cbd0b1c6c 100644
--- a/patches/server/0393-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/unapplied/server/0393-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0394-Add-BellRingEvent.patch b/patches/unapplied/server/0394-Add-BellRingEvent.patch
index c78e88ccaa..c78e88ccaa 100644
--- a/patches/server/0394-Add-BellRingEvent.patch
+++ b/patches/unapplied/server/0394-Add-BellRingEvent.patch
diff --git a/patches/server/0395-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0395-Add-zombie-targets-turtle-egg-config.patch
index 73a1b707b4..73a1b707b4 100644
--- a/patches/server/0395-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/unapplied/server/0395-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0396-Buffer-joins-to-world.patch b/patches/unapplied/server/0396-Buffer-joins-to-world.patch
index 2e31ea4385..2e31ea4385 100644
--- a/patches/server/0396-Buffer-joins-to-world.patch
+++ b/patches/unapplied/server/0396-Buffer-joins-to-world.patch
diff --git a/patches/server/0397-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0397-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 1cafcc355b..1cafcc355b 100644
--- a/patches/server/0397-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/unapplied/server/0397-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0398-Add-more-Evoker-API.patch b/patches/unapplied/server/0398-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0398-Add-more-Evoker-API.patch
+++ b/patches/unapplied/server/0398-Add-more-Evoker-API.patch
diff --git a/patches/server/0399-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0399-Add-methods-to-get-translation-keys.patch
index 667be15737..667be15737 100644
--- a/patches/server/0399-Add-methods-to-get-translation-keys.patch
+++ b/patches/unapplied/server/0399-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch
index 66d23bfd33..66d23bfd33 100644
--- a/patches/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/unapplied/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0401-Cache-block-data-strings.patch b/patches/unapplied/server/0401-Cache-block-data-strings.patch
index 2e9678dd02..2e9678dd02 100644
--- a/patches/server/0401-Cache-block-data-strings.patch
+++ b/patches/unapplied/server/0401-Cache-block-data-strings.patch
diff --git a/patches/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 4ced839378..4ced839378 100644
--- a/patches/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/unapplied/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0403-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0403-Add-additional-open-container-api-to-HumanEntity.patch
index 4f9cf8d9d9..4f9cf8d9d9 100644
--- a/patches/server/0403-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/unapplied/server/0403-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0404-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0404-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 9a0c6f1492..9a0c6f1492 100644
--- a/patches/server/0404-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/unapplied/server/0404-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch
index 493fb97397..493fb97397 100644
--- a/patches/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/unapplied/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index ace3484e57..ace3484e57 100644
--- a/patches/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0407-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0407-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0407-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/unapplied/server/0407-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0408-Entity-isTicking.patch b/patches/unapplied/server/0408-Entity-isTicking.patch
index 8c21802ef0..8c21802ef0 100644
--- a/patches/server/0408-Entity-isTicking.patch
+++ b/patches/unapplied/server/0408-Entity-isTicking.patch
diff --git a/patches/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 626e40e0cd..4c6974971b 100644
--- a/patches/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/unapplied/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 356b3b7649edf9289c5736638bca50e5d9670782..a570de59700ace7f17268a220ed104464c7e6b15 100644
+index 19708fe528c2c2794bc26f4c789dd32dbb3ba32b..8364a52db57b43ba503cb8109c35a261de347109 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2309,13 +2309,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0410-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/0410-Fix-Concurrency-issue-in-ShufflingList.patch
index f04a40e1ac..f04a40e1ac 100644
--- a/patches/server/0410-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/unapplied/server/0410-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0411-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0411-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 0c53eb55ed..0c53eb55ed 100644
--- a/patches/server/0411-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/unapplied/server/0411-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0412-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0412-Fix-for-large-move-vectors-crashing-server.patch
index 82dc6a2eef..82dc6a2eef 100644
--- a/patches/server/0412-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/unapplied/server/0412-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0413-Optimise-getType-calls.patch b/patches/unapplied/server/0413-Optimise-getType-calls.patch
index 07a3b551c2..2edc8fa421 100644
--- a/patches/server/0413-Optimise-getType-calls.patch
+++ b/patches/unapplied/server/0413-Optimise-getType-calls.patch
@@ -66,7 +66,7 @@ index fabdec2d66cc6d676ed58fa570e2c318ab0927e2..1002123cd0c6f57cecc4e80f5f21cc6f
  
      public void setFlag(int flag) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index f73858663162cb594db382d584b6500bb03e74b1..7f0d87bd43a54885fc521068116888083327f37e 100644
+index 628f26e98449bf508306265d569376cae6279284..cabf3146b0dd5790536cb9995de6a876d7ab3f50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -63,7 +63,7 @@ public class CraftBlockData implements BlockData {
diff --git a/patches/server/0414-Villager-resetOffers.patch b/patches/unapplied/server/0414-Villager-resetOffers.patch
index 2b919a8646..2b919a8646 100644
--- a/patches/server/0414-Villager-resetOffers.patch
+++ b/patches/unapplied/server/0414-Villager-resetOffers.patch
diff --git a/patches/server/0415-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0415-Retain-block-place-order-when-capturing-blockstates.patch
index 6da68ddaf2..6da68ddaf2 100644
--- a/patches/server/0415-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/unapplied/server/0415-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0416-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0416-Fix-item-locations-dropped-from-campfires.patch
index df4949c1b8..df4949c1b8 100644
--- a/patches/server/0416-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/unapplied/server/0416-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0417-Fix-bell-block-entity-memory-leak.patch b/patches/unapplied/server/0417-Fix-bell-block-entity-memory-leak.patch
index 5343b073cd..5343b073cd 100644
--- a/patches/server/0417-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/unapplied/server/0417-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 67b54defca..67b54defca 100644
--- a/patches/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/unapplied/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0419-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0419-Add-getOfflinePlayerIfCached-String.patch
index 3b226a9a85..3b226a9a85 100644
--- a/patches/server/0419-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/server/0419-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0420-Add-ignore-discounts-API.patch b/patches/unapplied/server/0420-Add-ignore-discounts-API.patch
index 84103c5a2e..84103c5a2e 100644
--- a/patches/server/0420-Add-ignore-discounts-API.patch
+++ b/patches/unapplied/server/0420-Add-ignore-discounts-API.patch
diff --git a/patches/server/0421-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0421-Toggle-for-removing-existing-dragon.patch
index 5efff5ff3f..5efff5ff3f 100644
--- a/patches/server/0421-Toggle-for-removing-existing-dragon.patch
+++ b/patches/unapplied/server/0421-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0422-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0422-Fix-client-lag-on-advancement-loading.patch
index c7284e1f8b..c7284e1f8b 100644
--- a/patches/server/0422-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/unapplied/server/0422-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0423-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0423-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0423-Item-no-age-no-player-pickup.patch
+++ b/patches/unapplied/server/0423-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0424-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0424-Beacon-API-custom-effect-ranges.patch
index 6afe0e8f7c..6afe0e8f7c 100644
--- a/patches/server/0424-Beacon-API-custom-effect-ranges.patch
+++ b/patches/unapplied/server/0424-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0425-Add-API-for-quit-reason.patch b/patches/unapplied/server/0425-Add-API-for-quit-reason.patch
index c4ca4510d4..c4ca4510d4 100644
--- a/patches/server/0425-Add-API-for-quit-reason.patch
+++ b/patches/unapplied/server/0425-Add-API-for-quit-reason.patch
diff --git a/patches/server/0426-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0426-Add-Wandering-Trader-spawn-rate-config-options.patch
index 30e4e03f24..30e4e03f24 100644
--- a/patches/server/0426-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/unapplied/server/0426-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0427-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0427-Add-Destroy-Speed-API.patch
index d7c93744a0..d7c93744a0 100644
--- a/patches/server/0427-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/server/0427-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index c5e4b9749f..fbc3a45203 100644
--- a/patches/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/unapplied/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f0872343921628714aa503c52089115ae814ae7d..87d1b609dbd145290427840a365f45e9c1a1eb61 100644
+index ee510171f58aca1ca18053fbd5a55cc2ab23a422..0ec00d64947359c08d2315ebaebd76aee548b512 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2724,7 +2724,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0429-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0429-Add-LivingEntity-clearActiveItem.patch
index 3c6621ccfa..3c6621ccfa 100644
--- a/patches/server/0429-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/unapplied/server/0429-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0430-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0430-Add-PlayerItemCooldownEvent.patch
index 773d0201e7..773d0201e7 100644
--- a/patches/server/0430-Add-PlayerItemCooldownEvent.patch
+++ b/patches/unapplied/server/0430-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0431-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0431-Significantly-improve-performance-of-the-end-generat.patch
index ed3ee50bc9..ed3ee50bc9 100644
--- a/patches/server/0431-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/unapplied/server/0431-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0432-More-lightning-API.patch b/patches/unapplied/server/0432-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0432-More-lightning-API.patch
+++ b/patches/unapplied/server/0432-More-lightning-API.patch
diff --git a/patches/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch
index f1a1607dd7..f1a1607dd7 100644
--- a/patches/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/unapplied/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0434-Add-missing-default-perms-for-commands.patch b/patches/unapplied/server/0434-Add-missing-default-perms-for-commands.patch
index 95a842cb3f..95a842cb3f 100644
--- a/patches/server/0434-Add-missing-default-perms-for-commands.patch
+++ b/patches/unapplied/server/0434-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0435-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0435-Add-PlayerShearBlockEvent.patch
index db7c1ccc71..db7c1ccc71 100644
--- a/patches/server/0435-Add-PlayerShearBlockEvent.patch
+++ b/patches/unapplied/server/0435-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0436-Limit-recipe-packets.patch b/patches/unapplied/server/0436-Limit-recipe-packets.patch
index 5b0badbbe1..5b0badbbe1 100644
--- a/patches/server/0436-Limit-recipe-packets.patch
+++ b/patches/unapplied/server/0436-Limit-recipe-packets.patch
diff --git a/patches/server/0437-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0437-Fix-CraftSound-backwards-compatibility.patch
index 604e24920d..604e24920d 100644
--- a/patches/server/0437-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/unapplied/server/0437-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0438-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0438-Player-Chunk-Load-Unload-Events.patch
index 0fee853cd3..0fee853cd3 100644
--- a/patches/server/0438-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/server/0438-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0439-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0439-Optimize-Dynamic-get-Missing-Keys.patch
index e8bbac8b76..e8bbac8b76 100644
--- a/patches/server/0439-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/unapplied/server/0439-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0440-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0440-Expose-LivingEntity-hurt-direction.patch
index 604bb654f0..604bb654f0 100644
--- a/patches/server/0440-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/server/0440-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0441-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0441-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 675b673d78..675b673d78 100644
--- a/patches/server/0441-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/server/0441-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/unapplied/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 8c0b0c171b..8c0b0c171b 100644
--- a/patches/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/unapplied/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0443-Add-TargetHitEvent.patch b/patches/unapplied/server/0443-Add-TargetHitEvent.patch
index 816c525fd2..816c525fd2 100644
--- a/patches/server/0443-Add-TargetHitEvent.patch
+++ b/patches/unapplied/server/0443-Add-TargetHitEvent.patch
diff --git a/patches/server/0444-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0444-MC-4-Fix-item-position-desync.patch
index a4ce339757..a4ce339757 100644
--- a/patches/server/0444-MC-4-Fix-item-position-desync.patch
+++ b/patches/unapplied/server/0444-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0445-Additional-Block-Material-API.patch b/patches/unapplied/server/0445-Additional-Block-Material-API.patch
index 19f5b4b7ef..19f5b4b7ef 100644
--- a/patches/server/0445-Additional-Block-Material-API.patch
+++ b/patches/unapplied/server/0445-Additional-Block-Material-API.patch
diff --git a/patches/server/0446-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/unapplied/server/0446-API-to-get-Material-from-Boats-and-Minecarts.patch
index 25467e469e..25467e469e 100644
--- a/patches/server/0446-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/unapplied/server/0446-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0447-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0447-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 893e6ffe60..893e6ffe60 100644
--- a/patches/server/0447-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/unapplied/server/0447-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0448-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0448-Fix-Not-a-string-Map-Conversion-spam.patch
index 8952de7633..8952de7633 100644
--- a/patches/server/0448-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/unapplied/server/0448-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0449-Add-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0449-Add-PlayerFlowerPotManipulateEvent.patch
index 5b13a05793..5b13a05793 100644
--- a/patches/server/0449-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/server/0449-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0450-Fix-interact-event-not-being-called-sometimes.patch b/patches/unapplied/server/0450-Fix-interact-event-not-being-called-sometimes.patch
index 72c54e87a3..72c54e87a3 100644
--- a/patches/server/0450-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/unapplied/server/0450-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0451-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0451-Zombie-API-breaking-doors.patch
index b0741f110f..b0741f110f 100644
--- a/patches/server/0451-Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/server/0451-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0452-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0452-Fix-nerfed-slime-when-splitting.patch
index c35358b895..c35358b895 100644
--- a/patches/server/0452-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/unapplied/server/0452-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0453-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0453-Add-EntityLoadCrossbowEvent.patch
index 72ec5141a0..72ec5141a0 100644
--- a/patches/server/0453-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/server/0453-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0454-Add-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0454-Add-WorldGameRuleChangeEvent.patch
index a2d6d932ee..a2d6d932ee 100644
--- a/patches/server/0454-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/server/0454-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0455-Add-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0455-Add-ServerResourcesReloadedEvent.patch
index 8473de6cd2..11f184335e 100644
--- a/patches/server/0455-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/0455-Add-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a570de59700ace7f17268a220ed104464c7e6b15..3aed6821527133c7c0db9a04b9ac19ae5531d006 100644
+index 8364a52db57b43ba503cb8109c35a261de347109..6a10ef4f5e6d19ffbadd43cb3a606084b69b5ce9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2150,7 +2150,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0456-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0456-Add-world-settings-for-mobs-picking-up-loot.patch
index 9e08c62541..9e08c62541 100644
--- a/patches/server/0456-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/unapplied/server/0456-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0457-Add-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0457-Add-BlockFailedDispenseEvent.patch
index 0be11fef1b..0be11fef1b 100644
--- a/patches/server/0457-Add-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/server/0457-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0458-Add-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0458-Add-PlayerLecternPageChangeEvent.patch
index 15052d962d..15052d962d 100644
--- a/patches/server/0458-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/server/0458-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0459-Add-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0459-Add-PlayerLoomPatternSelectEvent.patch
index b523b29e0f..b523b29e0f 100644
--- a/patches/server/0459-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/server/0459-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0460-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0460-Configurable-door-breaking-difficulty.patch
index 94b37c735f..94b37c735f 100644
--- a/patches/server/0460-Configurable-door-breaking-difficulty.patch
+++ b/patches/unapplied/server/0460-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0461-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0461-Empty-commands-shall-not-be-dispatched.patch
index ca4dd56d56..9d321da35f 100644
--- a/patches/server/0461-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/unapplied/server/0461-Empty-commands-shall-not-be-dispatched.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Empty commands shall not be dispatched
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index a7eb2a37a81a414dcb19319c075faefe0382aeba..e38f1d972d87f33a5f28459aa988e09f24614453 100644
+index b34abf66c7dc756e88e08637af976f7794144d06..2dcb1a1bdba1d1cad3caa117d85a8619ed9e67b4 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -291,6 +291,7 @@ public class Commands {
diff --git a/patches/server/0462-Remove-stale-POIs.patch b/patches/unapplied/server/0462-Remove-stale-POIs.patch
index 01a5abab0f..01a5abab0f 100644
--- a/patches/server/0462-Remove-stale-POIs.patch
+++ b/patches/unapplied/server/0462-Remove-stale-POIs.patch
diff --git a/patches/server/0463-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0463-Fix-villager-boat-exploit.patch
index f5548b98cc..f5548b98cc 100644
--- a/patches/server/0463-Fix-villager-boat-exploit.patch
+++ b/patches/unapplied/server/0463-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0464-Add-sendOpLevel-API.patch b/patches/unapplied/server/0464-Add-sendOpLevel-API.patch
index 26dede1fac..266bf11160 100644
--- a/patches/server/0464-Add-sendOpLevel-API.patch
+++ b/patches/unapplied/server/0464-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index fbe10666c4ec6caa95aa38a6f99ccca700e9a4d2..061bba184c8bc2569ce1d413435ec136
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 87d1b609dbd145290427840a365f45e9c1a1eb61..44046e5936f06b3e46078cffe3a4667034e8f33c 100644
+index 0ec00d64947359c08d2315ebaebd76aee548b512..a9ba1ae986985e1af132e651059d4aee261779a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -684,6 +684,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0465-Add-RegistryAccess-for-managing-Registries.patch b/patches/unapplied/server/0465-Add-RegistryAccess-for-managing-Registries.patch
index 721db48bdb..721db48bdb 100644
--- a/patches/server/0465-Add-RegistryAccess-for-managing-Registries.patch
+++ b/patches/unapplied/server/0465-Add-RegistryAccess-for-managing-Registries.patch
diff --git a/patches/server/0466-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0466-Add-StructuresLocateEvent.patch
index 5556e96212..5556e96212 100644
--- a/patches/server/0466-Add-StructuresLocateEvent.patch
+++ b/patches/unapplied/server/0466-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0467-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0467-Collision-option-for-requiring-a-player-participant.patch
index 407fffe0af..407fffe0af 100644
--- a/patches/server/0467-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/unapplied/server/0467-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0468-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0468-Return-chat-component-with-empty-text-instead-of-thr.patch
index 20c17b39c0..20c17b39c0 100644
--- a/patches/server/0468-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/server/0468-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0469-Make-schedule-command-per-world.patch b/patches/unapplied/server/0469-Make-schedule-command-per-world.patch
index 3ac2f8e3f4..3ac2f8e3f4 100644
--- a/patches/server/0469-Make-schedule-command-per-world.patch
+++ b/patches/unapplied/server/0469-Make-schedule-command-per-world.patch
diff --git a/patches/server/0470-Configurable-max-leash-distance.patch b/patches/unapplied/server/0470-Configurable-max-leash-distance.patch
index 625e1c156b..625e1c156b 100644
--- a/patches/server/0470-Configurable-max-leash-distance.patch
+++ b/patches/unapplied/server/0470-Configurable-max-leash-distance.patch
diff --git a/patches/server/0471-Add-BlockPreDispenseEvent.patch b/patches/unapplied/server/0471-Add-BlockPreDispenseEvent.patch
index 58c12a1348..58c12a1348 100644
--- a/patches/server/0471-Add-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/server/0471-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0472-Add-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0472-Add-PlayerChangeBeaconEffectEvent.patch
index 0b8263f96e..0b8263f96e 100644
--- a/patches/server/0472-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/server/0472-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0473-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0473-Add-toggle-for-always-placing-the-dragon-egg.patch
index 0b28271dd1..0b28271dd1 100644
--- a/patches/server/0473-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/unapplied/server/0473-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0474-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0474-Add-PlayerStonecutterRecipeSelectEvent.patch
index 8a5e50313f..8a5e50313f 100644
--- a/patches/server/0474-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/server/0474-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0475-Expand-EntityUnleashEvent.patch b/patches/unapplied/server/0475-Expand-EntityUnleashEvent.patch
index 9ca5dd92d0..9ca5dd92d0 100644
--- a/patches/server/0475-Expand-EntityUnleashEvent.patch
+++ b/patches/unapplied/server/0475-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0476-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0476-Reset-shield-blocking-on-dimension-change.patch
index 1e1175064f..1e1175064f 100644
--- a/patches/server/0476-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/unapplied/server/0476-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0477-Add-DragonEggFormEvent.patch b/patches/unapplied/server/0477-Add-DragonEggFormEvent.patch
index 34506b3c79..34506b3c79 100644
--- a/patches/server/0477-Add-DragonEggFormEvent.patch
+++ b/patches/unapplied/server/0477-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0478-Add-EntityMoveEvent.patch b/patches/unapplied/server/0478-Add-EntityMoveEvent.patch
index 09eb20254f..a117f77f1b 100644
--- a/patches/server/0478-Add-EntityMoveEvent.patch
+++ b/patches/unapplied/server/0478-Add-EntityMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3aed6821527133c7c0db9a04b9ac19ae5531d006..9e96998a36b63a1723406819eccb7841a96753fb 100644
+index 6a10ef4f5e6d19ffbadd43cb3a606084b69b5ce9..6920554bfaaadfa230f329784f0d9e0f12835745 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1647,6 +1647,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0479-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0479-added-option-to-disable-pathfinding-updates-on-block.patch
index d7fc759f02..d7fc759f02 100644
--- a/patches/server/0479-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/unapplied/server/0479-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0480-Inline-shift-direction-fields.patch b/patches/unapplied/server/0480-Inline-shift-direction-fields.patch
index 22234bc09a..22234bc09a 100644
--- a/patches/server/0480-Inline-shift-direction-fields.patch
+++ b/patches/unapplied/server/0480-Inline-shift-direction-fields.patch
diff --git a/patches/server/0481-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0481-Allow-adding-items-to-BlockDropItemEvent.patch
index 7b84a8ac96..7b84a8ac96 100644
--- a/patches/server/0481-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/server/0481-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0482-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0482-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 2f143cc0b4..2f143cc0b4 100644
--- a/patches/server/0482-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/server/0482-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0483-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0483-living-entity-allow-attribute-registration.patch
index e9e4ab2f48..e9e4ab2f48 100644
--- a/patches/server/0483-living-entity-allow-attribute-registration.patch
+++ b/patches/unapplied/server/0483-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0484-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0484-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0484-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/unapplied/server/0484-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0485-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0485-Merchant-getRecipes-should-return-an-immutable-list.patch
index d40a7cf8d7..d40a7cf8d7 100644
--- a/patches/server/0485-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/unapplied/server/0485-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0486-Expose-Tracked-Players.patch b/patches/unapplied/server/0486-Expose-Tracked-Players.patch
index 5e7f3c585c..5e7f3c585c 100644
--- a/patches/server/0486-Expose-Tracked-Players.patch
+++ b/patches/unapplied/server/0486-Expose-Tracked-Players.patch
diff --git a/patches/server/0487-Improve-ServerGUI.patch b/patches/unapplied/server/0487-Improve-ServerGUI.patch
index 8dde1d1a9b..8dde1d1a9b 100644
--- a/patches/server/0487-Improve-ServerGUI.patch
+++ b/patches/unapplied/server/0487-Improve-ServerGUI.patch
diff --git a/patches/server/0488-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0488-fix-converting-txt-to-json-file.patch
index 7f63558c05..7f63558c05 100644
--- a/patches/server/0488-fix-converting-txt-to-json-file.patch
+++ b/patches/unapplied/server/0488-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0489-Add-worldborder-events.patch b/patches/unapplied/server/0489-Add-worldborder-events.patch
index 014dba4c88..014dba4c88 100644
--- a/patches/server/0489-Add-worldborder-events.patch
+++ b/patches/unapplied/server/0489-Add-worldborder-events.patch
diff --git a/patches/server/0490-Add-PlayerNameEntityEvent.patch b/patches/unapplied/server/0490-Add-PlayerNameEntityEvent.patch
index 4215e4291d..4215e4291d 100644
--- a/patches/server/0490-Add-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/server/0490-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0491-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0491-Add-recipe-to-cook-events.patch
index db11d30abc..db11d30abc 100644
--- a/patches/server/0491-Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/server/0491-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0492-Add-Block-isValidTool.patch b/patches/unapplied/server/0492-Add-Block-isValidTool.patch
index e0c42e8e37..e0c42e8e37 100644
--- a/patches/server/0492-Add-Block-isValidTool.patch
+++ b/patches/unapplied/server/0492-Add-Block-isValidTool.patch
diff --git a/patches/server/0493-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0493-Allow-using-signs-inside-spawn-protection.patch
index cbb5462bf6..cbb5462bf6 100644
--- a/patches/server/0493-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/unapplied/server/0493-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0494-Expand-world-key-API.patch b/patches/unapplied/server/0494-Expand-world-key-API.patch
index f5b8dc10fe..f5b8dc10fe 100644
--- a/patches/server/0494-Expand-world-key-API.patch
+++ b/patches/unapplied/server/0494-Expand-world-key-API.patch
diff --git a/patches/server/0495-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0495-Add-fast-alternative-constructor-for-Rotations.patch
index e28775fc9a..e28775fc9a 100644
--- a/patches/server/0495-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/unapplied/server/0495-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0496-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0496-Drop-carried-item-when-player-has-disconnected.patch
index 42055a9f10..42055a9f10 100644
--- a/patches/server/0496-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/unapplied/server/0496-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0497-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0497-forced-whitelist-use-configurable-kick-message.patch
index 9f6ee3c356..d025eb967b 100644
--- a/patches/server/0497-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/unapplied/server/0497-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9e96998a36b63a1723406819eccb7841a96753fb..c2e535834f6b94f52c835a8d89c98220eb13bce9 100644
+index 6920554bfaaadfa230f329784f0d9e0f12835745..c0cf470807ddeaecd63946cc9e3bdbe18fdb7092 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2325,7 +2325,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0498-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0498-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 6363109547..6363109547 100644
--- a/patches/server/0498-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/unapplied/server/0498-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0499-Expose-protocol-version.patch b/patches/unapplied/server/0499-Expose-protocol-version.patch
index 61d4fc32be..61d4fc32be 100644
--- a/patches/server/0499-Expose-protocol-version.patch
+++ b/patches/unapplied/server/0499-Expose-protocol-version.patch
diff --git a/patches/server/0500-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0500-Enhance-console-tab-completions-for-brigadier-comman.patch
index 3d1a0fb945..3d1a0fb945 100644
--- a/patches/server/0500-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/unapplied/server/0500-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0501-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0501-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index ad9efea6d1..ad9efea6d1 100644
--- a/patches/server/0501-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/unapplied/server/0501-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0502-Add-bypass-host-check.patch b/patches/unapplied/server/0502-Add-bypass-host-check.patch
index 53fea6e14d..53fea6e14d 100644
--- a/patches/server/0502-Add-bypass-host-check.patch
+++ b/patches/unapplied/server/0502-Add-bypass-host-check.patch
diff --git a/patches/server/0503-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0503-Set-area-affect-cloud-rotation.patch
index e87d48589a..e87d48589a 100644
--- a/patches/server/0503-Set-area-affect-cloud-rotation.patch
+++ b/patches/unapplied/server/0503-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0504-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0504-add-isDeeplySleeping-to-HumanEntity.patch
index 645f1201ea..645f1201ea 100644
--- a/patches/server/0504-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/server/0504-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0505-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0505-add-consumeFuel-to-FurnaceBurnEvent.patch
index 5b664856f4..5b664856f4 100644
--- a/patches/server/0505-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/server/0505-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0506-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0506-add-get-set-drop-chance-to-EntityEquipment.patch
index e794470410..e794470410 100644
--- a/patches/server/0506-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/server/0506-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0507-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0507-fix-PigZombieAngerEvent-cancellation.patch
index 040d076f37..040d076f37 100644
--- a/patches/server/0507-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/unapplied/server/0507-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0508-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0508-fix-PlayerItemHeldEvent-firing-twice.patch
index 5732fc5af6..5732fc5af6 100644
--- a/patches/server/0508-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/unapplied/server/0508-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0509-Add-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0509-Add-PlayerDeepSleepEvent.patch
index 2f01c63a54..2f01c63a54 100644
--- a/patches/server/0509-Add-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/0509-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0510-More-World-API.patch b/patches/unapplied/server/0510-More-World-API.patch
index 6f6b279ced..6f6b279ced 100644
--- a/patches/server/0510-More-World-API.patch
+++ b/patches/unapplied/server/0510-More-World-API.patch
diff --git a/patches/server/0511-Add-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0511-Add-PlayerBedFailEnterEvent.patch
index a592f428c2..a592f428c2 100644
--- a/patches/server/0511-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/0511-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0512-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0512-Implement-methods-to-convert-between-Component-and-B.patch
index c5765e9de7..c5765e9de7 100644
--- a/patches/server/0512-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/unapplied/server/0512-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0513-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/unapplied/server/0513-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 852f5276ee..852f5276ee 100644
--- a/patches/server/0513-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/unapplied/server/0513-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0514-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0514-Introduce-beacon-activation-deactivation-events.patch
index 336acbe811..336acbe811 100644
--- a/patches/server/0514-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/server/0514-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0515-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0515-Add-Channel-initialization-listeners.patch
index 334eb230f0..334eb230f0 100644
--- a/patches/server/0515-Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/0515-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0516-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0516-Send-empty-commands-if-tab-completion-is-disabled.patch
index 58cea72f9b..35cf408aa7 100644
--- a/patches/server/0516-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/unapplied/server/0516-Send-empty-commands-if-tab-completion-is-disabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Send empty commands if tab completion is disabled
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index e38f1d972d87f33a5f28459aa988e09f24614453..7acd7f60327106d55e8f48247650bc0064dd1b58 100644
+index 2dcb1a1bdba1d1cad3caa117d85a8619ed9e67b4..d602c713696e23ba6a2d542b2e9e2cce46d79a66 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -453,7 +453,12 @@ public class Commands {
diff --git a/patches/server/0517-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0517-Add-more-WanderingTrader-API.patch
index 4221f28015..4221f28015 100644
--- a/patches/server/0517-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/0517-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0518-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0518-Add-EntityBlockStorage-clearEntities.patch
index c37749bd56..c37749bd56 100644
--- a/patches/server/0518-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/0518-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0519-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0519-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 9df7276feb..9df7276feb 100644
--- a/patches/server/0519-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/0519-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0520-Add-HiddenPotionEffect-API.patch b/patches/unapplied/server/0520-Add-HiddenPotionEffect-API.patch
index 2d0b0d5b03..2d0b0d5b03 100644
--- a/patches/server/0520-Add-HiddenPotionEffect-API.patch
+++ b/patches/unapplied/server/0520-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0521-Inventory-close.patch b/patches/unapplied/server/0521-Inventory-close.patch
index 9dcad3d0b1..9dcad3d0b1 100644
--- a/patches/server/0521-Inventory-close.patch
+++ b/patches/unapplied/server/0521-Inventory-close.patch
diff --git a/patches/server/0522-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0522-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index ca5b9a4b8a..ca5b9a4b8a 100644
--- a/patches/server/0522-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/0522-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0523-Add-basic-Datapack-API.patch b/patches/unapplied/server/0523-Add-basic-Datapack-API.patch
index 990697b9ea..990697b9ea 100644
--- a/patches/server/0523-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/0523-Add-basic-Datapack-API.patch
diff --git a/patches/server/0524-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0524-Add-environment-variable-to-disable-server-gui.patch
index 5afe5fb870..5afe5fb870 100644
--- a/patches/server/0524-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/0524-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0525-Expand-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0525-Expand-PlayerGameModeChangeEvent.patch
index ea2b448cf1..1aafe423c2 100644
--- a/patches/server/0525-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/server/0525-Expand-PlayerGameModeChangeEvent.patch
@@ -147,7 +147,7 @@ index 2bd2f1cdf3467cacee55094d43bd3eccf61b9aa7..c3b4b800c5a34afa03ed7c31e14f26ca
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 44046e5936f06b3e46078cffe3a4667034e8f33c..98e80b178551895eaec042c29068dcfdf6d07125 100644
+index a9ba1ae986985e1af132e651059d4aee261779a3..6f8e56117a78b9bd41668580414c2b4ebe2e1ec7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1671,7 +1671,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0526-ItemStack-repair-check-API.patch b/patches/unapplied/server/0526-ItemStack-repair-check-API.patch
index fb178f277b..fb178f277b 100644
--- a/patches/server/0526-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/server/0526-ItemStack-repair-check-API.patch
diff --git a/patches/server/0527-More-Enchantment-API.patch b/patches/unapplied/server/0527-More-Enchantment-API.patch
index a3bf8f8e7e..a3bf8f8e7e 100644
--- a/patches/server/0527-More-Enchantment-API.patch
+++ b/patches/unapplied/server/0527-More-Enchantment-API.patch
diff --git a/patches/server/0528-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0528-Move-range-check-for-block-placing-up.patch
index b93574bed6..b93574bed6 100644
--- a/patches/server/0528-Move-range-check-for-block-placing-up.patch
+++ b/patches/unapplied/server/0528-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0529-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0529-Add-Mob-lookAt-API.patch
index 8a8ba9fdcd..8a8ba9fdcd 100644
--- a/patches/server/0529-Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/server/0529-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0530-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/unapplied/server/0530-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index 85ef521c40..85ef521c40 100644
--- a/patches/server/0530-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/unapplied/server/0530-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0531-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0531-Add-Unix-domain-socket-support.patch
index 34dd3ee134..34dd3ee134 100644
--- a/patches/server/0531-Add-Unix-domain-socket-support.patch
+++ b/patches/unapplied/server/0531-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0532-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0532-Add-EntityInsideBlockEvent.patch
index 0009e3fbdf..0009e3fbdf 100644
--- a/patches/server/0532-Add-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/server/0532-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0533-Improve-item-default-attribute-API.patch b/patches/unapplied/server/0533-Improve-item-default-attribute-API.patch
index f5daf28287..f5daf28287 100644
--- a/patches/server/0533-Improve-item-default-attribute-API.patch
+++ b/patches/unapplied/server/0533-Improve-item-default-attribute-API.patch
diff --git a/patches/server/0534-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0534-Add-cause-to-Weather-ThunderChangeEvents.patch
index a95ce30f68..a1ad2da798 100644
--- a/patches/server/0534-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/server/0534-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -95,7 +95,7 @@ index 6a3959095e57f76b3a092b32d26ff91cf1c5e068..0fa16ff37f09ecfda104b751e48bf246
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 72e547073782c657d8a500c3a40046208dde7201..8603f52c40e5e604dbc704097289ab072bd6a950 100644
+index 956f7206f26325ed1be639bd6289991332763a70..1311c9aae7859f706b20bf4d43f23959d0ef050b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1201,7 +1201,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0535-More-Lidded-Block-API.patch b/patches/unapplied/server/0535-More-Lidded-Block-API.patch
index 437434c525..437434c525 100644
--- a/patches/server/0535-More-Lidded-Block-API.patch
+++ b/patches/unapplied/server/0535-More-Lidded-Block-API.patch
diff --git a/patches/server/0536-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0536-Limit-item-frame-cursors-on-maps.patch
index a55a4490c0..a55a4490c0 100644
--- a/patches/server/0536-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/unapplied/server/0536-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0537-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0537-Add-PlayerKickEvent-causes.patch
index 38dde8a325..72d8307b93 100644
--- a/patches/server/0537-Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/server/0537-Add-PlayerKickEvent-causes.patch
@@ -43,7 +43,7 @@ index dbcf183483766f39334d7f7e8336033906625f3f..300929a406905f5ff1ede664d5b99fb0
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c2e535834f6b94f52c835a8d89c98220eb13bce9..8e0bc6559aad75a713e1760ea17e5004686d7e7a 100644
+index c0cf470807ddeaecd63946cc9e3bdbe18fdb7092..8f7b68cda090e038b5b6a7928e872debca4e011d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2325,7 +2325,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -495,7 +495,7 @@ index 9e2ad78b12cadbf0e2bda1e12fe844120529c347..6a7d7fad990fc44fdda6849d43dad141
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 98e80b178551895eaec042c29068dcfdf6d07125..8b142874a8977676740f61a0e7277d767fab56e0 100644
+index 6f8e56117a78b9bd41668580414c2b4ebe2e1ec7..cfa079ba53e6829ed8abbb60d374e20585072cc0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -280,7 +280,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0538-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0538-Add-PufferFishStateChangeEvent.patch
index 0574c7ed8c..0574c7ed8c 100644
--- a/patches/server/0538-Add-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/server/0538-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0539-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0539-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 646e52a326..646e52a326 100644
--- a/patches/server/0539-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/unapplied/server/0539-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0540-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0540-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index ee4d412a1c..ee4d412a1c 100644
--- a/patches/server/0540-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/unapplied/server/0540-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0541-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0541-Add-option-to-fix-items-merging-through-walls.patch
index b4e4e39ae1..b4e4e39ae1 100644
--- a/patches/server/0541-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/unapplied/server/0541-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0542-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0542-Add-BellRevealRaiderEvent.patch
index 871aa2a198..871aa2a198 100644
--- a/patches/server/0542-Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/server/0542-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0543-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0543-Fix-invulnerable-end-crystals.patch
index 4349e5a8ad..4349e5a8ad 100644
--- a/patches/server/0543-Fix-invulnerable-end-crystals.patch
+++ b/patches/unapplied/server/0543-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0544-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0544-Add-ElderGuardianAppearanceEvent.patch
index e28248ff5d..e28248ff5d 100644
--- a/patches/server/0544-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/server/0544-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0545-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0545-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3d03f4c4d2..3d03f4c4d2 100644
--- a/patches/server/0545-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/unapplied/server/0545-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0546-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0546-Line-Of-Sight-Changes.patch
index 7fa7d25951..7fa7d25951 100644
--- a/patches/server/0546-Line-Of-Sight-Changes.patch
+++ b/patches/unapplied/server/0546-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0547-add-per-world-spawn-limits.patch b/patches/unapplied/server/0547-add-per-world-spawn-limits.patch
index 17abe63582..5018769224 100644
--- a/patches/server/0547-add-per-world-spawn-limits.patch
+++ b/patches/unapplied/server/0547-add-per-world-spawn-limits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add per world spawn limits
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8603f52c40e5e604dbc704097289ab072bd6a950..9221be1aef355a488745ca44e4cd5dd84060a2f9 100644
+index 1311c9aae7859f706b20bf4d43f23959d0ef050b..31305e402a3112d337b458f6b1aaf1bb97ba4fc2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -219,6 +219,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0548-Fix-potions-splash-events.patch b/patches/unapplied/server/0548-Fix-potions-splash-events.patch
index 68350d52f2..68350d52f2 100644
--- a/patches/server/0548-Fix-potions-splash-events.patch
+++ b/patches/unapplied/server/0548-Fix-potions-splash-events.patch
diff --git a/patches/server/0549-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0549-Add-more-LimitedRegion-API.patch
index f46a2383c8..f46a2383c8 100644
--- a/patches/server/0549-Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/server/0549-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0550-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0550-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 62881137b2..62881137b2 100644
--- a/patches/server/0550-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/unapplied/server/0550-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0551-Missing-Entity-API.patch b/patches/unapplied/server/0551-Missing-Entity-API.patch
index 5640dce8db..5640dce8db 100644
--- a/patches/server/0551-Missing-Entity-API.patch
+++ b/patches/unapplied/server/0551-Missing-Entity-API.patch
diff --git a/patches/server/0552-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0552-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 40cc161932..40cc161932 100644
--- a/patches/server/0552-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/unapplied/server/0552-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0553-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0553-Use-getChunkIfLoadedImmediately-in-places.patch
index 2e754bbb7b..2e754bbb7b 100644
--- a/patches/server/0553-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/unapplied/server/0553-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0554-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0554-Fix-commands-from-signs-not-firing-command-events.patch
index aa87a425fd..aa87a425fd 100644
--- a/patches/server/0554-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/unapplied/server/0554-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0555-Add-PlayerArmSwingEvent.patch b/patches/unapplied/server/0555-Add-PlayerArmSwingEvent.patch
index 5b14fa047d..5b14fa047d 100644
--- a/patches/server/0555-Add-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/server/0555-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0556-Fix-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0556-Fix-kick-event-leave-message-not-being-sent.patch
index 01fed42d62..01fed42d62 100644
--- a/patches/server/0556-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/unapplied/server/0556-Fix-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0557-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0557-Don-t-apply-cramming-damage-to-players.patch
index 55a1fe08a5..55a1fe08a5 100644
--- a/patches/server/0557-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/unapplied/server/0557-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0558-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0558-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 3473ea4ceb..3473ea4ceb 100644
--- a/patches/server/0558-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/unapplied/server/0558-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0559-Add-missing-forceDrop-toggles.patch b/patches/unapplied/server/0559-Add-missing-forceDrop-toggles.patch
index 70612df277..70612df277 100644
--- a/patches/server/0559-Add-missing-forceDrop-toggles.patch
+++ b/patches/unapplied/server/0559-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0560-Stinger-API.patch b/patches/unapplied/server/0560-Stinger-API.patch
index 6b8d804d91..6b8d804d91 100644
--- a/patches/server/0560-Stinger-API.patch
+++ b/patches/unapplied/server/0560-Stinger-API.patch
diff --git a/patches/server/0561-Add-System.out-err-catcher.patch b/patches/unapplied/server/0561-Add-System.out-err-catcher.patch
index 8b01f8520a..8b01f8520a 100644
--- a/patches/server/0561-Add-System.out-err-catcher.patch
+++ b/patches/unapplied/server/0561-Add-System.out-err-catcher.patch
diff --git a/patches/server/0562-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0562-Prevent-AFK-kick-while-watching-end-credits.patch
index dc3eed68eb..dc3eed68eb 100644
--- a/patches/server/0562-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/unapplied/server/0562-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0563-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0563-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0563-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/unapplied/server/0563-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0564-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0564-Add-PlayerSetSpawnEvent.patch
index 51b865e2ee..c3b8586965 100644
--- a/patches/server/0564-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/server/0564-Add-PlayerSetSpawnEvent.patch
@@ -187,7 +187,7 @@ index db26b5a0464bd6087eeacaf6dd61eba37365df92..9117c035d5a6ff114b028fad3380ceb1
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8b142874a8977676740f61a0e7277d767fab56e0..907b61ff0cde1024508157a45bef7cb50b812393 100644
+index cfa079ba53e6829ed8abbb60d374e20585072cc0..4e72aa7fce4da62751342f557e877dfddb8bd36c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1420,9 +1420,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0565-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0565-Make-hoppers-respect-inventory-max-stack-size.patch
index fc01c5cad4..fc01c5cad4 100644
--- a/patches/server/0565-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/unapplied/server/0565-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0566-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0566-Optimize-entity-tracker-passenger-checks.patch
index 0b928beb61..0b928beb61 100644
--- a/patches/server/0566-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/unapplied/server/0566-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0567-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0567-Config-option-for-Piglins-guarding-chests.patch
index 32c61a7ec0..32c61a7ec0 100644
--- a/patches/server/0567-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/unapplied/server/0567-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0568-Add-EntityDamageItemEvent.patch b/patches/unapplied/server/0568-Add-EntityDamageItemEvent.patch
index e6822b715e..e6822b715e 100644
--- a/patches/server/0568-Add-EntityDamageItemEvent.patch
+++ b/patches/unapplied/server/0568-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0569-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0569-Optimize-indirect-passenger-iteration.patch
index 36c3804273..36c3804273 100644
--- a/patches/server/0569-Optimize-indirect-passenger-iteration.patch
+++ b/patches/unapplied/server/0569-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0570-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0570-Configurable-item-frame-map-cursor-update-interval.patch
index 98f717ebc1..98f717ebc1 100644
--- a/patches/server/0570-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/unapplied/server/0570-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0571-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0571-Change-EnderEye-target-without-changing-other-things.patch
index 5612422ea7..5612422ea7 100644
--- a/patches/server/0571-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/server/0571-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0572-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0572-Add-BlockBreakBlockEvent.patch
index fbd3627b5c..fbd3627b5c 100644
--- a/patches/server/0572-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/server/0572-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0573-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/unapplied/server/0573-Option-to-prevent-data-components-copy-in-smithing-r.patch
index 1c9a4f5da5..1c9a4f5da5 100644
--- a/patches/server/0573-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/unapplied/server/0573-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0574-More-CommandBlock-API.patch b/patches/unapplied/server/0574-More-CommandBlock-API.patch
index 5fa4fa81e1..5fa4fa81e1 100644
--- a/patches/server/0574-More-CommandBlock-API.patch
+++ b/patches/unapplied/server/0574-More-CommandBlock-API.patch
diff --git a/patches/server/0575-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0575-Add-missing-team-sidebar-display-slots.patch
index de7d3fc8e5..de7d3fc8e5 100644
--- a/patches/server/0575-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/server/0575-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0576-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0576-Add-back-EntityPortalExitEvent.patch
index 282d51195e..282d51195e 100644
--- a/patches/server/0576-Add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/server/0576-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0577-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0577-Add-methods-to-find-targets-for-lightning-strikes.patch
index 792cc392d0..2e844ea2bd 100644
--- a/patches/server/0577-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/server/0577-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -31,7 +31,7 @@ index 57b82b90ab55922e57ccf79c57296d1d2e34d6a2..50d4bd6223eb92c640a61ee61af862e7
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9221be1aef355a488745ca44e4cd5dd84060a2f9..55b8b25dfece08ecc82fa2f15c81bd6a03a5de90 100644
+index 31305e402a3112d337b458f6b1aaf1bb97ba4fc2..be27fe25d1d1057da4734a8d9c2a92690a7eec3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -676,6 +676,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0578-Get-entity-default-attributes.patch b/patches/unapplied/server/0578-Get-entity-default-attributes.patch
index 9c95ca3611..9c95ca3611 100644
--- a/patches/server/0578-Get-entity-default-attributes.patch
+++ b/patches/unapplied/server/0578-Get-entity-default-attributes.patch
diff --git a/patches/server/0579-Left-handed-API.patch b/patches/unapplied/server/0579-Left-handed-API.patch
index 50bb0d4ebe..50bb0d4ebe 100644
--- a/patches/server/0579-Left-handed-API.patch
+++ b/patches/unapplied/server/0579-Left-handed-API.patch
diff --git a/patches/server/0580-Add-more-advancement-API.patch b/patches/unapplied/server/0580-Add-more-advancement-API.patch
index 70ac177106..70ac177106 100644
--- a/patches/server/0580-Add-more-advancement-API.patch
+++ b/patches/unapplied/server/0580-Add-more-advancement-API.patch
diff --git a/patches/server/0581-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0581-Add-ItemFactory-getSpawnEgg-API.patch
index ec4a572edf..ec4a572edf 100644
--- a/patches/server/0581-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/unapplied/server/0581-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0582-Add-critical-damage-API.patch b/patches/unapplied/server/0582-Add-critical-damage-API.patch
index bef96face6..78d51e8e03 100644
--- a/patches/server/0582-Add-critical-damage-API.patch
+++ b/patches/unapplied/server/0582-Add-critical-damage-API.patch
@@ -49,7 +49,7 @@ index 57850f16a681af4fc302895c7608247675b44ab4..68a6b1508ce4544fe8b18746d440944d
                                      }
                                      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index bc167c21f82ad09952f6cdbf1016523062890f8b..44bcb1117cfa4d66c500011489ae193a0d1e7d78 100644
+index 220c687a9543b84d994c4f238757737c9337227a..07f36edf9362227521daabfdceaa7e136d854f8d 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -450,6 +450,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0583-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0583-Fix-issues-with-mob-conversion.patch
index c286b73b30..c286b73b30 100644
--- a/patches/server/0583-Fix-issues-with-mob-conversion.patch
+++ b/patches/unapplied/server/0583-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0584-Add-hasCollision-methods-to-various-places.patch b/patches/unapplied/server/0584-Add-hasCollision-methods-to-various-places.patch
index 421b0ba92e..421b0ba92e 100644
--- a/patches/server/0584-Add-hasCollision-methods-to-various-places.patch
+++ b/patches/unapplied/server/0584-Add-hasCollision-methods-to-various-places.patch
diff --git a/patches/server/0585-Goat-ram-API.patch b/patches/unapplied/server/0585-Goat-ram-API.patch
index 21d6196f4c..21d6196f4c 100644
--- a/patches/server/0585-Goat-ram-API.patch
+++ b/patches/unapplied/server/0585-Goat-ram-API.patch
diff --git a/patches/server/0586-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0586-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0586-Add-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/server/0586-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0587-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0587-Add-Raw-Byte-Entity-Serialization.patch
index 6735257894..6735257894 100644
--- a/patches/server/0587-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/server/0587-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0588-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0588-Vanilla-command-permission-fixes.patch
index c1bd75dad5..90d31ae40c 100644
--- a/patches/server/0588-Vanilla-command-permission-fixes.patch
+++ b/patches/unapplied/server/0588-Vanilla-command-permission-fixes.patch
@@ -33,7 +33,7 @@ index 899008b2980d13f1be6280cd8cb959c53a29bebf..d5f7da3502575f6847f3c22ab0e94284
      private RedirectModifier<S> modifier = null;
      private boolean forks;
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 7acd7f60327106d55e8f48247650bc0064dd1b58..bee79fab7f8195e14f6bd22d9cd59bfc704bf903 100644
+index d602c713696e23ba6a2d542b2e9e2cce46d79a66..800d1756db8c27b7d129a90addc125c4fc81e134 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -261,6 +261,13 @@ public class Commands {
diff --git a/patches/server/0589-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0589-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index e2742c73ce..e2742c73ce 100644
--- a/patches/server/0589-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/unapplied/server/0589-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0590-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0590-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0590-Fix-GameProfileCache-concurrency.patch
+++ b/patches/unapplied/server/0590-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0591-Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/0591-Improve-and-expand-AsyncCatcher.patch
index 751923d583..751923d583 100644
--- a/patches/server/0591-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/unapplied/server/0591-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0592-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0592-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 61d853b7df..61d853b7df 100644
--- a/patches/server/0592-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/unapplied/server/0592-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0593-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0593-Sanitize-ResourceLocation-error-logging.patch
index 602f0d3b27..602f0d3b27 100644
--- a/patches/server/0593-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/unapplied/server/0593-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0594-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0594-Manually-inline-methods-in-BlockPosition.patch
index 89987ab3d2..89987ab3d2 100644
--- a/patches/server/0594-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/unapplied/server/0594-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0595-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0595-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0595-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/unapplied/server/0595-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0596-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0596-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 9efbcafadb..9efbcafadb 100644
--- a/patches/server/0596-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/unapplied/server/0596-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0597-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0597-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index eff1d0a95f..eff1d0a95f 100644
--- a/patches/server/0597-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/unapplied/server/0597-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0598-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/unapplied/server/0598-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index e01f02928a..e01f02928a 100644
--- a/patches/server/0598-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/unapplied/server/0598-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0599-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0599-Oprimise-map-impl-for-tracked-players.patch
index ba86306e1b..cea8c3752e 100644
--- a/patches/server/0599-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/unapplied/server/0599-Oprimise-map-impl-for-tracked-players.patch
@@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 2a216485522a63298e239074ef5bdfa1101fa9d6..fde03e0e5cd42339e5bfbeb60670139af5f56e1c 100644
+index 69f54e812794b23e5f54606da86f71163f5f0bbe..2d325c998e40a65af10d6adbb0dc304bea50e3d8 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1508,7 +1508,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0600-Add-missing-InventoryType.patch b/patches/unapplied/server/0600-Add-missing-InventoryType.patch
index 768c150fc1..768c150fc1 100644
--- a/patches/server/0600-Add-missing-InventoryType.patch
+++ b/patches/unapplied/server/0600-Add-missing-InventoryType.patch
diff --git a/patches/server/0601-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0601-Optimise-BlockSoil-nearby-water-lookup.patch
index 4a5d6c5b9d..4a5d6c5b9d 100644
--- a/patches/server/0601-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/unapplied/server/0601-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0602-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0602-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 73f23716d8..73f23716d8 100644
--- a/patches/server/0602-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/unapplied/server/0602-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0603-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0603-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0603-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/unapplied/server/0603-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0604-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0604-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index db870d4240..db870d4240 100644
--- a/patches/server/0604-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/unapplied/server/0604-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0605-Add-packet-limiter-config.patch b/patches/unapplied/server/0605-Add-packet-limiter-config.patch
index a6bd6521f4..a6bd6521f4 100644
--- a/patches/server/0605-Add-packet-limiter-config.patch
+++ b/patches/unapplied/server/0605-Add-packet-limiter-config.patch
diff --git a/patches/server/0606-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0606-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index f5c3a81df3..f5c3a81df3 100644
--- a/patches/server/0606-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/unapplied/server/0606-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0607-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0607-Ensure-valid-vehicle-status.patch
index 7440d5c859..7440d5c859 100644
--- a/patches/server/0607-Ensure-valid-vehicle-status.patch
+++ b/patches/unapplied/server/0607-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0608-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0608-Prevent-softlocked-end-exit-portal-generation.patch
index 4c54f27f94..4c54f27f94 100644
--- a/patches/server/0608-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/unapplied/server/0608-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0609-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0609-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0609-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/unapplied/server/0609-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0610-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0610-Don-t-log-debug-logging-being-disabled.patch
index 8e733b1cea..8e733b1cea 100644
--- a/patches/server/0610-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/unapplied/server/0610-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0611-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0611-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0611-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/unapplied/server/0611-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0612-Preserve-overstacked-loot.patch b/patches/unapplied/server/0612-Preserve-overstacked-loot.patch
index db50d2fd8a..db50d2fd8a 100644
--- a/patches/server/0612-Preserve-overstacked-loot.patch
+++ b/patches/unapplied/server/0612-Preserve-overstacked-loot.patch
diff --git a/patches/server/0613-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0613-Update-head-rotation-in-missing-places.patch
index 65816d8278..65816d8278 100644
--- a/patches/server/0613-Update-head-rotation-in-missing-places.patch
+++ b/patches/unapplied/server/0613-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0614-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0614-prevent-unintended-light-block-manipulation.patch
index b8ca205064..b8ca205064 100644
--- a/patches/server/0614-prevent-unintended-light-block-manipulation.patch
+++ b/patches/unapplied/server/0614-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0615-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0615-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0615-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/unapplied/server/0615-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0616-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0616-Fix-upstreams-block-state-factories.patch
index 93376fc4b1..93376fc4b1 100644
--- a/patches/server/0616-Fix-upstreams-block-state-factories.patch
+++ b/patches/unapplied/server/0616-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0617-Configurable-feature-seeds.patch b/patches/unapplied/server/0617-Configurable-feature-seeds.patch
index b374cbddbf..b374cbddbf 100644
--- a/patches/server/0617-Configurable-feature-seeds.patch
+++ b/patches/unapplied/server/0617-Configurable-feature-seeds.patch
diff --git a/patches/server/0618-Add-root-admin-user-detection.patch b/patches/unapplied/server/0618-Add-root-admin-user-detection.patch
index df739cc33c..df739cc33c 100644
--- a/patches/server/0618-Add-root-admin-user-detection.patch
+++ b/patches/unapplied/server/0618-Add-root-admin-user-detection.patch
diff --git a/patches/server/0619-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0619-don-t-attempt-to-teleport-dead-entities.patch
index a7655c738c..a7655c738c 100644
--- a/patches/server/0619-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/unapplied/server/0619-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0620-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0620-Prevent-excessive-velocity-through-repeated-crits.patch
index 7d38deddec..7d38deddec 100644
--- a/patches/server/0620-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/unapplied/server/0620-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0621-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0621-Remove-client-side-code-using-deprecated-for-removal.patch
index 1a9d2657f1..c369ec73f9 100644
--- a/patches/server/0621-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/unapplied/server/0621-Remove-client-side-code-using-deprecated-for-removal.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Remove client-side code using deprecated for removal
 Fixes warnings on build
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index bf2833c92eca6491699b4a89410e4e46b5bbe4d1..57223285860f61119b6cf348aa78e59384a04e22 100644
+index dbf79a018260a006bf5d16608b35bcbea9adb963..e4048d8f43befe5134222207cdb88f640a875deb 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -1082,16 +1082,7 @@ public class Util {
diff --git a/patches/server/0622-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0622-Fix-Spigot-growth-modifiers.patch
index 6a24adf1c8..6a24adf1c8 100644
--- a/patches/server/0622-Fix-Spigot-growth-modifiers.patch
+++ b/patches/unapplied/server/0622-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0623-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0623-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0623-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/unapplied/server/0623-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0624-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0624-Add-PlayerItemFrameChangeEvent.patch
index b7e908ab6e..b7e908ab6e 100644
--- a/patches/server/0624-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/unapplied/server/0624-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0625-Optimize-HashMapPalette.patch b/patches/unapplied/server/0625-Optimize-HashMapPalette.patch
index a490eb0c20..a490eb0c20 100644
--- a/patches/server/0625-Optimize-HashMapPalette.patch
+++ b/patches/unapplied/server/0625-Optimize-HashMapPalette.patch
diff --git a/patches/server/0626-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0626-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 50968cdc50..cde811d346 100644
--- a/patches/server/0626-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/unapplied/server/0626-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix ChunkSnapshot#isSectionEmpty(int) and optimize
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index b2d85abb6c9c725955d972cd6895440849213fdf..887a17a0833064eb5701222e5fb6f5ccf9511588 100644
+index be44b03527bd17344f5d835ba9d0b47e4b55d45f..08956b81b9a3e5caf3adce6699149491ff190d90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -338,14 +338,17 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0627-Add-more-Campfire-API.patch b/patches/unapplied/server/0627-Add-more-Campfire-API.patch
index c490c151c3..c490c151c3 100644
--- a/patches/server/0627-Add-more-Campfire-API.patch
+++ b/patches/unapplied/server/0627-Add-more-Campfire-API.patch
diff --git a/patches/server/0628-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0628-Forward-CraftEntity-in-teleport-command.patch
index 4a6aa85265..4a6aa85265 100644
--- a/patches/server/0628-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/unapplied/server/0628-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0629-Improve-scoreboard-entries.patch b/patches/unapplied/server/0629-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0629-Improve-scoreboard-entries.patch
+++ b/patches/unapplied/server/0629-Improve-scoreboard-entries.patch
diff --git a/patches/server/0630-Entity-powdered-snow-API.patch b/patches/unapplied/server/0630-Entity-powdered-snow-API.patch
index acfaef73e3..acfaef73e3 100644
--- a/patches/server/0630-Entity-powdered-snow-API.patch
+++ b/patches/unapplied/server/0630-Entity-powdered-snow-API.patch
diff --git a/patches/server/0631-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0631-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0631-Add-API-for-item-entity-health.patch
+++ b/patches/unapplied/server/0631-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0632-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0632-Configurable-max-block-light-for-monster-spawning.patch
index 8c19486a5f..8c19486a5f 100644
--- a/patches/server/0632-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/unapplied/server/0632-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0633-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0633-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index b239d74e25..b239d74e25 100644
--- a/patches/server/0633-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/unapplied/server/0633-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0634-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0634-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index cfaa295706..cfaa295706 100644
--- a/patches/server/0634-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/unapplied/server/0634-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0635-Bucketable-API.patch b/patches/unapplied/server/0635-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0635-Bucketable-API.patch
+++ b/patches/unapplied/server/0635-Bucketable-API.patch
diff --git a/patches/server/0636-Validate-usernames.patch b/patches/unapplied/server/0636-Validate-usernames.patch
index e8287bc641..e8287bc641 100644
--- a/patches/server/0636-Validate-usernames.patch
+++ b/patches/unapplied/server/0636-Validate-usernames.patch
diff --git a/patches/server/0637-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0637-Make-water-animal-spawn-height-configurable.patch
index 341b55b1f6..341b55b1f6 100644
--- a/patches/server/0637-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/unapplied/server/0637-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0638-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0638-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 735eff701a..9d5e0b16db 100644
--- a/patches/server/0638-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/unapplied/server/0638-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -44,7 +44,7 @@ index 33d9f3778996eedc83064332a2fbbdc7c6a8ba90..62ab88e022230d25ffb359981ce7da4e
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7424f8c16441d65e03e641e5052b5c96bd42137e..085b5a185a8470600e88d68f4fedfee8bae2b28a 100644
+index 4166d69347912b03c9aa566a9523590c5e4f6630..cdee49fbbf22fcbf4618b503e15b21a917144f85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -209,6 +209,39 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0639-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0639-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0639-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/unapplied/server/0639-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0640-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/unapplied/server/0640-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0640-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/unapplied/server/0640-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0641-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0641-Multiple-Entries-with-Scoreboards.patch
index 558cc93da5..558cc93da5 100644
--- a/patches/server/0641-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/unapplied/server/0641-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0642-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0642-Reset-placed-block-on-exception.patch
index 327d98e291..327d98e291 100644
--- a/patches/server/0642-Reset-placed-block-on-exception.patch
+++ b/patches/unapplied/server/0642-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0643-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0643-Add-configurable-height-for-slime-spawn.patch
index dfc8ecb349..dfc8ecb349 100644
--- a/patches/server/0643-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/unapplied/server/0643-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0644-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0644-Fix-xp-reward-for-baby-zombies.patch
index 3ec320760f..3ec320760f 100644
--- a/patches/server/0644-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/unapplied/server/0644-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0645-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0645-Multi-Block-Change-API-Implementation.patch
index 7f0a67630e..5763e38ec6 100644
--- a/patches/server/0645-Multi-Block-Change-API-Implementation.patch
+++ b/patches/unapplied/server/0645-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213
          buf.writeLong(this.sectionPos.asLong());
          buf.writeVarInt(this.positions.length);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 907b61ff0cde1024508157a45bef7cb50b812393..13f17ea2164972df50359af9af14262d0821c2a6 100644
+index 4e72aa7fce4da62751342f557e877dfddb8bd36c..2df2a194851c170343e2aa3695122618285edc31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -937,6 +937,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0646-Fix-NotePlayEvent.patch b/patches/unapplied/server/0646-Fix-NotePlayEvent.patch
index cdffcd6f0f..cdffcd6f0f 100644
--- a/patches/server/0646-Fix-NotePlayEvent.patch
+++ b/patches/unapplied/server/0646-Fix-NotePlayEvent.patch
diff --git a/patches/server/0647-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0647-Freeze-Tick-Lock-API.patch
index 1ac6ab0e8e..1ac6ab0e8e 100644
--- a/patches/server/0647-Freeze-Tick-Lock-API.patch
+++ b/patches/unapplied/server/0647-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0648-More-PotionEffectType-API.patch b/patches/unapplied/server/0648-More-PotionEffectType-API.patch
index 2773c98338..2773c98338 100644
--- a/patches/server/0648-More-PotionEffectType-API.patch
+++ b/patches/unapplied/server/0648-More-PotionEffectType-API.patch
diff --git a/patches/server/0649-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0649-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 027285c2b1..027285c2b1 100644
--- a/patches/server/0649-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/unapplied/server/0649-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0650-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0650-API-for-creating-command-sender-which-forwards-feedb.patch
index f86274766d..f86274766d 100644
--- a/patches/server/0650-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/unapplied/server/0650-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0651-Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/0651-Add-missing-structure-set-seed-configs.patch
index 8677197bdc..8677197bdc 100644
--- a/patches/server/0651-Add-missing-structure-set-seed-configs.patch
+++ b/patches/unapplied/server/0651-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0652-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0652-Fix-cancelled-powdered-snow-bucket-placement.patch
index d1a867e605..d1a867e605 100644
--- a/patches/server/0652-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/unapplied/server/0652-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0653-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0653-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index d5922672e4..d5922672e4 100644
--- a/patches/server/0653-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/unapplied/server/0653-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0654-Add-GameEvent-tags.patch b/patches/unapplied/server/0654-Add-GameEvent-tags.patch
index bb674d2f17..bb674d2f17 100644
--- a/patches/server/0654-Add-GameEvent-tags.patch
+++ b/patches/unapplied/server/0654-Add-GameEvent-tags.patch
diff --git a/patches/server/0655-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0655-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 37019b7021..5a8009431c 100644
--- a/patches/server/0655-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/unapplied/server/0655-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0db44e8205d795cbeca1d6411aca0da5edf40d21..606c63342dcfb88e5c5d34c2e841ec8fa12e38e7 100644
+index a63621fa5e15cf74a6c2e5a3d4e7c2d390ff4845..1ca4d6c166f60afd4e34bccc48c00578cfcbe962 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1404,6 +1404,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0656-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0656-Furnace-RecipesUsed-API.patch
index 5b19cd68c0..5b19cd68c0 100644
--- a/patches/server/0656-Furnace-RecipesUsed-API.patch
+++ b/patches/unapplied/server/0656-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0657-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0657-Configurable-sculk-sensor-listener-range.patch
index 3dd1324354..3dd1324354 100644
--- a/patches/server/0657-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/unapplied/server/0657-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0658-Add-missing-block-data-API.patch b/patches/unapplied/server/0658-Add-missing-block-data-API.patch
index ace8c632a6..ace8c632a6 100644
--- a/patches/server/0658-Add-missing-block-data-API.patch
+++ b/patches/unapplied/server/0658-Add-missing-block-data-API.patch
diff --git a/patches/server/0659-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0659-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index e7084b7b3d..eef80766b2 100644
--- a/patches/server/0659-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/unapplied/server/0659-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 606c63342dcfb88e5c5d34c2e841ec8fa12e38e7..df93afc35403db15aa8e09b7e36ca0bb630041eb 100644
+index 1ca4d6c166f60afd4e34bccc48c00578cfcbe962..211f25d0c5366f89d88fe3089773db27fa183edd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -645,7 +645,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0660-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0660-Put-world-into-worldlist-before-initing-the-world.patch
index 56e3b2d29b..d70da99cef 100644
--- a/patches/server/0660-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/unapplied/server/0660-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index df93afc35403db15aa8e09b7e36ca0bb630041eb..4cbb5fdcb8734d3944963b911bb759923ad38d16 100644
+index 211f25d0c5366f89d88fe3089773db27fa183edd..c2df890ffc8b72ef41c2de9f29ab54386f12b1d3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -657,9 +657,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0661-Custom-Potion-Mixes.patch b/patches/unapplied/server/0661-Custom-Potion-Mixes.patch
index 94e9dddaeb..fc9d5e089c 100644
--- a/patches/server/0661-Custom-Potion-Mixes.patch
+++ b/patches/unapplied/server/0661-Custom-Potion-Mixes.patch
@@ -96,7 +96,7 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4cbb5fdcb8734d3944963b911bb759923ad38d16..57c52a30d284332361f28d6138d3c5f1fc6d52bd 100644
+index c2df890ffc8b72ef41c2de9f29ab54386f12b1d3..f9a5e19f74022a03cf82e44ab59a256abc08468e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2196,6 +2196,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0662-Force-close-world-loading-screen.patch b/patches/unapplied/server/0662-Force-close-world-loading-screen.patch
index 820a46bebe..820a46bebe 100644
--- a/patches/server/0662-Force-close-world-loading-screen.patch
+++ b/patches/unapplied/server/0662-Force-close-world-loading-screen.patch
diff --git a/patches/server/0663-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0663-Fix-falling-block-spawn-methods.patch
index bf697e1042..c6d0a0b02a 100644
--- a/patches/server/0663-Fix-falling-block-spawn-methods.patch
+++ b/patches/unapplied/server/0663-Fix-falling-block-spawn-methods.patch
@@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 085b5a185a8470600e88d68f4fedfee8bae2b28a..d5675c1aec7d4b1a426cff55c8cac2decac6ec0a 100644
+index cdee49fbbf22fcbf4618b503e15b21a917144f85..33735897ec3800754ba690ca215d3d11d746f728 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1386,7 +1386,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0664-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0664-Expose-furnace-minecart-push-values.patch
index fb48aabb5f..fb48aabb5f 100644
--- a/patches/server/0664-Expose-furnace-minecart-push-values.patch
+++ b/patches/unapplied/server/0664-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0665-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0665-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 7a72849b26..10e5a4a924 100644
--- a/patches/server/0665-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/unapplied/server/0665-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
@@ -15,7 +15,7 @@ piercing arrows to avoid duplicate damage being applied.
 protected net.minecraft.world.entity.projectile.Projectile hitCancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 44bcb1117cfa4d66c500011489ae193a0d1e7d78..75cc3db39c974abab8510af4a633fc6812efc647 100644
+index 07f36edf9362227521daabfdceaa7e136d854f8d..c173c692e84eb5f2d2ed9873dc3411dbd575fcce 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -344,6 +344,19 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0666-More-Projectile-API.patch b/patches/unapplied/server/0666-More-Projectile-API.patch
index c03e65b770..c03e65b770 100644
--- a/patches/server/0666-More-Projectile-API.patch
+++ b/patches/unapplied/server/0666-More-Projectile-API.patch
diff --git a/patches/server/0667-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0667-Fix-swamp-hut-cat-generation-deadlock.patch
index 24bfbc0dc7..24bfbc0dc7 100644
--- a/patches/server/0667-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/unapplied/server/0667-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0668-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0668-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index cb7a4055d9..cb7a4055d9 100644
--- a/patches/server/0668-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/unapplied/server/0668-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0669-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0669-Implement-getComputedBiome-API.patch
index dab55a6218..dab55a6218 100644
--- a/patches/server/0669-Implement-getComputedBiome-API.patch
+++ b/patches/unapplied/server/0669-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0670-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0670-Make-some-itemstacks-nonnull.patch
index 20944d9088..20944d9088 100644
--- a/patches/server/0670-Make-some-itemstacks-nonnull.patch
+++ b/patches/unapplied/server/0670-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0671-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0671-Implement-enchantWithLevels-API.patch
index 45f1f704ca..45f1f704ca 100644
--- a/patches/server/0671-Implement-enchantWithLevels-API.patch
+++ b/patches/unapplied/server/0671-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0672-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0672-Fix-saving-in-unloadWorld.patch
index 540896076f..540896076f 100644
--- a/patches/server/0672-Fix-saving-in-unloadWorld.patch
+++ b/patches/unapplied/server/0672-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0673-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0673-Buffer-OOB-setBlock-calls.patch
index 1b7ba291c4..1b7ba291c4 100644
--- a/patches/server/0673-Buffer-OOB-setBlock-calls.patch
+++ b/patches/unapplied/server/0673-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0674-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0674-Add-TameableDeathMessageEvent.patch
index 641b0b0e37..641b0b0e37 100644
--- a/patches/server/0674-Add-TameableDeathMessageEvent.patch
+++ b/patches/unapplied/server/0674-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0675-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/0675-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 941734df6f..941734df6f 100644
--- a/patches/server/0675-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/unapplied/server/0675-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0676-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0676-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 7cf6d23322..7cf6d23322 100644
--- a/patches/server/0676-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/unapplied/server/0676-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0677-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0677-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 9e576da81a..9e576da81a 100644
--- a/patches/server/0677-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/unapplied/server/0677-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0678-Cache-resource-keys-and-optimize-reference-Holder-ta.patch b/patches/unapplied/server/0678-Cache-resource-keys-and-optimize-reference-Holder-ta.patch
index 7356aca21a..7356aca21a 100644
--- a/patches/server/0678-Cache-resource-keys-and-optimize-reference-Holder-ta.patch
+++ b/patches/unapplied/server/0678-Cache-resource-keys-and-optimize-reference-Holder-ta.patch
diff --git a/patches/server/0679-Allow-changing-the-EnderDragon-podium.patch b/patches/unapplied/server/0679-Allow-changing-the-EnderDragon-podium.patch
index 5cbce2b4ec..5cbce2b4ec 100644
--- a/patches/server/0679-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/unapplied/server/0679-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0680-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0680-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index f885dbe8b4..f885dbe8b4 100644
--- a/patches/server/0680-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/unapplied/server/0680-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0681-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0681-Prevent-tile-entity-copies-loading-chunks.patch
index d690eb7288..d690eb7288 100644
--- a/patches/server/0681-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/unapplied/server/0681-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0682-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0682-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 5407679d61..5407679d61 100644
--- a/patches/server/0682-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/unapplied/server/0682-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0683-Expand-PlayerItemDamageEvent.patch b/patches/unapplied/server/0683-Expand-PlayerItemDamageEvent.patch
index 9659c38659..9659c38659 100644
--- a/patches/server/0683-Expand-PlayerItemDamageEvent.patch
+++ b/patches/unapplied/server/0683-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0684-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0684-WorldCreator-keepSpawnLoaded.patch
index ab38fc7006..ab38fc7006 100644
--- a/patches/server/0684-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/unapplied/server/0684-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0685-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/unapplied/server/0685-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0685-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/unapplied/server/0685-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0686-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0686-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 3ecc56a332..3ecc56a332 100644
--- a/patches/server/0686-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/unapplied/server/0686-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0687-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0687-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index d50c55e4e3..d50c55e4e3 100644
--- a/patches/server/0687-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/unapplied/server/0687-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0688-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0688-Fire-CauldronLevelChange-on-initial-fill.patch
index 86520e0647..86520e0647 100644
--- a/patches/server/0688-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/unapplied/server/0688-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0689-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0689-fix-powder-snow-cauldrons-not-turning-to-water.patch
index 201c323a35..201c323a35 100644
--- a/patches/server/0689-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/unapplied/server/0689-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0690-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0690-Add-PlayerStopUsingItemEvent.patch
index 4471991148..4471991148 100644
--- a/patches/server/0690-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/unapplied/server/0690-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0691-Don-t-tick-markers.patch b/patches/unapplied/server/0691-Don-t-tick-markers.patch
index 81c5c7ea5c..81c5c7ea5c 100644
--- a/patches/server/0691-Don-t-tick-markers.patch
+++ b/patches/unapplied/server/0691-Don-t-tick-markers.patch
diff --git a/patches/server/0692-Expand-FallingBlock-API.patch b/patches/unapplied/server/0692-Expand-FallingBlock-API.patch
index 7992fef972..7992fef972 100644
--- a/patches/server/0692-Expand-FallingBlock-API.patch
+++ b/patches/unapplied/server/0692-Expand-FallingBlock-API.patch
diff --git a/patches/server/0693-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0693-Add-support-for-Proxy-Protocol.patch
index 6387bf34f6..6387bf34f6 100644
--- a/patches/server/0693-Add-support-for-Proxy-Protocol.patch
+++ b/patches/unapplied/server/0693-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0694-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0694-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 4726c2f65c..4726c2f65c 100644
--- a/patches/server/0694-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/unapplied/server/0694-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0695-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0695-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0695-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/unapplied/server/0695-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0696-Sanitize-sent-BlockEntity-NBT.patch b/patches/unapplied/server/0696-Sanitize-sent-BlockEntity-NBT.patch
index 60a49fa4ef..60a49fa4ef 100644
--- a/patches/server/0696-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/unapplied/server/0696-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0697-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0697-Disable-component-selector-resolving-in-books-by-def.patch
index 7231198032..7231198032 100644
--- a/patches/server/0697-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/unapplied/server/0697-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0698-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0698-Prevent-entity-loading-causing-async-lookups.patch
index a355a7c5d0..a355a7c5d0 100644
--- a/patches/server/0698-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/unapplied/server/0698-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0699-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0699-Throw-exception-on-world-create-while-being-ticked.patch
index 5e7fab746b..b4238c330f 100644
--- a/patches/server/0699-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/unapplied/server/0699-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 57c52a30d284332361f28d6138d3c5f1fc6d52bd..25e2baf2109b27887e4b3631d948907d9d8d65a2 100644
+index f9a5e19f74022a03cf82e44ab59a256abc08468e..d7e5c1a5963139ab0362b565a964c998b2a9691b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -327,6 +327,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0700-Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/0700-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0700-Dont-resent-entity-on-art-update.patch
+++ b/patches/unapplied/server/0700-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0701-Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/0701-Add-WardenAngerChangeEvent.patch
index ca2817ab51..ca2817ab51 100644
--- a/patches/server/0701-Add-WardenAngerChangeEvent.patch
+++ b/patches/unapplied/server/0701-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0702-Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/0702-Add-option-for-strict-advancement-dimension-checks.patch
index c58840bc49..c58840bc49 100644
--- a/patches/server/0702-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/unapplied/server/0702-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0703-Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/0703-Add-missing-important-BlockStateListPopulator-method.patch
index 94a1b50995..94a1b50995 100644
--- a/patches/server/0703-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/unapplied/server/0703-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0704-Nameable-Banner-API.patch b/patches/unapplied/server/0704-Nameable-Banner-API.patch
index aab360dbed..aab360dbed 100644
--- a/patches/server/0704-Nameable-Banner-API.patch
+++ b/patches/unapplied/server/0704-Nameable-Banner-API.patch
diff --git a/patches/server/0705-Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/0705-Don-t-broadcast-messages-to-command-blocks.patch
index e27e3d40a7..e27e3d40a7 100644
--- a/patches/server/0705-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/unapplied/server/0705-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0706-Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/0706-Prevent-empty-items-from-being-added-to-world.patch
index 4f718f2374..4f718f2374 100644
--- a/patches/server/0706-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/unapplied/server/0706-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0707-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/0707-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index c2e21a749e..c2e21a749e 100644
--- a/patches/server/0707-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/unapplied/server/0707-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0708-Add-Player-getFishHook.patch b/patches/unapplied/server/0708-Add-Player-getFishHook.patch
index 15a4d9dca1..15a4d9dca1 100644
--- a/patches/server/0708-Add-Player-getFishHook.patch
+++ b/patches/unapplied/server/0708-Add-Player-getFishHook.patch
diff --git a/patches/server/0709-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/0709-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0709-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/unapplied/server/0709-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0710-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/0710-Add-various-missing-EntityDropItemEvent-calls.patch
index 3175db1ada..3175db1ada 100644
--- a/patches/server/0710-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/unapplied/server/0710-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0711-Fix-Bee-flower-NPE.patch b/patches/unapplied/server/0711-Fix-Bee-flower-NPE.patch
index d84bd3a355..d84bd3a355 100644
--- a/patches/server/0711-Fix-Bee-flower-NPE.patch
+++ b/patches/unapplied/server/0711-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0712-More-Teleport-API.patch b/patches/unapplied/server/0712-More-Teleport-API.patch
index 0496d12460..2ceedf2496 100644
--- a/patches/server/0712-More-Teleport-API.patch
+++ b/patches/unapplied/server/0712-More-Teleport-API.patch
@@ -113,7 +113,7 @@ index 10fb64df10820974d11f142c102a11a5bd0f317c..8d2f6bb43fb69a4a1e2085960eb24f43
      private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 13f17ea2164972df50359af9af14262d0821c2a6..659e9e1062dd7d5cd6d1756f3d61c2478179d479 100644
+index 2df2a194851c170343e2aa3695122618285edc31..7c536fa1155dc87c54489dc145a41a02debda561 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1293,13 +1293,94 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0713-Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/0713-Add-EntityPortalReadyEvent.patch
index 46f19b8cc8..46f19b8cc8 100644
--- a/patches/server/0713-Add-EntityPortalReadyEvent.patch
+++ b/patches/unapplied/server/0713-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0714-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0714-Don-t-use-level-random-in-entity-constructors.patch
index 83efb1446f..83efb1446f 100644
--- a/patches/server/0714-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/unapplied/server/0714-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0715-Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/0715-Send-block-entities-after-destroy-prediction.patch
index 33f40a7bcc..33f40a7bcc 100644
--- a/patches/server/0715-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/unapplied/server/0715-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0716-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/0716-Warn-on-plugins-accessing-faraway-chunks.patch
index 990dd560c1..990dd560c1 100644
--- a/patches/server/0716-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/unapplied/server/0716-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0717-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/0717-Custom-Chat-Completion-Suggestions-API.patch
index 60f779c74e..52dce9a2b4 100644
--- a/patches/server/0717-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/unapplied/server/0717-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 659e9e1062dd7d5cd6d1756f3d61c2478179d479..947c4fd897ee61799d5532aca67b7118a806e842 100644
+index 7c536fa1155dc87c54489dc145a41a02debda561..84e58dbcbce92784cc6dd197b127736fdd2cc326 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -698,6 +698,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0718-Add-and-fix-missing-BlockFadeEvents.patch b/patches/unapplied/server/0718-Add-and-fix-missing-BlockFadeEvents.patch
index 1ac5d1e5ab..1ac5d1e5ab 100644
--- a/patches/server/0718-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/unapplied/server/0718-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0719-Collision-API.patch b/patches/unapplied/server/0719-Collision-API.patch
index 6798d0e429..6798d0e429 100644
--- a/patches/server/0719-Collision-API.patch
+++ b/patches/unapplied/server/0719-Collision-API.patch
diff --git a/patches/server/0720-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/0720-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 34f5fa3e3d..4627673f0f 100644
--- a/patches/server/0720-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/unapplied/server/0720-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix suggest command message for brigadier syntax exceptions
 This is a bug accidentally introduced in upstream CB
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index bee79fab7f8195e14f6bd22d9cd59bfc704bf903..fd12046fab797fd845ad8521f94147480dfba5da 100644
+index 800d1756db8c27b7d129a90addc125c4fc81e134..977f9ac300490562d9894af4a42621b594f0a8e0 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -391,7 +391,7 @@ public class Commands {
diff --git a/patches/server/0721-Block-Ticking-API.patch b/patches/unapplied/server/0721-Block-Ticking-API.patch
index b490077b4f..b490077b4f 100644
--- a/patches/server/0721-Block-Ticking-API.patch
+++ b/patches/unapplied/server/0721-Block-Ticking-API.patch
diff --git a/patches/server/0722-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0722-Add-Velocity-IP-Forwarding-Support.patch
index a276b2c88d..a276b2c88d 100644
--- a/patches/server/0722-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/unapplied/server/0722-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0723-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/0723-Add-NamespacedKey-biome-methods.patch
index 1734d3c119..1734d3c119 100644
--- a/patches/server/0723-Add-NamespacedKey-biome-methods.patch
+++ b/patches/unapplied/server/0723-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0724-Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/0724-Fix-plugin-loggers-on-server-shutdown.patch
index 1b6830b082..afe1b6cf76 100644
--- a/patches/server/0724-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/unapplied/server/0724-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 25e2baf2109b27887e4b3631d948907d9d8d65a2..3fc8e626bc66f3cf32d165099ed7a6e4300e8146 100644
+index d7e5c1a5963139ab0362b565a964c998b2a9691b..0fb8abcead1047c00fa7ee9484d704fc1cb46da7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1276,6 +1276,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0725-Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/0725-Stop-large-look-changes-from-crashing-the-server.patch
index add808bade..add808bade 100644
--- a/patches/server/0725-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/unapplied/server/0725-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0726-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/0726-Fire-EntityChangeBlockEvent-in-more-places.patch
index 1d46619357..1d46619357 100644
--- a/patches/server/0726-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/unapplied/server/0726-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0727-Missing-eating-regain-reason.patch b/patches/unapplied/server/0727-Missing-eating-regain-reason.patch
index 38626b6352..38626b6352 100644
--- a/patches/server/0727-Missing-eating-regain-reason.patch
+++ b/patches/unapplied/server/0727-Missing-eating-regain-reason.patch
diff --git a/patches/server/0728-Missing-effect-cause.patch b/patches/unapplied/server/0728-Missing-effect-cause.patch
index 6157121022..6157121022 100644
--- a/patches/server/0728-Missing-effect-cause.patch
+++ b/patches/unapplied/server/0728-Missing-effect-cause.patch
diff --git a/patches/server/0729-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/0729-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0729-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/unapplied/server/0729-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0730-Add-source-block-to-BlockPhysicsEvent.patch b/patches/unapplied/server/0730-Add-source-block-to-BlockPhysicsEvent.patch
index 91adea4a23..91adea4a23 100644
--- a/patches/server/0730-Add-source-block-to-BlockPhysicsEvent.patch
+++ b/patches/unapplied/server/0730-Add-source-block-to-BlockPhysicsEvent.patch
diff --git a/patches/server/0731-Configurable-chat-thread-limit.patch b/patches/unapplied/server/0731-Configurable-chat-thread-limit.patch
index 43277b9fb4..43277b9fb4 100644
--- a/patches/server/0731-Configurable-chat-thread-limit.patch
+++ b/patches/unapplied/server/0731-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0732-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/0732-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 3ce15af172..3ce15af172 100644
--- a/patches/server/0732-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/unapplied/server/0732-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0733-fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/0733-fix-Jigsaw-block-kicking-user.patch
index 749d498f57..749d498f57 100644
--- a/patches/server/0733-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/unapplied/server/0733-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0734-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/0734-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 3159c4b594..3159c4b594 100644
--- a/patches/server/0734-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/unapplied/server/0734-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0735-Add-getDrops-to-BlockState.patch b/patches/unapplied/server/0735-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0735-Add-getDrops-to-BlockState.patch
+++ b/patches/unapplied/server/0735-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0736-Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/0736-Fix-a-bunch-of-vanilla-bugs.patch
index c8defc9dce..c8defc9dce 100644
--- a/patches/server/0736-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/unapplied/server/0736-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0737-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/0737-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 1997aae5c2..1997aae5c2 100644
--- a/patches/server/0737-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/unapplied/server/0737-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0738-Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/0738-Fix-custom-piglin-loved-items.patch
index 358bd47f1e..358bd47f1e 100644
--- a/patches/server/0738-Fix-custom-piglin-loved-items.patch
+++ b/patches/unapplied/server/0738-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0739-EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/0739-EntityPickupItemEvent-fixes.patch
index 839a01673d..839a01673d 100644
--- a/patches/server/0739-EntityPickupItemEvent-fixes.patch
+++ b/patches/unapplied/server/0739-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0740-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/0740-Correctly-handle-interactions-with-items-on-cooldown.patch
index d902a451c9..d902a451c9 100644
--- a/patches/server/0740-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/unapplied/server/0740-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0741-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/0741-Add-PlayerInventorySlotChangeEvent.patch
index 873fac7831..873fac7831 100644
--- a/patches/server/0741-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/unapplied/server/0741-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0742-Elder-Guardian-appearance-API.patch b/patches/unapplied/server/0742-Elder-Guardian-appearance-API.patch
index 3d635e7223..cc3c415447 100644
--- a/patches/server/0742-Elder-Guardian-appearance-API.patch
+++ b/patches/unapplied/server/0742-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 947c4fd897ee61799d5532aca67b7118a806e842..c94e24b1d0752ed5031f5710068c2e1dd6a172c5 100644
+index 84e58dbcbce92784cc6dd197b127736fdd2cc326..364cca0680da16a3c38749ad7c668263808eff9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3310,6 +3310,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0743-Add-entity-knockback-API.patch b/patches/unapplied/server/0743-Add-entity-knockback-API.patch
index 71f4427274..71f4427274 100644
--- a/patches/server/0743-Add-entity-knockback-API.patch
+++ b/patches/unapplied/server/0743-Add-entity-knockback-API.patch
diff --git a/patches/server/0744-Detect-headless-JREs.patch b/patches/unapplied/server/0744-Detect-headless-JREs.patch
index e680b6146f..e680b6146f 100644
--- a/patches/server/0744-Detect-headless-JREs.patch
+++ b/patches/unapplied/server/0744-Detect-headless-JREs.patch
diff --git a/patches/server/0745-fix-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/0745-fix-entity-vehicle-collision-event-not-called.patch
index 5511a3cdd1..5511a3cdd1 100644
--- a/patches/server/0745-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/unapplied/server/0745-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0746-Add-EntityToggleSitEvent.patch b/patches/unapplied/server/0746-Add-EntityToggleSitEvent.patch
index 7bab6af93d..7bab6af93d 100644
--- a/patches/server/0746-Add-EntityToggleSitEvent.patch
+++ b/patches/unapplied/server/0746-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0747-Add-fire-tick-delay-option.patch b/patches/unapplied/server/0747-Add-fire-tick-delay-option.patch
index 7db107dee9..7db107dee9 100644
--- a/patches/server/0747-Add-fire-tick-delay-option.patch
+++ b/patches/unapplied/server/0747-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0748-Add-Moving-Piston-API.patch b/patches/unapplied/server/0748-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0748-Add-Moving-Piston-API.patch
+++ b/patches/unapplied/server/0748-Add-Moving-Piston-API.patch
diff --git a/patches/server/0749-Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/0749-Ignore-impossible-spawn-tick.patch
index ee2750f36d..ee2750f36d 100644
--- a/patches/server/0749-Ignore-impossible-spawn-tick.patch
+++ b/patches/unapplied/server/0749-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0750-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/unapplied/server/0750-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
index 2fe35c8b32..2fe35c8b32 100644
--- a/patches/server/0750-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
+++ b/patches/unapplied/server/0750-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
diff --git a/patches/server/0751-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/0751-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index c12c95ac99..c12c95ac99 100644
--- a/patches/server/0751-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/unapplied/server/0751-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0752-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/0752-Add-PrePlayerAttackEntityEvent.patch
index 5a925374e5..5a925374e5 100644
--- a/patches/server/0752-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/unapplied/server/0752-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0753-ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/0753-ensure-reset-EnderDragon-boss-event-name.patch
index 4c5db1221b..4c5db1221b 100644
--- a/patches/server/0753-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/unapplied/server/0753-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0754-Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/0754-Add-Player-Warden-Warning-API.patch
index 8755c60c90..8c780e80f9 100644
--- a/patches/server/0754-Add-Player-Warden-Warning-API.patch
+++ b/patches/unapplied/server/0754-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c94e24b1d0752ed5031f5710068c2e1dd6a172c5..76d85db873d223aa3f8b310e83eff880d451ff8f 100644
+index 364cca0680da16a3c38749ad7c668263808eff9b..da5f9cbb1c0376ac492cb7a92af79da3ff486c63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3315,6 +3315,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0755-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/0755-More-vanilla-friendly-methods-to-update-trades.patch
index b3901a0ae7..b3901a0ae7 100644
--- a/patches/server/0755-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/unapplied/server/0755-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0756-Add-paper-dumplisteners-command.patch b/patches/unapplied/server/0756-Add-paper-dumplisteners-command.patch
index aabb60033d..aabb60033d 100644
--- a/patches/server/0756-Add-paper-dumplisteners-command.patch
+++ b/patches/unapplied/server/0756-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0757-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0757-check-global-player-list-where-appropriate.patch
index c8b1741440..c8b1741440 100644
--- a/patches/server/0757-check-global-player-list-where-appropriate.patch
+++ b/patches/unapplied/server/0757-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0758-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/0758-Fix-async-entity-add-due-to-fungus-trees.patch
index 009feeb37a..009feeb37a 100644
--- a/patches/server/0758-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/unapplied/server/0758-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0759-ItemStack-damage-API.patch b/patches/unapplied/server/0759-ItemStack-damage-API.patch
index 55e7f06af1..55e7f06af1 100644
--- a/patches/server/0759-ItemStack-damage-API.patch
+++ b/patches/unapplied/server/0759-ItemStack-damage-API.patch
diff --git a/patches/server/0760-Friction-API.patch b/patches/unapplied/server/0760-Friction-API.patch
index d0219e68b9..d0219e68b9 100644
--- a/patches/server/0760-Friction-API.patch
+++ b/patches/unapplied/server/0760-Friction-API.patch
diff --git a/patches/server/0761-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/0761-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 0b482955d5..0b482955d5 100644
--- a/patches/server/0761-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/unapplied/server/0761-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0762-Fix-premature-player-kicks-on-shutdown.patch b/patches/unapplied/server/0762-Fix-premature-player-kicks-on-shutdown.patch
index 640595a34d..814f370b2d 100644
--- a/patches/server/0762-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/unapplied/server/0762-Fix-premature-player-kicks-on-shutdown.patch
@@ -47,7 +47,7 @@ index 4d9f1fc884050993287adfa4578a87da710623fb..a8dfe7a4b3d01bf75587be078f471d1e
                          this.disconnect((Component) Component.translatable("multiplayer.disconnect.server_shutdown"));
                      } catch (ClassCastException classcastexception) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3fc8e626bc66f3cf32d165099ed7a6e4300e8146..741b5ba321d9bd854afb9b54f0e23c739c7f929c 100644
+index 0fb8abcead1047c00fa7ee9484d704fc1cb46da7..3cc43a697ccccac582b72b65bdf6ba08156a0d30 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2127,7 +2127,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0763-Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/0763-Sync-offhand-slot-in-menus.patch
index 8200d057c4..8200d057c4 100644
--- a/patches/server/0763-Sync-offhand-slot-in-menus.patch
+++ b/patches/unapplied/server/0763-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0764-Player-Entity-Tracking-Events.patch b/patches/unapplied/server/0764-Player-Entity-Tracking-Events.patch
index 8a601a81f2..ecf81e686e 100644
--- a/patches/server/0764-Player-Entity-Tracking-Events.patch
+++ b/patches/unapplied/server/0764-Player-Entity-Tracking-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index fde03e0e5cd42339e5bfbeb60670139af5f56e1c..bf88c5de30e6cde87099dab546e5d1bd817134a2 100644
+index 2d325c998e40a65af10d6adbb0dc304bea50e3d8..c1c2eeba0f5b8e499cc51cc1df7bf9acb61bd7d6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1580,7 +1580,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0765-Limit-pet-look-distance.patch b/patches/unapplied/server/0765-Limit-pet-look-distance.patch
index 983f861539..983f861539 100644
--- a/patches/server/0765-Limit-pet-look-distance.patch
+++ b/patches/unapplied/server/0765-Limit-pet-look-distance.patch
diff --git a/patches/server/0766-fix-Instruments.patch b/patches/unapplied/server/0766-fix-Instruments.patch
index 4269d924c3..137a1404f2 100644
--- a/patches/server/0766-fix-Instruments.patch
+++ b/patches/unapplied/server/0766-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 76d85db873d223aa3f8b310e83eff880d451ff8f..9e7c7e016211622e35acda872477acb1ea62ca9f 100644
+index da5f9cbb1c0376ac492cb7a92af79da3ff486c63..3bbb1f29e98a75a5be8ba1777c6f8c088267d599 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -775,7 +775,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0767-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/unapplied/server/0767-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 6825374465..6825374465 100644
--- a/patches/server/0767-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/unapplied/server/0767-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0768-Add-BlockLockCheckEvent.patch b/patches/unapplied/server/0768-Add-BlockLockCheckEvent.patch
index b06f734eb2..b06f734eb2 100644
--- a/patches/server/0768-Add-BlockLockCheckEvent.patch
+++ b/patches/unapplied/server/0768-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0769-Add-Sneaking-API-for-Entities.patch b/patches/unapplied/server/0769-Add-Sneaking-API-for-Entities.patch
index aaf72ccfd7..aaf72ccfd7 100644
--- a/patches/server/0769-Add-Sneaking-API-for-Entities.patch
+++ b/patches/unapplied/server/0769-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0770-Improve-logging-and-errors.patch b/patches/unapplied/server/0770-Improve-logging-and-errors.patch
index 05b5ce7881..05b5ce7881 100644
--- a/patches/server/0770-Improve-logging-and-errors.patch
+++ b/patches/unapplied/server/0770-Improve-logging-and-errors.patch
diff --git a/patches/server/0771-Improve-PortalEvents.patch b/patches/unapplied/server/0771-Improve-PortalEvents.patch
index 1f961cddb9..1f961cddb9 100644
--- a/patches/server/0771-Improve-PortalEvents.patch
+++ b/patches/unapplied/server/0771-Improve-PortalEvents.patch
diff --git a/patches/server/0772-Add-config-option-for-spider-worldborder-climbing.patch b/patches/unapplied/server/0772-Add-config-option-for-spider-worldborder-climbing.patch
index 6d4efc38b6..6d4efc38b6 100644
--- a/patches/server/0772-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/unapplied/server/0772-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0773-Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/0773-Add-missing-SpigotConfig-logCommands-check.patch
index 1f4535d32a..1f4535d32a 100644
--- a/patches/server/0773-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/unapplied/server/0773-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0774-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/unapplied/server/0774-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0774-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/unapplied/server/0774-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0775-Flying-Fall-Damage.patch b/patches/unapplied/server/0775-Flying-Fall-Damage.patch
index 6e83415e6d..26fa959443 100644
--- a/patches/server/0775-Flying-Fall-Damage.patch
+++ b/patches/unapplied/server/0775-Flying-Fall-Damage.patch
@@ -26,7 +26,7 @@ index 30e0a5fe3f9bd85d2b702c2c877c5682ed35d461..aca888c2f02b09ac6739bdc81b194c45
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9e7c7e016211622e35acda872477acb1ea62ca9f..2bebbc926acce49d2ea1e7a170abb5b9a587868d 100644
+index 3bbb1f29e98a75a5be8ba1777c6f8c088267d599..4e37b5c5f95607c368495b0b02a4987d9741b84d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2593,6 +2593,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0776-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/server/0776-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index e26237618f..e26237618f 100644
--- a/patches/server/0776-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/unapplied/server/0776-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0777-config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/0777-config-for-disabling-entity-tag-tags.patch
index 59c33843ce..59c33843ce 100644
--- a/patches/server/0777-config-for-disabling-entity-tag-tags.patch
+++ b/patches/unapplied/server/0777-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0778-Use-single-player-info-update-packet-on-join.patch b/patches/unapplied/server/0778-Use-single-player-info-update-packet-on-join.patch
index a4901625a7..a4901625a7 100644
--- a/patches/server/0778-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/unapplied/server/0778-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0779-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/0779-Correctly-shrink-items-during-EntityResurrectEvent.patch
index d2f07ac306..d2f07ac306 100644
--- a/patches/server/0779-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/unapplied/server/0779-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0780-Win-Screen-API.patch b/patches/unapplied/server/0780-Win-Screen-API.patch
index 42b019a13f..c9c5f63cdb 100644
--- a/patches/server/0780-Win-Screen-API.patch
+++ b/patches/unapplied/server/0780-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2bebbc926acce49d2ea1e7a170abb5b9a587868d..cc8423a7feeb33f95a429c293e628fb1499ebb73 100644
+index 4e37b5c5f95607c368495b0b02a4987d9741b84d..941efccd54038c2bffbcd89cf3e5a6d1915409fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1312,6 +1312,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0781-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/0781-Remove-CraftItemStack-setAmount-null-assignment.patch
index aa0acd564f..aa0acd564f 100644
--- a/patches/server/0781-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/unapplied/server/0781-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0782-Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/0782-Fix-force-opening-enchantment-tables.patch
index deac4001bb..deac4001bb 100644
--- a/patches/server/0782-Fix-force-opening-enchantment-tables.patch
+++ b/patches/unapplied/server/0782-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0783-Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/0783-Add-Entity-Body-Yaw-API.patch
index 8c8b6b3629..8c8b6b3629 100644
--- a/patches/server/0783-Add-Entity-Body-Yaw-API.patch
+++ b/patches/unapplied/server/0783-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0784-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/unapplied/server/0784-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 9c1f7e2d47..9c1f7e2d47 100644
--- a/patches/server/0784-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/unapplied/server/0784-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0785-Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/0785-Add-EntityFertilizeEggEvent.patch
index a5b9caf556..a5b9caf556 100644
--- a/patches/server/0785-Add-EntityFertilizeEggEvent.patch
+++ b/patches/unapplied/server/0785-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0786-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/unapplied/server/0786-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 5807cdf697..5807cdf697 100644
--- a/patches/server/0786-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/unapplied/server/0786-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0787-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/0787-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 2e105236ee..2e105236ee 100644
--- a/patches/server/0787-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/unapplied/server/0787-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0788-Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/0788-Correctly-handle-ArmorStand-invisibility.patch
index 4c4c5048be..4c4c5048be 100644
--- a/patches/server/0788-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/unapplied/server/0788-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0789-Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/0789-Fix-advancement-triggers-for-entity-damage.patch
index 5d63deeb0d..5d63deeb0d 100644
--- a/patches/server/0789-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/unapplied/server/0789-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0790-Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/0790-Fix-text-display-error-on-spawn.patch
index d783ac8eee..d783ac8eee 100644
--- a/patches/server/0790-Fix-text-display-error-on-spawn.patch
+++ b/patches/unapplied/server/0790-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0791-Fix-inventories-returning-null-Locations.patch b/patches/unapplied/server/0791-Fix-inventories-returning-null-Locations.patch
index 1a65689fad..1a65689fad 100644
--- a/patches/server/0791-Fix-inventories-returning-null-Locations.patch
+++ b/patches/unapplied/server/0791-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0792-Add-Shearable-API.patch b/patches/unapplied/server/0792-Add-Shearable-API.patch
index 302cec90c2..302cec90c2 100644
--- a/patches/server/0792-Add-Shearable-API.patch
+++ b/patches/unapplied/server/0792-Add-Shearable-API.patch
diff --git a/patches/server/0793-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/server/0793-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 254a94df3a..254a94df3a 100644
--- a/patches/server/0793-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/unapplied/server/0793-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0794-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/unapplied/server/0794-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 72035f8c0e..72035f8c0e 100644
--- a/patches/server/0794-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/unapplied/server/0794-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0795-Treat-sequence-violations-like-they-should-be.patch b/patches/unapplied/server/0795-Treat-sequence-violations-like-they-should-be.patch
index de57dee971..de57dee971 100644
--- a/patches/server/0795-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/unapplied/server/0795-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0796-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/unapplied/server/0796-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 0ee423dac7..0ee423dac7 100644
--- a/patches/server/0796-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/unapplied/server/0796-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0797-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/unapplied/server/0797-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index cf13c8d853..cf13c8d853 100644
--- a/patches/server/0797-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/unapplied/server/0797-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0798-Use-array-for-gamerule-storage.patch b/patches/unapplied/server/0798-Use-array-for-gamerule-storage.patch
index efb6cfeb50..efb6cfeb50 100644
--- a/patches/server/0798-Use-array-for-gamerule-storage.patch
+++ b/patches/unapplied/server/0798-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0799-Fix-a-couple-of-upstream-bed-issues.patch b/patches/unapplied/server/0799-Fix-a-couple-of-upstream-bed-issues.patch
index 76cfa7bc0d..76cfa7bc0d 100644
--- a/patches/server/0799-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/unapplied/server/0799-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0800-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/0800-Fix-demo-flag-not-enabling-demo-mode.patch
index 1a72571965..1a72571965 100644
--- a/patches/server/0800-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/unapplied/server/0800-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0801-Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/0801-Add-Mob-Experience-reward-API.patch
index 9e59c458f8..9e59c458f8 100644
--- a/patches/server/0801-Add-Mob-Experience-reward-API.patch
+++ b/patches/unapplied/server/0801-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0802-Break-redstone-on-top-of-trap-doors-early.patch b/patches/unapplied/server/0802-Break-redstone-on-top-of-trap-doors-early.patch
index ded460b32b..ded460b32b 100644
--- a/patches/server/0802-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/unapplied/server/0802-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0803-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/0803-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0803-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/unapplied/server/0803-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0804-More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/0804-More-accurate-isInOpenWater-impl.patch
index 6e110094dd..6e110094dd 100644
--- a/patches/server/0804-More-accurate-isInOpenWater-impl.patch
+++ b/patches/unapplied/server/0804-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0805-Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/0805-Expand-PlayerItemMendEvent.patch
index aba88cb11c..9733afb76c 100644
--- a/patches/server/0805-Expand-PlayerItemMendEvent.patch
+++ b/patches/unapplied/server/0805-Expand-PlayerItemMendEvent.patch
@@ -30,7 +30,7 @@ index 3a7af27bb1ce0cbe56bd3760cd400083daf98d4c..bf0838f574fa3fb9654e087d602b8d38
                  if (l > 0) {
                      // this.value = l; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls // Paper - the value field should not be mutated here because it doesn't take "count" into account
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cc8423a7feeb33f95a429c293e628fb1499ebb73..086492649e07de374aed486181a7c3ddb96cd7e1 100644
+index 941efccd54038c2bffbcd89cf3e5a6d1915409fe..ad3eaf3a5cb751051f2c9ca1464166a3e12950f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1865,11 +1865,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0806-Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/0806-Refresh-ProjectileSource-for-projectiles.patch
index 0041557448..0041557448 100644
--- a/patches/server/0806-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/unapplied/server/0806-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0807-Add-transient-modifier-API.patch b/patches/unapplied/server/0807-Add-transient-modifier-API.patch
index 36cc0a030a..36cc0a030a 100644
--- a/patches/server/0807-Add-transient-modifier-API.patch
+++ b/patches/unapplied/server/0807-Add-transient-modifier-API.patch
diff --git a/patches/server/0808-Fix-block-place-logic.patch b/patches/unapplied/server/0808-Fix-block-place-logic.patch
index 4f22f03cab..4f22f03cab 100644
--- a/patches/server/0808-Fix-block-place-logic.patch
+++ b/patches/unapplied/server/0808-Fix-block-place-logic.patch
diff --git a/patches/server/0809-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/unapplied/server/0809-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 69e6a10e57..69e6a10e57 100644
--- a/patches/server/0809-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/unapplied/server/0809-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0810-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/unapplied/server/0810-Call-BlockGrowEvent-for-missing-blocks.patch
index d48638c261..d48638c261 100644
--- a/patches/server/0810-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/unapplied/server/0810-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0811-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/unapplied/server/0811-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 516bf15511..516bf15511 100644
--- a/patches/server/0811-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/unapplied/server/0811-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0812-fix-MapLike-spam-for-missing-key-selector.patch b/patches/unapplied/server/0812-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0812-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/unapplied/server/0812-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0813-Fix-sniffer-removeExploredLocation.patch b/patches/unapplied/server/0813-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0813-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/unapplied/server/0813-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0814-Add-method-to-remove-all-active-potion-effects.patch b/patches/unapplied/server/0814-Add-method-to-remove-all-active-potion-effects.patch
index e730bcf1d4..e730bcf1d4 100644
--- a/patches/server/0814-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/unapplied/server/0814-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0815-Add-event-for-player-editing-sign.patch b/patches/unapplied/server/0815-Add-event-for-player-editing-sign.patch
index 5029597839..5029597839 100644
--- a/patches/server/0815-Add-event-for-player-editing-sign.patch
+++ b/patches/unapplied/server/0815-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0816-Only-tick-item-frames-if-players-can-see-it.patch b/patches/unapplied/server/0816-Only-tick-item-frames-if-players-can-see-it.patch
index c7c6cd499f..c7c6cd499f 100644
--- a/patches/server/0816-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/unapplied/server/0816-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0817-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/unapplied/server/0817-Fix-cmd-permission-levels-for-command-blocks.patch
index aa96a27db6..ea3dfd5584 100644
--- a/patches/server/0817-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/unapplied/server/0817-Fix-cmd-permission-levels-for-command-blocks.patch
@@ -41,7 +41,7 @@ index f31c5d665678c3163ed4469f8e9d395b890c1bbe..fc0c60b22844ed010aede2fa125b9fa4
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index fd12046fab797fd845ad8521f94147480dfba5da..fe9f638db3525893beed565ef9b7ac2fc76318bd 100644
+index 977f9ac300490562d9894af4a42621b594f0a8e0..cfa328f06c1b972c8328ff40580b485c02e0c270 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -300,16 +300,7 @@ public class Commands {
diff --git a/patches/server/0818-Add-option-to-disable-block-updates.patch b/patches/unapplied/server/0818-Add-option-to-disable-block-updates.patch
index 0ea835ecc9..0ea835ecc9 100644
--- a/patches/server/0818-Add-option-to-disable-block-updates.patch
+++ b/patches/unapplied/server/0818-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0819-Call-missing-BlockDispenseEvent.patch b/patches/unapplied/server/0819-Call-missing-BlockDispenseEvent.patch
index 174a0ab4b6..174a0ab4b6 100644
--- a/patches/server/0819-Call-missing-BlockDispenseEvent.patch
+++ b/patches/unapplied/server/0819-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0820-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/unapplied/server/0820-Don-t-load-chunks-for-supporting-block-checks.patch
index 7440fc0c49..7440fc0c49 100644
--- a/patches/server/0820-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/unapplied/server/0820-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0821-Optimize-player-lookups-for-beacons.patch b/patches/unapplied/server/0821-Optimize-player-lookups-for-beacons.patch
index 7e1285d891..7e1285d891 100644
--- a/patches/server/0821-Optimize-player-lookups-for-beacons.patch
+++ b/patches/unapplied/server/0821-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0822-More-Sign-Block-API.patch b/patches/unapplied/server/0822-More-Sign-Block-API.patch
index 70558b0010..70558b0010 100644
--- a/patches/server/0822-More-Sign-Block-API.patch
+++ b/patches/unapplied/server/0822-More-Sign-Block-API.patch
diff --git a/patches/server/0823-fix-item-meta-for-tadpole-buckets.patch b/patches/unapplied/server/0823-fix-item-meta-for-tadpole-buckets.patch
index 0ad43795a2..0ad43795a2 100644
--- a/patches/server/0823-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/unapplied/server/0823-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0824-Fix-BanList-API.patch b/patches/unapplied/server/0824-Fix-BanList-API.patch
index 6773a8fbe0..3793414ced 100644
--- a/patches/server/0824-Fix-BanList-API.patch
+++ b/patches/unapplied/server/0824-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 086492649e07de374aed486181a7c3ddb96cd7e1..e00a0eef7166793849f1caca285a51b922d422fa 100644
+index ad3eaf3a5cb751051f2c9ca1464166a3e12950f6..f4401ae5d4f9ceb963b582db63d65524f9a653fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1759,23 +1759,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0825-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/unapplied/server/0825-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 4f2b8e09cd..4f2b8e09cd 100644
--- a/patches/server/0825-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/unapplied/server/0825-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0826-Fix-possible-NPE-on-painting-creation.patch b/patches/unapplied/server/0826-Fix-possible-NPE-on-painting-creation.patch
index cc63dc03cf..cc63dc03cf 100644
--- a/patches/server/0826-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/unapplied/server/0826-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0827-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0827-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index c481798890..c481798890 100644
--- a/patches/server/0827-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/unapplied/server/0827-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0828-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/unapplied/server/0828-ExperienceOrb-should-call-EntitySpawnEvent.patch
index da24259a50..da24259a50 100644
--- a/patches/server/0828-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/unapplied/server/0828-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0829-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/unapplied/server/0829-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0829-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/unapplied/server/0829-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0830-Add-whitelist-events.patch b/patches/unapplied/server/0830-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0830-Add-whitelist-events.patch
+++ b/patches/unapplied/server/0830-Add-whitelist-events.patch
diff --git a/patches/server/0831-Implement-PlayerFailMoveEvent.patch b/patches/unapplied/server/0831-Implement-PlayerFailMoveEvent.patch
index ad4b642a19..ad4b642a19 100644
--- a/patches/server/0831-Implement-PlayerFailMoveEvent.patch
+++ b/patches/unapplied/server/0831-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0832-Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/server/0832-Folia-scheduler-and-owned-region-API.patch
index 10b07e7cdb..ee5c8a3e88 100644
--- a/patches/server/0832-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/unapplied/server/0832-Folia-scheduler-and-owned-region-API.patch
@@ -1148,7 +1148,7 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 741b5ba321d9bd854afb9b54f0e23c739c7f929c..9312279f8f958cd1fd13e8333ca476809e956e1c 100644
+index 3cc43a697ccccac582b72b65bdf6ba08156a0d30..84f1a1a5ffc04823f7e83bc352c0f66a0207e771 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1624,6 +1624,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0833-Only-erase-allay-memory-on-non-item-targets.patch b/patches/unapplied/server/0833-Only-erase-allay-memory-on-non-item-targets.patch
index 6342f7dee7..6342f7dee7 100644
--- a/patches/server/0833-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/unapplied/server/0833-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0834-Fix-rotation-when-spawning-display-entities.patch b/patches/unapplied/server/0834-Fix-rotation-when-spawning-display-entities.patch
index 22ee667200..22ee667200 100644
--- a/patches/server/0834-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/unapplied/server/0834-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0835-Only-capture-actual-tree-growth.patch b/patches/unapplied/server/0835-Only-capture-actual-tree-growth.patch
index 13fcd8afc3..13fcd8afc3 100644
--- a/patches/server/0835-Only-capture-actual-tree-growth.patch
+++ b/patches/unapplied/server/0835-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0836-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/unapplied/server/0836-Use-correct-source-for-mushroom-block-spread-event.patch
index 658d9ec376..658d9ec376 100644
--- a/patches/server/0836-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/unapplied/server/0836-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0837-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/unapplied/server/0837-Respect-randomizeData-on-more-entities-when-spawning.patch
index adf37e5cf2..adf37e5cf2 100644
--- a/patches/server/0837-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/unapplied/server/0837-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0838-Use-correct-seed-on-api-world-load.patch b/patches/unapplied/server/0838-Use-correct-seed-on-api-world-load.patch
index 80e41be4af..80e41be4af 100644
--- a/patches/server/0838-Use-correct-seed-on-api-world-load.patch
+++ b/patches/unapplied/server/0838-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0839-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/unapplied/server/0839-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index d87f310ded..d87f310ded 100644
--- a/patches/server/0839-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/unapplied/server/0839-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0840-Cache-map-ids-on-item-frames.patch b/patches/unapplied/server/0840-Cache-map-ids-on-item-frames.patch
index 01fb83165d..01fb83165d 100644
--- a/patches/server/0840-Cache-map-ids-on-item-frames.patch
+++ b/patches/unapplied/server/0840-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0841-API-for-updating-recipes-on-clients.patch b/patches/unapplied/server/0841-API-for-updating-recipes-on-clients.patch
index b9405f1a8f..b9405f1a8f 100644
--- a/patches/server/0841-API-for-updating-recipes-on-clients.patch
+++ b/patches/unapplied/server/0841-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0842-Fix-custom-statistic-criteria-creation.patch b/patches/unapplied/server/0842-Fix-custom-statistic-criteria-creation.patch
index ff197a490c..ff197a490c 100644
--- a/patches/server/0842-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/unapplied/server/0842-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0843-Bandaid-fix-for-Effect.patch b/patches/unapplied/server/0843-Bandaid-fix-for-Effect.patch
index fd2b0030e9..b8a1381bfb 100644
--- a/patches/server/0843-Bandaid-fix-for-Effect.patch
+++ b/patches/unapplied/server/0843-Bandaid-fix-for-Effect.patch
@@ -68,7 +68,7 @@ index 71733f918ed84b9879ac1b142ef6205c5e768a9c..c856384019eff2f2d0bb831ebe1ccb0f
              break;
          case BONE_MEAL_USE:
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5ac5f5a1963a89dace45d61e0ca0588c1c0fd05c..01c06c0287e8c6538adac33f9e3755d062545a01 100644
+index b0e57ca463a3c7cb1be8920a899c9afc7c871f4b..f85f94ddf55034b8e160f0be7ba847f0ad785a04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1363,7 +1363,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0844-SculkCatalyst-bloom-API.patch b/patches/unapplied/server/0844-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0844-SculkCatalyst-bloom-API.patch
+++ b/patches/unapplied/server/0844-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0845-API-for-an-entity-s-scoreboard-name.patch b/patches/unapplied/server/0845-API-for-an-entity-s-scoreboard-name.patch
index 703131ac85..703131ac85 100644
--- a/patches/server/0845-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/unapplied/server/0845-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0846-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/unapplied/server/0846-Deprecate-and-replace-methods-with-old-StructureType.patch
index d058ddea87..d058ddea87 100644
--- a/patches/server/0846-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/unapplied/server/0846-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0847-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/unapplied/server/0847-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 3098f18301..3098f18301 100644
--- a/patches/server/0847-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/unapplied/server/0847-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0848-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/unapplied/server/0848-Properly-handle-BlockBreakEvent-isDropItems.patch
index 7bf30bb112..7bf30bb112 100644
--- a/patches/server/0848-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/unapplied/server/0848-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0849-Fire-entity-death-event-for-ender-dragon.patch b/patches/unapplied/server/0849-Fire-entity-death-event-for-ender-dragon.patch
index 0efcc781a4..0efcc781a4 100644
--- a/patches/server/0849-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/unapplied/server/0849-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0850-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/unapplied/server/0850-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 89e48222c8..b838446e28 100644
--- a/patches/server/0850-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/unapplied/server/0850-Configurable-entity-tracking-range-by-Y-coordinate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable entity tracking range by Y coordinate
 Options to configure entity tracking by Y coordinate, also for each entity category.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index bf88c5de30e6cde87099dab546e5d1bd817134a2..51c52aeb3724c919443b7f5aa574d64983b57c49 100644
+index c1c2eeba0f5b8e499cc51cc1df7bf9acb61bd7d6..054c962288585ef3d0249d68c24d85624f172374 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1571,7 +1571,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0851-Add-Listing-API-for-Player.patch b/patches/unapplied/server/0851-Add-Listing-API-for-Player.patch
index 2fb2685db5..86fa75135c 100644
--- a/patches/server/0851-Add-Listing-API-for-Player.patch
+++ b/patches/unapplied/server/0851-Add-Listing-API-for-Player.patch
@@ -122,7 +122,7 @@ index efc12d629b71ba1da664d9ecfd4575bee9b45dc3..9067100a82a8c405cec0a19e53b3b245
          // Paper end - Use single player info update packet on join
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e98d9d0c7a04d168cf8de42d575e07d55065bd09..3e9a4fb43589b4e0cf3a08f7b2a1a0e38b14c001 100644
+index 3c9aff1848d902a566e0dc252a88528ea471c72e..1368e882c476eaf219643f0050e3c77898769d42 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -206,6 +206,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0852-Configurable-Region-Compression-Format.patch b/patches/unapplied/server/0852-Configurable-Region-Compression-Format.patch
index ce17b1e202..ce17b1e202 100644
--- a/patches/server/0852-Configurable-Region-Compression-Format.patch
+++ b/patches/unapplied/server/0852-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0853-Add-BlockFace-to-BlockDamageEvent.patch b/patches/unapplied/server/0853-Add-BlockFace-to-BlockDamageEvent.patch
index a5b150b6fc..a5b150b6fc 100644
--- a/patches/server/0853-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/unapplied/server/0853-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0854-Fix-NPE-on-Boat-getStatus.patch b/patches/unapplied/server/0854-Fix-NPE-on-Boat-getStatus.patch
index 19f832054d..19f832054d 100644
--- a/patches/server/0854-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/unapplied/server/0854-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0855-Expand-Pose-API.patch b/patches/unapplied/server/0855-Expand-Pose-API.patch
index 2a0272f0fa..2a0272f0fa 100644
--- a/patches/server/0855-Expand-Pose-API.patch
+++ b/patches/unapplied/server/0855-Expand-Pose-API.patch
diff --git a/patches/server/0856-More-DragonBattle-API.patch b/patches/unapplied/server/0856-More-DragonBattle-API.patch
index a752a4de81..a752a4de81 100644
--- a/patches/server/0856-More-DragonBattle-API.patch
+++ b/patches/unapplied/server/0856-More-DragonBattle-API.patch
diff --git a/patches/server/0857-Add-PlayerPickItemEvent.patch b/patches/unapplied/server/0857-Add-PlayerPickItemEvent.patch
index b23a4f152a..b23a4f152a 100644
--- a/patches/server/0857-Add-PlayerPickItemEvent.patch
+++ b/patches/unapplied/server/0857-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0858-Allow-trident-custom-damage.patch b/patches/unapplied/server/0858-Allow-trident-custom-damage.patch
index ee7ac1a043..ee7ac1a043 100644
--- a/patches/server/0858-Allow-trident-custom-damage.patch
+++ b/patches/unapplied/server/0858-Allow-trident-custom-damage.patch
diff --git a/patches/server/0859-Expose-hand-in-BlockCanBuildEvent.patch b/patches/unapplied/server/0859-Expose-hand-in-BlockCanBuildEvent.patch
index f3ed54f3f9..f3ed54f3f9 100644
--- a/patches/server/0859-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/unapplied/server/0859-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0860-Optimize-nearest-structure-border-iteration.patch b/patches/unapplied/server/0860-Optimize-nearest-structure-border-iteration.patch
index edd50774cc..edd50774cc 100644
--- a/patches/server/0860-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/unapplied/server/0860-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0861-Implement-OfflinePlayer-isConnected.patch b/patches/unapplied/server/0861-Implement-OfflinePlayer-isConnected.patch
index b3d522bfbc..a0fc66ac67 100644
--- a/patches/server/0861-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/unapplied/server/0861-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 2c2c4db31a746b4eb853dc04c6b3e5631bbfa034..4f4e3ee18d586f61706504218cddc06a
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3e9a4fb43589b4e0cf3a08f7b2a1a0e38b14c001..3ff1eeb47b2d547483f3340eca4adad7a2d55c78 100644
+index 1368e882c476eaf219643f0050e3c77898769d42..fc78d8855bb3c0eac47d65520939bebaf0da7c2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -261,6 +261,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0862-Fix-slot-desync.patch b/patches/unapplied/server/0862-Fix-slot-desync.patch
index 7570c7226a..7570c7226a 100644
--- a/patches/server/0862-Fix-slot-desync.patch
+++ b/patches/unapplied/server/0862-Fix-slot-desync.patch
diff --git a/patches/server/0863-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/unapplied/server/0863-Add-titleOverride-to-InventoryOpenEvent.patch
index 80612faf72..80612faf72 100644
--- a/patches/server/0863-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/unapplied/server/0863-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0864-Configure-sniffer-egg-hatch-time.patch b/patches/unapplied/server/0864-Configure-sniffer-egg-hatch-time.patch
index e39971b614..e39971b614 100644
--- a/patches/server/0864-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/unapplied/server/0864-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0865-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/unapplied/server/0865-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0ba2ce3d55..0ba2ce3d55 100644
--- a/patches/server/0865-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/unapplied/server/0865-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0866-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/unapplied/server/0866-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0866-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/unapplied/server/0866-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0867-Add-slot-sanity-checks-in-container-clicks.patch b/patches/unapplied/server/0867-Add-slot-sanity-checks-in-container-clicks.patch
index 8bc3b0c3fd..8bc3b0c3fd 100644
--- a/patches/server/0867-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/unapplied/server/0867-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0868-Call-BlockRedstoneEvents-properly.patch b/patches/unapplied/server/0868-Call-BlockRedstoneEvents-properly.patch
index 54b0e427b8..54b0e427b8 100644
--- a/patches/server/0868-Call-BlockRedstoneEvents-properly.patch
+++ b/patches/unapplied/server/0868-Call-BlockRedstoneEvents-properly.patch
diff --git a/patches/server/0869-Allow-proper-checking-of-empty-item-stacks.patch b/patches/unapplied/server/0869-Allow-proper-checking-of-empty-item-stacks.patch
index 85819379c1..85819379c1 100644
--- a/patches/server/0869-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/unapplied/server/0869-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0870-Fix-silent-equipment-change-for-mobs.patch b/patches/unapplied/server/0870-Fix-silent-equipment-change-for-mobs.patch
index 14b0a2dab0..14b0a2dab0 100644
--- a/patches/server/0870-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/unapplied/server/0870-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0871-Fix-spigot-s-Forced-Stats.patch b/patches/unapplied/server/0871-Fix-spigot-s-Forced-Stats.patch
index 8e920d0d89..8e920d0d89 100644
--- a/patches/server/0871-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/unapplied/server/0871-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0872-Add-missing-InventoryHolders-to-inventories.patch b/patches/unapplied/server/0872-Add-missing-InventoryHolders-to-inventories.patch
index d6bf23a4f8..d6bf23a4f8 100644
--- a/patches/server/0872-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/unapplied/server/0872-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0873-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/unapplied/server/0873-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index c55e56d157..c55e56d157 100644
--- a/patches/server/0873-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/unapplied/server/0873-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0874-Add-missing-logs-for-log-ips-config-option.patch b/patches/unapplied/server/0874-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0874-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/unapplied/server/0874-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0875-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/unapplied/server/0875-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index b6ec32df61..b6ec32df61 100644
--- a/patches/server/0875-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/unapplied/server/0875-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0876-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/unapplied/server/0876-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0876-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/unapplied/server/0876-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0877-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/unapplied/server/0877-Fix-team-sidebar-objectives-not-being-cleared.patch
index cebe7aefc2..cebe7aefc2 100644
--- a/patches/server/0877-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/unapplied/server/0877-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0878-Fix-missing-map-initialize-event-call.patch b/patches/unapplied/server/0878-Fix-missing-map-initialize-event-call.patch
index a3e1b9d535..a3e1b9d535 100644
--- a/patches/server/0878-Fix-missing-map-initialize-event-call.patch
+++ b/patches/unapplied/server/0878-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0879-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/unapplied/server/0879-Update-entity-data-when-attaching-firework-to-entity.patch
index f2c094976f..f2c094976f 100644
--- a/patches/server/0879-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/unapplied/server/0879-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0880-Fix-UnsafeValues-loadAdvancement.patch b/patches/unapplied/server/0880-Fix-UnsafeValues-loadAdvancement.patch
index a2c8813abd..a2c8813abd 100644
--- a/patches/server/0880-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/unapplied/server/0880-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0881-Add-player-idle-duration-API.patch b/patches/unapplied/server/0881-Add-player-idle-duration-API.patch
index d86386b0b1..c4d135a22a 100644
--- a/patches/server/0881-Add-player-idle-duration-API.patch
+++ b/patches/unapplied/server/0881-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3ff1eeb47b2d547483f3340eca4adad7a2d55c78..d11f2fbdf41bf5e6ccc51f467e3f8ebb3f9e4f0b 100644
+index fc78d8855bb3c0eac47d65520939bebaf0da7c2e..7ec99101add68688a0d04ae2c177d64862c3a283 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3431,6 +3431,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0882-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/unapplied/server/0882-Don-t-check-if-we-can-see-non-visible-entities.patch
index 0160bd3b03..f93e6dba80 100644
--- a/patches/server/0882-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/unapplied/server/0882-Don-t-check-if-we-can-see-non-visible-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check if we can see non-visible entities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 51c52aeb3724c919443b7f5aa574d64983b57c49..a76b53c6f0640f2d3c73ee48d584ce747e010776 100644
+index 054c962288585ef3d0249d68c24d85624f172374..1c76e0d54320c3aa358159a1590d4701d4f18e9e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1584,7 +1584,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0883-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/unapplied/server/0883-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 3f44bad4f1..3f44bad4f1 100644
--- a/patches/server/0883-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/unapplied/server/0883-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0884-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/unapplied/server/0884-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 04ca940c95..c8b749cd23 100644
--- a/patches/server/0884-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/unapplied/server/0884-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d11f2fbdf41bf5e6ccc51f467e3f8ebb3f9e4f0b..1a2fa3ffaa36b486513ff5b16cf2ee27269cae18 100644
+index 7ec99101add68688a0d04ae2c177d64862c3a283..27371b2d6cdd4c996a28d102f8449866a2441061 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1134,7 +1134,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0885-Optimize-VarInts.patch b/patches/unapplied/server/0885-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0885-Optimize-VarInts.patch
+++ b/patches/unapplied/server/0885-Optimize-VarInts.patch
diff --git a/patches/server/0886-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/unapplied/server/0886-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index f8c8435473..f8c8435473 100644
--- a/patches/server/0886-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/unapplied/server/0886-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0887-Add-predicate-for-blocks-when-raytracing.patch b/patches/unapplied/server/0887-Add-predicate-for-blocks-when-raytracing.patch
index a85d20a914..4f053a20bc 100644
--- a/patches/server/0887-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/unapplied/server/0887-Add-predicate-for-blocks-when-raytracing.patch
@@ -47,7 +47,7 @@ index 7e1a332168357b9af14dbe3299549c2c93903fa6..93738c7dea1ea3d19013a47380391274
              Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 01c06c0287e8c6538adac33f9e3755d062545a01..e3db170099b674c46248509daba332c771c3f750 100644
+index f85f94ddf55034b8e160f0be7ba847f0ad785a04..d7d6eb37cbb3bc8c4850a2bbf5d57c5fbc9a22bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1097,9 +1097,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0888-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/unapplied/server/0888-Broadcast-take-item-packets-with-collector-as-source.patch
index 056419eb72..056419eb72 100644
--- a/patches/server/0888-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/unapplied/server/0888-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0889-Expand-LingeringPotion-API.patch b/patches/unapplied/server/0889-Expand-LingeringPotion-API.patch
index 3a58f0528a..3a58f0528a 100644
--- a/patches/server/0889-Expand-LingeringPotion-API.patch
+++ b/patches/unapplied/server/0889-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0890-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/unapplied/server/0890-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index d70f73f92e..8a2398d6ab 100644
--- a/patches/server/0890-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/unapplied/server/0890-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
@@ -45,7 +45,7 @@ index 152ecd38814089333b8d61538297ce720756d2c3..12127b14babf646711d3a118416453c4
  
              if (world instanceof ServerLevel) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e3db170099b674c46248509daba332c771c3f750..7f9c39649c9e11e34b043e914bbfb52a813ef6db 100644
+index d7d6eb37cbb3bc8c4850a2bbf5d57c5fbc9a22bc..a58e26a89ffd23eee44c822a5a426284d87ec4f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -723,7 +723,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0891-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/unapplied/server/0891-Add-hand-to-fish-event-for-all-player-interactions.patch
index cb3197a1b2..cb3197a1b2 100644
--- a/patches/server/0891-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/unapplied/server/0891-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0892-Fix-several-issues-with-EntityBreedEvent.patch b/patches/unapplied/server/0892-Fix-several-issues-with-EntityBreedEvent.patch
index 7d7a988fc0..7d7a988fc0 100644
--- a/patches/server/0892-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/unapplied/server/0892-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0893-Add-UUID-attribute-modifier-API.patch b/patches/unapplied/server/0893-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0893-Add-UUID-attribute-modifier-API.patch
+++ b/patches/unapplied/server/0893-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0894-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/unapplied/server/0894-Fix-missing-event-call-for-entity-teleport-API.patch
index 7f89636154..7f89636154 100644
--- a/patches/server/0894-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/unapplied/server/0894-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0895-Lazily-create-LootContext-for-criterions.patch b/patches/unapplied/server/0895-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0895-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/unapplied/server/0895-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0896-Don-t-fire-sync-events-during-worldgen.patch b/patches/unapplied/server/0896-Don-t-fire-sync-events-during-worldgen.patch
index 60837d1de4..60837d1de4 100644
--- a/patches/server/0896-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/unapplied/server/0896-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0897-Add-Structure-check-API.patch b/patches/unapplied/server/0897-Add-Structure-check-API.patch
index ea82ad83a2..4e91539351 100644
--- a/patches/server/0897-Add-Structure-check-API.patch
+++ b/patches/unapplied/server/0897-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7f9c39649c9e11e34b043e914bbfb52a813ef6db..725c25beef960feb567b9a0304f74cd53c450175 100644
+index a58e26a89ffd23eee44c822a5a426284d87ec4f2..0633bc206578b3bca7203ea721cfdfcd609dc568 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -243,6 +243,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0898-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/unapplied/server/0898-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index af848f2181..9c0d8110d9 100644
--- a/patches/server/0898-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/unapplied/server/0898-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CraftMetaItem#getAttributeModifier duplication check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 43d1f278a56ff344ddf4e5d70471485b393a3b1d..2948fc39ad2f65739dea6b8256112b85ea755340 100644
+index f93870955c83505432c352f627cd105dfa4e5b78..bc6bdf4a12c83b7a0742f3202860f56f14afe4a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1666,7 +1666,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0899-Restore-vanilla-entity-drops-behavior.patch b/patches/unapplied/server/0899-Restore-vanilla-entity-drops-behavior.patch
index d7aef7b13a..d7aef7b13a 100644
--- a/patches/server/0899-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/unapplied/server/0899-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0900-Dont-resend-blocks-on-interactions.patch b/patches/unapplied/server/0900-Dont-resend-blocks-on-interactions.patch
index 04f0061970..04f0061970 100644
--- a/patches/server/0900-Dont-resend-blocks-on-interactions.patch
+++ b/patches/unapplied/server/0900-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0901-add-more-scoreboard-API.patch b/patches/unapplied/server/0901-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0901-add-more-scoreboard-API.patch
+++ b/patches/unapplied/server/0901-add-more-scoreboard-API.patch
diff --git a/patches/server/0902-Improve-Registry.patch b/patches/unapplied/server/0902-Improve-Registry.patch
index 5546233da5..5546233da5 100644
--- a/patches/server/0902-Improve-Registry.patch
+++ b/patches/unapplied/server/0902-Improve-Registry.patch
diff --git a/patches/server/0903-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/unapplied/server/0903-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 9f3a60df76..9f3a60df76 100644
--- a/patches/server/0903-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/unapplied/server/0903-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0904-Add-experience-points-API.patch b/patches/unapplied/server/0904-Add-experience-points-API.patch
index 43c16d428f..1cb50a5ad7 100644
--- a/patches/server/0904-Add-experience-points-API.patch
+++ b/patches/unapplied/server/0904-Add-experience-points-API.patch
@@ -18,7 +18,7 @@ index aca888c2f02b09ac6739bdc81b194c4527dd69f5..a19a795deaa7f46c92b97912e2ade006
      // Paper start - send while respecting visibility
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1a2fa3ffaa36b486513ff5b16cf2ee27269cae18..46e800a3116a364cc8230b2f84084ade256959c7 100644
+index 27371b2d6cdd4c996a28d102f8449866a2441061..62ecf21905d247fdb7e23d1d383a39855bfa4d45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1933,6 +1933,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0905-Add-drops-to-shear-events.patch b/patches/unapplied/server/0905-Add-drops-to-shear-events.patch
index 6e55898206..6e55898206 100644
--- a/patches/server/0905-Add-drops-to-shear-events.patch
+++ b/patches/unapplied/server/0905-Add-drops-to-shear-events.patch
diff --git a/patches/server/0906-Add-PlayerShieldDisableEvent.patch b/patches/unapplied/server/0906-Add-PlayerShieldDisableEvent.patch
index d2d860a028..d2d860a028 100644
--- a/patches/server/0906-Add-PlayerShieldDisableEvent.patch
+++ b/patches/unapplied/server/0906-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0907-Validate-ResourceLocation-in-NBT-reading.patch b/patches/unapplied/server/0907-Validate-ResourceLocation-in-NBT-reading.patch
index cbc12c1bb2..3600f0bb95 100644
--- a/patches/server/0907-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/unapplied/server/0907-Validate-ResourceLocation-in-NBT-reading.patch
@@ -116,7 +116,7 @@ index 8a0e65ac8318a467996f48b423db1ac621359fbe..aad63549d7c4f501b683b8dead4938ea
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 75cc3db39c974abab8510af4a633fc6812efc647..14e31ae88e90d8ea1a98800cc6c1c3527bb2ed6b 100644
+index c173c692e84eb5f2d2ed9873dc3411dbd575fcce..d43f7c44e4f7769654b92b130246822d68697f7d 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -695,7 +695,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0908-Properly-handle-experience-dropping-on-block-break.patch b/patches/unapplied/server/0908-Properly-handle-experience-dropping-on-block-break.patch
index 5b45a7fb92..5b45a7fb92 100644
--- a/patches/server/0908-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/unapplied/server/0908-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0909-Fixup-NamespacedKey-handling.patch b/patches/unapplied/server/0909-Fixup-NamespacedKey-handling.patch
index 2de1c49d0b..2de1c49d0b 100644
--- a/patches/server/0909-Fixup-NamespacedKey-handling.patch
+++ b/patches/unapplied/server/0909-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0910-Expose-LootTable-of-DecoratedPot.patch b/patches/unapplied/server/0910-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0910-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/unapplied/server/0910-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0911-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0911-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index e5b83e9d8d..f47e4d5d90 100644
--- a/patches/server/0911-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/unapplied/server/0911-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -18,7 +18,7 @@ index a043ac10834562d357ef0b5aded2e916e2a0d056..74276c368016fcc4dbf9579b2ecbadc9
      @VisibleForTesting
      static long encode(double value) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index a76b53c6f0640f2d3c73ee48d584ce747e010776..16e55cc94c8f6e204e4b7ab6ad8d32a6c443357f 100644
+index 1c76e0d54320c3aa358159a1590d4701d4f18e9e..e9b585387f6cbc454e7b16feb36a256e733c5488 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1566,10 +1566,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0912-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0912-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 4ed1121ea1..4ed1121ea1 100644
--- a/patches/server/0912-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/unapplied/server/0912-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0913-Add-ShulkerDuplicateEvent.patch b/patches/unapplied/server/0913-Add-ShulkerDuplicateEvent.patch
index f06c91ae48..f06c91ae48 100644
--- a/patches/server/0913-Add-ShulkerDuplicateEvent.patch
+++ b/patches/unapplied/server/0913-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0914-Add-api-for-spawn-egg-texture-colors.patch b/patches/unapplied/server/0914-Add-api-for-spawn-egg-texture-colors.patch
index d894cc200c..d894cc200c 100644
--- a/patches/server/0914-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/unapplied/server/0914-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0915-Add-Lifecycle-Event-system.patch b/patches/unapplied/server/0915-Add-Lifecycle-Event-system.patch
index cd301c6af8..cd301c6af8 100644
--- a/patches/server/0915-Add-Lifecycle-Event-system.patch
+++ b/patches/unapplied/server/0915-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0916-ItemStack-Tooltip-API.patch b/patches/unapplied/server/0916-ItemStack-Tooltip-API.patch
index f3abeb774c..f3abeb774c 100644
--- a/patches/server/0916-ItemStack-Tooltip-API.patch
+++ b/patches/unapplied/server/0916-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0917-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/unapplied/server/0917-Add-getChunkSnapshot-includeLightData-parameter.patch
index ba33560bab..750a593b62 100644
--- a/patches/server/0917-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/unapplied/server/0917-Add-getChunkSnapshot-includeLightData-parameter.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getChunkSnapshot includeLightData parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 887a17a0833064eb5701222e5fb6f5ccf9511588..5fc9e8e969debb3e15ed474b36a1c48b086d0449 100644
+index 08956b81b9a3e5caf3adce6699149491ff190d90..bfc8b87941578e8f52f7cd9035776b7db5ab2221 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -328,12 +328,21 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0918-Add-FluidState-API.patch b/patches/unapplied/server/0918-Add-FluidState-API.patch
index e1e2fe004f..e1e2fe004f 100644
--- a/patches/server/0918-Add-FluidState-API.patch
+++ b/patches/unapplied/server/0918-Add-FluidState-API.patch
diff --git a/patches/server/0919-add-number-format-api.patch b/patches/unapplied/server/0919-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0919-add-number-format-api.patch
+++ b/patches/unapplied/server/0919-add-number-format-api.patch
diff --git a/patches/server/0920-improve-BanList-types.patch b/patches/unapplied/server/0920-improve-BanList-types.patch
index bb669a58a1..bb669a58a1 100644
--- a/patches/server/0920-improve-BanList-types.patch
+++ b/patches/unapplied/server/0920-improve-BanList-types.patch
diff --git a/patches/server/0921-Expanded-Hopper-API.patch b/patches/unapplied/server/0921-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0921-Expanded-Hopper-API.patch
+++ b/patches/unapplied/server/0921-Expanded-Hopper-API.patch
diff --git a/patches/server/0922-Add-BlockBreakProgressUpdateEvent.patch b/patches/unapplied/server/0922-Add-BlockBreakProgressUpdateEvent.patch
index 35b4cf39bc..35b4cf39bc 100644
--- a/patches/server/0922-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/unapplied/server/0922-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0923-Deprecate-ItemStack-setType.patch b/patches/unapplied/server/0923-Deprecate-ItemStack-setType.patch
index e58b22013f..e58b22013f 100644
--- a/patches/server/0923-Deprecate-ItemStack-setType.patch
+++ b/patches/unapplied/server/0923-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0924-Add-CartographyItemEvent.patch b/patches/unapplied/server/0924-Add-CartographyItemEvent.patch
index 11d1fd5ed9..11d1fd5ed9 100644
--- a/patches/server/0924-Add-CartographyItemEvent.patch
+++ b/patches/unapplied/server/0924-Add-CartographyItemEvent.patch
diff --git a/patches/server/0925-More-Raid-API.patch b/patches/unapplied/server/0925-More-Raid-API.patch
index 095d7f04b8..095d7f04b8 100644
--- a/patches/server/0925-More-Raid-API.patch
+++ b/patches/unapplied/server/0925-More-Raid-API.patch
diff --git a/patches/server/0926-Add-onboarding-message-for-initial-server-start.patch b/patches/unapplied/server/0926-Add-onboarding-message-for-initial-server-start.patch
index a7f484e960..5c01d85a89 100644
--- a/patches/server/0926-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/unapplied/server/0926-Add-onboarding-message-for-initial-server-start.patch
@@ -29,7 +29,7 @@ index d8db428f06606c16466d39cceb2a5e02eb3d3b24..2d2ff826354670fef356e241d939080c
          return instance;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9312279f8f958cd1fd13e8333ca476809e956e1c..95786d2e1a8ac0fdbe8d449b3f100ac0512ee21e 100644
+index 84f1a1a5ffc04823f7e83bc352c0f66a0207e771..9c1e1c049db55e73851e3d513cba25027bd0c3b4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1148,6 +1148,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0927-Configurable-max-block-fluid-ticks.patch b/patches/unapplied/server/0927-Configurable-max-block-fluid-ticks.patch
index 8f7fdf137d..8f7fdf137d 100644
--- a/patches/server/0927-Configurable-max-block-fluid-ticks.patch
+++ b/patches/unapplied/server/0927-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0928-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0928-Fix-bees-aging-inside-hives.patch
index 8d4dcd0b64..8d4dcd0b64 100644
--- a/patches/server/0928-Fix-bees-aging-inside-hives.patch
+++ b/patches/unapplied/server/0928-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0929-Disable-memory-reserve-allocating.patch b/patches/unapplied/server/0929-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0929-Disable-memory-reserve-allocating.patch
+++ b/patches/unapplied/server/0929-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0930-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/unapplied/server/0930-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 3cf04503d8..3cf04503d8 100644
--- a/patches/server/0930-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/unapplied/server/0930-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0931-Fix-DamageSource-API.patch b/patches/unapplied/server/0931-Fix-DamageSource-API.patch
index 641e4cb5ad..641e4cb5ad 100644
--- a/patches/server/0931-Fix-DamageSource-API.patch
+++ b/patches/unapplied/server/0931-Fix-DamageSource-API.patch
diff --git a/patches/server/0932-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/unapplied/server/0932-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index d12e5cd665..d12e5cd665 100644
--- a/patches/server/0932-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/unapplied/server/0932-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0933-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch b/patches/unapplied/server/0933-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch
index 2041bbd5a1..2041bbd5a1 100644
--- a/patches/server/0933-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch
+++ b/patches/unapplied/server/0933-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch
diff --git a/patches/server/0934-Improve-tag-parser-handling.patch b/patches/unapplied/server/0934-Improve-tag-parser-handling.patch
index 2d01b18c07..2d01b18c07 100644
--- a/patches/server/0934-Improve-tag-parser-handling.patch
+++ b/patches/unapplied/server/0934-Improve-tag-parser-handling.patch
diff --git a/patches/server/0935-Item-Mutation-Fixes.patch b/patches/unapplied/server/0935-Item-Mutation-Fixes.patch
index f7242e591f..f7242e591f 100644
--- a/patches/server/0935-Item-Mutation-Fixes.patch
+++ b/patches/unapplied/server/0935-Item-Mutation-Fixes.patch
diff --git a/patches/server/0936-Per-world-ticks-per-spawn-settings.patch b/patches/unapplied/server/0936-Per-world-ticks-per-spawn-settings.patch
index 2746e3483b..2746e3483b 100644
--- a/patches/server/0936-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/unapplied/server/0936-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0937-Properly-track-the-changed-item-from-dispense-events.patch b/patches/unapplied/server/0937-Properly-track-the-changed-item-from-dispense-events.patch
index 7b03ec7aef..7b03ec7aef 100644
--- a/patches/server/0937-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/unapplied/server/0937-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0938-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0938-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 5c06384279..5c06384279 100644
--- a/patches/server/0938-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/unapplied/server/0938-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0939-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0939-Add-config-for-mobs-immune-to-default-effects.patch
index c3b01a16ed..c3b01a16ed 100644
--- a/patches/server/0939-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/unapplied/server/0939-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0940-Deep-clone-nbt-tags-in-PDC.patch b/patches/unapplied/server/0940-Deep-clone-nbt-tags-in-PDC.patch
index f2a98afbc1..ff94bd0591 100644
--- a/patches/server/0940-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/unapplied/server/0940-Deep-clone-nbt-tags-in-PDC.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deep clone nbt tags in PDC
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 2948fc39ad2f65739dea6b8256112b85ea755340..8cfc5a381aa39b8ec396efeed6d456cbf3e792f9 100644
+index bc6bdf4a12c83b7a0742f3202860f56f14afe4a3..da2b118afcfeb6de6e002bbbba9207769f07a72b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -372,7 +372,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0941-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0941-Support-old-UUID-format-for-NBT.patch
index 68ff8a5255..68ff8a5255 100644
--- a/patches/server/0941-Support-old-UUID-format-for-NBT.patch
+++ b/patches/unapplied/server/0941-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0942-Fix-shield-disable-inconsistency.patch b/patches/unapplied/server/0942-Fix-shield-disable-inconsistency.patch
index 0c35d7cbf8..0c35d7cbf8 100644
--- a/patches/server/0942-Fix-shield-disable-inconsistency.patch
+++ b/patches/unapplied/server/0942-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0943-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0943-Handle-Large-Packets-disconnecting-client.patch
index 32e463a242..32e463a242 100644
--- a/patches/server/0943-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/unapplied/server/0943-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0944-Fix-ItemFlags.patch b/patches/unapplied/server/0944-Fix-ItemFlags.patch
index e37a753912..fe97f1e169 100644
--- a/patches/server/0944-Fix-ItemFlags.patch
+++ b/patches/unapplied/server/0944-Fix-ItemFlags.patch
@@ -33,7 +33,7 @@ index 73fe41322e0349ad1d46a760f621b6c91112e90e..19af55ec2bf62b70bd3be44f499b32f5
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 8cfc5a381aa39b8ec396efeed6d456cbf3e792f9..6641c72ddb9fd55f1c25f33a5272fd3c85a6cf5c 100644
+index da2b118afcfeb6de6e002bbbba9207769f07a72b..52f62779fc57379232c31bcc03b870aa7d6de7ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -275,6 +275,12 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0945-Fix-damage-modifier-inconsistencies.patch b/patches/unapplied/server/0945-Fix-damage-modifier-inconsistencies.patch
index 57f6c98116..57f6c98116 100644
--- a/patches/server/0945-Fix-damage-modifier-inconsistencies.patch
+++ b/patches/unapplied/server/0945-Fix-damage-modifier-inconsistencies.patch
diff --git a/patches/server/0946-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/unapplied/server/0946-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 1c00cb4a33..1c00cb4a33 100644
--- a/patches/server/0946-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/unapplied/server/0946-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0947-improve-checking-handled-tags-in-itemmeta.patch b/patches/unapplied/server/0947-improve-checking-handled-tags-in-itemmeta.patch
index f90c4b0ad0..ea010748dc 100644
--- a/patches/server/0947-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/unapplied/server/0947-improve-checking-handled-tags-in-itemmeta.patch
@@ -456,7 +456,7 @@ index 4941e0afff8df5f10f06c715b54bf58eb86051c5..566d893a413fd04b99e83dc2da8fe958
          getOrEmpty(tag, CraftMetaFirework.FIREWORKS).ifPresent((fireworks) -> {
              this.power = fireworks.flightDuration();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 6641c72ddb9fd55f1c25f33a5272fd3c85a6cf5c..c42a6ced8c04dc04c918550ab8f9722d89183cca 100644
+index 52f62779fc57379232c31bcc03b870aa7d6de7ca..38e5e41bc68adc6786c0b5d0e1e0dc6e99a877c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -389,7 +389,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0948-Expose-hasColor-to-leather-armor.patch b/patches/unapplied/server/0948-Expose-hasColor-to-leather-armor.patch
index 9166ad6261..9166ad6261 100644
--- a/patches/server/0948-Expose-hasColor-to-leather-armor.patch
+++ b/patches/unapplied/server/0948-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0949-Added-API-to-get-player-ha-proxy-address.patch b/patches/unapplied/server/0949-Added-API-to-get-player-ha-proxy-address.patch
index 42ff377a0c..37cf390989 100644
--- a/patches/server/0949-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/unapplied/server/0949-Added-API-to-get-player-ha-proxy-address.patch
@@ -35,7 +35,7 @@ index c62df32af11636ad408b584fcc590590ce4fb0d0..baed0bb80d44973f9323bbe536551182
                                  } else {
                                      super.channelRead(ctx, msg);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 46e800a3116a364cc8230b2f84084ade256959c7..bdc5ad40f83590066f8702b2b60868bd56d58596 100644
+index 62ecf21905d247fdb7e23d1d383a39855bfa4d45..f694e79c21a8f84e48c8f46de8aebb0889b7c9f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -270,7 +270,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0950-General-ItemMeta-fixes.patch b/patches/unapplied/server/0950-General-ItemMeta-fixes.patch
index 4c8bd99900..e3d7ff3836 100644
--- a/patches/server/0950-General-ItemMeta-fixes.patch
+++ b/patches/unapplied/server/0950-General-ItemMeta-fixes.patch
@@ -1049,7 +1049,7 @@ index 566d893a413fd04b99e83dc2da8fe958a48492a8..a944803771d514572f94b4e98a6d4435
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index c42a6ced8c04dc04c918550ab8f9722d89183cca..29946404ed7fe29c9f7457fcf5650111cd6411a9 100644
+index 38e5e41bc68adc6786c0b5d0e1e0dc6e99a877c4..ca7ca4e5bd617cbcdaae1718b10a80993b5dea83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -199,9 +199,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0951-More-Chest-Block-API.patch b/patches/unapplied/server/0951-More-Chest-Block-API.patch
index d7c00f61e1..d7c00f61e1 100644
--- a/patches/server/0951-More-Chest-Block-API.patch
+++ b/patches/unapplied/server/0951-More-Chest-Block-API.patch
diff --git a/patches/server/0952-Print-data-component-type-on-encoding-error.patch b/patches/unapplied/server/0952-Print-data-component-type-on-encoding-error.patch
index f003f33b92..f003f33b92 100644
--- a/patches/server/0952-Print-data-component-type-on-encoding-error.patch
+++ b/patches/unapplied/server/0952-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0953-Brigadier-based-command-API.patch b/patches/unapplied/server/0953-Brigadier-based-command-API.patch
index 0d56637cc8..0d56637cc8 100644
--- a/patches/server/0953-Brigadier-based-command-API.patch
+++ b/patches/unapplied/server/0953-Brigadier-based-command-API.patch
diff --git a/patches/server/0954-Fix-issues-with-Recipe-API.patch b/patches/unapplied/server/0954-Fix-issues-with-Recipe-API.patch
index d0ead5ed62..d0ead5ed62 100644
--- a/patches/server/0954-Fix-issues-with-Recipe-API.patch
+++ b/patches/unapplied/server/0954-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0955-Fix-equipment-slot-and-group-API.patch b/patches/unapplied/server/0955-Fix-equipment-slot-and-group-API.patch
index aeb8a79cfa..8570ede687 100644
--- a/patches/server/0955-Fix-equipment-slot-and-group-API.patch
+++ b/patches/unapplied/server/0955-Fix-equipment-slot-and-group-API.patch
@@ -52,7 +52,7 @@ index e62baea16df017f1e394e3c706157e158066eb93..656c9a6d8cd42891141ee29ec91ab5d1
                  throw new IllegalArgumentException("Could not get slot " + slot + " - not a valid slot for PlayerInventory");
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 29946404ed7fe29c9f7457fcf5650111cd6411a9..37a8954f37a97afdbcc7b7c7026371f477cb3655 100644
+index ca7ca4e5bd617cbcdaae1718b10a80993b5dea83..3a4b88122fff891632a5dfc7787365eb22d33edb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1704,7 +1704,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0956-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/unapplied/server/0956-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8b39d13b43..8b39d13b43 100644
--- a/patches/server/0956-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/unapplied/server/0956-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0957-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0957-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 75e7f6ee9d..75e7f6ee9d 100644
--- a/patches/server/0957-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/unapplied/server/0957-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0958-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/unapplied/server/0958-Prevent-NPE-if-hooked-entity-was-cleared.patch
index f51092a291..f51092a291 100644
--- a/patches/server/0958-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/unapplied/server/0958-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0959-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/unapplied/server/0959-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index 4b06a0c06a..4b06a0c06a 100644
--- a/patches/server/0959-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/unapplied/server/0959-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
diff --git a/patches/server/0960-Add-missing-fishing-event-state.patch b/patches/unapplied/server/0960-Add-missing-fishing-event-state.patch
index 5bc1574135..5bc1574135 100644
--- a/patches/server/0960-Add-missing-fishing-event-state.patch
+++ b/patches/unapplied/server/0960-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0961-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/unapplied/server/0961-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 8a27d911c5..8a27d911c5 100644
--- a/patches/server/0961-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/unapplied/server/0961-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0962-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/unapplied/server/0962-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0962-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/unapplied/server/0962-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0963-Adopt-MaterialRerouting.patch b/patches/unapplied/server/0963-Adopt-MaterialRerouting.patch
index e66973fb9d..e66973fb9d 100644
--- a/patches/server/0963-Adopt-MaterialRerouting.patch
+++ b/patches/unapplied/server/0963-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0964-Suspicious-Effect-Entry-API.patch b/patches/unapplied/server/0964-Suspicious-Effect-Entry-API.patch
index d2599dfa85..d2599dfa85 100644
--- a/patches/server/0964-Suspicious-Effect-Entry-API.patch
+++ b/patches/unapplied/server/0964-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0965-check-if-itemstack-is-stackable-first.patch b/patches/unapplied/server/0965-check-if-itemstack-is-stackable-first.patch
index a7ddd8df5b..a7ddd8df5b 100644
--- a/patches/server/0965-check-if-itemstack-is-stackable-first.patch
+++ b/patches/unapplied/server/0965-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0966-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0966-Fix-removing-recipes-from-RecipeIterator.patch
index f64e093768..f64e093768 100644
--- a/patches/server/0966-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/unapplied/server/0966-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0967-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/unapplied/server/0967-Configurable-damage-tick-when-blocking-with-shield.patch
index 0c5196e832..0c5196e832 100644
--- a/patches/server/0967-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/unapplied/server/0967-Configurable-damage-tick-when-blocking-with-shield.patch
diff --git a/patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/unapplied/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch
index aa554450a4..aa554450a4 100644
--- a/patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/unapplied/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0969-disable-forced-empty-world-ticks.patch b/patches/unapplied/server/0969-disable-forced-empty-world-ticks.patch
index dd54449a10..dd54449a10 100644
--- a/patches/server/0969-disable-forced-empty-world-ticks.patch
+++ b/patches/unapplied/server/0969-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0970-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0970-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index a2e8a59019..a2e8a59019 100644
--- a/patches/server/0970-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/unapplied/server/0970-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0971-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0971-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 9bfa4733be..9bfa4733be 100644
--- a/patches/server/0971-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/unapplied/server/0971-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0972-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0972-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index a22e16473b..a22e16473b 100644
--- a/patches/server/0972-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/unapplied/server/0972-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0973-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0973-Allow-Saving-of-Oversized-Chunks.patch
index 99f43d8eff..99f43d8eff 100644
--- a/patches/server/0973-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/unapplied/server/0973-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0974-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/0974-Flat-bedrock-generator-settings.patch
index f9c0bab64c..f9c0bab64c 100644
--- a/patches/server/0974-Flat-bedrock-generator-settings.patch
+++ b/patches/unapplied/server/0974-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0975-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0975-Entity-Activation-Range-2.0.patch
index 61a792a001..61a792a001 100644
--- a/patches/server/0975-Entity-Activation-Range-2.0.patch
+++ b/patches/unapplied/server/0975-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0976-Anti-Xray.patch b/patches/unapplied/server/0976-Anti-Xray.patch
index 126f7a294c..cf135696e8 100644
--- a/patches/server/0976-Anti-Xray.patch
+++ b/patches/unapplied/server/0976-Anti-Xray.patch
@@ -1586,7 +1586,7 @@ index b86b3bf713668999a21c4120b1d16c295531b2ad..4bc7fa3324e9af3abce2acf960c7b065
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 5fc9e8e969debb3e15ed474b36a1c48b086d0449..f65cc95ab28e8a3b21eac2b16bd9ebe97e56e571 100644
+index bfc8b87941578e8f52f7cd9035776b7db5ab2221..028174f712ea9605f22243b76c3f5dd6da76b57f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -56,7 +56,7 @@ public class CraftChunk implements Chunk {
@@ -1612,7 +1612,7 @@ index 338b60f0254d55ac4a0645ca351d0ce736ce0681..87477ad186b5f692a39f323a618d016b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6c51f0a66236c6a64f4ed18bf4fb0ba6ad822d94..cec56346e6832603dab3eb0f67426d4de571438e 100644
+index 035ffd365555cc2a82917e56c3d7454730287755..bc78b58dec47d8ca1da7762b0b3f168a35e090b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -453,11 +453,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0977-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0977-Use-Velocity-compression-and-cipher-natives.patch
index 8459cc1aba..8459cc1aba 100644
--- a/patches/server/0977-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/unapplied/server/0977-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0978-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0978-Optimize-Collision-to-not-load-chunks.patch
index b67457788b..b67457788b 100644
--- a/patches/server/0978-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/unapplied/server/0978-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0979-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0979-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 9a50ca7915..9a50ca7915 100644
--- a/patches/server/0979-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/unapplied/server/0979-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0980-Optimize-Hoppers.patch b/patches/unapplied/server/0980-Optimize-Hoppers.patch
index 21523246d3..de493b8022 100644
--- a/patches/server/0980-Optimize-Hoppers.patch
+++ b/patches/unapplied/server/0980-Optimize-Hoppers.patch
@@ -52,7 +52,7 @@ index 0000000000000000000000000000000000000000..5c42823726e70ce6c9d0121d07431548
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b13b3991292ab96542ba390f3e8e3ff0d7529c44..ff6f2dc31bbbaa420323a68282cb1ee3d8b98c0f 100644
+index ab1a2c4272c4c84743ff501bb35816d35c9d4c94..6756f325dc755e5fcb8823c7395c925104dcdda0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1688,6 +1688,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0981-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0981-Optimize-Voxel-Shape-Merging.patch
index fe52a8b802..fe52a8b802 100644
--- a/patches/server/0981-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/unapplied/server/0981-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0982-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0982-Optimize-Bit-Operations-by-inlining.patch
index 2659c21023..2659c21023 100644
--- a/patches/server/0982-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/unapplied/server/0982-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0983-Remove-streams-from-hot-code.patch b/patches/unapplied/server/0983-Remove-streams-from-hot-code.patch
index f1585163e2..f1585163e2 100644
--- a/patches/server/0983-Remove-streams-from-hot-code.patch
+++ b/patches/unapplied/server/0983-Remove-streams-from-hot-code.patch
diff --git a/patches/server/0984-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0984-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index edf50d7e23..edf50d7e23 100644
--- a/patches/server/0984-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/unapplied/server/0984-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0985-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/0985-Fix-entity-type-tags-suggestions-in-selectors.patch
index 826ee39209..826ee39209 100644
--- a/patches/server/0985-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/unapplied/server/0985-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0986-Handle-Oversized-block-entities-in-chunks.patch b/patches/unapplied/server/0986-Handle-Oversized-block-entities-in-chunks.patch
index 5098df0611..5098df0611 100644
--- a/patches/server/0986-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/unapplied/server/0986-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/0987-Check-distance-in-entity-interactions.patch b/patches/unapplied/server/0987-Check-distance-in-entity-interactions.patch
index bc351d5fd9..3a6eef9912 100644
--- a/patches/server/0987-Check-distance-in-entity-interactions.patch
+++ b/patches/unapplied/server/0987-Check-distance-in-entity-interactions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Check distance in entity interactions
 Feature patch
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 57223285860f61119b6cf348aa78e59384a04e22..ccfe9ef24dce9f34613692adb13738d3ad0e7aac 100644
+index e4048d8f43befe5134222207cdb88f640a875deb..276ad77ecb274b6cd454d0f92457964a8eaa5824 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -128,6 +128,7 @@ public class Util {
diff --git a/patches/server/0988-Configurable-Sand-Duping.patch b/patches/unapplied/server/0988-Configurable-Sand-Duping.patch
index d209e03e1e..d209e03e1e 100644
--- a/patches/server/0988-Configurable-Sand-Duping.patch
+++ b/patches/unapplied/server/0988-Configurable-Sand-Duping.patch
diff --git a/patches/server/0989-Properly-resend-entities.patch b/patches/unapplied/server/0989-Properly-resend-entities.patch
index 01b1658ae9..01b1658ae9 100644
--- a/patches/server/0989-Properly-resend-entities.patch
+++ b/patches/unapplied/server/0989-Properly-resend-entities.patch
diff --git a/patches/server/0990-Registry-Modification-API.patch b/patches/unapplied/server/0990-Registry-Modification-API.patch
index aa674ef8dc..aa674ef8dc 100644
--- a/patches/server/0990-Registry-Modification-API.patch
+++ b/patches/unapplied/server/0990-Registry-Modification-API.patch
diff --git a/patches/server/0991-Add-registry-entry-and-builders.patch b/patches/unapplied/server/0991-Add-registry-entry-and-builders.patch
index 36bfa68a40..36bfa68a40 100644
--- a/patches/server/0991-Add-registry-entry-and-builders.patch
+++ b/patches/unapplied/server/0991-Add-registry-entry-and-builders.patch
diff --git a/patches/server/0992-Proxy-ItemStack-to-CraftItemStack.patch b/patches/unapplied/server/0992-Proxy-ItemStack-to-CraftItemStack.patch
index a321d37f33..a321d37f33 100644
--- a/patches/server/0992-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/unapplied/server/0992-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/server/0993-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/unapplied/server/0993-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index f0bd1ac5eb..f0bd1ac5eb 100644
--- a/patches/server/0993-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/unapplied/server/0993-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/server/0994-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/unapplied/server/0994-Prioritize-Minecraft-commands-in-function-parsing-an.patch
index c22d5f09be..a31a29a23b 100644
--- a/patches/server/0994-Prioritize-Minecraft-commands-in-function-parsing-an.patch
+++ b/patches/unapplied/server/0994-Prioritize-Minecraft-commands-in-function-parsing-an.patch
@@ -118,7 +118,7 @@ index 85a890403645f0f9d381e85b48efcae126673945..bcc27fec043a57eb5064934c967982de
  
      @Override
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 1e7b99a82184f73aa31cb2e0d4e52a806240926f..260350422fc724ba5cd5769cbb387b6007f36a84 100644
+index 2daf16ae4a30fe03bc1a1bbc3eb95b3b7bcd83fa..64bf4444ffba25cb40743a32267aa790ad1738f9 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -315,10 +315,7 @@ public class Commands {
diff --git a/patches/server/0995-optimize-dirt-and-snow-spreading.patch b/patches/unapplied/server/0995-optimize-dirt-and-snow-spreading.patch
index 36f98fb336..36f98fb336 100644
--- a/patches/server/0995-optimize-dirt-and-snow-spreading.patch
+++ b/patches/unapplied/server/0995-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/0996-Fix-NPE-for-Jukebox-setRecord.patch b/patches/unapplied/server/0996-Fix-NPE-for-Jukebox-setRecord.patch
index c673e4f8c7..c673e4f8c7 100644
--- a/patches/server/0996-Fix-NPE-for-Jukebox-setRecord.patch
+++ b/patches/unapplied/server/0996-Fix-NPE-for-Jukebox-setRecord.patch
diff --git a/patches/server/0997-fix-horse-inventories.patch b/patches/unapplied/server/0997-fix-horse-inventories.patch
index 9737a4fa71..9737a4fa71 100644
--- a/patches/server/0997-fix-horse-inventories.patch
+++ b/patches/unapplied/server/0997-fix-horse-inventories.patch
diff --git a/patches/server/0998-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/unapplied/server/0998-Only-call-EntityDamageEvents-before-actuallyHurt.patch
index b607b89045..b607b89045 100644
--- a/patches/server/0998-Only-call-EntityDamageEvents-before-actuallyHurt.patch
+++ b/patches/unapplied/server/0998-Only-call-EntityDamageEvents-before-actuallyHurt.patch
diff --git a/patches/server/0999-Add-ItemType-getItemRarity.patch b/patches/unapplied/server/0999-Add-ItemType-getItemRarity.patch
index 0863f02f5c..0863f02f5c 100644
--- a/patches/server/0999-Add-ItemType-getItemRarity.patch
+++ b/patches/unapplied/server/0999-Add-ItemType-getItemRarity.patch
diff --git a/patches/server/1000-Add-plugin-info-at-startup.patch b/patches/unapplied/server/1000-Add-plugin-info-at-startup.patch
index 051309bbed..051309bbed 100644
--- a/patches/server/1000-Add-plugin-info-at-startup.patch
+++ b/patches/unapplied/server/1000-Add-plugin-info-at-startup.patch
diff --git a/patches/server/1001-Make-interaction-leniency-distance-configurable.patch b/patches/unapplied/server/1001-Make-interaction-leniency-distance-configurable.patch
index 236b30655b..236b30655b 100644
--- a/patches/server/1001-Make-interaction-leniency-distance-configurable.patch
+++ b/patches/unapplied/server/1001-Make-interaction-leniency-distance-configurable.patch
diff --git a/patches/server/1002-Fix-PickupStatus-getting-reset.patch b/patches/unapplied/server/1002-Fix-PickupStatus-getting-reset.patch
index 5008a8638b..f6e9463e32 100644
--- a/patches/server/1002-Fix-PickupStatus-getting-reset.patch
+++ b/patches/unapplied/server/1002-Fix-PickupStatus-getting-reset.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PickupStatus getting reset
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 14e31ae88e90d8ea1a98800cc6c1c3527bb2ed6b..accc246f441c8bf5e1a755cfc0db8f97c0c01c6b 100644
+index d43f7c44e4f7769654b92b130246822d68697f7d..8ce573042ea87631eb6539f2a0d5036655c2b809 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -714,7 +714,14 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/1003-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/unapplied/server/1003-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
index b06a0b6c33..b06a0b6c33 100644
--- a/patches/server/1003-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
+++ b/patches/unapplied/server/1003-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
diff --git a/patches/server/1004-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/unapplied/server/1004-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 67e1737740..efecb93aad 100644
--- a/patches/server/1004-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/unapplied/server/1004-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 37a8954f37a97afdbcc7b7c7026371f477cb3655..ab616f58e35458e52fb5a94e39875a188fd6a05b 100644
+index 3a4b88122fff891632a5dfc7787365eb22d33edb..f246df4e117dddd08ae6314050ad3e73114d765b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -2500,4 +2500,119 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/1005-Configuration-for-horizontal-only-item-merging.patch b/patches/unapplied/server/1005-Configuration-for-horizontal-only-item-merging.patch
index 4b1c29914b..4b1c29914b 100644
--- a/patches/server/1005-Configuration-for-horizontal-only-item-merging.patch
+++ b/patches/unapplied/server/1005-Configuration-for-horizontal-only-item-merging.patch
diff --git a/patches/server/1006-Add-skipping-world-symlink-scan.patch b/patches/unapplied/server/1006-Add-skipping-world-symlink-scan.patch
index f3221508c6..f3221508c6 100644
--- a/patches/server/1006-Add-skipping-world-symlink-scan.patch
+++ b/patches/unapplied/server/1006-Add-skipping-world-symlink-scan.patch
diff --git a/patches/server/1007-Add-even-more-Enchantment-API.patch b/patches/unapplied/server/1007-Add-even-more-Enchantment-API.patch
index dfc79b5b19..dfc79b5b19 100644
--- a/patches/server/1007-Add-even-more-Enchantment-API.patch
+++ b/patches/unapplied/server/1007-Add-even-more-Enchantment-API.patch
diff --git a/patches/server/1008-Leashable-API.patch b/patches/unapplied/server/1008-Leashable-API.patch
index f3cf7dc395..f3cf7dc395 100644
--- a/patches/server/1008-Leashable-API.patch
+++ b/patches/unapplied/server/1008-Leashable-API.patch
diff --git a/patches/server/1009-Fix-CraftBukkit-drag-system.patch b/patches/unapplied/server/1009-Fix-CraftBukkit-drag-system.patch
index 29c50814ac..29c50814ac 100644
--- a/patches/server/1009-Fix-CraftBukkit-drag-system.patch
+++ b/patches/unapplied/server/1009-Fix-CraftBukkit-drag-system.patch
diff --git a/patches/server/1010-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/unapplied/server/1010-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
index c2857c2245..c2857c2245 100644
--- a/patches/server/1010-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
+++ b/patches/unapplied/server/1010-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
diff --git a/patches/server/1011-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/unapplied/server/1011-Remove-set-damage-lootable-item-function-from-compas.patch
index ac0c0e3513..ac0c0e3513 100644
--- a/patches/server/1011-Remove-set-damage-lootable-item-function-from-compas.patch
+++ b/patches/unapplied/server/1011-Remove-set-damage-lootable-item-function-from-compas.patch
diff --git a/patches/server/1012-Add-enchantment-seed-update-API.patch b/patches/unapplied/server/1012-Add-enchantment-seed-update-API.patch
index 3725102979..3725102979 100644
--- a/patches/server/1012-Add-enchantment-seed-update-API.patch
+++ b/patches/unapplied/server/1012-Add-enchantment-seed-update-API.patch
diff --git a/patches/server/1013-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/unapplied/server/1013-Fix-synchronise-sending-chat-to-client-with-updating.patch
index 9f024a9662..9f024a9662 100644
--- a/patches/server/1013-Fix-synchronise-sending-chat-to-client-with-updating.patch
+++ b/patches/unapplied/server/1013-Fix-synchronise-sending-chat-to-client-with-updating.patch
diff --git a/patches/server/1014-Fix-InventoryOpenEvent-cancellation.patch b/patches/unapplied/server/1014-Fix-InventoryOpenEvent-cancellation.patch
index 5abbfba60b..5abbfba60b 100644
--- a/patches/server/1014-Fix-InventoryOpenEvent-cancellation.patch
+++ b/patches/unapplied/server/1014-Fix-InventoryOpenEvent-cancellation.patch
diff --git a/patches/server/1015-Fire-BlockExpEvent-on-grindstone-use.patch b/patches/unapplied/server/1015-Fire-BlockExpEvent-on-grindstone-use.patch
index e5944fabfe..e5944fabfe 100644
--- a/patches/server/1015-Fire-BlockExpEvent-on-grindstone-use.patch
+++ b/patches/unapplied/server/1015-Fire-BlockExpEvent-on-grindstone-use.patch
diff --git a/patches/server/1016-Check-dead-flag-in-isAlive.patch b/patches/unapplied/server/1016-Check-dead-flag-in-isAlive.patch
index 0641acbaa9..0641acbaa9 100644
--- a/patches/server/1016-Check-dead-flag-in-isAlive.patch
+++ b/patches/unapplied/server/1016-Check-dead-flag-in-isAlive.patch
diff --git a/patches/server/1017-Add-FeatureFlag-API.patch b/patches/unapplied/server/1017-Add-FeatureFlag-API.patch
index 2d3757f237..2d3757f237 100644
--- a/patches/server/1017-Add-FeatureFlag-API.patch
+++ b/patches/unapplied/server/1017-Add-FeatureFlag-API.patch
diff --git a/patches/server/1018-Tag-Lifecycle-Events.patch b/patches/unapplied/server/1018-Tag-Lifecycle-Events.patch
index 593b77a3f1..11e8f6e7cc 100644
--- a/patches/server/1018-Tag-Lifecycle-Events.patch
+++ b/patches/unapplied/server/1018-Tag-Lifecycle-Events.patch
@@ -474,7 +474,7 @@ index c5e279216f6cb880397ea2768ee6e99a8798e3e1..46bf2b95658ca3bbd3048df5f8adf1bd
  
      static <E> void loadContentsFromNetwork(
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ff6f2dc31bbbaa420323a68282cb1ee3d8b98c0f..e18692ad6bdbc8bc2df605833501b1ad888b8b7d 100644
+index 6756f325dc755e5fcb8823c7395c925104dcdda0..57b242a4a1de49e8869e8ec83e74d60d877a4003 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2208,7 +2208,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1019-Item-serialization-as-json.patch b/patches/unapplied/server/1019-Item-serialization-as-json.patch
index 1e422d7da9..1e422d7da9 100644
--- a/patches/server/1019-Item-serialization-as-json.patch
+++ b/patches/unapplied/server/1019-Item-serialization-as-json.patch
diff --git a/patches/server/1020-Validate-slot-in-PlayerInventory-setSlot.patch b/patches/unapplied/server/1020-Validate-slot-in-PlayerInventory-setSlot.patch
index 3c402b2284..3c402b2284 100644
--- a/patches/server/1020-Validate-slot-in-PlayerInventory-setSlot.patch
+++ b/patches/unapplied/server/1020-Validate-slot-in-PlayerInventory-setSlot.patch
diff --git a/patches/server/1021-Remove-wall-time-unused-skip-tick-protection.patch b/patches/unapplied/server/1021-Remove-wall-time-unused-skip-tick-protection.patch
index c25e6680dc..c25e6680dc 100644
--- a/patches/server/1021-Remove-wall-time-unused-skip-tick-protection.patch
+++ b/patches/unapplied/server/1021-Remove-wall-time-unused-skip-tick-protection.patch
diff --git a/patches/server/1022-Disable-pretty-printing-for-advancement-saving.patch b/patches/unapplied/server/1022-Disable-pretty-printing-for-advancement-saving.patch
index c6ad9249f5..c6ad9249f5 100644
--- a/patches/server/1022-Disable-pretty-printing-for-advancement-saving.patch
+++ b/patches/unapplied/server/1022-Disable-pretty-printing-for-advancement-saving.patch
diff --git a/patches/server/1023-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch b/patches/unapplied/server/1023-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch
index 67b0a1e97f..67b0a1e97f 100644
--- a/patches/server/1023-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch
+++ b/patches/unapplied/server/1023-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch
diff --git a/patches/server/1024-Add-enchantWithLevels-with-enchantment-registry-set.patch b/patches/unapplied/server/1024-Add-enchantWithLevels-with-enchantment-registry-set.patch
index 61f5aced36..61f5aced36 100644
--- a/patches/server/1024-Add-enchantWithLevels-with-enchantment-registry-set.patch
+++ b/patches/unapplied/server/1024-Add-enchantWithLevels-with-enchantment-registry-set.patch
diff --git a/patches/server/1025-Improve-entity-effect-API.patch b/patches/unapplied/server/1025-Improve-entity-effect-API.patch
index 7acc892caa..8214467d02 100644
--- a/patches/server/1025-Improve-entity-effect-API.patch
+++ b/patches/unapplied/server/1025-Improve-entity-effect-API.patch
@@ -25,7 +25,7 @@ index d1d9916db7bd4886d30355e6a0ecb69cd21c2364..ddabaed899c755925ad8618b78c33dac
 +    // Paper end - broadcast hurt animation
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bdc5ad40f83590066f8702b2b60868bd56d58596..5989a9af8840e1bdb5c7a25a44473e2ab597e1e5 100644
+index f694e79c21a8f84e48c8f46de8aebb0889b7c9f8..7e3552390c7dd11a79fd95d3543707cc5d652c66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1284,6 +1284,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1026-Add-recipeBrewTime.patch b/patches/unapplied/server/1026-Add-recipeBrewTime.patch
index 39d7149206..39d7149206 100644
--- a/patches/server/1026-Add-recipeBrewTime.patch
+++ b/patches/unapplied/server/1026-Add-recipeBrewTime.patch
diff --git a/patches/server/1027-Call-bucket-events-for-cauldrons.patch b/patches/unapplied/server/1027-Call-bucket-events-for-cauldrons.patch
index ab192b82a4..ab192b82a4 100644
--- a/patches/server/1027-Call-bucket-events-for-cauldrons.patch
+++ b/patches/unapplied/server/1027-Call-bucket-events-for-cauldrons.patch
diff --git a/patches/server/1028-Add-PlayerInsertLecternBookEvent.patch b/patches/unapplied/server/1028-Add-PlayerInsertLecternBookEvent.patch
index f15585222f..f15585222f 100644
--- a/patches/server/1028-Add-PlayerInsertLecternBookEvent.patch
+++ b/patches/unapplied/server/1028-Add-PlayerInsertLecternBookEvent.patch
diff --git a/patches/server/1029-Void-damage-configuration-API.patch b/patches/unapplied/server/1029-Void-damage-configuration-API.patch
index 49dc8ef853..5b445033c3 100644
--- a/patches/server/1029-Void-damage-configuration-API.patch
+++ b/patches/unapplied/server/1029-Void-damage-configuration-API.patch
@@ -33,7 +33,7 @@ index f2708479ccf994278ad1ab4665edc46672001e8a..59c992173fda6153c58722caae061b0e
  
      protected void updateSwingTime() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c79c4db56fc4f43498d7886dcb3248798a4c509e..cd2e74ebadc1aa8282b3d5b89696ddbc053b2708 100644
+index 1a6f4621190c9f3859c1ef6588718a8a555e026d..ebee036527eaef5e940dd4fec8e3c5dab12fac76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -168,6 +168,41 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/1030-Add-Offline-PDC-API.patch b/patches/unapplied/server/1030-Add-Offline-PDC-API.patch
index f1513955cb..f1513955cb 100644
--- a/patches/server/1030-Add-Offline-PDC-API.patch
+++ b/patches/unapplied/server/1030-Add-Offline-PDC-API.patch
diff --git a/patches/server/1031-Add-AnvilView-bypassEnchantmentLevelRestriction.patch b/patches/unapplied/server/1031-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
index 7084bf9f8d..7084bf9f8d 100644
--- a/patches/server/1031-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
+++ b/patches/unapplied/server/1031-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
diff --git a/patches/server/1032-Add-proper-async-player-disconnections.patch b/patches/unapplied/server/1032-Add-proper-async-player-disconnections.patch
index eff84b6f89..eff84b6f89 100644
--- a/patches/server/1032-Add-proper-async-player-disconnections.patch
+++ b/patches/unapplied/server/1032-Add-proper-async-player-disconnections.patch
diff --git a/patches/server/1033-DataComponent-API.patch b/patches/unapplied/server/1033-DataComponent-API.patch
index baa3aaef48..baa3aaef48 100644
--- a/patches/server/1033-DataComponent-API.patch
+++ b/patches/unapplied/server/1033-DataComponent-API.patch
diff --git a/patches/server/1034-Separate-dimensiondata-executor.patch b/patches/unapplied/server/1034-Separate-dimensiondata-executor.patch
index 40c89f1045..40c89f1045 100644
--- a/patches/server/1034-Separate-dimensiondata-executor.patch
+++ b/patches/unapplied/server/1034-Separate-dimensiondata-executor.patch
diff --git a/patches/server/1035-Always-send-Banner-patterns-to-the-client.patch b/patches/unapplied/server/1035-Always-send-Banner-patterns-to-the-client.patch
index a5951afc90..a5951afc90 100644
--- a/patches/server/1035-Always-send-Banner-patterns-to-the-client.patch
+++ b/patches/unapplied/server/1035-Always-send-Banner-patterns-to-the-client.patch
diff --git a/patches/server/1036-Rewrite-dataconverter-system.patch b/patches/unapplied/server/1036-Rewrite-dataconverter-system.patch
index 7f88441f12..7f88441f12 100644
--- a/patches/server/1036-Rewrite-dataconverter-system.patch
+++ b/patches/unapplied/server/1036-Rewrite-dataconverter-system.patch
diff --git a/patches/server/1037-Moonrise-optimisation-patches.patch b/patches/unapplied/server/1037-Moonrise-optimisation-patches.patch
index 34722c234c..34722c234c 100644
--- a/patches/server/1037-Moonrise-optimisation-patches.patch
+++ b/patches/unapplied/server/1037-Moonrise-optimisation-patches.patch
diff --git a/patches/server/1038-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/1038-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index c155a5cca2..c155a5cca2 100644
--- a/patches/server/1038-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/unapplied/server/1038-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/1039-API-for-checking-sent-chunks.patch b/patches/unapplied/server/1039-API-for-checking-sent-chunks.patch
index b8a7aea07d..fc8b212100 100644
--- a/patches/server/1039-API-for-checking-sent-chunks.patch
+++ b/patches/unapplied/server/1039-API-for-checking-sent-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for checking sent chunks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e1f20b5b9ebc5d9870136aa2c77d887094bd4b6e..7aa3ba20f63be469ec82637e79f864262e41f3c6 100644
+index 71ed0230baf3115a53a8ce8f0a5c72f01954fffc..d4e497961578bb693275cdf95915b60b2cc76eb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3500,6 +3500,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch b/patches/unapplied/server/1040-Fix-CraftWorld-isChunkGenerated.patch
index 8724b88715..ab99075727 100644
--- a/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/unapplied/server/1040-Fix-CraftWorld-isChunkGenerated.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix CraftWorld#isChunkGenerated
 The upstream implementation is returning true for non-full chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2abe37bfbe69c039433b11fcc3a1d4f4e7481ec8..2e4dc3ce88e8fe7db47908fc6d335bd74c0614d0 100644
+index ddf6403682025e544ab4060c32ff089ed11ffe0a..57da11c0da7322e74810e7108e9c8000b0c36520 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -398,11 +398,28 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch b/patches/unapplied/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch
index 83ad17bfc0..83ad17bfc0 100644
--- a/patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch
+++ b/patches/unapplied/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch
diff --git a/patches/server/1042-Improved-Watchdog-Support.patch b/patches/unapplied/server/1042-Improved-Watchdog-Support.patch
index d9040f3b39..7e6f9c63e0 100644
--- a/patches/server/1042-Improved-Watchdog-Support.patch
+++ b/patches/unapplied/server/1042-Improved-Watchdog-Support.patch
@@ -304,7 +304,7 @@ index bf2bae3166df06be240dbbeecce16a24c85897a9..c06863578c5d654706d93e73059d89c1
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 61f3ee42aaad1641c92df3eb60d699b9dd5679e3..47664c545e3f58719f55366bac05732dbfe3c00a 100644
+index 7f5686571ace6155247e085560fcc8919e67734c..532e4c1dac20d7481557bb8c84f81c30994ae4d5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -553,7 +553,7 @@ public abstract class PlayerList {
diff --git a/patches/server/1043-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/1043-Detail-more-information-in-watchdog-dumps.patch
index 98c659d4a2..2ec02452ea 100644
--- a/patches/server/1043-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/unapplied/server/1043-Detail-more-information-in-watchdog-dumps.patch
@@ -78,7 +78,7 @@ index f7197f1347251a37dd0f6d9ffa2f09bc3a4e1233..1f7f68aad97ee73763c042837f239bdc
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9928e14a5a42a2f0deba86e9dcb1f6f9f59412ef..d81be1069ef6ce51789df38ce21f125b6d524945 100644
+index c5eed86a8982466fd8302c678f0f041db1b24029..2e0dcac7642d899efd60cf70fb0ad0336e1923da 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1253,7 +1253,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/patches/server/1044-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/1044-Entity-load-save-limit-per-chunk.patch
index 7a75cf646d..7a75cf646d 100644
--- a/patches/server/1044-Entity-load-save-limit-per-chunk.patch
+++ b/patches/unapplied/server/1044-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 16f1024afb..16f1024afb 100644
--- a/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/unapplied/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1046-Bundle-spark.patch b/patches/unapplied/server/1046-Bundle-spark.patch
index 84624b4705..84624b4705 100644
--- a/patches/server/1046-Bundle-spark.patch
+++ b/patches/unapplied/server/1046-Bundle-spark.patch
diff --git a/patches/server/1047-Improve-performance-of-mass-crafts.patch b/patches/unapplied/server/1047-Improve-performance-of-mass-crafts.patch
index 7231e230c1..7231e230c1 100644
--- a/patches/server/1047-Improve-performance-of-mass-crafts.patch
+++ b/patches/unapplied/server/1047-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1048-Incremental-chunk-and-player-saving.patch b/patches/unapplied/server/1048-Incremental-chunk-and-player-saving.patch
index 573570fbe8..321440c65f 100644
--- a/patches/server/1048-Incremental-chunk-and-player-saving.patch
+++ b/patches/unapplied/server/1048-Incremental-chunk-and-player-saving.patch
@@ -51,7 +51,7 @@ index ca70815b73199835b88c9d68c8a01699536d320f..be6e64d5c858961b19eb7b1b028530c1
          ProfilerFiller gameprofilerfiller = Profiler.get();
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d81be1069ef6ce51789df38ce21f125b6d524945..dc523c3017939d4a206f28617e5aacd83e5d2334 100644
+index 2e0dcac7642d899efd60cf70fb0ad0336e1923da..b5f0ce0869c0ea6ad478bddddfc463ec42a5bef7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1353,6 +1353,30 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -98,7 +98,7 @@ index 2b6c5b2387b67f25d8877849ccbfaaa77eab51d3..05981a075898794b899f1327bff1e7ca
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      private static final int FLY_STAT_RECORDING_SPEED = 25;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 47664c545e3f58719f55366bac05732dbfe3c00a..a03ff473a683611670ee274b0eec5a395ee6981a 100644
+index 532e4c1dac20d7481557bb8c84f81c30994ae4d5..8de23b39806734c9a413b6d98dbfff25888c1798 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -518,6 +518,7 @@ public abstract class PlayerList {
diff --git a/patches/server/1049-Optimise-general-POI-access.patch b/patches/unapplied/server/1049-Optimise-general-POI-access.patch
index 2fa0832c02..2fa0832c02 100644
--- a/patches/server/1049-Optimise-general-POI-access.patch
+++ b/patches/unapplied/server/1049-Optimise-general-POI-access.patch
diff --git a/patches/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/unapplied/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch
index 9737c35436..0b5b0d3c49 100644
--- a/patches/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/unapplied/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch
@@ -50,7 +50,7 @@ index f6e1deb2f849d8b01b15cfa69e2f6cd5f2b1512b..f66e40326c510aa3267542b1a24ed75d
              entityTrackerEntry.getLastSentYRot(),
              entity.getType(),
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 80bbf77454ff34505196998bcfeaa3e40a4f639c..674fbb35d372a67c21453a8c63c3628c563ccef7 100644
+index 67cfc3236a39008cfcf3acffefafda1a604b8573..7833c53b4eff67f2ff37c091b5926cb081205921 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1265,6 +1265,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/1051-Lag-compensation-ticks.patch b/patches/unapplied/server/1051-Lag-compensation-ticks.patch
index e4475fead4..373bf30ab1 100644
--- a/patches/server/1051-Lag-compensation-ticks.patch
+++ b/patches/unapplied/server/1051-Lag-compensation-ticks.patch
@@ -30,7 +30,7 @@ index be6e64d5c858961b19eb7b1b028530c1eb4c68d7..11a0bf52d891d79e3520de91d270b876
              gameprofilerfiller.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dc523c3017939d4a206f28617e5aacd83e5d2334..5979e8d25eaddf990ded79bcf6485cc0612faa63 100644
+index b5f0ce0869c0ea6ad478bddddfc463ec42a5bef7..06ae6347d2c9666cb64aea2bea9ff946324015d9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -582,6 +582,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/patches/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch
index 82b8f60c95..82b8f60c95 100644
--- a/patches/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/unapplied/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1053-Optional-per-player-mob-spawns.patch b/patches/unapplied/server/1053-Optional-per-player-mob-spawns.patch
index 79231e71e6..9e2c455dcc 100644
--- a/patches/server/1053-Optional-per-player-mob-spawns.patch
+++ b/patches/unapplied/server/1053-Optional-per-player-mob-spawns.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optional per player mob spawns
 Feature patch
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 674fbb35d372a67c21453a8c63c3628c563ccef7..d708edb01328642b9374c59bd73ff39824005f2e 100644
+index 7833c53b4eff67f2ff37c091b5926cb081205921..094096bd08450e5d656ce2c442757cbc63ffb090 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -229,8 +229,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/unapplied/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 0e96e6bf9c..68c09ef04f 100644
--- a/patches/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/unapplied/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d708edb01328642b9374c59bd73ff39824005f2e..52a6a4badace15a983f0acb431036bd704d9cebd 100644
+index 094096bd08450e5d656ce2c442757cbc63ffb090..cfeeddf2cb4ff50dbc29c6913e78ca1dee076790 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -246,8 +246,25 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/1055-Avoid-issues-with-certain-tasks-not-processing-durin.patch b/patches/unapplied/server/1055-Avoid-issues-with-certain-tasks-not-processing-durin.patch
index 5da4e0387b..5da4e0387b 100644
--- a/patches/server/1055-Avoid-issues-with-certain-tasks-not-processing-durin.patch
+++ b/patches/unapplied/server/1055-Avoid-issues-with-certain-tasks-not-processing-durin.patch
diff --git a/patches/server/1056-Allow-using-old-ender-pearl-behavior.patch b/patches/unapplied/server/1056-Allow-using-old-ender-pearl-behavior.patch
index cd17c1aa1f..f23be1b293 100644
--- a/patches/server/1056-Allow-using-old-ender-pearl-behavior.patch
+++ b/patches/unapplied/server/1056-Allow-using-old-ender-pearl-behavior.patch
@@ -30,7 +30,7 @@ index a755a2742f18ed55adc1fc735d995c9874b1e62e..5a8f396d47577f087abb415c972fd4f5
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a03ff473a683611670ee274b0eec5a395ee6981a..30de3d1a7792c38ae946f19cb0e14637919b5001 100644
+index 8de23b39806734c9a413b6d98dbfff25888c1798..1a956249828156fdc273888de59128c3d1a0b898 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -602,7 +602,13 @@ public abstract class PlayerList {
diff --git a/patches/server/1057-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/1057-Block-Enderpearl-Travel-Exploit.patch
index 6c0ae6175b..6c0ae6175b 100644
--- a/patches/server/1057-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/unapplied/server/1057-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/unapplied/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 30f853ff98..30f853ff98 100644
--- a/patches/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/unapplied/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/1059-Correct-update-cursor.patch b/patches/unapplied/server/1059-Correct-update-cursor.patch
index 5a1e3ce282..5a1e3ce282 100644
--- a/patches/server/1059-Correct-update-cursor.patch
+++ b/patches/unapplied/server/1059-Correct-update-cursor.patch
diff --git a/patches/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch b/patches/unapplied/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
index 0e72daf994..0e72daf994 100644
--- a/patches/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
+++ b/patches/unapplied/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
diff --git a/patches/server/1061-Improve-exact-choice-recipe-ingredients.patch b/patches/unapplied/server/1061-Improve-exact-choice-recipe-ingredients.patch
index eaed7d5bad..eaed7d5bad 100644
--- a/patches/server/1061-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/unapplied/server/1061-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/1062-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/1062-Eigencraft-redstone-implementation.patch
index 85700695b3..85700695b3 100644
--- a/patches/server/1062-Eigencraft-redstone-implementation.patch
+++ b/patches/unapplied/server/1062-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch b/patches/unapplied/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch
index 08bbad66b6..08bbad66b6 100644
--- a/patches/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch
+++ b/patches/unapplied/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch
diff --git a/patches/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch b/patches/unapplied/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch
index 81c7b52685..81c7b52685 100644
--- a/patches/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch
+++ b/patches/unapplied/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch
diff --git a/patches/server/1065-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/1065-Add-Alternate-Current-redstone-implementation.patch
index 6d9bd74276..6d9bd74276 100644
--- a/patches/server/1065-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/unapplied/server/1065-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1066-Fix-incorrect-invulnerability-damage-reduction.patch b/patches/unapplied/server/1066-Fix-incorrect-invulnerability-damage-reduction.patch
index 3b3dd3d144..3b3dd3d144 100644
--- a/patches/server/1066-Fix-incorrect-invulnerability-damage-reduction.patch
+++ b/patches/unapplied/server/1066-Fix-incorrect-invulnerability-damage-reduction.patch
diff --git a/patches/server/1067-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch b/patches/unapplied/server/1067-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch
index 511cccc084..511cccc084 100644
--- a/patches/server/1067-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch
+++ b/patches/unapplied/server/1067-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch
diff --git a/patches/server/1068-API-to-check-if-the-server-is-sleeping.patch b/patches/unapplied/server/1068-API-to-check-if-the-server-is-sleeping.patch
index c19dba5aeb..c19dba5aeb 100644
--- a/patches/server/1068-API-to-check-if-the-server-is-sleeping.patch
+++ b/patches/unapplied/server/1068-API-to-check-if-the-server-is-sleeping.patch
diff --git a/patches/server/1069-API-to-allow-disallow-tick-sleeping.patch b/patches/unapplied/server/1069-API-to-allow-disallow-tick-sleeping.patch
index 1aff91abe2..1aff91abe2 100644
--- a/patches/server/1069-API-to-allow-disallow-tick-sleeping.patch
+++ b/patches/unapplied/server/1069-API-to-allow-disallow-tick-sleeping.patch
diff --git a/patches/server/1070-Configurable-Entity-Despawn-Time.patch b/patches/unapplied/server/1070-Configurable-Entity-Despawn-Time.patch
index 3885f857a3..3885f857a3 100644
--- a/patches/server/1070-Configurable-Entity-Despawn-Time.patch
+++ b/patches/unapplied/server/1070-Configurable-Entity-Despawn-Time.patch
diff --git a/patches/server/1071-Expanded-Art-API.patch b/patches/unapplied/server/1071-Expanded-Art-API.patch
index 56e4179720..56e4179720 100644
--- a/patches/server/1071-Expanded-Art-API.patch
+++ b/patches/unapplied/server/1071-Expanded-Art-API.patch
diff --git a/patches/server/1072-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch b/patches/unapplied/server/1072-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch
index 43aea85654..43aea85654 100644
--- a/patches/server/1072-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch
+++ b/patches/unapplied/server/1072-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch
diff --git a/work/BuildData b/work/BuildData
-Subproject 0c5ebabcb4ce41f69a7d2319b468b6faee43403
+Subproject 3edaf46ec1eed4115ce1b18d2846cded42577e4
diff --git a/work/Bukkit b/work/Bukkit
-Subproject ed0ec4893b5f755e2493e652091bba42dc7ad74
+Subproject 3339db1661695d48bf170e58c24c4f8021ddced
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 40dd796db69931bd3b5220f2ee4d734a8bd44c9
+Subproject ff9a8bf8287245918b691aca892f7517e0930a0
diff --git a/work/Spigot b/work/Spigot
-Subproject 60c9969b3e34b1a7c8f06e358241399b5f47bfb
+Subproject 33ece3efc24165112baa4177f2e9343dd922f5b