Start working on 1.20

1075 files changed, 505 insertions, 558 deletions

diff --git a/README.md b/README.md
index 72bb670b09..95d0d66253 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.19.4-R0.1-SNAPSHOT</version>
+    <version>1.20-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
  ```
@@ -54,7 +54,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT")
 }
 
 java {
diff --git a/build.gradle.kts b/build.gradle.kts
index e0911816b7..d5566aac1e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,7 +61,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.19.4+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.20+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
     decompiler("net.minecraftforge:forgeflower:2.0.627.2")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
@@ -133,7 +133,7 @@ allprojects {
 
 tasks.collectAtsFromPatches {
     // Uncomment while updating for a new Minecraft version
-    // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
+    extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
 }
 
 tasks.register("printMinecraftVersion") {
diff --git a/gradle.properties b/gradle.properties
index 080537633e..5fb6c52862 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.19.4-R0.1-SNAPSHOT
-mcVersion=1.19.4
+version=1.20-R0.1-SNAPSHOT
+mcVersion=1.20
 
 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 3596bd55af..8bd1e3da6d 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -27,10 +27,10 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d9bf41f10
+index 0000000000000000000000000000000000000000..8686d850f41753923e375bd8ed9fec45e6171e05
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,85 @@
 +plugins {
 +    `java-library`
 +    `maven-publish`
@@ -41,6 +41,8 @@ index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d
 +    withJavadocJar()
 +}
 +
++val annotationsVersion = "24.0.1"
++
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
 +    api("com.google.guava:guava:31.1-jre")
@@ -49,11 +51,11 @@ index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d
 +    api("org.yaml:snakeyaml:1.33")
 +    api("org.joml:joml:1.10.5")
 +
-+    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
++    compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
++    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
++    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
 +
-+    val annotations = "org.jetbrains:annotations-java5:23.0.0"
++    val annotations = "org.jetbrains:annotations-java5:$annotationsVersion"
 +    compileOnly(annotations)
 +    testCompileOnly(annotations)
 +
@@ -98,7 +100,7 @@ index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d
 +    options.links(
 +        "https://guava.dev/releases/31.1-jre/api/docs/",
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
-+        "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
++        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
 +    )
 +    options.tags("apiNote:a:API Note:")
@@ -116,7 +118,7 @@ index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..0000000000000000000000000000000000000000
+index 2ac982a8bc43604298a0788bf03b5e6314f5ab9b..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,270 +0,0 @@
@@ -127,7 +129,7 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.19.4-R0.1-SNAPSHOT</version>
+-    <version>1.20-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -184,33 +186,33 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.yaml</groupId>
 -            <artifactId>snakeyaml</artifactId>
--            <version>1.33</version>
+-            <version>2.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- not part of the API proper -->
 -        <dependency>
 -            <groupId>org.apache.maven</groupId>
 -            <artifactId>maven-resolver-provider</artifactId>
--            <version>3.8.5</version>
+-            <version>3.9.2</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.7.3</version>
+-            <version>1.9.10</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.7.3</version>
+-            <version>1.9.10</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- annotations -->
 -        <dependency>
 -            <groupId>org.jetbrains</groupId>
 -            <artifactId>annotations-java5</artifactId>
--            <version>23.0.0</version>
+-            <version>24.0.1</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- testing -->
@@ -229,7 +231,7 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.ow2.asm</groupId>
 -            <artifactId>asm-tree</artifactId>
--            <version>9.4</version>
+-            <version>9.5</version>
 -            <scope>test</scope>
 -        </dependency>
 -    </dependencies>
@@ -317,7 +319,7 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000
 -                    <links>
 -                        <link>https://guava.dev/releases/31.1-jre/api/docs/</link>
 -                        <link>https://javadoc.io/doc/org.yaml/snakeyaml/1.33/</link>
--                        <link>https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/</link>
+-                        <link>https://javadoc.io/doc/org.jetbrains/annotations-java5/24.0.1/</link>
 -                        <link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
 -                    </links>
 -                    <tags>
@@ -343,7 +345,7 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000
 -                    <plugin>
 -                        <groupId>org.apache.maven.plugins</groupId>
 -                        <artifactId>maven-checkstyle-plugin</artifactId>
--                        <version>3.2.1</version>
+-                        <version>3.3.0</version>
 -                        <executions>
 -                            <execution>
 -                                <phase>process-classes</phase>
diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index f852024983..4c535298ff 100644
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 4b7f005519d8856fc35a94401636ae8d9bf41f10..bb6e3afe8e8bc1a3b598b085286ffcdaf3574072 100644
+index 8686d850f41753923e375bd8ed9fec45e6171e05..d72a4e039e77a0dc9a2eacb6d2e07260c206c678 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -15,15 +15,27 @@ dependencies {
+@@ -17,15 +17,27 @@ dependencies {
      api("net.md-5:bungeecord-chat:1.16-R0.4")
      api("org.yaml:snakeyaml:1.33")
      api("org.joml:joml:1.10.5")
@@ -18,13 +18,13 @@ index 4b7f005519d8856fc35a94401636ae8d9bf41f10..bb6e3afe8e8bc1a3b598b085286ffcda
 +    }
 +    // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
+     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
+     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
 +    compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
  
--    val annotations = "org.jetbrains:annotations-java5:23.0.0"
-+    val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
+-    val annotations = "org.jetbrains:annotations-java5:$annotationsVersion"
++    val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
      compileOnly(annotations)
      testCompileOnly(annotations)
  
@@ -37,16 +37,16 @@ index 4b7f005519d8856fc35a94401636ae8d9bf41f10..bb6e3afe8e8bc1a3b598b085286ffcda
      testImplementation("org.apache.commons:commons-lang3:3.12.0")
      testImplementation("junit:junit:4.13.2")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
-@@ -65,7 +77,7 @@ tasks.withType<Javadoc> {
+@@ -67,7 +79,7 @@ tasks.withType<Javadoc> {
      options.links(
          "https://guava.dev/releases/31.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
--        "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
-+        "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
+-        "https://javadoc.io/doc/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/1.16-R0.4/",
      )
      options.tags("apiNote:a:API Note:")
-@@ -81,3 +93,14 @@ tasks.withType<Javadoc> {
+@@ -83,3 +95,14 @@ tasks.withType<Javadoc> {
          }
      }
  }
diff --git a/patches/api/0003-Test-changes.patch b/patches/api/0003-Test-changes.patch
index 9c96414a6b..6a8879dfb7 100644
--- a/patches/api/0003-Test-changes.patch
+++ b/patches/api/0003-Test-changes.patch
@@ -12,10 +12,10 @@ Co-authored-by: Riley Park <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 82444d3b95881702910369ec5694dd9f327ad81a..c06eda648d8626c86afb2140d6a583ddf82f295c 100644
+index d72a4e039e77a0dc9a2eacb6d2e07260c206c678..cf022f431c1a9c5b40d6b71411df2dfab98cde13 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -35,6 +35,7 @@ dependencies {
+@@ -37,6 +37,7 @@ dependencies {
      compileOnlyApi(checkerQual)
      testCompileOnly(checkerQual)
      // Paper end
diff --git a/patches/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
index a3b6bc3d59..0d38b90e72 100644
--- a/patches/api/0004-Add-FastUtil-to-Bukkit.patch
+++ b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
@@ -6,14 +6,14 @@ 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 c06eda648d8626c86afb2140d6a583ddf82f295c..464a209dbf52ebdfa287a553778a37c382a5405c 100644
+index cf022f431c1a9c5b40d6b71411df2dfab98cde13..77078078c16671b65a604afe17eaf66042afcae2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -19,6 +19,7 @@ dependencies {
+@@ -21,6 +21,7 @@ dependencies {
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
      }
 +    api("it.unimi.dsi:fastutil:8.5.6")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index 82d43764d4..d018e951a6 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -7,10 +7,10 @@ Co-authored-by: zml <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5fccd83117c2c153951d102756acfd4862b8c51b..acf12dfbecb9360c0921f70ed31650feecd33f12 100644
+index 77078078c16671b65a604afe17eaf66042afcae2..a346f0d360bacf245a8905e3ff3c4f370960e051 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -8,11 +8,24 @@ java {
+@@ -8,13 +8,26 @@ java {
      withJavadocJar()
  }
  
@@ -27,6 +27,8 @@ index 5fccd83117c2c153951d102756acfd4862b8c51b..acf12dfbecb9360c0921f70ed31650fe
 +    extendsFrom(apiAndDocs)
 +}
 +
+ val annotationsVersion = "24.0.1"
+ 
  dependencies {
      // api dependencies are listed transitively to API consumers
      api("com.google.guava:guava:31.1-jre")
@@ -36,7 +38,7 @@ index 5fccd83117c2c153951d102756acfd4862b8c51b..acf12dfbecb9360c0921f70ed31650fe
      api("org.yaml:snakeyaml:1.33")
      api("org.joml:joml:1.10.5")
      // Paper start
-@@ -20,6 +33,13 @@ dependencies {
+@@ -22,6 +35,13 @@ dependencies {
          isTransitive = false // includes junit
      }
      api("it.unimi.dsi:fastutil:8.5.6")
@@ -49,11 +51,11 @@ index 5fccd83117c2c153951d102756acfd4862b8c51b..acf12dfbecb9360c0921f70ed31650fe
 +    apiAndDocs("net.kyori:adventure-text-logger-slf4j")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-@@ -80,10 +100,25 @@ tasks.withType<Javadoc> {
+     compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
+@@ -82,10 +102,25 @@ tasks.withType<Javadoc> {
          "https://guava.dev/releases/31.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
-         "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
+         "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
 -        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
 +        // Paper start
 +        //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
@@ -1366,10 +1368,10 @@ index 6f97c680535fabf88509a49ec21704eb527b2add..b516021b6772d8266ed72b73170510ca
              throw new UnsupportedOperationException("Not supported yet.");
          }
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 4dda5091739ece442a66d983670ad432b6042867..762b0d9ba22a1012ebe5ea77b6aef909fddc0403 100644
+index 4cbc963f268753316327e38b6e1e42cffb486b54..6e8d2b35d8f33827396dbcfa817cd9c2f8ad83a6 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
-@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
   * guarantee values will not be removed from this Enum. As such, you should not
   * depend on the ordinal values of this class.
   */
@@ -1378,7 +1380,7 @@ index 4dda5091739ece442a66d983670ad432b6042867..762b0d9ba22a1012ebe5ea77b6aef909
  
      AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"),
      AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"),
-@@ -1640,4 +1640,11 @@ public enum Sound implements Keyed {
+@@ -1498,4 +1498,11 @@ public enum Sound implements Keyed {
      public NamespacedKey getKey() {
          return key;
      }
@@ -1530,10 +1532,10 @@ index 372c0bd5a4d7800a11c24c95e39fe376a96232bf..9c88be68b4f403d0500cb607394b3a16
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java
-index 1844b7136ddcc1aa267b8fb2159244d04900da36..9a9f4af69fc8adbd0a05e2e7574f83ff9befad85 100644
+index 80f6b718dba4a48130449388f147b4f12510d9f9..abefc7a96528c52434bd7d4eef3be63c5e31e770 100644
 --- a/src/main/java/org/bukkit/block/Sign.java
 +++ b/src/main/java/org/bukkit/block/Sign.java
-@@ -11,6 +11,42 @@ import org.jetbrains.annotations.NotNull;
+@@ -10,12 +10,50 @@ import org.jetbrains.annotations.NotNull;
   * Represents a captured state of either a SignPost or a WallSign.
   */
  public interface Sign extends TileState, Colorable {
@@ -1542,7 +1544,7 @@ index 1844b7136ddcc1aa267b8fb2159244d04900da36..9a9f4af69fc8adbd0a05e2e7574f83ff
 +     * Gets all the lines of text currently on the {@link Side#FRONT} of this sign.
 +     *
 +     * @return List of components containing each line of text
-+     * @see #getSide(Side)
++     * @deprecated  A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#lines()}.
 +     */
 +    @NotNull
 +    public java.util.List<net.kyori.adventure.text.Component> lines();
@@ -1555,9 +1557,10 @@ index 1844b7136ddcc1aa267b8fb2159244d04900da36..9a9f4af69fc8adbd0a05e2e7574f83ff
 +     * @param index Line number to get the text from, starting at 0
 +     * @throws IndexOutOfBoundsException Thrown when the line does not exist
 +     * @return Text on the given line
-+     * @see #getSide(Side)
++     * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int)}.
 +     */
 +    @NotNull
++    @Deprecated
 +    public net.kyori.adventure.text.Component line(int index) throws IndexOutOfBoundsException;
 +
 +    /**
@@ -1569,49 +1572,46 @@ index 1844b7136ddcc1aa267b8fb2159244d04900da36..9a9f4af69fc8adbd0a05e2e7574f83ff
 +     * @param index Line number to set the text at, starting from 0
 +     * @param line New text to set at the specified index
 +     * @throws IndexOutOfBoundsException If the index is out of the range 0..3
-+     * @see #getSide(Side)
++     * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int, net.kyori.adventure.text.Component)}.
 +     */
++    @Deprecated
 +    public void line(int index, net.kyori.adventure.text.@NotNull Component line) throws IndexOutOfBoundsException;
 +    // Paper end
  
      /**
       * Gets all the lines of text currently on the {@link Side#FRONT} of this sign.
-@@ -19,6 +55,7 @@ public interface Sign extends TileState, Colorable {
-      * @see #getSide(Side)
+      *
+      * @return Array of Strings containing each line of text
+-     * @deprecated  A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#getLines()}.
++     * @deprecated  A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#lines()}.
       */
+     @Deprecated
      @NotNull
-+    @Deprecated // Paper
-     public String[] getLines();
- 
-     /**
-@@ -30,8 +67,10 @@ public interface Sign extends TileState, Colorable {
+@@ -29,7 +67,7 @@ public interface Sign extends TileState, Colorable {
+      * @param index Line number to get the text from, starting at 0
       * @return Text on the given line
       * @throws IndexOutOfBoundsException Thrown when the line does not exist
-      * @see #getSide(Side)
-+     * @deprecated in favour of {@link #line(int)}
+-     * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#getLine(int)}.
++     * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int)}.
       */
+     @Deprecated
      @NotNull
-+    @Deprecated // Paper
-     public String getLine(int index) throws IndexOutOfBoundsException;
- 
-     /**
-@@ -44,7 +83,9 @@ public interface Sign extends TileState, Colorable {
+@@ -44,7 +82,7 @@ public interface Sign extends TileState, Colorable {
+      * @param index Line number to set the text at, starting from 0
       * @param line New text to set at the specified index
       * @throws IndexOutOfBoundsException If the index is out of the range 0..3
-      * @see #getSide(Side)
-+     * @deprecated in favour of {@link #line(int, net.kyori.adventure.text.Component)}
+-     * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#setLine(int, String)}.
++     * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int, net.kyori.adventure.text.Component)}.
       */
-+    @Deprecated // Paper
+     @Deprecated
      public void setLine(int index, @NotNull String line) throws IndexOutOfBoundsException;
- 
-     /**
 diff --git a/src/main/java/org/bukkit/block/sign/SignSide.java b/src/main/java/org/bukkit/block/sign/SignSide.java
-index 85be6cfa9ed074073656cd0678600780eb03b47b..e6b9a1b0dbf7cdffafe4a9bb5dd1c3e8afb846e5 100644
+index 0f4ae7bd2ad379b5edb40f49f93de9e18c38f415..22bfe971920b526bd1bd52cb58d6acbf0a7ef5be 100644
 --- a/src/main/java/org/bukkit/block/sign/SignSide.java
 +++ b/src/main/java/org/bukkit/block/sign/SignSide.java
-@@ -9,6 +9,39 @@ import org.jetbrains.annotations.NotNull;
+@@ -7,6 +7,39 @@ import org.jetbrains.annotations.NotNull;
+  * Represents a side of a sign.
   */
- @Experimental
  public interface SignSide extends Colorable {
 +    // Paper start
 +    /**
@@ -2043,7 +2043,7 @@ index f3afe67f0832cb828d25be3654518ff73a80b0e1..598abaa82c634178043a29f6caa6ac52
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827cc5590e3b 100644
+index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451ea4967173 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -42,7 +42,28 @@ import org.jetbrains.annotations.Nullable;
@@ -2221,7 +2221,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      /**
       * Says a message (or runs a command).
       *
-@@ -609,6 +695,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -632,6 +718,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map<EquipmentSlot, ItemStack> items);
  
@@ -2312,7 +2312,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      /**
       * Send a sign change. This fakes a sign change packet for a user at
       * a certain location. This will not actually change the world in any way.
-@@ -623,7 +793,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -646,7 +816,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param lines the new text on the sign or null to clear it
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2322,7 +2322,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
  
      /**
-@@ -642,7 +814,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -665,7 +837,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if dyeColor is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2332,7 +2332,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
  
      /**
-@@ -662,7 +836,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -685,7 +859,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if dyeColor is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2342,7 +2342,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
  
      /**
-@@ -1156,6 +1332,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1179,6 +1355,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -2350,7 +2350,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
       * @param url The URL from which the client will download the resource
       *     pack. The string must contain only US-ASCII characters and should
       *     be encoded as per RFC 1738.
-@@ -1212,8 +1389,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1235,8 +1412,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2361,7 +2361,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1249,6 +1428,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1272,6 +1451,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param hash The sha1 hash sum of the resource pack file which is used
       *     to apply a cached version of the pack directly without downloading
       *     if it is available. Hast to be 20 bytes long!
@@ -2416,7 +2416,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
       * @param force If true, the client will be disconnected from the server
       *     when it declines to use the resource pack.
       * @throws IllegalArgumentException Thrown if the URL is null.
-@@ -1303,8 +1530,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1326,8 +1553,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2474,7 +2474,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      /**
       * Gets the Scoreboard displayed to this player
       *
-@@ -1420,7 +1696,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1443,7 +1719,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param title Title text
       * @param subtitle Subtitle text
@@ -2483,7 +2483,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
       */
      @Deprecated
      public void sendTitle(@Nullable String title, @Nullable String subtitle);
-@@ -1439,7 +1715,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1462,7 +1738,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param fadeIn time in ticks for titles to fade in. Defaults to 10.
       * @param stay time in ticks for titles to stay. Defaults to 70.
       * @param fadeOut time in ticks for titles to fade out. Defaults to 20.
@@ -2493,7 +2493,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
  
      /**
-@@ -1666,6 +1944,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1689,6 +1967,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public int getClientViewDistance();
  
@@ -2508,7 +2508,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      /**
       * Gets the player's estimated ping in milliseconds.
       *
-@@ -1691,8 +1977,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1714,8 +2000,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * they wish.
       *
       * @return the player's locale
@@ -2519,7 +2519,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      public String getLocale();
  
      /**
-@@ -1744,6 +2032,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1767,6 +2055,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public boolean isAllowingServerListings();
  
@@ -2534,7 +2534,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
      // Spigot start
      public class Spigot extends Entity.Spigot {
  
-@@ -1798,11 +2094,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1821,11 +2117,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2548,7 +2548,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
          @Override
          public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
-@@ -1813,7 +2111,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1836,7 +2134,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param component the components to send
@@ -2558,7 +2558,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1823,7 +2123,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1846,7 +2146,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param components the components to send
@@ -2568,7 +2568,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1834,7 +2136,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1857,7 +2159,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           * @param position the screen position
           * @param sender the sender of the message
           * @param component the components to send
@@ -2578,7 +2578,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1845,7 +2149,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1868,7 +2172,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           * @param position the screen position
           * @param sender the sender of the message
           * @param components the components to send
diff --git a/patches/api/0007-Use-ASM-for-event-executors.patch b/patches/api/0007-Use-ASM-for-event-executors.patch
index 378b866fb7..2c5a9ad94f 100644
--- a/patches/api/0007-Use-ASM-for-event-executors.patch
+++ b/patches/api/0007-Use-ASM-for-event-executors.patch
@@ -6,10 +6,10 @@ 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 23b1e7600d2507be60cb8543773b91f4851afb4f..d95b3d504ddc9ed76fc86cd45fa922d68e597827 100644
+index a346f0d360bacf245a8905e3ff3c4f370960e051..57e5d0bf373067138a53067563b82e9aa8e100c4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -40,6 +40,9 @@ dependencies {
+@@ -42,6 +42,9 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-legacy")
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
@@ -18,7 +18,7 @@ index 23b1e7600d2507be60cb8543773b91f4851afb4f..d95b3d504ddc9ed76fc86cd45fa922d6
 +    implementation("org.ow2.asm:asm-commons:9.4")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..5b28e9b1daba7834af67dbc193dd656bedd9a994
diff --git a/patches/api/0008-Paper-Plugins.patch b/patches/api/0008-Paper-Plugins.patch
index 42a3f68bc8..35f5a2bbf0 100644
--- a/patches/api/0008-Paper-Plugins.patch
+++ b/patches/api/0008-Paper-Plugins.patch
@@ -5,17 +5,17 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index cff3eb363b17c2a8245b3b2ceb02cbdc1efe3896..03b2fc4c6dd9cbc9f28add7da9420c816f8faa2b 100644
+index 57e5d0bf373067138a53067563b82e9aa8e100c4..6c42827db10fb2fb4dede44cba84e7989c1a6fdc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -45,7 +45,7 @@ dependencies {
+@@ -47,7 +47,7 @@ dependencies {
      implementation("org.ow2.asm:asm-commons:9.4")
      // Paper end
  
--    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-+    api("org.apache.maven:maven-resolver-provider:3.8.5") // Paper, expose
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+-    compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
++    api("org.apache.maven:maven-resolver-provider:3.9.2")
+     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
+     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
      compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
 diff --git a/src/main/java/io/papermc/paper/plugin/PermissionManager.java b/src/main/java/io/papermc/paper/plugin/PermissionManager.java
 new file mode 100644
diff --git a/patches/api/0010-Timings-v2.patch b/patches/api/0010-Timings-v2.patch
index fb445b2dc7..68a96e0957 100644
--- a/patches/api/0010-Timings-v2.patch
+++ b/patches/api/0010-Timings-v2.patch
@@ -3455,10 +3455,10 @@ 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 4190d5b3b3d3eb9525ed342179cb827cc5590e3b..3fffe6844d5f113f13ae3e2636efd7a8f43940dd 100644
+index 44be86a9315d45dcbaabbbfcf2c7451ea4967173..02e09dc027409b3be9e960be6f2e4c10a06819b6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2154,7 +2154,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2177,7 +2177,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          @Deprecated // Paper
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
diff --git a/patches/api/0012-Player-affects-spawning-API.patch b/patches/api/0012-Player-affects-spawning-API.patch
index 7038ebf984..254e55960f 100644
--- a/patches/api/0012-Player-affects-spawning-API.patch
+++ b/patches/api/0012-Player-affects-spawning-API.patch
@@ -5,10 +5,10 @@ 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 3fffe6844d5f113f13ae3e2636efd7a8f43940dd..aaca12b0fd009f605ce8120f0cbe0a1049771cf5 100644
+index 02e09dc027409b3be9e960be6f2e4c10a06819b6..94d9882520a6a87d936e5f7823b910a630ec5f34 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1983,6 +1983,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2006,6 +2006,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Deprecated // Paper
      public String getLocale();
  
diff --git a/patches/api/0017-Add-view-distance-API.patch b/patches/api/0017-Add-view-distance-API.patch
index fece2adf68..39b6ed510e 100644
--- a/patches/api/0017-Add-view-distance-API.patch
+++ b/patches/api/0017-Add-view-distance-API.patch
@@ -75,10 +75,10 @@ index 5357291ff0f2f20bd87ab9f6e57f6a4f6ff65226..887aa6217583d224d66f6d238ac269c2
      public class Spigot {
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index aaca12b0fd009f605ce8120f0cbe0a1049771cf5..e543a0cc1bd7e4d87038c06cad0f5bde7c64f1b9 100644
+index 94d9882520a6a87d936e5f7823b910a630ec5f34..c8569243fdbb6673d7808a9cae12d08e4d81a947 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1997,6 +1997,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2020,6 +2020,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);
diff --git a/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 251ca1f13a..f6e53262da 100644
--- a/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -76,10 +76,10 @@ index b6ff3a80fcb5c0e843caa1cfdb165cf2cadb8bd2..f24bb5b22975bcbdce1bf1e80cf7a1b3
       * 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 e543a0cc1bd7e4d87038c06cad0f5bde7c64f1b9..9caacc128a53d13b049a03f78d9dea16f8ff025e 100644
+index c8569243fdbb6673d7808a9cae12d08e4d81a947..a08f7f055e450b5f4d79e62bdd6d076f38703e95 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -849,6 +849,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -872,6 +872,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/patches/api/0022-Add-exception-reporting-event.patch b/patches/api/0022-Add-exception-reporting-event.patch
index ed0a0f8620..f4d1eb65f8 100644
--- a/patches/api/0022-Add-exception-reporting-event.patch
+++ b/patches/api/0022-Add-exception-reporting-event.patch
@@ -493,7 +493,7 @@ index 4205649948a9e2a72f64c3f007112245abac6d50..b3b32ce429edbf1ed040354dbe28ab86
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 3fcb73a0fc2daaeb76dd4c6757afce52c5b3118b..2b8308989fce7f8a16907f8711b362e671fdbfb6 100644
+index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc70445f411 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -515,7 +515,8 @@ public final class SimplePluginManager implements PluginManager {
diff --git a/patches/api/0025-Player-Tab-List-and-Title-APIs.patch b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch
index d5b8c545e4..b2bd7f7ba3 100644
--- a/patches/api/0025-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch
@@ -432,10 +432,10 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9caacc128a53d13b049a03f78d9dea16f8ff025e..c7d9185e2f16b77f78779403d075f31dabbc117b 100644
+index a08f7f055e450b5f4d79e62bdd6d076f38703e95..6e40bc2a4e768d49d57998146e2d2cd8f0a32a95 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -883,6 +883,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -906,6 +906,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
diff --git a/patches/api/0027-Complete-resource-pack-API.patch b/patches/api/0027-Complete-resource-pack-API.patch
index 8c8028a9b9..8f932688d6 100644
--- a/patches/api/0027-Complete-resource-pack-API.patch
+++ b/patches/api/0027-Complete-resource-pack-API.patch
@@ -5,10 +5,10 @@ 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 c7d9185e2f16b77f78779403d075f31dabbc117b..29b1cceff7100cbcde7ddca0d1acbb717f3b6b1c 100644
+index 6e40bc2a4e768d49d57998146e2d2cd8f0a32a95..2bac5662dc227e89ca74f8504bc30dc757618da5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1461,7 +1461,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1484,7 +1484,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index c7d9185e2f16b77f78779403d075f31dabbc117b..29b1cceff7100cbcde7ddca0d1acbb71
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -2287,6 +2289,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2310,6 +2312,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
          return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
      }
diff --git a/patches/api/0046-Add-String-based-Action-Bar-API.patch b/patches/api/0046-Add-String-based-Action-Bar-API.patch
index a7440bd6b1..649256226c 100644
--- a/patches/api/0046-Add-String-based-Action-Bar-API.patch
+++ b/patches/api/0046-Add-String-based-Action-Bar-API.patch
@@ -5,10 +5,10 @@ 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 29b1cceff7100cbcde7ddca0d1acbb717f3b6b1c..d85ce38bcae05a643479e7f687431dced1834b93 100644
+index 2bac5662dc227e89ca74f8504bc30dc757618da5..a30692c9128eca4d7a317e5fcc1c830e9cc239a7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -850,6 +850,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -873,6 +873,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -48,7 +48,7 @@ index 29b1cceff7100cbcde7ddca0d1acbb717f3b6b1c..d85ce38bcae05a643479e7f687431dce
      /**
       * Sends the component to the player
       *
-@@ -877,9 +910,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -900,9 +933,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch
index 03794df239..d4e66873e4 100644
--- a/patches/api/0055-Fix-upstream-javadocs.patch
+++ b/patches/api/0055-Fix-upstream-javadocs.patch
@@ -414,7 +414,7 @@ index ae9eaaa8e38e1d9dfc459926c7fc51ddb89de84a..b2ec535bb1b0ce0c114ddd7638b90218
      @Override
      public int getConversionTime();
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d85ce38bcae05a643479e7f687431dced1834b93..bb12eb007aeb932c2d89c6e6c4081c4802469cb6 100644
+index a30692c9128eca4d7a317e5fcc1c830e9cc239a7..530315d757f330b22cf6fd41e3609608cb242b6e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -313,15 +313,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -446,7 +446,7 @@ index d85ce38bcae05a643479e7f687431dced1834b93..bb12eb007aeb932c2d89c6e6c4081c48
       * @param loc the location to play the effect at
       * @param effect the {@link Effect}
       * @param data a data bit needed for some effects
-@@ -867,7 +867,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -890,7 +890,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -455,7 +455,7 @@ index d85ce38bcae05a643479e7f687431dced1834b93..bb12eb007aeb932c2d89c6e6c4081c48
       * @param message The message to send
       * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
       */
-@@ -1331,7 +1331,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1354,7 +1354,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see a player that was previously hidden. If
@@ -464,7 +464,7 @@ index d85ce38bcae05a643479e7f687431dced1834b93..bb12eb007aeb932c2d89c6e6c4081c48
       * remain hidden until the other plugin calls this method too.
       *
       * @param plugin Plugin that wants to show the player
-@@ -1360,7 +1360,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1383,7 +1383,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see an entity that was previously hidden. If
@@ -978,18 +978,18 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..c69904f3ee7f3a41d6cebcd401abf838
      /**
       * Sets the entities armor to the provided array of ItemStacks
 diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
-index 0a1c39a2a007342f02459b3f5515dbec012b2a61..69a66073bcaa10967b8736cbf35182b912c17d11 100644
+index 42fcc31147934fd4ed6484b0729e938e7ae2f8e2..4e637420b9a39b822be19367a16da93f236549b3 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFlag.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
-@@ -38,7 +38,7 @@ public enum ItemFlag {
+@@ -35,7 +35,7 @@ public enum ItemFlag {
       */
      HIDE_DYE,
      /**
 -     * Setting to show/hide armor trim from leather armor.
 +     * Setting to show/hide armor trim from armor.
       */
-     @MinecraftExperimental
-     @ApiStatus.Experimental
+     HIDE_ARMOR_TRIM;
+ }
 diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
 index 62fbd7f6d8195bebcab7f704a0a485a1bbeca26c..5461f7fa75f5a065bb333b4a113640b5fe1e3825 100644
 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
diff --git a/patches/api/0066-ensureServerConversions-API.patch b/patches/api/0066-ensureServerConversions-API.patch
index cd92d4f5a2..2b0cf31e73 100644
--- a/patches/api/0066-ensureServerConversions-API.patch
+++ b/patches/api/0066-ensureServerConversions-API.patch
@@ -29,7 +29,7 @@ index 159e5a908b35b84b7fabc36581e093d9aa4c4b67..349da0065ddf000cacdc259fab0f2c75
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 87f7942082ad943a97058f58c09ea2fe9caf5bfe..9d32283ee612a50b8a2bfe5151f42c9f181ede4c 100644
+index 09a36df6edce2a283df80c67d5ef62da7ff73555..a8faa4c1881bae4d47d901388a78b991d138b518 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -537,7 +537,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
index f9beb9f108..ff6aa81254 100644
--- a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,10 +14,10 @@ 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 9d6e604c7667985dc8107a5df9d36c53e8006326..1de2f8f345a287d93aad106dd13472a7837ec805 100644
+index 6c42827db10fb2fb4dede44cba84e7989c1a6fdc..7d6239855a84502de4eb3328b0dcf12ac671dce4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -40,6 +40,8 @@ dependencies {
+@@ -42,6 +42,8 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-legacy")
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
diff --git a/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch
index 8f748c0ed1..323b157741 100644
--- a/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/api/0074-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 f8e12868f2e629cdf4784f0157fdb2f8e7b01f99..61ce341daec63392f040b70cd12662379b2f1ebd 100644
+index 870ad6cd930653e6248abcc0fce94ffafbe9ebde..9f4d383ea3d6b26d16b8b77ca4c29d2d839ad6dd 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/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
index 079c74bbd2..c2a2be9b39 100644
--- a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bb12eb007aeb932c2d89c6e6c4081c4802469cb6..c7c23873a09c9eb0d86a6984e3dfe3413f88d5e1 100644
+index 530315d757f330b22cf6fd41e3609608cb242b6e..47cf629a4d75f9c8b8502ff9f7898eebcf4e6762 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -42,7 +42,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch
index acb4f5a0bd..e8ea0ae716 100644
--- a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch
@@ -10,10 +10,10 @@ 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 c7c23873a09c9eb0d86a6984e3dfe3413f88d5e1..e4e254c26adb15be4f60a59a0cf8a41816b9250a 100644
+index 47cf629a4d75f9c8b8502ff9f7898eebcf4e6762..1323badb5073735155e38751d954a51448f8e47e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1174,6 +1174,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1197,6 +1197,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
@@ -29,7 +29,7 @@ index c7c23873a09c9eb0d86a6984e3dfe3413f88d5e1..e4e254c26adb15be4f60a59a0cf8a418
      /**
       * Gets the player's cooldown between picking up experience orbs.
       *
-@@ -1199,8 +1208,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1222,8 +1231,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Gives the player the amount of experience specified.
       *
       * @param amount Exp amount to give
diff --git a/patches/api/0081-PreCreatureSpawnEvent.patch b/patches/api/0081-PreCreatureSpawnEvent.patch
index 8ae0d7d159..3213ed0ab2 100644
--- a/patches/api/0081-PreCreatureSpawnEvent.patch
+++ b/patches/api/0081-PreCreatureSpawnEvent.patch
@@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..02e421b0bb4ce3529ef1c4d34ec8a0c0345cce57
+index 0000000000000000000000000000000000000000..8b48759bf6f4fcef0847d9a2461993e3f2fdc9aa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
 @@ -0,0 +1,105 @@
diff --git a/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch
index 2e21f259dc..62d576949f 100644
--- a/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch
@@ -7,10 +7,10 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
-index fab2ca9f6c7738795cfedbb6d0d2206f13e9da8a..33ae32155d12ecd58a2a6434dba229043d4e2132 100644
+index b39128bb0ca2d4fe7a254193236c60fb5bfaa7da..5135b8e6028e6926e2711e2dd6ce68b76f468fd7 100644
 --- a/src/main/java/org/bukkit/block/Skull.java
 +++ b/src/main/java/org/bukkit/block/Skull.java
-@@ -65,6 +65,20 @@ public interface Skull extends TileState {
+@@ -63,6 +63,20 @@ public interface Skull extends TileState {
       */
      public void setOwningPlayer(@NotNull OfflinePlayer player);
  
@@ -31,7 +31,7 @@ index fab2ca9f6c7738795cfedbb6d0d2206f13e9da8a..33ae32155d12ecd58a2a6434dba22904
      /**
       * Gets the profile of the player who owns the skull. This player profile
       * may appear as the texture depending on skull type.
-@@ -72,6 +86,7 @@ public interface Skull extends TileState {
+@@ -70,6 +84,7 @@ public interface Skull extends TileState {
       * @return the profile of the owning player
       */
      @Nullable
@@ -39,7 +39,7 @@ index fab2ca9f6c7738795cfedbb6d0d2206f13e9da8a..33ae32155d12ecd58a2a6434dba22904
      PlayerProfile getOwnerProfile();
  
      /**
-@@ -86,6 +101,7 @@ public interface Skull extends TileState {
+@@ -84,6 +99,7 @@ public interface Skull extends TileState {
       * @throws IllegalArgumentException if the profile does not contain the
       * necessary information
       */
@@ -48,10 +48,10 @@ index fab2ca9f6c7738795cfedbb6d0d2206f13e9da8a..33ae32155d12ecd58a2a6434dba22904
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-index 461cdecc3e8f45b63f17963031b16943309909e2..1808e1315c72f983817426420eb22434c6a65024 100644
+index 5a18a66a0b7877ec0c1859f78cce659db4b8541a..862640b4611458dfbcd3be797eacd120fc8d1f9f 100644
 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-@@ -40,6 +40,20 @@ public interface SkullMeta extends ItemMeta {
+@@ -38,6 +38,20 @@ public interface SkullMeta extends ItemMeta {
      @Deprecated
      boolean setOwner(@Nullable String owner);
  
@@ -72,7 +72,7 @@ index 461cdecc3e8f45b63f17963031b16943309909e2..1808e1315c72f983817426420eb22434
      /**
       * Gets the owner of the skull.
       *
-@@ -66,6 +80,7 @@ public interface SkullMeta extends ItemMeta {
+@@ -64,6 +78,7 @@ public interface SkullMeta extends ItemMeta {
       * @return the profile of the owning player
       */
      @Nullable
@@ -80,7 +80,7 @@ index 461cdecc3e8f45b63f17963031b16943309909e2..1808e1315c72f983817426420eb22434
      PlayerProfile getOwnerProfile();
  
      /**
-@@ -80,6 +95,7 @@ public interface SkullMeta extends ItemMeta {
+@@ -78,6 +93,7 @@ public interface SkullMeta extends ItemMeta {
       * @throws IllegalArgumentException if the profile does not contain the
       * necessary information
       */
diff --git a/patches/api/0090-Add-extended-PaperServerListPingEvent.patch b/patches/api/0090-Add-extended-PaperServerListPingEvent.patch
index e64aa2ecd2..6fd11cfebc 100644
--- a/patches/api/0090-Add-extended-PaperServerListPingEvent.patch
+++ b/patches/api/0090-Add-extended-PaperServerListPingEvent.patch
@@ -366,7 +366,7 @@ index 0000000000000000000000000000000000000000..517d15238ed117f38bbd39f570874014
 +
 +}
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 612958a331575d1da2715531ebdf6b1168f2e860..bb4f7702ced0baf0670a7a21d48ad528b7249361 100644
+index 9a7768d41270714d4a1c89b4dcb436cc66f57545..b74b21a1ac7798e847b6d34ff45026e1c9cfed14 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
 @@ -18,4 +18,9 @@ public interface CachedServerIcon {
diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/api/0091-Player.setPlayerProfile-API.patch
index fc42539b43..f6f0951664 100644
--- a/patches/api/0091-Player.setPlayerProfile-API.patch
+++ b/patches/api/0091-Player.setPlayerProfile-API.patch
@@ -93,10 +93,10 @@ index 7f6400c58530d4827c197f3d1fbabfa34554010f..e4c85e67713c5ed4b8b1fcc3c4231327
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e4e254c26adb15be4f60a59a0cf8a41816b9250a..93129241f182e217478e61df37d6f7789954fc62 100644
+index 1323badb5073735155e38751d954a51448f8e47e..bcd059b4e52443431e6445d70b9f6a13761d96ad 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2463,6 +2463,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2486,6 +2486,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
diff --git a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch
index d22bf25564..1e11a6b092 100644
--- a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch
@@ -24,10 +24,10 @@ index abdca9fe5acc90f167219eb769ece66c35682bb1..9715a9d36187e2eecfeab1a05087d27c
      /**
       * Make the entity drop the item in their hand.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 93129241f182e217478e61df37d6f7789954fc62..26f9b1b5773f39aad3d8fe02a53d040c4042e81d 100644
+index bcd059b4e52443431e6445d70b9f6a13761d96ad..7509c7654df9f020686ee4a3d84d3380a540f9e2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2308,7 +2308,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2331,7 +2331,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Open a Sign for editing by the Player.
       *
diff --git a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
index b59fe35c9d..aae828e542 100644
--- a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
@@ -74,10 +74,10 @@ index b1ded556a1ce4e1d3c873ab9d7f799b6edcc5118..6ab8f05be11f8101202d56bfebc7ec23
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 26f9b1b5773f39aad3d8fe02a53d040c4042e81d..675e1fed283a90c49380f51e4e50e0e7dde9c3e4 100644
+index 7509c7654df9f020686ee4a3d84d3380a540f9e2..f14212bbdc6a44509469cf985d3105041b6aafaa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -850,6 +850,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -873,6 +873,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
diff --git a/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch
index c3beab3c51..e4b3fc128b 100644
--- a/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -500,10 +500,10 @@ index 0000000000000000000000000000000000000000..f45b8cfd1611345e8d81ecb8297a586f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 7336edb91e7095cce381318220496b51962afbe9..0125890a258ee58a43990285b341f8a62a5c281b 100644
+index 73b782c3975ad13159b6236976783fcfabd20493..819506712e9874c0142fc9e7d959bd7be97fc649 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -170,6 +170,17 @@ public enum Particle {
+@@ -162,6 +162,17 @@ public enum Particle {
          return dataType;
      }
  
diff --git a/patches/api/0107-ItemStack-getMaxItemUseDuration.patch b/patches/api/0107-ItemStack-getMaxItemUseDuration.patch
index 13fc1407e6..18991e040f 100644
--- a/patches/api/0107-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/api/0107-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 9d32283ee612a50b8a2bfe5151f42c9f181ede4c..53d99d214652ae1636f28a179a5b66edc0f8f229 100644
+index a8faa4c1881bae4d47d901388a78b991d138b518..b85eb71ff5d198d6270cbe07da0de3ed27fa72d5 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -646,5 +646,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
index 1bf900f07a..0e4f6385f6 100644
--- a/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/patches/api/0115-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 53d99d214652ae1636f28a179a5b66edc0f8f229..1907b8cfb4a78415fba8d5445ba98a6208516fd9 100644
+index b85eb71ff5d198d6270cbe07da0de3ed27fa72d5..83a0631a80db156ace1d977df71d5fc653b70bb6 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -3,6 +3,7 @@ package org.bukkit.inventory;
diff --git a/patches/api/0117-RangedEntity-API.patch b/patches/api/0117-RangedEntity-API.patch
index f2ed002e60..ee7e081646 100644
--- a/patches/api/0117-RangedEntity-API.patch
+++ b/patches/api/0117-RangedEntity-API.patch
@@ -169,7 +169,7 @@ index 0ebd54df0bb072df25a6ebcf137a39829cf71bf9..6618f2129e108c0a6cd15f6d0e864260
      /**
       * Gets whether the witch is drinking a potion
 diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java
-index 225c65a20a3e33dfb14e108a36f2f4bc60f7920c..b86f0196e6eb8070830f63a94f732522c2a6c2f1 100644
+index b3a5d7a91e483b9fd569dd3c8cec989498a50104..87a814f63c3f35be35bfa210c9248ad211c0dd8f 100644
 --- a/src/main/java/org/bukkit/entity/Wither.java
 +++ b/src/main/java/org/bukkit/entity/Wither.java
 @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index b0bfc7075c..8c532bba78 100644
--- a/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index dc1a328e2202b755266b2564656f5bb60dd260cd..2f6142b6bfaa3b523478eccd6ad13ce922e81da9 100644
+index 766d643f0fe79660942fdad25e39e488e9379419..4418c41f75e9a190dd77abdd6048b0a4fb2a57ed 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -122,7 +122,30 @@ public interface Chunk extends PersistentDataHolder {
diff --git a/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch
index 27430272ef..c6c2d720f3 100644
--- a/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ 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 675e1fed283a90c49380f51e4e50e0e7dde9c3e4..44aa4ad14818e26993c912460bd91015ded09754 100644
+index f14212bbdc6a44509469cf985d3105041b6aafaa..71cd103ba699a6f7af5bdbbd2079991e4a2b4655 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2633,6 +2633,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2656,6 +2656,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);
diff --git a/patches/api/0145-Improve-death-events.patch b/patches/api/0145-Improve-death-events.patch
index 1251da62c5..8ee8acb362 100644
--- a/patches/api/0145-Improve-death-events.patch
+++ b/patches/api/0145-Improve-death-events.patch
@@ -179,7 +179,7 @@ index a5984ab06cce95d30e70511e125f69339b574c04..130cf9e5981f701dff4fa72e71e0b5dc
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-index 1f1df82c9bcf18bad1187e3f24ede1901d91c06f..3b43954b428f2e5e9a718bf6d34116f25c90269f 100644
+index a803bfea5400b3578bb4cf3261874e873b6467d9..27909044c0c136acde18d64f14e84de932ba1045 100644
 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 @@ -63,6 +63,17 @@ public class PlayerDeathEvent extends EntityDeathEvent {
diff --git a/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 6c29c03705..6fcf17ae03 100644
--- a/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -226,7 +226,7 @@ index a42f1d53340e4073038d46b7fabf5d44248d5b32..dbc22807a33606f8fe326cc2f5f755fe
          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 64114b1a9e201df369fc794fbee984d496385420..35009498aafd1bd36c493085127135fc8a5c36ec 100644
+index f78714c2a6d9da162c9802552984cbfad76ff728..55e9dc5d1d87fbc9d0dabbb7bd59584fe2c5f379 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -444,4 +444,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
diff --git a/patches/api/0152-Material-API-additions.patch b/patches/api/0152-Material-API-additions.patch
index 7a452665da..6b7874324c 100644
--- a/patches/api/0152-Material-API-additions.patch
+++ b/patches/api/0152-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 0d04591db6e2e0b08b06904c16ef41b59decd952..fb23fce97a1930b968b76fa9ff4fbbb452768096 100644
+index f52c0e25e75e890046339d605c0abf79d82864f2..64d01ce77966e895ec494719a4398577be1097a1 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -116,6 +116,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -118,6 +118,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * An enum of all material IDs accepted by the official server and client
   */
@@ -16,7 +16,7 @@ index 0d04591db6e2e0b08b06904c16ef41b59decd952..fb23fce97a1930b968b76fa9ff4fbbb4
  public enum Material implements Keyed, Translatable {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -4548,6 +4549,22 @@ public enum Material implements Keyed, Translatable {
+@@ -4435,6 +4436,22 @@ public enum Material implements Keyed, Translatable {
          }
      }
  
diff --git a/patches/api/0153-Add-Material-Tags.patch b/patches/api/0153-Add-Material-Tags.patch
index d0b8b83dcc..5fd3e2b0a4 100644
--- a/patches/api/0153-Add-Material-Tags.patch
+++ b/patches/api/0153-Add-Material-Tags.patch
@@ -1119,10 +1119,10 @@ index 0000000000000000000000000000000000000000..d7eb49a05c3f0cacf285f8995433c5d5
 +        .ensureSize("WATER_BASED", 11).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 2d25228016fc9a9a1ba87f58865ec8ee65115461..28e5691e265b94eb9855f87d05f84e8ff963c566 100644
+index 1504dca4ec3e8d21189b7534bb009521799ffdf7..82d34e9aae42dfafd900dc0e610bf1dc82a5a6f3 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -12,6 +12,10 @@ import org.jetbrains.annotations.NotNull;
+@@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
   * Note that whilst all tags defined within this interface must be present in
   * implementations, their existence is not guaranteed across future versions.
   *
diff --git a/patches/api/0170-Add-PlayerPostRespawnEvent.patch b/patches/api/0170-Add-PlayerPostRespawnEvent.patch
index 004d74e96d..01106b663b 100644
--- a/patches/api/0170-Add-PlayerPostRespawnEvent.patch
+++ b/patches/api/0170-Add-PlayerPostRespawnEvent.patch
@@ -63,7 +63,7 @@ index 0000000000000000000000000000000000000000..31f34b54801f6699ce43355fa2a0a51f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
-index 7c2cec60cbaf199416496292f2264fa3864b499c..f5bdb5244c8d993c624f938c8fb7ccff74655d75 100644
+index c3d9d95be50eacb212108a01b612756f772956aa..03225d2b4c91caa58c2995d9cf0e7fb4663749ab 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/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
index a345b5ad36..322b3af1c2 100644
--- a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
@@ -90,10 +90,10 @@ index 20978b269a7757a561d6b872cc77898b44bbd272..2b9a117804a8ca54b47e51e23359bd6e
          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 2126636b646068312a49242917808f5d91bce614..96e44836b3634a53d8a9f0785d4cdcec872b95f7 100644
+index 64d01ce77966e895ec494719a4398577be1097a1..7705fece7f58bd66f7d68da85f8f34e43b4bae12 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4578,11 +4578,11 @@ public enum Material implements Keyed, Translatable {
+@@ -4465,11 +4465,11 @@ public enum Material implements Keyed, Translatable {
      }
  
      /**
@@ -107,7 +107,7 @@ index 2126636b646068312a49242917808f5d91bce614..96e44836b3634a53d8a9f0785d4cdcec
      public boolean isLegacy() {
          return legacy;
      }
-@@ -4653,8 +4653,10 @@ public enum Material implements Keyed, Translatable {
+@@ -4540,8 +4540,10 @@ public enum Material implements Keyed, Translatable {
       * Gets the MaterialData class associated with this Material
       *
       * @return MaterialData associated with this Material
@@ -156,10 +156,10 @@ index f43209cf7b752c26718c303ca8c3e1c7d9912ad3..f0094e6fb05e526736629ad3181c8d2c
  
      /**
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index bb333b90e103e49923808b1ee0e1cd2787086cea..1976ed42f255825d1eaf2ee2c9465d22e81abdb3 100644
+index 6e5e5fecdd7b76dde2e1524fe7b5faa837f491fb..5a09d288c980eefbd69471d83aabac627b0ac0b3 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -248,8 +248,11 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -246,8 +246,11 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
       *
       * @param input non-null input
       * @return registered object or null if does not exist
diff --git a/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch
index 613dd778e6..999842766c 100644
--- a/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-index 3b43954b428f2e5e9a718bf6d34116f25c90269f..bfd3654c02e8ad906c620a86165a38c65a31b62b 100644
+index 27909044c0c136acde18d64f14e84de932ba1045..ed7ede83507c052e05afffea78600b16439590dd 100644
 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 @@ -36,7 +36,6 @@ public class PlayerDeathEvent extends EntityDeathEvent {
diff --git a/patches/api/0177-Add-BlockSoundGroup-interface.patch b/patches/api/0177-Add-BlockSoundGroup-interface.patch
index d7e1a7c6c0..993c769c62 100644
--- a/patches/api/0177-Add-BlockSoundGroup-interface.patch
+++ b/patches/api/0177-Add-BlockSoundGroup-interface.patch
@@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..ec36942128cbacae171584c89480b4aa
 +    Sound getFallSound();
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 0be73b2f45c9aab6e73bcb7a76136ec6e2428163..3107abe94bb94b03b2e285c75ab0b7fdc7c0bc87 100644
+index 78f6cc1a8a8de05aec6f551f8a5f425944f0ffa3..b0b148918eeaf10d60734def6ac84b678c0d74c7 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -607,4 +607,25 @@ public interface Block extends Metadatable, Translatable {
diff --git a/patches/api/0181-Improve-Block-breakNaturally-API.patch b/patches/api/0181-Improve-Block-breakNaturally-API.patch
index 01e9249c42..b96cf1505a 100644
--- a/patches/api/0181-Improve-Block-breakNaturally-API.patch
+++ b/patches/api/0181-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 3107abe94bb94b03b2e285c75ab0b7fdc7c0bc87..06ef9e133125d80127e1dbd6ae0eda89fa08a1d7 100644
+index b0b148918eeaf10d60734def6ac84b678c0d74c7..232662f3130ca49156ed8b71acf4495aea33c212 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/0182-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch
index 71a39f4f71..47dc1d2141 100644
--- a/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-index bfd3654c02e8ad906c620a86165a38c65a31b62b..d5eeb37d331e205826aa6199bd481cb0db40d721 100644
+index ed7ede83507c052e05afffea78600b16439590dd..c7138d79a572a525c70b51b7c79d2c5dfb18f25c 100644
 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 @@ -1,6 +1,8 @@
diff --git a/patches/api/0189-Add-Player-Client-Options-API.patch b/patches/api/0189-Add-Player-Client-Options-API.patch
index 11a43b629e..8c3102617d 100644
--- a/patches/api/0189-Add-Player-Client-Options-API.patch
+++ b/patches/api/0189-Add-Player-Client-Options-API.patch
@@ -229,10 +229,10 @@ index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f52
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 44aa4ad14818e26993c912460bd91015ded09754..a2dd30628458a60922a1326c88e2cbc158a28e89 100644
+index 71cd103ba699a6f7af5bdbbd2079991e4a2b4655..8a011236b128fa52a0453b492eeb809f2fa77def 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2653,6 +2653,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2676,6 +2676,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the cooldown counter to 0, effectively starting the cooldown period.
       */
      void resetCooldown();
diff --git a/patches/api/0192-Add-item-slot-convenience-methods.patch b/patches/api/0192-Add-item-slot-convenience-methods.patch
index d456638d28..abad4883ed 100644
--- a/patches/api/0192-Add-item-slot-convenience-methods.patch
+++ b/patches/api/0192-Add-item-slot-convenience-methods.patch
@@ -178,10 +178,10 @@ index 4a0c43acc2714e095973eb78536041bb1a179ddc..acf2244f77133df53eb5f862c8e713c8
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/SmithingInventory.java b/src/main/java/org/bukkit/inventory/SmithingInventory.java
-index 8f7749d10b68b6fe3c29f2e38dd1f7b9a6b45d8c..7808d30ae194d5ec043e630c277916a66d452a69 100644
+index 96d526b7b153e56c9a97de42ce3270b6638510e4..a41ca6bd2672db2810dd70c4925b84a4f081af05 100644
 --- a/src/main/java/org/bukkit/inventory/SmithingInventory.java
 +++ b/src/main/java/org/bukkit/inventory/SmithingInventory.java
-@@ -35,4 +35,44 @@ public interface SmithingInventory extends Inventory {
+@@ -30,4 +30,44 @@ public interface SmithingInventory extends Inventory {
       */
      @Nullable
      Recipe getRecipe();
diff --git a/patches/api/0193-Villager-Restocks-API.patch b/patches/api/0193-Villager-Restocks-API.patch
index b456e877c6..5b3898429d 100644
--- a/patches/api/0193-Villager-Restocks-API.patch
+++ b/patches/api/0193-Villager-Restocks-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Villager Restocks API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index 6bf3af3ed81b66f61e53105d3591165ea74dba0e..d8cf5e5921357ce9645f5dcb5a3bffcf3c10af7e 100644
+index a91400cd8bb4c72d1f3200a17f6de025540fe09d..4128b848ec739308694d54d9e859c28185f42a63 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -78,6 +78,20 @@ public interface Villager extends AbstractVillager {
diff --git a/patches/api/0196-Add-villager-reputation-API.patch b/patches/api/0196-Add-villager-reputation-API.patch
index 0bf00d9130..4a2093aab9 100644
--- a/patches/api/0196-Add-villager-reputation-API.patch
+++ b/patches/api/0196-Add-villager-reputation-API.patch
@@ -110,7 +110,7 @@ index 0000000000000000000000000000000000000000..5600fcdc9795a9f49091db48d73bbd49
 +    TRADING,
 +}
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index d8cf5e5921357ce9645f5dcb5a3bffcf3c10af7e..c799ac46dbe257d470d3b236cf55b41240f5fda8 100644
+index 4128b848ec739308694d54d9e859c28185f42a63..d841d94d46462e0ceb7c6b04cc8fc36792bd9201 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -1,6 +1,8 @@
diff --git a/patches/api/0197-Spawn-Reason-API.patch b/patches/api/0197-Spawn-Reason-API.patch
index 60d33effef..dbde82e3ba 100644
--- a/patches/api/0197-Spawn-Reason-API.patch
+++ b/patches/api/0197-Spawn-Reason-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn Reason API
 
 
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index a89fff5c164881be0286ec2240e94dd5883ecc40..e55f6e2baf35dbd91c433ab9e62713eaac85435b 100644
+index 05c29cbd2ae1ca0434a90f8389479bd608ca2ac1..66bc6da2a482bb207ec50beb22fd62aeda90cc34 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
 @@ -10,6 +10,7 @@ import org.bukkit.block.data.BlockData;
diff --git a/patches/api/0202-Support-components-in-ItemMeta.patch b/patches/api/0202-Support-components-in-ItemMeta.patch
index a4e6b27bd0..83aa6e9ada 100644
--- a/patches/api/0202-Support-components-in-ItemMeta.patch
+++ b/patches/api/0202-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 1beedb446a9dd554d05d1d94dba8598e4b69eba6..c6b0fd783675cd019048e445d8e959637d90be7a 100644
+index 5c1ca0e47f0ac1525c3d37b55f52874878f44c28..e33ec3eaa1cd520db8224250e886e6240fefe76f 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -5,6 +5,7 @@ import java.util.Collection;
diff --git a/patches/api/0206-Brand-support.patch b/patches/api/0206-Brand-support.patch
index b32abad272..7e3d714402 100644
--- a/patches/api/0206-Brand-support.patch
+++ b/patches/api/0206-Brand-support.patch
@@ -5,10 +5,10 @@ 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 a2dd30628458a60922a1326c88e2cbc158a28e89..2606c3edf89ca1f435aa3809d4609fe104211523 100644
+index 8a011236b128fa52a0453b492eeb809f2fa77def..712d391f4ce3ac5fd6293629ecd4e74e0d049b3a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2785,6 +2785,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2808,6 +2808,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          // Paper end
      }
  
diff --git a/patches/api/0212-Add-methods-to-get-translation-keys.patch b/patches/api/0212-Add-methods-to-get-translation-keys.patch
index d99ff81d4d..96b7bbb309 100644
--- a/patches/api/0212-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0212-Add-methods-to-get-translation-keys.patch
@@ -144,10 +144,10 @@ index 753bfcec441533071120d925c83789ef53afa176..c6bc84a8755b2fe5d7d8d3ec857700ec
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 96e44836b3634a53d8a9f0785d4cdcec872b95f7..fb4d98c8538e21936b256a7cbc8242e7a3b3b26c 100644
+index 7705fece7f58bd66f7d68da85f8f34e43b4bae12..6a89eab53f21bc4420e616cc299864fb564e1045 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -117,7 +117,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -119,7 +119,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 96e44836b3634a53d8a9f0785d4cdcec872b95f7..fb4d98c8538e21936b256a7cbc8242e7
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
      STONE(22948),
-@@ -4563,6 +4563,15 @@ public enum Material implements Keyed, Translatable {
+@@ -4450,6 +4450,15 @@ public enum Material implements Keyed, Translatable {
          }
          return false;
      }
@@ -172,7 +172,7 @@ index 96e44836b3634a53d8a9f0785d4cdcec872b95f7..fb4d98c8538e21936b256a7cbc8242e7
      // Paper end
  
      /**
-@@ -11046,9 +11055,11 @@ public enum Material implements Keyed, Translatable {
+@@ -10949,9 +10958,11 @@ public enum Material implements Keyed, Translatable {
       * material
       * @see #getBlockTranslationKey()
       * @see #getItemTranslationKey()
@@ -232,10 +232,10 @@ index 13eac9ad2c1672051635d1c35cc49239252e7a61..107e36ef02a9481954bd770ce9a55a0b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
-index a5908d0a03801757d1f6184d73c3c89981afa107..d268498c779d6b2ec07812d4d1c0b168fab63c07 100644
+index d3087d60378822cdd7cea25fd63d3f496e3cd2fb..5d8fa5b39a5d50cca48ba63af3a84b80f279b649 100644
 --- a/src/main/java/org/bukkit/block/Biome.java
 +++ b/src/main/java/org/bukkit/block/Biome.java
-@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
  /**
   * Holds all accepted Biomes in the default server
   */
@@ -244,7 +244,7 @@ index a5908d0a03801757d1f6184d73c3c89981afa107..d268498c779d6b2ec07812d4d1c0b168
      OCEAN,
      PLAINS,
      DESERT,
-@@ -93,4 +93,11 @@ public enum Biome implements Keyed {
+@@ -89,4 +89,11 @@ public enum Biome implements Keyed {
      public NamespacedKey getKey() {
          return key;
      }
@@ -311,10 +311,10 @@ index 4d5f0837bd0e02a30c943d8969fb6b13452322e0..a39f9c078f42451bd122f3e3729d10ca
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 16f1ed5bdad79928806b4509af03581bdbf002c5..bf3aa78cb901301571aa3fad5bd0bcebee8e6e1b 100644
+index bb9ae81870a340c00d7480aff5106dc2c44dab8a..6c40a989eff1163c19106c1e6b4c8fc01ace7280 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Contract;
+@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Contract;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
@@ -323,7 +323,7 @@ index 16f1ed5bdad79928806b4509af03581bdbf002c5..bf3aa78cb901301571aa3fad5bd0bceb
  
      // These strings MUST match the strings in nms.EntityTypes and are case sensitive.
      /**
-@@ -441,10 +441,22 @@ public enum EntityType implements Keyed, Translatable {
+@@ -435,10 +435,22 @@ public enum EntityType implements Keyed, Translatable {
  
      @Override
      @NotNull
diff --git a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch
index e2c5562130..49e64dc27d 100644
--- a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Create HoverEvent from ItemStack Entity
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 50fe28b48d885c782278bdb53a0bbae303f4a32d..af36ee37290f04a629c1d6471f2a99a8bf437132 100644
+index abf95d917eca248ff3f5a5caa008c1c87fa1e029..11e59068b8a8ef1128e3c75283d161c39e2a3a99 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -204,5 +204,64 @@ public interface ItemFactory {
diff --git a/patches/api/0218-Player-elytra-boost-API.patch b/patches/api/0218-Player-elytra-boost-API.patch
index 571a3da396..4a519deb98 100644
--- a/patches/api/0218-Player-elytra-boost-API.patch
+++ b/patches/api/0218-Player-elytra-boost-API.patch
@@ -5,10 +5,10 @@ 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 2606c3edf89ca1f435aa3809d4609fe104211523..8caa318f71c8fd765a583c18af72705e3864f23a 100644
+index 712d391f4ce3ac5fd6293629ecd4e74e0d049b3a..6d95bc0e7409e47b17f74eef9c0e0861a8834e51 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2659,6 +2659,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2682,6 +2682,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @NotNull
      <T> T getClientOption(@NotNull com.destroystokyo.paper.ClientOption<T> option);
diff --git a/patches/api/0224-Add-Destroy-Speed-API.patch b/patches/api/0224-Add-Destroy-Speed-API.patch
index bdf9933289..6e2512b8b7 100644
--- a/patches/api/0224-Add-Destroy-Speed-API.patch
+++ b/patches/api/0224-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 35ed58bce2589bb097dd0f6bf2a6ebd76dc31fcd..ded1daaef53882a80e618f4ed97b50fd0ee4786c 100644
+index 5ae85ddc2cff3145dcba877a7bf55abd818f6881..546c6709383edb0007b9a8a560af0b64f498dadd 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -680,5 +680,29 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0234-Additional-Block-Material-API-s.patch b/patches/api/0234-Additional-Block-Material-API-s.patch
index 5d7efccc1f..91196a2442 100644
--- a/patches/api/0234-Additional-Block-Material-API-s.patch
+++ b/patches/api/0234-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 ded1daaef53882a80e618f4ed97b50fd0ee4786c..4abd16a4e99ae0380b67c86b9744d71423053b5e 100644
+index 546c6709383edb0007b9a8a560af0b64f498dadd..6c0249863601e8f0fc06828574315a9f0af66e5b 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/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index 96e3e59f8e..d297dd5c24 100644
--- a/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
@@ -5,10 +5,10 @@ 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 08e54aac52322aac2d033083ab4f589160386627..8715e53e6b85ebaf3d07297c838432b9e6f28c2a 100644
+index 88852215d01f3fc4866449f7b826f6603b0ed9d8..f7548098bcdd033d9c530fdc584fc5538c635ca1 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 {
+@@ -175,4 +175,14 @@ public interface Boat extends Vehicle {
          ON_LAND,
          IN_AIR;
      }
diff --git a/patches/api/0245-Add-sendOpLevel-API.patch b/patches/api/0245-Add-sendOpLevel-API.patch
index 4eed894093..09029d2d76 100644
--- a/patches/api/0245-Add-sendOpLevel-API.patch
+++ b/patches/api/0245-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ 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 8caa318f71c8fd765a583c18af72705e3864f23a..f874f4342fbd1095ea4996da5d29f25ba7135e9a 100644
+index 6d95bc0e7409e47b17f74eef9c0e0861a8834e51..f04ce165d18726aff8948fade18addae707fa747 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2672,6 +2672,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2695,6 +2695,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @Nullable
      Firework boostElytra(@NotNull ItemStack firework);
diff --git a/patches/api/0247-Add-StructuresLocateEvent.patch b/patches/api/0247-Add-StructuresLocateEvent.patch
index 439c86c610..3acf0a7aaf 100644
--- a/patches/api/0247-Add-StructuresLocateEvent.patch
+++ b/patches/api/0247-Add-StructuresLocateEvent.patch
@@ -505,10 +505,10 @@ index 0000000000000000000000000000000000000000..1e7b53f9bc13dcd5a0a4a40004591e4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index 1976ed42f255825d1eaf2ee2c9465d22e81abdb3..e22233eed3eb9b6aaf835d682d13450d1ba5e8af 100644
+index 5a09d288c980eefbd69471d83aabac627b0ac0b3..6e839812b6b523ddfac06d7d3921043b972c5b7f 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -230,6 +230,15 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -228,6 +228,15 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
              return GameEvent.getByKey(key);
          }
      };
diff --git a/patches/api/0249-Added-missing-vanilla-tags.patch b/patches/api/0249-Added-missing-vanilla-tags.patch
index 80a493bbea..0b81d3e855 100644
--- a/patches/api/0249-Added-missing-vanilla-tags.patch
+++ b/patches/api/0249-Added-missing-vanilla-tags.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added missing vanilla tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 28e5691e265b94eb9855f87d05f84e8ff963c566..a28d38408ff2dc9b835d737aff25196a94878a77 100644
+index 82d34e9aae42dfafd900dc0e610bf1dc82a5a6f3..3e9f1ee242b8087759c98b54ebb3cc3b8f5fcbd5 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -735,6 +735,12 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -759,6 +759,12 @@ public interface Tag<T extends Keyed> extends Keyed {
       * Vanilla item tag representing all chest boat items.
       */
      Tag<Material> ITEMS_CHEST_BOATS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("chest_boats"), Material.class);
diff --git a/patches/api/0260-Cache-the-result-of-Material-isBlock.patch b/patches/api/0260-Cache-the-result-of-Material-isBlock.patch
index 094e9ab4d0..49dab657f2 100644
--- a/patches/api/0260-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0260-Cache-the-result-of-Material-isBlock.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache the result of Material#isBlock
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 3da281e454f1f242c57e0174917084557f9c85df..6ec19c038ce3c551b5207028355594f8a0c80bd2 100644
+index 6a89eab53f21bc4420e616cc299864fb564e1045..37898f36f859eda945471fa9b00fcabbc3d211df 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4507,6 +4507,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4394,6 +4394,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public final Class<?> data;
      private final boolean legacy;
      private final NamespacedKey key;
@@ -16,7 +16,7 @@ index 3da281e454f1f242c57e0174917084557f9c85df..6ec19c038ce3c551b5207028355594f8
  
      private Material(final int id) {
          this(id, 64);
-@@ -4705,6 +4706,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4592,6 +4593,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       * @return true if this material is a block
       */
      public boolean isBlock() {
@@ -28,7 +28,7 @@ index 3da281e454f1f242c57e0174917084557f9c85df..6ec19c038ce3c551b5207028355594f8
          switch (this) {
              //<editor-fold defaultstate="collapsed" desc="isBlock">
              case ACACIA_BUTTON:
-@@ -5886,6 +5892,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5778,6 +5784,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      static {
          for (Material material : values()) {
              BY_NAME.put(material.name(), material);
diff --git a/patches/api/0266-Item-Rarity-API.patch b/patches/api/0266-Item-Rarity-API.patch
index d80cad6604..5c25c66d65 100644
--- a/patches/api/0266-Item-Rarity-API.patch
+++ b/patches/api/0266-Item-Rarity-API.patch
@@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index ac9395474e17c3a03c611c777b04a5bd18948be6..0b3b623455337c6500b9ce518ad8e6a7e5e9a17f 100644
+index 37898f36f859eda945471fa9b00fcabbc3d211df..85d19b0c659c75472aa91d18fdf17f25bd6a2e04 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4573,6 +4573,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4460,6 +4460,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
              return Bukkit.getUnsafe().getBlockTranslationKey(this);
          }
      }
diff --git a/patches/api/0290-Attributes-API-for-item-defaults.patch b/patches/api/0290-Attributes-API-for-item-defaults.patch
index 4c9512433c..abd3dd1e69 100644
--- a/patches/api/0290-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0290-Attributes-API-for-item-defaults.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 0b3b623455337c6500b9ce518ad8e6a7e5e9a17f..220db091ce8b79688f82a099b5c227c86dd2c803 100644
+index 85d19b0c659c75472aa91d18fdf17f25bd6a2e04..5fe8207fd9b76564b0547eec5e3db2b7abed0150 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4584,6 +4584,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4471,6 +4471,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public io.papermc.paper.inventory.ItemRarity getItemRarity() {
          return Bukkit.getUnsafe().getItemRarity(this);
      }
diff --git a/patches/api/0293-Add-PlayerKickEvent-causes.patch b/patches/api/0293-Add-PlayerKickEvent-causes.patch
index 13269984a8..19e92f5795 100644
--- a/patches/api/0293-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0293-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 f874f4342fbd1095ea4996da5d29f25ba7135e9a..44665d304b4245da3e5fe63e9d58649755259647 100644
+index f04ce165d18726aff8948fade18addae707fa747..69cac7bcf53c968c00bffae7ae2a04600c9d5d18 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -252,6 +252,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0300-Missing-Entity-Behavior-API.patch b/patches/api/0300-Missing-Entity-Behavior-API.patch
index 2f15b08736..5bcf3a9146 100644
--- a/patches/api/0300-Missing-Entity-Behavior-API.patch
+++ b/patches/api/0300-Missing-Entity-Behavior-API.patch
@@ -10,7 +10,7 @@ Co-authored-by: SoSeDiK <[email protected]>
 Co-authored-by: booky10 <[email protected]>
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 9dc131ac6f6990d2a9997609c1d8f104dbfb2aef..e67eac34839c7a471b85ccd09cab741a3cdae024 100644
+index c9837c7c47314b5bdf6c7973e6bc962d390dc13d..b7a2cecb334ce39fa09d8ab949a29eedbdc44c36 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -24,7 +24,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
diff --git a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch
index 38bbf0f145..f8c58e9869 100644
--- a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0316-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 ecf900140d0007b4e69ab8ab0e439828ee718a6b..0baf878c80ae42d7e77e3f1a57c5f3e715b163ba 100644
+index 0fa6f8e99059b26861bc5bb3505ac544587e51bc..8d5b73b92b78676467c24a73332a2a8c14cd0506 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -716,6 +716,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0317-Get-entity-default-attributes.patch b/patches/api/0317-Get-entity-default-attributes.patch
index 62d210c5a5..32c28f3adf 100644
--- a/patches/api/0317-Get-entity-default-attributes.patch
+++ b/patches/api/0317-Get-entity-default-attributes.patch
@@ -32,10 +32,10 @@ index a9e7c64e1f98ff73c1804466d7c79eaf343dde7c..c2b042ced0f32b0dafc13a2933c2bd9b
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index bf3aa78cb901301571aa3fad5bd0bcebee8e6e1b..22cb13b3d63e06476581e3d92e2b7c245944cb38 100644
+index 6c40a989eff1163c19106c1e6b4c8fc01ace7280..6cf14afd2c1b8018c67c6cac302ae28bb12ab5a5 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -455,6 +455,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
+@@ -449,6 +449,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/0323-Add-isCollidable-methods-to-various-places.patch b/patches/api/0323-Add-isCollidable-methods-to-various-places.patch
index 08f7932d08..62fba2ca0e 100644
--- a/patches/api/0323-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0323-Add-isCollidable-methods-to-various-places.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add isCollidable methods to various places
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 220db091ce8b79688f82a099b5c227c86dd2c803..48a2fbe33a8b0522d53bd79bdd253eaed6b6357f 100644
+index 5fe8207fd9b76564b0547eec5e3db2b7abed0150..03b47012447430a350e152920f754d993d4023db 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4599,6 +4599,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4486,6 +4486,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public Multimap<Attribute, AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
          return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot);
      }
diff --git a/patches/api/0328-Add-player-health-update-API.patch b/patches/api/0328-Add-player-health-update-API.patch
index 7e84f09ec9..8316e6ed25 100644
--- a/patches/api/0328-Add-player-health-update-API.patch
+++ b/patches/api/0328-Add-player-health-update-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 44665d304b4245da3e5fe63e9d58649755259647..195acdc1d1805caf4ef865e53280f4e8c360eb66 100644
+index 69cac7bcf53c968c00bffae7ae2a04600c9d5d18..388af21e1dedbd08cb87aedb4fa9fffbbddedfaa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2050,6 +2050,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2073,6 +2073,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public double getHealthScale();
  
diff --git a/patches/api/0343-Multi-Block-Change-API.patch b/patches/api/0343-Multi-Block-Change-API.patch
index 392912e02c..52f4ffdece 100644
--- a/patches/api/0343-Multi-Block-Change-API.patch
+++ b/patches/api/0343-Multi-Block-Change-API.patch
@@ -5,10 +5,10 @@ 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 195acdc1d1805caf4ef865e53280f4e8c360eb66..a4eb5ca72061ccc593ec8f03b663aebe9b2ccb02 100644
+index 388af21e1dedbd08cb87aedb4fa9fffbbddedfaa..5b2d4d394f14a1952e4da349cd091a98561cf280 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -649,6 +649,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -672,6 +672,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendBlockDamage(@NotNull Location loc, float progress);
  
diff --git a/patches/api/0347-More-PotionEffectType-API.patch b/patches/api/0347-More-PotionEffectType-API.patch
index 52c7f2634e..87659c1aa4 100644
--- a/patches/api/0347-More-PotionEffectType-API.patch
+++ b/patches/api/0347-More-PotionEffectType-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More PotionEffectType API
 
 
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index 39c13a459dede4992f5a3fa7309733820cfa44c5..fbd5a8fae7e72f3fb1098742c9680aeea1297fe7 100644
+index 6e839812b6b523ddfac06d7d3921043b972c5b7f..3d55f1a6c71a8f9281906f034fb8af087005c8f0 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -238,6 +238,26 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -236,6 +236,26 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
       */
      @Deprecated(forRemoval = true)
      Registry<io.papermc.paper.world.structure.ConfiguredStructure> CONFIGURED_STRUCTURE = Bukkit.getRegistry(io.papermc.paper.world.structure.ConfiguredStructure.class);
diff --git a/patches/api/0349-Implement-regenerateChunk.patch b/patches/api/0349-Implement-regenerateChunk.patch
index 11280a1baf..ee4594616d 100644
--- a/patches/api/0349-Implement-regenerateChunk.patch
+++ b/patches/api/0349-Implement-regenerateChunk.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement regenerateChunk
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0baf878c80ae42d7e77e3f1a57c5f3e715b163ba..c1827f97e9255e72c082548c8b2782e39f1ebb8c 100644
+index 8d5b73b92b78676467c24a73332a2a8c14cd0506..72f1576b8ce5b55b50f053f346ce42c52db4b568 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -465,8 +465,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0350-Add-GameEvent-tags.patch b/patches/api/0350-Add-GameEvent-tags.patch
index c4ed6aaaeb..1aabdd065a 100644
--- a/patches/api/0350-Add-GameEvent-tags.patch
+++ b/patches/api/0350-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 a28d38408ff2dc9b835d737aff25196a94878a77..e8206aa4cb574ee629f375a85acf597ae164a1c3 100644
+index 3e9f1ee242b8087759c98b54ebb3cc3b8f5fcbd5..9257a5530264195260becedf73d291488c29d176 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -942,6 +942,24 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -960,6 +960,24 @@ public interface Tag<T extends Keyed> extends Keyed {
       * Vanilla tag representing entities which are dismounted when underwater.
       */
      Tag<EntityType> ENTITY_TYPES_DISMOUNTS_UNDERWATER = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("dismounts_underwater"), EntityType.class);
diff --git a/patches/api/0357-Add-getComputedBiome-API.patch b/patches/api/0357-Add-getComputedBiome-API.patch
index 5de8fdeb0d..a1ec54fe08 100644
--- a/patches/api/0357-Add-getComputedBiome-API.patch
+++ b/patches/api/0357-Add-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index 3c38abfbe0391bf748702b1599d359a1180838af..96291baf8bd06ff5f7fb2fccdbb2a172f01ba8db 100644
+index cd83348de3f82b3fddcf2d4bb9187ec8173b0e40..8f50eb9b902236f5e039f5d26f3ca9a044b01a75 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
 @@ -26,6 +26,7 @@ public interface RegionAccessor extends Keyed { // Paper
diff --git a/patches/api/0371-More-Teleport-API.patch b/patches/api/0371-More-Teleport-API.patch
index 2af9ab7301..e57ec2eaec 100644
--- a/patches/api/0371-More-Teleport-API.patch
+++ b/patches/api/0371-More-Teleport-API.patch
@@ -165,10 +165,10 @@ index ab0ceaba9ddcbe20a8b8a1fc3ed19cb3c64ecd3d..97f0bc6573c8ba09de77061b6312b91c
       * 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 a4eb5ca72061ccc593ec8f03b663aebe9b2ccb02..c100a2815a1ee7bd59ecbd8c12a907d8aabb0290 100644
+index 5b2d4d394f14a1952e4da349cd091a98561cf280..17c2136e2b58c5f8bd45005688239f74dd474b60 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2873,6 +2873,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2896,6 +2896,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  
diff --git a/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch
index d7165e4edb..adc3071594 100644
--- a/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,10 +5,10 @@ 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 c100a2815a1ee7bd59ecbd8c12a907d8aabb0290..b886e9a59272ef6c8afa65f31a42bfc47f48b43a 100644
+index 17c2136e2b58c5f8bd45005688239f74dd474b60..dbd27bbb4fb6ac1b7054808159338054ff1b9a05 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2737,6 +2737,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2760,6 +2760,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException If the level is negative or greater than {@code 4} (i.e. not within {@code [0, 4]}).
       */
      void sendOpLevel(byte level);
diff --git a/patches/api/0383-Elder-Guardian-appearance-API.patch b/patches/api/0383-Elder-Guardian-appearance-API.patch
index 14d8e806a9..cc6ca0b4b4 100644
--- a/patches/api/0383-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0383-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ 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 b886e9a59272ef6c8afa65f31a42bfc47f48b43a..a7dca9f902cd9916afd7a453288d669ab06c626c 100644
+index dbd27bbb4fb6ac1b7054808159338054ff1b9a05..9f196a6cec6c03f05e06b2e148cc5417a02ec98d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2935,6 +2935,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2958,6 +2958,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void lookAt(@NotNull org.bukkit.entity.Entity entity, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor, @NotNull io.papermc.paper.entity.LookAnchor entityAnchor);
      // Paper end - Teleport API
  
diff --git a/patches/api/0391-Add-Player-Warden-Warning-API.patch b/patches/api/0391-Add-Player-Warden-Warning-API.patch
index 664bc6ed45..a136ed4dae 100644
--- a/patches/api/0391-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0391-Add-Player-Warden-Warning-API.patch
@@ -5,10 +5,10 @@ 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 a7dca9f902cd9916afd7a453288d669ab06c626c..bdb63e445c1bc2e08bfa840d61cdeb2d8576bde7 100644
+index 9f196a6cec6c03f05e06b2e148cc5417a02ec98d..cb601a1558189e015a0447e1265bd8261cdf1d3f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2951,6 +2951,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2974,6 +2974,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param silent whether sound should be silenced
       */
      void showElderGuardian(boolean silent);
diff --git a/patches/api/0399-Actually-mark-mc-experimental-API-as-such.patch b/patches/api/0399-Actually-mark-mc-experimental-API-as-such.patch
index 09ec1116c0..52afe262ab 100644
--- a/patches/api/0399-Actually-mark-mc-experimental-API-as-such.patch
+++ b/patches/api/0399-Actually-mark-mc-experimental-API-as-such.patch
@@ -7,10 +7,10 @@ upstream has inconsistent and incomplete
 minecraft experimental annotations
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105328c24a5 100644
+index 03b47012447430a350e152920f754d993d4023db..9b489cc0a7426ce80e4be27df99552354f770d04 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -471,6 +471,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -459,6 +459,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link Orientable}
       */
@@ -19,7 +19,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      STRIPPED_BAMBOO_BLOCK(14799, Orientable.class),
      /**
       * BlockData: {@link Orientable}
-@@ -893,6 +895,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -865,6 +867,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link Fence}
       */
@@ -28,7 +28,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      BAMBOO_FENCE(17207, Fence.class),
      /**
       * BlockData: {@link Fence}
-@@ -1932,6 +1936,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -1904,6 +1908,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link Switch}
       */
@@ -37,7 +37,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      BAMBOO_BUTTON(21810, Switch.class),
      /**
       * BlockData: {@link Switch}
-@@ -1994,6 +2000,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -1964,6 +1970,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link Powerable}
       */
@@ -46,7 +46,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      BAMBOO_PRESSURE_PLATE(26740, Powerable.class),
      /**
       * BlockData: {@link Powerable}
-@@ -2044,6 +2052,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2012,6 +2020,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link Door}
       */
@@ -55,7 +55,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      BAMBOO_DOOR(19971, Door.class),
      /**
       * BlockData: {@link Door}
-@@ -2094,6 +2104,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2060,6 +2070,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link TrapDoor}
       */
@@ -64,7 +64,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      BAMBOO_TRAPDOOR(9174, TrapDoor.class),
      /**
       * BlockData: {@link TrapDoor}
-@@ -2140,6 +2152,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2104,6 +2116,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link Gate}
       */
@@ -73,7 +73,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      BAMBOO_FENCE_GATE(14290, Gate.class),
      /**
       * BlockData: {@link Gate}
-@@ -2194,7 +2208,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2154,7 +2168,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      DARK_OAK_CHEST_BOAT(8733, 1),
      MANGROVE_BOAT(20792, 1),
      MANGROVE_CHEST_BOAT(18572, 1),
@@ -85,7 +85,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      BAMBOO_CHEST_RAFT(20056, 1),
      /**
       * BlockData: {@link StructureBlock}
-@@ -2334,6 +2352,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2292,6 +2310,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link Sign}
       */
@@ -94,7 +94,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      BAMBOO_SIGN(26139, 16, Sign.class),
      /**
       * BlockData: {@link Sign}
-@@ -3151,6 +3171,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -3064,6 +3084,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link WallSign}
       */
@@ -104,10 +104,10 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105
      /**
       * BlockData: {@link WallHangingSign}
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c197150601850a3f28b 100644
+index 6e8d2b35d8f33827396dbcfa817cd9c2f8ad83a6..13a53a91626d0e73a0b600ce8479304c5fbec01a 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
-@@ -77,13 +77,29 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -77,25 +77,55 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
      BLOCK_BAMBOO_SAPLING_HIT("block.bamboo_sapling.hit"),
      BLOCK_BAMBOO_SAPLING_PLACE("block.bamboo_sapling.place"),
      BLOCK_BAMBOO_STEP("block.bamboo.step"),
@@ -135,11 +135,10 @@ index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c1971506018
 +    @MinecraftExperimental // Paper
 +    @ApiStatus.Experimental // Paper
      BLOCK_BAMBOO_WOOD_FENCE_GATE_OPEN("block.bamboo_wood_fence_gate.open"),
-     @MinecraftExperimental
-     @ApiStatus.Experimental
-@@ -100,12 +116,26 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
-     @MinecraftExperimental
-     @ApiStatus.Experimental
+     BLOCK_BAMBOO_WOOD_HANGING_SIGN_BREAK("block.bamboo_wood_hanging_sign.break"),
+     BLOCK_BAMBOO_WOOD_HANGING_SIGN_FALL("block.bamboo_wood_hanging_sign.fall"),
+     BLOCK_BAMBOO_WOOD_HANGING_SIGN_HIT("block.bamboo_wood_hanging_sign.hit"),
+     BLOCK_BAMBOO_WOOD_HANGING_SIGN_PLACE("block.bamboo_wood_hanging_sign.place"),
      BLOCK_BAMBOO_WOOD_HANGING_SIGN_STEP("block.bamboo_wood_hanging_sign.step"),
 +    @MinecraftExperimental // Paper
 +    @ApiStatus.Experimental // Paper
@@ -164,7 +163,7 @@ index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c1971506018
      BLOCK_BAMBOO_WOOD_TRAPDOOR_OPEN("block.bamboo_wood_trapdoor.open"),
      BLOCK_BARREL_CLOSE("block.barrel.close"),
      BLOCK_BARREL_OPEN("block.barrel.open"),
-@@ -412,10 +442,20 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -312,10 +342,20 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
      BLOCK_HANGING_ROOTS_HIT("block.hanging_roots.hit"),
      BLOCK_HANGING_ROOTS_PLACE("block.hanging_roots.place"),
      BLOCK_HANGING_ROOTS_STEP("block.hanging_roots.step"),
@@ -185,7 +184,7 @@ index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c1971506018
      BLOCK_HANGING_SIGN_STEP("block.hanging_sign.step"),
      BLOCK_HONEY_BLOCK_BREAK("block.honey_block.break"),
      BLOCK_HONEY_BLOCK_FALL("block.honey_block.fall"),
-@@ -551,11 +591,23 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -451,11 +491,23 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
      BLOCK_NOTE_BLOCK_GUITAR("block.note_block.guitar"),
      BLOCK_NOTE_BLOCK_HARP("block.note_block.harp"),
      BLOCK_NOTE_BLOCK_HAT("block.note_block.hat"),
@@ -209,49 +208,11 @@ index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c1971506018
      BLOCK_NOTE_BLOCK_IMITATE_ZOMBIE("block.note_block.imitate.zombie"),
      BLOCK_NOTE_BLOCK_IRON_XYLOPHONE("block.note_block.iron_xylophone"),
      BLOCK_NOTE_BLOCK_PLING("block.note_block.pling"),
-@@ -830,26 +882,37 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
-     ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"),
-     ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_AMBIENT("entity.camel.ambient"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_DASH("entity.camel.dash"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_DASH_READY("entity.camel.dash_ready"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_DEATH("entity.camel.death"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_EAT("entity.camel.eat"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_HURT("entity.camel.hurt"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_SADDLE("entity.camel.saddle"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_SIT("entity.camel.sit"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_STAND("entity.camel.stand"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_STEP("entity.camel.step"),
-     @MinecraftExperimental
-+    @ApiStatus.Experimental // Paper
-     ENTITY_CAMEL_STEP_SAND("entity.camel.step_sand"),
-     ENTITY_CAT_AMBIENT("entity.cat.ambient"),
-     ENTITY_CAT_BEG_FOR_FOOD("entity.cat.beg_for_food"),
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index e8206aa4cb574ee629f375a85acf597ae164a1c3..30f9e5e28edd5c267cc1ddef4aa5eac1bdc14a36 100644
+index 9257a5530264195260becedf73d291488c29d176..1024aff5bc31372256903f4f982805a95c3cb2a1 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -149,6 +149,8 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -150,6 +150,8 @@ public interface Tag<T extends Keyed> extends Keyed {
      /**
       * Vanilla block tag representing all bamboo blocks.
       */
@@ -260,7 +221,7 @@ index e8206aa4cb574ee629f375a85acf597ae164a1c3..30f9e5e28edd5c267cc1ddef4aa5eac1
      Tag<Material> BAMBOO_BLOCKS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("bamboo_blocks"), Material.class);
      /**
       * Vanilla block tag representing all banner blocks.
-@@ -768,6 +770,8 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -792,6 +794,8 @@ public interface Tag<T extends Keyed> extends Keyed {
      /**
       * Vanilla item tag representing all books that may be placed on bookshelves.
       */
@@ -269,7 +230,7 @@ index e8206aa4cb574ee629f375a85acf597ae164a1c3..30f9e5e28edd5c267cc1ddef4aa5eac1
      Tag<Material> ITEMS_BOOKSHELF_BOOKS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("bookshelf_books"), Material.class);
      /**
       * Vanilla item tag representing all items that may be placed in beacons.
-@@ -788,6 +792,8 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -812,6 +816,8 @@ public interface Tag<T extends Keyed> extends Keyed {
      /**
       * Vanilla item tag representing all hanging signs.
       */
diff --git a/patches/api/0400-fix-Instruments.patch b/patches/api/0400-fix-Instruments.patch
index 79a34a6fe1..6c1d815b5b 100644
--- a/patches/api/0400-fix-Instruments.patch
+++ b/patches/api/0400-fix-Instruments.patch
@@ -7,10 +7,10 @@ Add missing instrument enums
 fix some wrong javadocs
 
 diff --git a/src/main/java/org/bukkit/Instrument.java b/src/main/java/org/bukkit/Instrument.java
-index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f418cdd3a5 100644
+index de976be7132d05506fde7a839cac3954b0dd8da4..642feb8b4578e6dbd2bf78d859283d20f877051f 100644
 --- a/src/main/java/org/bukkit/Instrument.java
 +++ b/src/main/java/org/bukkit/Instrument.java
-@@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable;
  public enum Instrument {
  
      /**
@@ -19,7 +19,7 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4
       */
      PIANO(0x0),
      /**
-@@ -22,7 +22,7 @@ public enum Instrument {
+@@ -21,7 +21,7 @@ public enum Instrument {
       */
      SNARE_DRUM(0x2),
      /**
@@ -28,52 +28,40 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4
       * block.
       */
      STICKS(0x3),
-@@ -81,50 +81,48 @@ public enum Instrument {
+@@ -78,38 +78,36 @@ public enum Instrument {
+     /**
+      * Zombie is normally played when a Zombie Head is on top of the note block.
       */
-     @MinecraftExperimental
-     @ApiStatus.Experimental
 -    ZOMBIE,
 +    ZOMBIE(0x10), // Paper
      /**
       * Skeleton is normally played when a Skeleton Head is on top of the note block.
       */
-     @MinecraftExperimental
-     @ApiStatus.Experimental
 -    SKELETON,
 +    SKELETON(0x11), // Paper
      /**
       * Creeper is normally played when a Creeper Head is on top of the note block.
       */
-     @MinecraftExperimental
-     @ApiStatus.Experimental
 -    CREEPER,
 +    CREEPER(0x12), // Paper
      /**
       * Dragon is normally played when a Dragon Head is on top of the note block.
       */
-     @MinecraftExperimental
-     @ApiStatus.Experimental
 -    DRAGON,
 +    DRAGON(0x13), // Paper
      /**
       * Wither Skeleton is normally played when a Wither Skeleton Head is on top of the note block.
       */
-     @MinecraftExperimental
-     @ApiStatus.Experimental
 -    WITHER_SKELETON,
 +    WITHER_SKELETON(0x14), // Paper
      /**
       * Piglin is normally played when a Piglin Head is on top of the note block.
       */
-     @MinecraftExperimental
-     @ApiStatus.Experimental
 -    PIGLIN,
 +    PIGLIN(0x15), // Paper
      /**
       * Custom Sound is normally played when a Player Head with the required data is on top of the note block.
       */
-     @MinecraftExperimental
-     @ApiStatus.Experimental
 -    CUSTOM_HEAD;
 +    CUSTOM_HEAD(0x16); // Paper
  
@@ -87,7 +75,7 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4
  
      private Instrument(final int type) {
          this.type = (byte) type;
-@@ -132,9 +130,8 @@ public enum Instrument {
+@@ -117,9 +115,8 @@ public enum Instrument {
  
      /**
       * @return The type ID of this instrument.
@@ -98,7 +86,7 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4
      public byte getType() {
          return this.type;
      }
-@@ -144,9 +141,8 @@ public enum Instrument {
+@@ -129,9 +126,8 @@ public enum Instrument {
       *
       * @param type The type ID
       * @return The instrument
@@ -110,7 +98,7 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4
      public static Instrument getByType(final byte type) {
          return BY_DATA.get(type);
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bdb63e445c1bc2e08bfa840d61cdeb2d8576bde7..fabe9a415c88d3669c7b09e4d7c2453c0f2edeff 100644
+index cb601a1558189e015a0447e1265bd8261cdf1d3f..d29df91c63ea83ee2e26bf1ba7639927eda19318 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -393,9 +393,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0402-Add-Sneaking-API-for-Entities.patch b/patches/api/0402-Add-Sneaking-API-for-Entities.patch
index 057cb23cad..ce44f889a6 100644
--- a/patches/api/0402-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0402-Add-Sneaking-API-for-Entities.patch
@@ -35,7 +35,7 @@ index 3f3ea5bb6b3ea6f55b5cd699f1c01ac159619add..a2a423d4e4c2702ba5967223cab0432d
       * 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 fabe9a415c88d3669c7b09e4d7c2453c0f2edeff..7627cc0c25fc37cf914befda49ce83eeda9bfbef 100644
+index d29df91c63ea83ee2e26bf1ba7639927eda19318..63558eb98a970c4a59ae78daba9d6c9a61965797 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -296,6 +296,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0405-Flying-Fall-Damage-API.patch b/patches/api/0405-Flying-Fall-Damage-API.patch
index c779db5b39..dfbeb96208 100644
--- a/patches/api/0405-Flying-Fall-Damage-API.patch
+++ b/patches/api/0405-Flying-Fall-Damage-API.patch
@@ -5,10 +5,10 @@ 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 7627cc0c25fc37cf914befda49ce83eeda9bfbef..1c79a556c2267b5d87d5469123818e270840a684 100644
+index 63558eb98a970c4a59ae78daba9d6c9a61965797..b0f863b34ba169a09df2a80beef6583b0bebe1e9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1509,6 +1509,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1532,6 +1532,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void setAllowFlight(boolean flight);
  
diff --git a/patches/api/0407-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0407-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index e56e16ce94..3936bb4a92 100644
--- a/patches/api/0407-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0407-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Replace ItemFlag.HIDE_POTION_EFFECTS
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
-index 69a66073bcaa10967b8736cbf35182b912c17d11..0d8d4154a156edd1092a7f5318d28336bbc57a9b 100644
+index 4e637420b9a39b822be19367a16da93f236549b3..3df1044fd791ae19576dbfd008cfcbb4e5651b05 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFlag.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
-@@ -31,7 +31,9 @@ public enum ItemFlag {
+@@ -28,7 +28,9 @@ public enum ItemFlag {
      /**
       * Setting to show/hide potion effects, book and firework information, map
       * tooltips, patterns of banners, and enchantments of enchanted books.
@@ -18,9 +18,9 @@ index 69a66073bcaa10967b8736cbf35182b912c17d11..0d8d4154a156edd1092a7f5318d28336
      HIDE_POTION_EFFECTS,
      /**
       * Setting to show/hide dyes from colored leather armor.
-@@ -43,4 +45,25 @@ public enum ItemFlag {
-     @MinecraftExperimental
-     @ApiStatus.Experimental
+@@ -38,4 +40,25 @@ public enum ItemFlag {
+      * Setting to show/hide armor trim from armor.
+      */
      HIDE_ARMOR_TRIM;
 +    // Paper start
 +    /**
diff --git a/patches/api/0408-Win-Screen-API.patch b/patches/api/0408-Win-Screen-API.patch
index f558002195..d6db6a7502 100644
--- a/patches/api/0408-Win-Screen-API.patch
+++ b/patches/api/0408-Win-Screen-API.patch
@@ -5,10 +5,10 @@ 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 1c79a556c2267b5d87d5469123818e270840a684..88c4885569d2b8b22fce55601d50608ac8e9388c 100644
+index b0f863b34ba169a09df2a80beef6583b0bebe1e9..def31cdbe5765f5d05386753868e51c424cbfe9e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -878,6 +878,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -901,6 +901,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index 0b7fd954c1..ec77b27ddd 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..c207fd9b001dccaa71ba1615ffcdc093dd2b581c
+index 0000000000000000000000000000000000000000..b663ef66dfe3f19a58f265de866d002d19517324
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,137 @@
@@ -48,12 +48,12 @@ index 0000000000000000000000000000000000000000..c207fd9b001dccaa71ba1615ffcdc093
 +    }
 +    implementation("org.ow2.asm:asm:9.4")
 +    implementation("commons-lang:commons-lang:2.6")
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2")
-+    runtimeOnly("com.mysql:mysql-connector-j:8.0.32")
++    runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
++    runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
 +
-+    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
++    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2")
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
 +
 +    testImplementation("junit:junit:4.13.2")
 +    testImplementation("org.hamcrest:hamcrest-library:1.3")
@@ -171,7 +171,7 @@ index 0000000000000000000000000000000000000000..c207fd9b001dccaa71ba1615ffcdc093
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index d3490073bebae5918fe97895ead320c06c8358c7..0000000000000000000000000000000000000000
+index e1dfaf1e4cbe0ad18ba41c5eb5e465de0529090a..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,587 +0,0 @@
@@ -181,7 +181,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.19.4-R0.1-SNAPSHOT</version>
+-    <version>1.20-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
@@ -197,7 +197,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000
 -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -        <api.version>unknown</api.version>
 -        <bt.name>git</bt.name>
--        <minecraft_version>1_19_R3</minecraft_version>
+-        <minecraft_version>1_20_R1</minecraft_version>
 -        <maven.compiler.source>17</maven.compiler.source>
 -        <maven.compiler.target>17</maven.compiler.target>
 -    </properties>
@@ -251,19 +251,19 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>authlib</artifactId>
--            <version>3.17.30</version>
+-            <version>4.0.43</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>brigadier</artifactId>
--            <version>1.0.18</version>
+-            <version>1.1.8</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>datafixerupper</artifactId>
--            <version>6.0.6</version>
+-            <version>6.0.8</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -405,39 +405,39 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.xerial</groupId>
 -            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.41.2.2</version>
+-            <version>3.42.0.0</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mysql</groupId>
 -            <artifactId>mysql-connector-j</artifactId>
--            <version>8.0.32</version>
+-            <version>8.0.33</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- add these back in as they are not exposed by the API -->
 -        <dependency>
 -            <groupId>org.apache.maven</groupId>
 -            <artifactId>maven-resolver-provider</artifactId>
--            <version>3.8.5</version>
+-            <version>3.9.2</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.7.3</version>
+-            <version>1.9.10</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.7.3</version>
+-            <version>1.9.10</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- annotations -->
 -        <dependency>
 -            <groupId>org.jetbrains</groupId>
 -            <artifactId>annotations-java5</artifactId>
--            <version>23.0.0</version>
+-            <version>24.0.1</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- testing -->
@@ -578,7 +578,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>net.md-5</groupId>
 -                <artifactId>specialsource-maven-plugin</artifactId>
--                <version>1.2.4</version>
+-                <version>1.2.5</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
@@ -623,7 +623,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-assembly-plugin</artifactId>
--                <version>3.5.0</version>
+-                <version>3.6.0</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
@@ -668,7 +668,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-surefire-plugin</artifactId>
--                <version>3.0.0</version>
+-                <version>3.1.0</version>
 -                <configuration>
 -                    <workingDirectory>${basedir}/target/test-server</workingDirectory>
 -                    <excludes>
@@ -697,7 +697,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000
 -                    <plugin>
 -                        <groupId>org.apache.maven.plugins</groupId>
 -                        <artifactId>maven-checkstyle-plugin</artifactId>
--                        <version>3.2.1</version>
+-                        <version>3.3.0</version>
 -                        <executions>
 -                            <execution>
 -                                <phase>test-compile</phase>
diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch
index 4fe34ad62d..22510b7636 100644
--- a/patches/server/0002-Remap-fixes.patch
+++ b/patches/server/0002-Remap-fixes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remap fixes
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 0612eef6d9a9cda81a8d761be2b5e9b094388270..77bf6865c6df829c5b5455d440cb2222a0d8f2af 100644
+index ad3035da44c6af2fa7cc53926f33526a43740313..e89fa618fa20e3e843d8de81629e6dc551777823 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -265,9 +265,11 @@ public class BlockPos extends Vec3i {
+@@ -278,9 +278,11 @@ public class BlockPos extends Vec3i {
  
      public static Iterable<BlockPos> withinManhattan(BlockPos center, int rangeX, int rangeY, int rangeZ) {
          int i = rangeX + rangeY + rangeZ;
@@ -23,7 +23,7 @@ index 0612eef6d9a9cda81a8d761be2b5e9b094388270..77bf6865c6df829c5b5455d440cb2222
          return () -> {
              return new AbstractIterator<BlockPos>() {
                  private final BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
-@@ -282,7 +284,7 @@ public class BlockPos extends Vec3i {
+@@ -295,7 +297,7 @@ public class BlockPos extends Vec3i {
                  protected BlockPos computeNext() {
                      if (this.zMirror) {
                          this.zMirror = false;
@@ -32,7 +32,7 @@ index 0612eef6d9a9cda81a8d761be2b5e9b094388270..77bf6865c6df829c5b5455d440cb2222
                          return this.cursor;
                      } else {
                          BlockPos blockPos;
-@@ -308,7 +310,7 @@ public class BlockPos extends Vec3i {
+@@ -321,7 +323,7 @@ public class BlockPos extends Vec3i {
                              int k = this.currentDepth - Math.abs(i) - Math.abs(j);
                              if (k <= rangeZ) {
                                  this.zMirror = k != 0;
@@ -42,13 +42,13 @@ index 0612eef6d9a9cda81a8d761be2b5e9b094388270..77bf6865c6df829c5b5455d440cb2222
                          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-index 1206ca32cadb98573938328f611b67162c700d84..d81f7eecb8204a974da14a75d1a7a23a6c071112 100644
+index 3ba785845a63e46a44fc48264d08c96bfc34ab8b..92bd58010e8c89e361e28aec59447349edbbc028 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
 @@ -173,11 +173,11 @@ public class BehaviorUtils {
  
          return optional.map((uuid) -> {
-             return ((ServerLevel) entity.level).getEntity(uuid);
+             return ((ServerLevel) entity.level()).getEntity(uuid);
 -        }).map((entity) -> {
 +        }).map((entity1) -> { // Paper - remap fix
              LivingEntity entityliving1;
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index d7d9430cdd..b1b50fe88d 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c207fd9b001dccaa71ba1615ffcdc093dd2b581c..ac679b0a66ce9676937a9971bf3ee2a935dd9acb 100644
+index b663ef66dfe3f19a58f265de866d002d19517324..2b67d93dd4d18235b28388dab3ee9bd57d2b816c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,10 +9,9 @@ plugins {
@@ -19,8 +19,8 @@ index c207fd9b001dccaa71ba1615ffcdc093dd2b581c..ac679b0a66ce9676937a9971bf3ee2a9
      implementation("org.ow2.asm:asm:9.4")
 +    implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation
      implementation("commons-lang:commons-lang:2.6")
-     runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2")
-     runtimeOnly("com.mysql:mysql-connector-j:8.0.32")
+     runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
+     runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
 @@ -23,6 +22,8 @@ dependencies {
  
      testImplementation("junit:junit:4.13.2")
@@ -67,7 +67,7 @@ index c207fd9b001dccaa71ba1615ffcdc093dd2b581c..ac679b0a66ce9676937a9971bf3ee2a9
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 23e88fde465853629c4371d1e1a44d1af493ca3e..5a39201392fefe8da495244fdbc380e882ec938f 100644
+index 58a237d85b05def8e52ca737869ee80c300d050c..f3412dbbb0f37d5625ab05cfd502189ab4a343c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -209,7 +209,7 @@ public class Main {
@@ -78,7 +78,7 @@ index 23e88fde465853629c4371d1e1a44d1af493ca3e..5a39201392fefe8da495244fdbc380e8
 +                    Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -21);
+                     deadline.add(Calendar.DAY_OF_YEAR, -3);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/patches/server/0004-Test-changes.patch b/patches/server/0004-Test-changes.patch
index eef7d22999..f084ccd6c1 100644
--- a/patches/server/0004-Test-changes.patch
+++ b/patches/server/0004-Test-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Test changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ac679b0a66ce9676937a9971bf3ee2a935dd9acb..e0724559c70b5967123010e898e66e757b2b1b58 100644
+index 2b67d93dd4d18235b28388dab3ee9bd57d2b816c..69753539208112385e5057be560dc57071259b33 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,7 @@ dependencies {
@@ -14,11 +14,11 @@ index ac679b0a66ce9676937a9971bf3ee2a935dd9acb..e0724559c70b5967123010e898e66e75
      implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation
 +    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
      implementation("commons-lang:commons-lang:2.6")
-     runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2")
-     runtimeOnly("com.mysql:mysql-connector-j:8.0.32")
+     runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
+     runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
 diff --git a/src/test/java/io/papermc/paper/testing/DummyServer.java b/src/test/java/io/papermc/paper/testing/DummyServer.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c6503ff76f56bab5f383f0ca17d137155e9be447
+index 0000000000000000000000000000000000000000..e944e9dca13883c57e93e480ae5adfe51c342532
 --- /dev/null
 +++ b/src/test/java/io/papermc/paper/testing/DummyServer.java
 @@ -0,0 +1,67 @@
@@ -74,7 +74,7 @@ index 0000000000000000000000000000000000000000..c6503ff76f56bab5f383f0ca17d13715
 +
 +        when(dummyServer.getLootTable(any(NamespacedKey.class))).thenAnswer(invocation -> {
 +            final NamespacedKey key = invocation.getArgument(0, NamespacedKey.class);
-+            return new org.bukkit.craftbukkit.CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootTables().get(CraftNamespacedKey.toMinecraft(key)));
++            return new org.bukkit.craftbukkit.CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootData().getLootTable(CraftNamespacedKey.toMinecraft(key)));
 +        });
 +
 +        when(dummyServer.getRegistry(any())).thenAnswer(invocation -> {
@@ -119,7 +119,7 @@ index 0000000000000000000000000000000000000000..8dd0df8c2cc25d37a2590a0787268223
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index a85d3606c09717906798f0e1716755d1dae0d760..eab3834dca7cf70468390584156b9a770bfb2a32 100644
+index 1b875fc4dc5550ffab21d11e0c2451a2b22250f9..c440dcf3cc2ddb8fd9094fe8495e820ae7797f5c 100644
 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
 +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
 @@ -53,6 +53,7 @@ public abstract class AbstractTestingBase {
@@ -140,7 +140,7 @@ index a85d3606c09717906798f0e1716755d1dae0d760..eab3834dca7cf70468390584156b9a77
          ImmutableList.Builder<Material> builder = ImmutableList.builder();
 diff --git a/src/test/java/org/bukkit/support/DummyServer.java b/src/test/java/org/bukkit/support/DummyServer.java
 deleted file mode 100644
-index 946497353a64421592d2bae012c9a3cb874dd5b8..0000000000000000000000000000000000000000
+index e3197ea88b68de8f893f3fa986507b95b789645d..0000000000000000000000000000000000000000
 --- a/src/test/java/org/bukkit/support/DummyServer.java
 +++ /dev/null
 @@ -1,127 +0,0 @@
@@ -240,7 +240,7 @@ index 946497353a64421592d2bae012c9a3cb874dd5b8..00000000000000000000000000000000
 -                        @Override
 -                        public Object handle(DummyServer server, Object[] args) {
 -                            NamespacedKey key = (NamespacedKey) args[0];
--                            return new CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootTables().get(CraftNamespacedKey.toMinecraft(key)));
+-                            return new CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootData().getLootTable(CraftNamespacedKey.toMinecraft(key)));
 -                        }
 -                    }
 -                );
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index d24f8ea89f..832c8f6a94 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -14,7 +14,7 @@ public org.spigotmc.SpigotWorldConfig getString(Ljava/lang/String;Ljava/lang/Str
 public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e0724559c70b5967123010e898e66e757b2b1b58..b0facb2b0b86fafbfd5776eba2e5bdb69cc1cbed 100644
+index 69753539208112385e5057be560dc57071259b33..bdd78d14723211bfec493126d603b99611cdf748 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,6 +13,7 @@ dependencies {
@@ -23,8 +23,8 @@ index e0724559c70b5967123010e898e66e757b2b1b58..b0facb2b0b86fafbfd5776eba2e5bdb6
      testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
 +    implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
-     runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2")
-     runtimeOnly("com.mysql:mysql-connector-j:8.0.32")
+     runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
+     runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..ef41cf3a7d1e6f2bfe81e0fb865d2f969bbc77c1
@@ -4421,7 +4421,7 @@ index 0000000000000000000000000000000000000000..70cc7b45e7355f6c8476a74a070f1266
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 9b93b953f0747078d25289f129f82755089f94c9..aa054369cef3da4f90ce17788dcb9ca80dc98010 100644
+index e7240acad17dc9c0d93f2792cc0d90c1855ac436..35e7f8e7b19c217fa5f3f55abb0f8b9cd6b16f18 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -131,6 +131,10 @@ public class Main {
@@ -4445,7 +4445,7 @@ index 9b93b953f0747078d25289f129f82755089f94c9..aa054369cef3da4f90ce17788dcb9ca8
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3e1460b8331652c2f2e174ee41e3c728b2dbc753..2ed954f1fab3235a1d3fff2dd0d24c3b398b4d67 100644
+index 49eaa50c5e83e47022a1d126c62f6984f2d16f46..8eb949b43e8b403f3d98e36066cabd7cb9ab0e63 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -295,6 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -4465,19 +4465,19 @@ index 3e1460b8331652c2f2e174ee41e3c728b2dbc753..2ed954f1fab3235a1d3fff2dd0d24c3b
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/Services.java b/src/main/java/net/minecraft/server/Services.java
-index 697ca7457115423a8c4d8a7d1f7a353237b56509..d7d65d0faefa5551480a4090de3a881828238ffd 100644
+index 71e7beac6cf1e0f813d5ff3e9c51c13491be7139..f1cc27809c1e8612f7c4fa912f5e39c07b09d808 100644
 --- a/src/main/java/net/minecraft/server/Services.java
 +++ b/src/main/java/net/minecraft/server/Services.java
-@@ -7,14 +7,30 @@ import java.io.File;
+@@ -10,14 +10,30 @@ import javax.annotation.Nullable;
  import net.minecraft.server.players.GameProfileCache;
  import net.minecraft.util.SignatureValidator;
  
--public record Services(MinecraftSessionService sessionService, SignatureValidator serviceSignatureValidator, GameProfileRepository profileRepository, GameProfileCache profileCache) {
+-public record Services(MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache) {
 +// Paper start
-+public record Services(MinecraftSessionService sessionService, SignatureValidator serviceSignatureValidator, GameProfileRepository profileRepository, GameProfileCache profileCache, @javax.annotation.Nullable io.papermc.paper.configuration.PaperConfigurations paperConfigurations) {
++public record Services(MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache, @javax.annotation.Nullable io.papermc.paper.configuration.PaperConfigurations paperConfigurations) {
 +
-+    public Services(MinecraftSessionService sessionService, SignatureValidator signatureValidator, GameProfileRepository profileRepository, GameProfileCache profileCache) {
-+        this(sessionService, signatureValidator, profileRepository, profileCache, null);
++    public Services(MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache) {
++        this(sessionService, servicesKeySet, profileRepository, profileCache, null);
 +    }
 +
 +    @Override
@@ -4492,18 +4492,18 @@ index 697ca7457115423a8c4d8a7d1f7a353237b56509..d7d65d0faefa5551480a4090de3a8818
          MinecraftSessionService minecraftSessionService = authenticationService.createMinecraftSessionService();
          GameProfileRepository gameProfileRepository = authenticationService.createProfileRepository();
          GameProfileCache gameProfileCache = new GameProfileCache(gameProfileRepository, new File(rootDirectory, "usercache.json"));
-         SignatureValidator signatureValidator = SignatureValidator.from(authenticationService.getServicesKey());
--        return new Services(minecraftSessionService, signatureValidator, gameProfileRepository, gameProfileCache);
+-        return new Services(minecraftSessionService, authenticationService.getServicesKeySet(), gameProfileRepository, gameProfileCache);
 +        // Paper start
 +        final java.nio.file.Path legacyConfigPath = ((File) optionSet.valueOf("paper-settings")).toPath();
 +        final java.nio.file.Path configDirPath = ((File) optionSet.valueOf("paper-settings-directory")).toPath();
 +        io.papermc.paper.configuration.PaperConfigurations paperConfigurations = io.papermc.paper.configuration.PaperConfigurations.setup(legacyConfigPath, configDirPath, rootDirectory.toPath(), (File) optionSet.valueOf("spigot-settings"));
-+        return new Services(minecraftSessionService, signatureValidator, gameProfileRepository, gameProfileCache, paperConfigurations);
++        return new Services(minecraftSessionService, authenticationService.getServicesKeySet(), gameProfileRepository, gameProfileCache, paperConfigurations);
 +        // Paper end
      }
- }
+ 
+     @Nullable
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c434bec64863cb9023917e737c9471444f23a110..1fe07773cf9664164b29164caba22800e5a6bdae 100644
+index a58c0be585a2761d5b781a23934b956def221c5b..2ac30ef2dd72582f2b7f6a05b1f94b12b44fafc9 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -183,6 +183,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -4518,10 +4518,10 @@ index c434bec64863cb9023917e737c9471444f23a110..1fe07773cf9664164b29164caba22800
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index a02be624f7203d9465a8d62ccb734b436781f18c..5ac04182d32922dab00b81bc7f2ee1321066dcd5 100644
+index 635c1164defec812af378a69d45c7ae0aed5024f..9dde5b89e6de9d470b0c0b08e3aa6c471cd075fe 100644
 --- a/src/main/java/net/minecraft/server/dedicated/Settings.java
 +++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
-@@ -75,6 +75,7 @@ public abstract class Settings<T extends Settings<T>> {
+@@ -114,6 +114,7 @@ public abstract class Settings<T extends Settings<T>> {
          try {
              // CraftBukkit start - Don't attempt writing to file if it's read only
              if (path.toFile().exists() && !path.toFile().canWrite()) {
@@ -4530,10 +4530,10 @@ index a02be624f7203d9465a8d62ccb734b436781f18c..5ac04182d32922dab00b81bc7f2ee132
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 37b2696e69719e44490116e4c4f6ab86c38043ed..ad011c4f328129e2e5eb6b1b1f5e1d282d1ec04a 100644
+index d40998a5330be64849a5bc2b49781b70ef149a0e..82435da47f0f7db73556310f84dc538a7c5f0809 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -230,7 +230,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -234,7 +234,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
  
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
@@ -4543,10 +4543,10 @@ index 37b2696e69719e44490116e4c4f6ab86c38043ed..ad011c4f328129e2e5eb6b1b1f5e1d28
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9a86fedb7ea4932590b86ef96785141489b03528..40deaa2463876659c0579b5273b5249760e8f8c0 100644
+index cda55e481ddbcc1de5478125c5db20ebba168e7d..bacd4d875642cd93c3185f788745dd73a3cfde8a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -156,6 +156,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -155,6 +155,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<SpawnCategory> ticksPerSpawnCategory = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>();
      public boolean populating;
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
@@ -4559,7 +4559,7 @@ index 9a86fedb7ea4932590b86ef96785141489b03528..40deaa2463876659c0579b5273b52497
  
      public final SpigotTimings.WorldTimingsHandler timings; // Spigot
      public static BlockPos lastPhysicsProblem; // Spigot
-@@ -173,8 +179,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -172,8 +178,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
@@ -4571,7 +4571,7 @@ index 9a86fedb7ea4932590b86ef96785141489b03528..40deaa2463876659c0579b5273b52497
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0ae7df422a58df7acb8e57e21d5e8ded592192ee..6e2a1ca2a1d6cb457c1eb70ce5c25f8287f5ccb9 100644
+index c1c575593b2470aeaf73ce6f9f45f4f7f9b16c04..9c82e4d2f5676808bb57c5e7dd19d0e7615ca884 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -903,6 +903,7 @@ public final class CraftServer implements Server {
@@ -4583,7 +4583,7 @@ index 0ae7df422a58df7acb8e57e21d5e8ded592192ee..6e2a1ca2a1d6cb457c1eb70ce5c25f82
              world.serverLevelData.setDifficulty(config.difficulty);
              world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5a39201392fefe8da495244fdbc380e882ec938f..e8fb9e3454282ad328e6bc0d078142285d9cfa76 100644
+index f3412dbbb0f37d5625ab05cfd502189ab4a343c2..60ca15373b489941555315bf6fb311326670e7de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -141,6 +141,19 @@ public class Main {
@@ -4667,7 +4667,7 @@ index 0000000000000000000000000000000000000000..0396589795da1f83ddf62426236dde9a
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index eab3834dca7cf70468390584156b9a770bfb2a32..a616624a7beb35239be0fc2bb7fe60db1c673c2d 100644
+index c440dcf3cc2ddb8fd9094fe8495e820ae7797f5c..d1fd4cf65c31bc00d0bffa3123fc2223f1498a34 100644
 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
 +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
 @@ -62,6 +62,7 @@ public abstract class AbstractTestingBase {
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch
index d8edf09358..a420971c5d 100644
--- a/patches/server/0006-MC-Dev-fixes.patch
+++ b/patches/server/0006-MC-Dev-fixes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index c400121d4956014a376760360180e5141013d702..b3e0495e0f242c96d4348438c0257c2045b801e5 100644
+index 2b7e2b7ecda6ac2b019c361163079fd747033719..90edfea7151f2ad259288545d512af7cd1b82f19 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -357,7 +357,7 @@ public class Util {
+@@ -358,7 +358,7 @@ public class Util {
      }
  
      public static <K> Hash.Strategy<K> identityStrategy() {
@@ -18,10 +18,10 @@ index c400121d4956014a376760360180e5141013d702..b3e0495e0f242c96d4348438c0257c20
  
      public static <V> CompletableFuture<List<V>> sequence(List<? extends CompletableFuture<V>> futures) {
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 77bf6865c6df829c5b5455d440cb2222a0d8f2af..819562d2c938fa05b8e8a00d1ae1f7c1fc9b00d5 100644
+index e89fa618fa20e3e843d8de81629e6dc551777823..2bb5e51f71cbf66819d198505aa4a5ecffd246c6 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -370,12 +370,12 @@ public class BlockPos extends Vec3i {
+@@ -383,12 +383,12 @@ public class BlockPos extends Vec3i {
                      if (this.index == l) {
                          return this.endOfData();
                      } else {
@@ -40,10 +40,10 @@ index 77bf6865c6df829c5b5455d440cb2222a0d8f2af..819562d2c938fa05b8e8a00d1ae1f7c1
                  }
              };
 diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
-index 396d065805853318b0fed98b64b2e1ab0a022e51..a969cd46694ce3094b4a65cf188677d38ae72198 100644
+index fe671ee23a5d364e20571dede6fc6bca7d83e98c..baa88201c4d08fb4f32f1198e187d7ca138b0f0e 100644
 --- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
 +++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
-@@ -307,7 +307,7 @@ public class BuiltInRegistries {
+@@ -314,7 +314,7 @@ public class BuiltInRegistries {
          LOADERS.put(resourceLocation, () -> {
              return initializer.run(registry);
          });
@@ -94,7 +94,7 @@ index 41d6569c00db3d467f6e90d33ebd261529b89f4c..5f051cb22ae77f4d8994b07ac5b963bd
          };
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2ed954f1fab3235a1d3fff2dd0d24c3b398b4d67..41a6756144a3b826d32ecb85a71d26761e25ec11 100644
+index 8eb949b43e8b403f3d98e36066cabd7cb9ab0e63..a9e30b7b3a666d83b3c595a7975693ccfcf3e8f9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1775,7 +1775,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -133,23 +133,23 @@ index 2dc801061025888192c3bf2c4c38b928c16a0165..ca788f0dcec4a117b410fe8348969e05
  
      public static <T> SortedArraySet<T> create(Comparator<T> comparator) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 37a01cd6f616cac741d50066aaba21911a1ed3bb..36222d2140aa1151c30e095afc557ea7db91911f 100644
+index d6e25c7f5dc6c219e2590aa8b1ffd51a2120d50e..5e3c750b2ce30b4c89143c5dfbb7a90e861f169f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -150,7 +150,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
+@@ -151,7 +151,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
      @Override
      protected void customServerAiStep() {
-         this.level.getProfiler().push("camelBrain");
+         this.level().getProfiler().push("camelBrain");
 -        Brain<?> brain = this.getBrain();
 +        Brain<Camel> brain = (Brain<Camel>) this.getBrain(); // Paper - decompile fix
-         brain.tick((ServerLevel)this.level, this);
-         this.level.getProfiler().pop();
-         this.level.getProfiler().push("camelActivityUpdate");
+         brain.tick((ServerLevel)this.level(), this);
+         this.level().getProfiler().pop();
+         this.level().getProfiler().push("camelActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 872243700e982c97c8ef491684a447afc7a24bdf..c12b8831deb54deb191908ba8a769d4c78825d5b 100644
+index e8da5e51449d908de492b55dfa21e8d1108514fa..22eb0a8fc35baa04b34265b62aa29a71f3cc7343 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -104,7 +104,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -99,7 +99,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
  
      @Override
      public Brain<Frog> getBrain() {
@@ -159,7 +159,7 @@ index 872243700e982c97c8ef491684a447afc7a24bdf..c12b8831deb54deb191908ba8a769d4c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 64314cf4dc53a1a0a5f676fa00503858e0120dfa..45741410a13cffe3419e34b5607b048bbcf1c3ff 100644
+index 555b52e2d9a6d4db7a527cda46ba6acf711da697..98c41e87b644f79ebfd45af2e0d7b887a3f5d00b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -123,7 +123,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch
index d212022ee8..b00266aec5 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/server/0008-CB-fixes.patch
@@ -17,10 +17,10 @@ Subject: [PATCH] CB fixes
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ad011c4f328129e2e5eb6b1b1f5e1d282d1ec04a..3bcbdf37ad9d76ec97ad3f20e7a683e267441ed9 100644
+index 82435da47f0f7db73556310f84dc538a7c5f0809..ebae711991a3ae35e35c2cffa8d928677c205492 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -294,7 +294,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -298,7 +298,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          long l = minecraftserver.getWorldData().worldGenOptions().seed();
  
@@ -30,7 +30,7 @@ index ad011c4f328129e2e5eb6b1b1f5e1d282d1ec04a..3bcbdf37ad9d76ec97ad3f20e7a683e2
          if ((this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END
              this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenOptions().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/world/entity/Marker.java b/src/main/java/net/minecraft/world/entity/Marker.java
-index 15ec0d085d09d9a70eb6cdd47f9e4587dd1402b5..9cd0f0628a3f533229d25d9ccd0d381364f4957c 100644
+index 299d0755b782a26af6c6acc00e3d8ab0269348a9..70791a052c1ec8f41d7f1e65c33eee4f0b1b53b2 100644
 --- a/src/main/java/net/minecraft/world/entity/Marker.java
 +++ b/src/main/java/net/minecraft/world/entity/Marker.java
 @@ -49,8 +49,8 @@ public class Marker extends Entity {
@@ -45,16 +45,16 @@ index 15ec0d085d09d9a70eb6cdd47f9e4587dd1402b5..9cd0f0628a3f533229d25d9ccd0d3813
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 36222d2140aa1151c30e095afc557ea7db91911f..9d4a3041ecae2adda40134710eb1edb8571228aa 100644
+index 5e3c750b2ce30b4c89143c5dfbb7a90e861f169f..1769045a053f7f4576099fb21686d84b682194f5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -441,9 +441,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
+@@ -446,9 +446,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
      }
  
      @Override
 -    protected void actuallyHurt(DamageSource source, float amount) {
 +    protected boolean damageEntity0(DamageSource source, float amount) { // Paper - fix CB method rename issue
-         this.standUpPanic();
+         this.standUpInstantly();
 -        super.actuallyHurt(source, amount);
 +        return super.damageEntity0(source, amount); // Paper - fix CB method rename issue
      }
@@ -83,20 +83,20 @@ index 161ad6ab1443b2ce33a2d7d91d189c855db0453b..15a9736a870055d639d03063c7cf67fd
          this.registryAccess = registryManager;
          this.structureTemplateManager = structureTemplateManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6e2a1ca2a1d6cb457c1eb70ce5c25f8287f5ccb9..1177d64793be0d82c99dcd9e037c3e4cef2f74d3 100644
+index 9c82e4d2f5676808bb57c5e7dd19d0e7615ca884..9874d0d3ae16e79f2598d9c1f93a9b7cc40f56b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2326,7 +2326,13 @@ public final class CraftServer implements Server {
+@@ -2324,7 +2324,13 @@ public final class CraftServer implements Server {
          Validate.notNull(key, "NamespacedKey cannot be null");
  
-         LootTables registry = this.getServer().getLootTables();
--        return new CraftLootTable(key, registry.get(CraftNamespacedKey.toMinecraft(key)));
+         LootDataManager registry = this.getServer().getLootData();
+-        return new CraftLootTable(key, registry.getLootTable(CraftNamespacedKey.toMinecraft(key)));
 +        // Paper start - honor method contract
 +        final ResourceLocation lootTableKey = CraftNamespacedKey.toMinecraft(key);
-+        if (!registry.getIds().contains(lootTableKey)) {
++        if (registry.getLootTable(lootTableKey) == net.minecraft.world.level.storage.loot.LootTable.EMPTY) {
 +            return null;
 +        }
-+        return new CraftLootTable(key, registry.get(lootTableKey));
++        return new CraftLootTable(key, registry.getLootTable(lootTableKey));
 +        // Paper end
      }
  
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index 63e12ee0a8..a7da87ebce 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -5434,10 +5434,10 @@ index 0000000000000000000000000000000000000000..808d1449ac44ae86a650932365081fba
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index b3e0495e0f242c96d4348438c0257c2045b801e5..c5fb6adb353538360ef420faee41565626eea1dc 100644
+index 90edfea7151f2ad259288545d512af7cd1b82f19..01eb418bde1dadbbfa30954f81281199b2fec778 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -116,7 +116,7 @@ public class Util {
+@@ -117,7 +117,7 @@ public class Util {
      }
  
      public static long getNanos() {
@@ -5447,10 +5447,10 @@ index b3e0495e0f242c96d4348438c0257c2045b801e5..c5fb6adb353538360ef420faee415656
  
      public static long getEpochMillis() {
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 819562d2c938fa05b8e8a00d1ae1f7c1fc9b00d5..4dffce4dc3434ef6adef7dc3cfac867ad89d9a5d 100644
+index 2bb5e51f71cbf66819d198505aa4a5ecffd246c6..1834f3efb05fd70c8c1c67733bff514829ae1154 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -521,6 +521,7 @@ public class BlockPos extends Vec3i {
+@@ -562,6 +562,7 @@ public class BlockPos extends Vec3i {
              }
          }
  
@@ -5458,7 +5458,7 @@ index 819562d2c938fa05b8e8a00d1ae1f7c1fc9b00d5..4dffce4dc3434ef6adef7dc3cfac867a
          @Override
          public BlockPos.MutableBlockPos setX(int i) {
              super.setX(i);
-@@ -538,6 +539,7 @@ public class BlockPos extends Vec3i {
+@@ -579,6 +580,7 @@ public class BlockPos extends Vec3i {
              super.setZ(i);
              return this;
          }
@@ -5504,7 +5504,7 @@ index e6c4379b0fd7c1338e1713281cd9515cb54acecb..a63e7ee5c42bd51312155feab31c6ec4
                          throw new SkipPacketException(var10);
                      } else {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 41a6756144a3b826d32ecb85a71d26761e25ec11..5725631835ea68802c75934cd85d5c1b1a78d358 100644
+index a9e30b7b3a666d83b3c595a7975693ccfcf3e8f9..9b34e401040a45393afbb9e984ff421a89f744a0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -296,6 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -5515,7 +5515,7 @@ index 41a6756144a3b826d32ecb85a71d26761e25ec11..5725631835ea68802c75934cd85d5c1b
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -931,6 +932,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -929,6 +930,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              MinecraftServer.LOGGER.error("Failed to unlock level {}", this.storageSource.getLevelId(), ioexception1);
          }
          // Spigot start
@@ -5525,7 +5525,7 @@ index 41a6756144a3b826d32ecb85a71d26761e25ec11..5725631835ea68802c75934cd85d5c1b
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              MinecraftServer.LOGGER.info("Saving usercache.json");
              this.getProfileCache().save();
-@@ -995,6 +999,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -993,6 +997,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.lastOverloadWarning = this.nextTickTime;
                  }
  
@@ -5533,7 +5533,7 @@ index 41a6756144a3b826d32ecb85a71d26761e25ec11..5725631835ea68802c75934cd85d5c1b
                  if ( tickCount++ % MinecraftServer.SAMPLE_INTERVAL == 0 )
                  {
                      double currentTps = 1E3 / ( curTime - tickSection ) * MinecraftServer.SAMPLE_INTERVAL;
-@@ -1212,7 +1217,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1210,7 +1215,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              MinecraftServer.LOGGER.debug("Autosave finished");
              SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
          }
@@ -5542,7 +5542,7 @@ index 41a6756144a3b826d32ecb85a71d26761e25ec11..5725631835ea68802c75934cd85d5c1b
          this.profiler.push("tallying");
          long j = this.tickTimes[this.tickCount % 100] = Util.getNanos() - i;
  
-@@ -1302,6 +1307,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1300,6 +1305,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
                  worldserver.tick(shouldKeepTicking);
@@ -5555,11 +5555,11 @@ index 41a6756144a3b826d32ecb85a71d26761e25ec11..5725631835ea68802c75934cd85d5c1b
              } catch (Throwable throwable) {
                  // Spigot Start
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1c3570aec 100644
+index 6d4cd75b9dbddce30b92f83fef96ec0a47e1fe9d..32d186fefa5ff8afedcceacea0c6fa1cefbd5490 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -52,9 +52,9 @@ public class ChunkHolder {
-     private static final int BLOCKS_BEFORE_RESEND_FUDGE = 64;
+@@ -50,9 +50,9 @@ public class ChunkHolder {
+     private static final List<ChunkStatus> CHUNK_STATUSES = ChunkStatus.getStatusList();
      private final AtomicReferenceArray<CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> futures;
      private final LevelHeightAccessor levelHeightAccessor;
 -    private volatile CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> fullChunkFuture;
@@ -5571,8 +5571,8 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
      private CompletableFuture<ChunkAccess> chunkToSave;
      @Nullable
      private final DebugBuffer<ChunkHolder.ChunkSaveDebug> chunkToSaveHistory;
-@@ -73,6 +73,18 @@ public class ChunkHolder {
-     private boolean resendLight;
+@@ -70,6 +70,18 @@ public class ChunkHolder {
+     private boolean wasAccessibleSinceLastSave;
      private CompletableFuture<Void> pendingFullStateConfirmation;
  
 +    private final ChunkMap chunkMap; // Paper
@@ -5590,7 +5590,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
      public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) {
          this.futures = new AtomicReferenceArray(ChunkHolder.CHUNK_STATUSES.size());
          this.fullChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE;
-@@ -93,8 +105,23 @@ public class ChunkHolder {
+@@ -90,8 +102,23 @@ public class ChunkHolder {
          this.queueLevel = this.oldTicketLevel;
          this.setTicketLevel(level);
          this.changedBlocksPerSection = new ShortSet[world.getSectionsCount()];
@@ -5614,8 +5614,8 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
      // CraftBukkit start
      public LevelChunk getFullChunkNow() {
          // Note: We use the oldTicketLevel for isLoaded checks.
-@@ -119,20 +146,20 @@ public class ChunkHolder {
-         return ChunkHolder.getStatus(this.ticketLevel).isOrAfter(leastStatus) ? this.getFutureIfPresentUnchecked(leastStatus) : ChunkHolder.UNLOADED_CHUNK_FUTURE;
+@@ -116,20 +143,20 @@ public class ChunkHolder {
+         return ChunkLevel.generationStatus(this.ticketLevel).isOrAfter(leastStatus) ? this.getFutureIfPresentUnchecked(leastStatus) : ChunkHolder.UNLOADED_CHUNK_FUTURE;
      }
  
 -    public CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> getTickingChunkFuture() {
@@ -5639,7 +5639,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
          CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> completablefuture = this.getTickingChunkFuture();
          Either<LevelChunk, ChunkHolder.ChunkLoadingFailure> either = (Either) completablefuture.getNow(null); // CraftBukkit - decompile error
  
-@@ -140,7 +167,7 @@ public class ChunkHolder {
+@@ -137,7 +164,7 @@ public class ChunkHolder {
      }
  
      @Nullable
@@ -5648,7 +5648,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
          CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> completablefuture = this.getFullChunkFuture();
          Either<LevelChunk, ChunkHolder.ChunkLoadingFailure> either = (Either) completablefuture.getNow(null); // CraftBukkit - decompile error
  
-@@ -161,6 +188,21 @@ public class ChunkHolder {
+@@ -158,6 +185,21 @@ public class ChunkHolder {
          return null;
      }
  
@@ -5670,7 +5670,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
      @Nullable
      public ChunkAccess getLastAvailable() {
          for (int i = ChunkHolder.CHUNK_STATUSES.size() - 1; i >= 0; --i) {
-@@ -179,7 +221,7 @@ public class ChunkHolder {
+@@ -176,7 +218,7 @@ public class ChunkHolder {
          return null;
      }
  
@@ -5679,8 +5679,8 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
          return this.chunkToSave;
      }
  
-@@ -360,11 +402,11 @@ public class ChunkHolder {
-         return ChunkHolder.getFullChunkStatus(this.ticketLevel);
+@@ -364,11 +406,11 @@ public class ChunkHolder {
+         return ChunkLevel.fullStatus(this.ticketLevel);
      }
  
 -    public ChunkPos getPos() {
@@ -5693,13 +5693,13 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
          return this.ticketLevel;
      }
  
-@@ -453,14 +495,31 @@ public class ChunkHolder {
+@@ -457,14 +499,31 @@ public class ChunkHolder {
  
          this.wasAccessibleSinceLastSave |= flag3;
          if (!flag2 && flag3) {
 +            int expectCreateCount = ++this.fullChunkCreateCount; // Paper
              this.fullChunkFuture = chunkStorage.prepareAccessibleChunk(this);
-             this.scheduleFullChunkPromotion(chunkStorage, this.fullChunkFuture, executor, ChunkHolder.FullChunkStatus.BORDER);
+             this.scheduleFullChunkPromotion(chunkStorage, this.fullChunkFuture, executor, FullChunkStatus.FULL);
 +            // Paper start - cache ticking ready status
 +            this.fullChunkFuture.thenAccept(either -> {
 +                final Optional<LevelChunk> left = either.left();
@@ -5724,11 +5724,11 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
 +            this.isFullChunkReady = false; // Paper - cache ticking ready status
          }
  
-         boolean flag4 = playerchunk_state.isOrAfter(ChunkHolder.FullChunkStatus.TICKING);
-@@ -469,11 +528,25 @@ public class ChunkHolder {
+         boolean flag4 = fullchunkstatus.isOrAfter(FullChunkStatus.BLOCK_TICKING);
+@@ -473,11 +532,25 @@ public class ChunkHolder {
          if (!flag4 && flag5) {
              this.tickingChunkFuture = chunkStorage.prepareTickingChunk(this);
-             this.scheduleFullChunkPromotion(chunkStorage, this.tickingChunkFuture, executor, ChunkHolder.FullChunkStatus.TICKING);
+             this.scheduleFullChunkPromotion(chunkStorage, this.tickingChunkFuture, executor, FullChunkStatus.BLOCK_TICKING);
 +            // Paper start - cache ticking ready status
 +            this.tickingChunkFuture.thenAccept(either -> {
 +                either.ifLeft(chunk -> {
@@ -5752,10 +5752,10 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
              this.tickingChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE;
          }
  
-@@ -487,11 +560,24 @@ public class ChunkHolder {
+@@ -491,11 +564,24 @@ public class ChunkHolder {
  
-             this.entityTickingChunkFuture = chunkStorage.prepareEntityTickingChunk(this.pos);
-             this.scheduleFullChunkPromotion(chunkStorage, this.entityTickingChunkFuture, executor, ChunkHolder.FullChunkStatus.ENTITY_TICKING);
+             this.entityTickingChunkFuture = chunkStorage.prepareEntityTickingChunk(this);
+             this.scheduleFullChunkPromotion(chunkStorage, this.entityTickingChunkFuture, executor, FullChunkStatus.ENTITY_TICKING);
 +            // Paper start - cache ticking ready status
 +            this.entityTickingChunkFuture.thenAccept(either -> {
 +                either.ifLeft(chunk -> {
@@ -5778,7 +5778,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
              this.entityTickingChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE;
          }
  
-@@ -608,4 +694,18 @@ public class ChunkHolder {
+@@ -593,4 +679,18 @@ public class ChunkHolder {
              }
          };
      }
@@ -5798,7 +5798,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef67d3d13c 100644
+index de34a02c44043b6f90806eeef94a232e6b3c845b..c943e64d70bab240f8dc733e78a185172664c5e4 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -68,6 +68,7 @@ import net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket;
@@ -5809,7 +5809,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
  import net.minecraft.server.level.progress.ChunkProgressListener;
  import net.minecraft.server.network.ServerPlayerConnection;
  import net.minecraft.util.CsvOutput;
-@@ -176,6 +177,56 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -175,6 +176,56 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      };
      // CraftBukkit end
  
@@ -5866,7 +5866,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
      public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance, boolean dsync) {
          super(session.getDimensionPath(world.dimension()).resolve("region"), dataFixer, dsync);
          this.visibleChunkMap = this.updatingChunkMap.clone();
-@@ -229,6 +280,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -228,6 +279,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          this.overworldDataStorage = persistentStateManagerFactory;
          this.poiManager = new PoiManager(path.resolve("poi"), dataFixer, dsync, iregistrycustom, world);
          this.setViewDistance(viewDistance);
@@ -5877,7 +5877,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
      }
  
      protected ChunkGenerator generator() {
-@@ -326,6 +381,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -324,6 +379,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
      }
  
@@ -5885,14 +5885,15 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
 +    public final int getEffectiveViewDistance() {
 +        // TODO this needs to be checked on update
 +        // Mojang currently sets it to +1 of the configured view distance. So subtract one to get the one we really want.
-+        return this.viewDistance - 1;
++        //TODO check if +0 is correct now
++        return this.viewDistance;
 +    }
 +    // Paper end
 +
-     private CompletableFuture<Either<List<ChunkAccess>, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkPos centerChunk, int margin, IntFunction<ChunkStatus> distanceToStatus) {
-         List<CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> list = new ArrayList();
-         List<ChunkHolder> list1 = new ArrayList();
-@@ -413,9 +476,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     private CompletableFuture<Either<List<ChunkAccess>, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkHolder centerChunk, int margin, IntFunction<ChunkStatus> distanceToStatus) {
+         if (margin == 0) {
+             ChunkStatus chunkstatus = (ChunkStatus) distanceToStatus.apply(0);
+@@ -420,9 +484,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          };
  
          stringbuilder.append("Updating:").append(System.lineSeparator());
@@ -5904,7 +5905,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
          CrashReport crashreport = CrashReport.forThrowable(exception, "Chunk loading");
          CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Chunk loading");
  
-@@ -457,8 +520,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -464,8 +528,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      holder.setTicketLevel(level);
                  } else {
                      holder = new ChunkHolder(new ChunkPos(pos), level, this.level, this.lightEngine, this.queueSorter, this);
@@ -5919,7 +5920,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
                  this.updatingChunkMap.put(pos, holder);
                  this.modified = true;
              }
-@@ -480,7 +549,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -487,7 +557,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      protected void saveAllChunks(boolean flush) {
          if (flush) {
@@ -5928,7 +5929,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
              MutableBoolean mutableboolean = new MutableBoolean();
  
              do {
-@@ -509,7 +578,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -516,7 +586,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              });
              this.flushWorker();
          } else {
@@ -5937,7 +5938,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
          }
  
      }
-@@ -528,7 +597,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -535,7 +605,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      public boolean hasWork() {
@@ -5946,7 +5947,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
      }
  
      private void processUnloads(BooleanSupplier shouldKeepTicking) {
-@@ -539,6 +608,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -546,6 +616,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              ChunkHolder playerchunk = (ChunkHolder) this.updatingChunkMap.remove(j);
  
              if (playerchunk != null) {
@@ -5954,7 +5955,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
                  this.pendingUnloads.put(j, playerchunk);
                  this.modified = true;
                  ++i;
-@@ -556,7 +626,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -563,7 +634,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
  
          int l = 0;
@@ -5963,7 +5964,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
  
          while (l < 20 && shouldKeepTicking.getAsBoolean() && objectiterator.hasNext()) {
              if (this.saveChunkIfNeeded((ChunkHolder) objectiterator.next())) {
-@@ -574,7 +644,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -581,7 +652,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              if (completablefuture1 != completablefuture) {
                  this.scheduleUnload(pos, holder);
              } else {
@@ -5976,7 +5977,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
                      if (ichunkaccess instanceof LevelChunk) {
                          ((LevelChunk) ichunkaccess).setLoaded(false);
                      }
-@@ -590,7 +664,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -597,7 +672,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      this.lightEngine.tryScheduleUpdate();
                      this.progressListener.onStatusChange(ichunkaccess.getPos(), (ChunkStatus) null);
                      this.chunkSaveCooldowns.remove(ichunkaccess.getPos().toLong());
@@ -5987,16 +5988,16 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
  
              }
          };
-@@ -971,7 +1047,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -991,7 +1068,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
              this.viewDistance = j;
-             this.distanceManager.updatePlayerTickets(this.viewDistance + 1);
+             this.distanceManager.updatePlayerTickets(this.viewDistance);
 -            ObjectIterator objectiterator = this.updatingChunkMap.values().iterator();
 +            Iterator objectiterator = io.papermc.paper.chunk.system.ChunkSystem.getUpdatingChunkHolders(this.level).iterator(); // Paper
  
              while (objectiterator.hasNext()) {
                  ChunkHolder playerchunk = (ChunkHolder) objectiterator.next();
-@@ -1014,7 +1090,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1034,7 +1111,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      public int size() {
@@ -6005,7 +6006,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
      }
  
      public DistanceManager getDistanceManager() {
-@@ -1022,19 +1098,19 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1042,19 +1119,19 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      protected Iterable<ChunkHolder> getChunks() {
@@ -6030,7 +6031,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
              Optional<ChunkAccess> optional = Optional.ofNullable(playerchunk.getLastAvailable());
              Optional<LevelChunk> optional1 = optional.flatMap((ichunkaccess) -> {
                  return ichunkaccess instanceof LevelChunk ? Optional.of((LevelChunk) ichunkaccess) : Optional.empty();
-@@ -1160,6 +1236,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1180,6 +1257,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              if (!flag1) {
                  this.distanceManager.addPlayer(SectionPos.of((EntityAccess) player), player);
              }
@@ -6038,7 +6039,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
          } else {
              SectionPos sectionposition = player.getLastSectionPos();
  
-@@ -1167,6 +1244,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1187,6 +1265,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              if (!flag2) {
                  this.distanceManager.removePlayer(sectionposition, player);
              }
@@ -6046,7 +6047,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
          }
  
          for (int k = i - this.viewDistance - 1; k <= i + this.viewDistance + 1; ++k) {
-@@ -1279,6 +1357,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1300,6 +1379,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              }
          }
  
@@ -6055,7 +6056,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
      }
  
      @Override
-@@ -1515,7 +1595,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1536,7 +1617,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      private class ChunkDistanceManager extends DistanceManager {
  
          protected ChunkDistanceManager(Executor workerExecutor, Executor mainThreadExecutor) {
@@ -6065,10 +6066,10 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a813824e6f2c2 100644
+index 1bfa33253a154c66dc8b7e476c777b74cda8999f..d8b83c8c89143d78620f812c491a1950e3218eb1 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
-@@ -60,8 +60,9 @@ public abstract class DistanceManager {
+@@ -56,8 +56,9 @@ public abstract class DistanceManager {
      final Executor mainThreadExecutor;
      private long ticketTickCounter;
      private int simulationDistance = 10;
@@ -6079,7 +6080,7 @@ index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a8138
          Objects.requireNonNull(mainThreadExecutor);
          ProcessorHandle<Runnable> mailbox = ProcessorHandle.of("player ticket throttler", mainThreadExecutor::execute);
          ChunkTaskPriorityQueueSorter chunktaskqueuesorter = new ChunkTaskPriorityQueueSorter(ImmutableList.of(mailbox), workerExecutor, 4);
-@@ -70,6 +71,7 @@ public abstract class DistanceManager {
+@@ -66,6 +67,7 @@ public abstract class DistanceManager {
          this.ticketThrottlerInput = chunktaskqueuesorter.getProcessor(mailbox, true);
          this.ticketThrottlerReleaser = chunktaskqueuesorter.getReleaseProcessor(mailbox);
          this.mainThreadExecutor = mainThreadExecutor;
@@ -6087,7 +6088,7 @@ index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a8138
      }
  
      protected void purgeStaleTickets() {
-@@ -319,6 +321,12 @@ public abstract class DistanceManager {
+@@ -315,6 +317,12 @@ public abstract class DistanceManager {
          this.playerTicketManager.updateViewDistance(viewDistance);
      }
  
@@ -6100,7 +6101,7 @@ index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a8138
      public void updateSimulationDistance(int simulationDistance) {
          if (simulationDistance != this.simulationDistance) {
              this.simulationDistance = simulationDistance;
-@@ -382,7 +390,7 @@ public abstract class DistanceManager {
+@@ -378,7 +386,7 @@ public abstract class DistanceManager {
      }
  
      public void removeTicketsOnClosing() {
@@ -6110,7 +6111,7 @@ index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a8138
  
          while (objectiterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index b323b8329f534b7020dd595b8b15197c29939590..794ad2dbaea2555d4557124e9d942d3e6919ea09 100644
+index 2bc9afcd46f2d42e8bab1cf29defe53d00b2bc8b..07e1c75c0df7362ced6cffd125aec4fd553a9243 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -51,6 +51,7 @@ import net.minecraft.world.level.storage.LevelStorageSource;
@@ -6403,7 +6404,7 @@ index b323b8329f534b7020dd595b8b15197c29939590..794ad2dbaea2555d4557124e9d942d3e
      @Nullable
      @Override
      public ChunkAccess getChunk(int x, int z, ChunkStatus leastStatus, boolean create) {
-@@ -328,6 +597,12 @@ public class ServerChunkCache extends ChunkSource {
+@@ -329,6 +598,12 @@ public class ServerChunkCache extends ChunkSource {
          }
      }
  
@@ -6417,10 +6418,10 @@ index b323b8329f534b7020dd595b8b15197c29939590..794ad2dbaea2555d4557124e9d942d3e
          ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3bcbdf37ad9d76ec97ad3f20e7a683e267441ed9..aa164a81d072d9390fa1400120e801979e5d74d0 100644
+index ebae711991a3ae35e35c2cffa8d928677c205492..7be97441aed66fa3a21d13ad2211b3e0e08120c0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -173,6 +173,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
+@@ -176,6 +176,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
  import org.bukkit.event.world.GenericGameEvent;
  import org.bukkit.event.world.TimeSkipEvent;
  // CraftBukkit end
@@ -6428,7 +6429,7 @@ index 3bcbdf37ad9d76ec97ad3f20e7a683e267441ed9..aa164a81d072d9390fa1400120e80197
  
  public class ServerLevel extends Level implements WorldGenLevel {
  
-@@ -224,6 +225,98 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -228,6 +229,98 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return convertable.dimensionType;
      }
  
@@ -6525,10 +6526,10 @@ index 3bcbdf37ad9d76ec97ad3f20e7a683e267441ed9..aa164a81d072d9390fa1400120e80197
 +    // Paper end
 +
      // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
-     public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
+     public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
          // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fcc9aaa87b4092e838b6523e15347f01b38b8943..e8f748a7af40637b6aa5e0b032de909316e1161f 100644
+index e1a8dc23249c04de66289fbf157d349e7fae606d..931955a7f5b20f04350ec91b3bc95146e8e219a3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -255,6 +255,8 @@ public class ServerPlayer extends Player {
@@ -6540,7 +6541,7 @@ index fcc9aaa87b4092e838b6523e15347f01b38b8943..e8f748a7af40637b6aa5e0b032de9093
  
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
-@@ -320,6 +322,8 @@ public class ServerPlayer extends Player {
+@@ -319,6 +321,8 @@ public class ServerPlayer extends Player {
          this.setMaxUpStep(1.0F);
          this.fudgeSpawnLocation(world);
  
@@ -6593,7 +6594,7 @@ index a63d5ba706a5b8e430aedc045bdeb3a410bd0eef..e96a0ca47e4701ba187555bd92c96834
      public BlockState getBlockState(BlockPos pos) {
          return this.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ())).getBlockState(pos);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5ef84d53146de440e4eb14ba33bc4fb9885045b8..9909208363443a216cf689197f103d9e79119bbf 100644
+index ce4194ebecceec9a86f5f11873da41e1382646d1..c48318d9d5882dd87e423aecf27c31994af42bdb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -185,6 +185,7 @@ public abstract class PlayerList {
@@ -6603,7 +6604,7 @@ index 5ef84d53146de440e4eb14ba33bc4fb9885045b8..9909208363443a216cf689197f103d9e
 +        player.isRealPlayer = true; // Paper
          GameProfile gameprofile = player.getGameProfile();
          GameProfileCache usercache = this.server.getProfileCache();
-         Optional<GameProfile> optional = usercache.get(gameprofile.getId());
+         String s;
 diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
 index 337e0a7b3c14e1b1a28744920e0dc0a69e0c5a87..f5829ae484d93b547a5437b85a9621346384a11b 100644
 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
@@ -6623,10 +6624,10 @@ index 337e0a7b3c14e1b1a28744920e0dc0a69e0c5a87..f5829ae484d93b547a5437b85a962134
      @Override
      public void tell(R runnable) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3177b3b974b6a98d41bc9e57c75b49bf9584b17b..956c39b6d0c208366508f2064f7b98270eebaedc 100644
+index 10089634151125402123f75b756b5443b328362d..cde2df65bf2e33494c9e893d2c944c2e33f5419f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -319,6 +319,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -323,6 +323,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.level.hasChunk((int) Math.floor(this.getX()) >> 4, (int) Math.floor(this.getZ()) >> 4);
      }
      // CraftBukkit end
@@ -6639,10 +6640,10 @@ index 3177b3b974b6a98d41bc9e57c75b49bf9584b17b..956c39b6d0c208366508f2064f7b9827
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c0859f1ded9679e59b19313352fa474742653255..592e41884ffda0075ec16e5538d5004efeb80f78 100644
+index 34d9f71b9d23ec60494d8567af3cc5966d6a2525..0a070ff26a1e9b2583e95adac0b2dd85b567c8d1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -256,6 +256,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -259,6 +259,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public boolean collides = true;
      public Set<UUID> collidableExemptions = new HashSet<>();
      public boolean bukkitPickUpLoot;
@@ -6651,10 +6652,10 @@ index c0859f1ded9679e59b19313352fa474742653255..592e41884ffda0075ec16e5538d5004e
      @Override
      public float getBukkitYaw() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 1afd00e39bc5423d8bcce37a2caa4d6401c5b5e7..a290487b153a66a3e936ed1183f3c2ce343e59b1 100644
+index 7224ab24ea0e5806665ee1355b3d1ce64123fd29..c2c2c24a593f67abc1eec4a20ced1ec0b5fa8cad 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -272,6 +272,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -275,6 +275,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
          return this.target;
      }
  
@@ -6663,7 +6664,7 @@ index 1afd00e39bc5423d8bcce37a2caa4d6401c5b5e7..a290487b153a66a3e936ed1183f3c2ce
          // CraftBukkit start - fire event
          this.setTarget(target, EntityTargetEvent.TargetReason.UNKNOWN, true);
 diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-index fbe69ec9cded766c9b76ed4a1bcba6d4f49d6165..6ae3f5cd42dfd424fc3741957995f47ad5ec8941 100644
+index 9aa82c1d8743076e7737d5b0d14ea36687e87723..d8ce7ea5fcb2785435ec1f530cb6e7114c01e4b7 100644
 --- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 +++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 @@ -18,6 +18,8 @@ public abstract class PathfinderMob extends Mob {
@@ -6673,7 +6674,7 @@ index fbe69ec9cded766c9b76ed4a1bcba6d4f49d6165..6ae3f5cd42dfd424fc3741957995f47a
 +    public org.bukkit.craftbukkit.entity.CraftCreature getBukkitCreature() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper
 +
      public float getWalkTargetValue(BlockPos pos) {
-         return this.getWalkTargetValue(pos, this.level);
+         return this.getWalkTargetValue(pos, this.level());
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java
 index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292544e9f3c 100644
@@ -6688,10 +6689,10 @@ index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292
          super(type, world);
          this.xpReward = 5;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index fecfcd21647efa27c2fb82617070eed10574abc5..81f6b580873fdad106515c3fc619e2288d936ca3 100644
+index 3aa6636aec62b031e2449db7b1b844d2ee5e9a8d..70e663baefe90c06eca2033f07e7e85c6f27c97f 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -786,6 +786,25 @@ public final class ItemStack {
+@@ -788,6 +788,25 @@ public final class ItemStack {
          return this.tag != null ? this.tag.getList("Enchantments", 10) : new ListTag();
      }
  
@@ -6717,7 +6718,7 @@ index fecfcd21647efa27c2fb82617070eed10574abc5..81f6b580873fdad106515c3fc619e228
      public void setTag(@Nullable CompoundTag nbt) {
          this.tag = nbt;
          if (this.getItem().canBeDepleted()) {
-@@ -1176,6 +1195,7 @@ public final class ItemStack {
+@@ -1178,6 +1197,7 @@ public final class ItemStack {
      // CraftBukkit start
      @Deprecated
      public void setItem(Item item) {
@@ -6831,7 +6832,7 @@ index 3c707d6674b2594b09503b959a31c1f4ad3981e6..db61b6b0158a9bcc0e1d735e34fe3671
      public BlockState getBlockState(BlockPos pos) {
          return Blocks.AIR.defaultBlockState();
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd35264b015f4 100644
+index bacd4d875642cd93c3185f788745dd73a3cfde8a..003e2064f64115d1f5c48ac97e16100d4c10c5d7 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -90,6 +90,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -6842,7 +6843,7 @@ index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd352
  import org.bukkit.craftbukkit.block.data.CraftBlockData;
  import org.bukkit.craftbukkit.util.CraftSpawnCategory;
  import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-@@ -293,18 +294,52 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -292,18 +293,52 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return y < -20000000 || y >= 20000000;
      }
  
@@ -6899,7 +6900,7 @@ index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd352
          ChunkAccess ichunkaccess = this.getChunkSource().getChunk(chunkX, chunkZ, leastStatus, create);
  
          if (ichunkaccess == null && create) {
-@@ -315,7 +350,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -314,7 +349,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      @Override
@@ -6908,7 +6909,7 @@ index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd352
          return this.setBlock(pos, state, flags, 512);
      }
  
-@@ -559,7 +594,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -552,7 +587,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          if (this.isOutsideBuildHeight(pos)) {
              return Blocks.VOID_AIR.defaultBlockState();
          } else {
@@ -6918,17 +6919,18 @@ index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd352
              return chunk.getBlockState(pos);
          }
 diff --git a/src/main/java/net/minecraft/world/level/LevelReader.java b/src/main/java/net/minecraft/world/level/LevelReader.java
-index f5dbac0a13d23413dbdc48cfacc247ef25ef9444..7fe1b8856bf916796fa6d2a984f0a07a2331e23b 100644
+index e6aabec35f4e27623d1fbbfb285cc78531137014..fe76ec5b10242beb6d6057bd680484fc63b7eac3 100644
 --- a/src/main/java/net/minecraft/world/level/LevelReader.java
 +++ b/src/main/java/net/minecraft/world/level/LevelReader.java
-@@ -24,6 +24,7 @@ import net.minecraft.world.level.levelgen.Heightmap;
- import net.minecraft.world.phys.AABB;
- 
- public interface LevelReader extends BlockAndTintGetter, CollisionGetter, BiomeManager.NoiseBiomeSource {
-+    @Nullable ChunkAccess getChunkIfLoadedImmediately(int x, int z); // Paper - ifLoaded api (we need this since current impl blocks if the chunk is loading)
+@@ -26,6 +26,8 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, Signal
      @Nullable
      ChunkAccess getChunk(int chunkX, int chunkZ, ChunkStatus leastStatus, boolean create);
  
++    @Nullable ChunkAccess getChunkIfLoadedImmediately(int x, int z); // Paper - ifLoaded api (we need this since current impl blocks if the chunk is loading)
++
+     /** @deprecated */
+     @Deprecated
+     boolean hasChunk(int chunkX, int chunkZ);
 diff --git a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java
 index 249b3ed33672a9a9529bd14de978722b62019314..0f1025495237aebe30132ace0832aa5718d6f9bb 100644
 --- a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java
@@ -6982,10 +6984,10 @@ index 249b3ed33672a9a9529bd14de978722b62019314..0f1025495237aebe30132ace0832aa57
      public WorldBorder getWorldBorder() {
          return this.level.getWorldBorder();
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741d18910ca 100644
+index ccb3ceddd8f60f59473cd24d6ca5282f6e51f630..88b1aabec2812252c54d0901ccd1eba0216cb7c3 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -711,14 +711,14 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -754,8 +754,8 @@ public abstract class BlockBehaviour implements FeatureElement {
  
      public abstract static class BlockStateBase extends StateHolder<Block, BlockState> {
  
@@ -6994,8 +6996,10 @@ index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741
 +        private final int lightEmission; public final int getEmittedLight() { return this.lightEmission; } // Paper - OBFHELPER
 +        private final boolean useShapeForLightOcclusion; public final boolean isTransparentOnSomeFaces() { return this.useShapeForLightOcclusion; } // Paper - OBFHELPER
          private final boolean isAir;
-         private final Material material;
-         private final MaterialColor materialColor;
+         private final boolean ignitedByLava;
+         /** @deprecated */
+@@ -768,7 +768,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+         private final MapColor mapColor;
          public final float destroySpeed;
          private final boolean requiresCorrectToolForDrops;
 -        private final boolean canOcclude;
@@ -7003,8 +7007,8 @@ index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741
          private final BlockBehaviour.StatePredicate isRedstoneConductor;
          private final BlockBehaviour.StatePredicate isSuffocating;
          private final BlockBehaviour.StatePredicate isViewBlocking;
-@@ -753,12 +753,20 @@ public abstract class BlockBehaviour implements FeatureElement {
-             this.spawnParticlesOnBreak = blockbase_info.spawnParticlesOnBreak;
+@@ -829,12 +829,20 @@ public abstract class BlockBehaviour implements FeatureElement {
+             }
          }
  
 +        // Paper start
@@ -7022,9 +7026,9 @@ index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741
              }
 +            this.shapeExceedsCube = this.cache == null || this.cache.largeCollisionShape; // Paper - moved from actual method to here
  
+             this.legacySolid = this.calculateSolid();
          }
- 
-@@ -794,8 +802,8 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -881,8 +889,8 @@ public abstract class BlockBehaviour implements FeatureElement {
              return this.getBlock().getOcclusionShape(this.asState(), world, pos);
          }
  
@@ -7036,10 +7040,10 @@ index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741
  
          public boolean useShapeForLightOcclusion() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-index db6a64ae4437b76c39e7ddb02adbea27c95fde78..3fdbb777d4722596cc4df79b2d4d7b9c553580fd 100644
+index 532a0cae6db0d830e720a72e9021aa7a8ed0f106..e5e562f75e7d4b6a750f192842940c5e3af81e7d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-@@ -58,7 +58,7 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
+@@ -62,7 +62,7 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
      protected final ShortList[] postProcessing;
      protected volatile boolean unsaved;
      private volatile boolean isLightCorrect;
@@ -7048,10 +7052,10 @@ index db6a64ae4437b76c39e7ddb02adbea27c95fde78..3fdbb777d4722596cc4df79b2d4d7b9c
      private long inhabitedTime;
      /** @deprecated */
      @Nullable
-@@ -83,7 +83,8 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
+@@ -88,7 +88,8 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
      // CraftBukkit end
  
-     public ChunkAccess(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry<Biome> biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) {
+     public ChunkAccess(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry<Biome> biomeRegistry, long inhabitedTime, @Nullable LevelChunkSection[] sectionArray, @Nullable BlendingData blendingData) {
 -        this.chunkPos = pos;
 +        this.locX = pos.x; this.locZ = pos.z; // Paper - reduce need for field lookups
 +        this.chunkPos = pos; this.coordinateKey = ChunkPos.asLong(locX, locZ); // Paper - cache long key
@@ -7059,18 +7063,10 @@ index db6a64ae4437b76c39e7ddb02adbea27c95fde78..3fdbb777d4722596cc4df79b2d4d7b9c
          this.levelHeightAccessor = heightLimitView;
          this.sections = new LevelChunkSection[heightLimitView.getSectionsCount()];
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871f88528d4 100644
+index 36c3a06a94177ec21cfc5c513d16f7168fe2fe2c..5aa89166e854136f366eb36ff02a37ae9ba77ab1 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -25,6 +25,7 @@ import net.minecraft.nbt.CompoundTag;
- import net.minecraft.network.FriendlyByteBuf;
- import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
- import net.minecraft.server.level.ChunkHolder;
-+import net.minecraft.server.level.ServerChunkCache;
- import net.minecraft.server.level.ServerLevel;
- import net.minecraft.util.profiling.ProfilerFiller;
- import net.minecraft.world.entity.Entity;
-@@ -117,6 +118,109 @@ public class LevelChunk extends ChunkAccess {
+@@ -114,6 +114,109 @@ public class LevelChunk extends ChunkAccess {
      public boolean needsDecoration;
      // CraftBukkit end
  
@@ -7180,7 +7176,7 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871
      public LevelChunk(ServerLevel world, ProtoChunk protoChunk, @Nullable LevelChunk.PostLoadProcessor entityLoader) {
          this(world, protoChunk.getPos(), protoChunk.getUpgradeData(), protoChunk.unpackBlockTicks(), protoChunk.unpackFluidTicks(), protoChunk.getInhabitedTime(), protoChunk.getSections(), entityLoader, protoChunk.getBlendingData());
          Iterator iterator = protoChunk.getBlockEntities().values().iterator();
-@@ -226,6 +330,18 @@ public class LevelChunk extends ChunkAccess {
+@@ -224,6 +327,18 @@ public class LevelChunk extends ChunkAccess {
          }
      }
  
@@ -7199,7 +7195,7 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871
      @Override
      public FluidState getFluidState(BlockPos pos) {
          return this.getFluidState(pos.getX(), pos.getY(), pos.getZ());
-@@ -347,6 +463,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -355,6 +470,7 @@ public class LevelChunk extends ChunkAccess {
          return this.getBlockEntity(pos, LevelChunk.EntityCreationType.CHECK);
      }
  
@@ -7207,14 +7203,14 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871
      @Nullable
      public BlockEntity getBlockEntity(BlockPos pos, LevelChunk.EntityCreationType creationType) {
          // CraftBukkit start
-@@ -528,7 +645,25 @@ public class LevelChunk extends ChunkAccess {
+@@ -537,7 +653,25 @@ public class LevelChunk extends ChunkAccess {
  
      // CraftBukkit start
      public void loadCallback() {
 +        // Paper start - neighbour cache
 +        int chunkX = this.chunkPos.x;
 +        int chunkZ = this.chunkPos.z;
-+        ServerChunkCache chunkProvider = this.level.getChunkSource();
++        net.minecraft.server.level.ServerChunkCache chunkProvider = this.level.getChunkSource();
 +        for (int dx = -NEIGHBOUR_CACHE_RADIUS; dx <= NEIGHBOUR_CACHE_RADIUS; ++dx) {
 +            for (int dz = -NEIGHBOUR_CACHE_RADIUS; dz <= NEIGHBOUR_CACHE_RADIUS; ++dz) {
 +                LevelChunk neighbour = chunkProvider.getChunkAtIfLoadedMainThreadNoCache(chunkX + dx, chunkZ + dz);
@@ -7233,7 +7229,7 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871
          if (server != null) {
              /*
               * If it's a new world, the first few chunks are generated inside
-@@ -569,6 +704,22 @@ public class LevelChunk extends ChunkAccess {
+@@ -578,6 +712,22 @@ public class LevelChunk extends ChunkAccess {
          server.getPluginManager().callEvent(unloadEvent);
          // note: saving can be prevented, but not forced if no saving is actually required
          this.mustNotSave = !unloadEvent.isSaveChunk();
@@ -7241,7 +7237,7 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871
 +        // Paper start - neighbour cache
 +        int chunkX = this.chunkPos.x;
 +        int chunkZ = this.chunkPos.z;
-+        ServerChunkCache chunkProvider = this.level.getChunkSource();
++        net.minecraft.server.level.ServerChunkCache chunkProvider = this.level.getChunkSource();
 +        for (int dx = -NEIGHBOUR_CACHE_RADIUS; dx <= NEIGHBOUR_CACHE_RADIUS; ++dx) {
 +            for (int dz = -NEIGHBOUR_CACHE_RADIUS; dz <= NEIGHBOUR_CACHE_RADIUS; ++dz) {
 +                LevelChunk neighbour = chunkProvider.getChunkAtIfLoadedMainThreadNoCache(chunkX + dx, chunkZ + dz);
@@ -7257,10 +7253,10 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-index cb4e43177a735442fa2adda8640263bca8cdcb64..92a64c49b1c7227a5b34488ea15d3d8adb0f9c80 100644
+index 51a0ddcee9a9cb1040fda643a6442d2e2e15b8a0..38ec21faaa16df5485a81a581506700a5ab0a440 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-@@ -74,6 +74,18 @@ public class ProtoChunk extends ChunkAccess {
+@@ -72,6 +72,18 @@ public class ProtoChunk extends ChunkAccess {
          return new ChunkAccess.TicksToSave(this.blockTicks, this.fluidTicks);
      }
  
@@ -7280,7 +7276,7 @@ index cb4e43177a735442fa2adda8640263bca8cdcb64..92a64c49b1c7227a5b34488ea15d3d8a
      public BlockState getBlockState(BlockPos pos) {
          int i = pos.getY();
 diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
-index f66369ddaeab5c5ac643c0979dac3ed21337ff71..038abf2ac104ceecaab11b10d466ea69ec86623e 100644
+index 25156be63f91a1c41ef41154f675d04eb97459a8..ace46eec77b30aee6024e19fec9e50f363da162a 100644
 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 @@ -90,6 +90,18 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
@@ -7303,7 +7299,7 @@ index f66369ddaeab5c5ac643c0979dac3ed21337ff71..038abf2ac104ceecaab11b10d466ea69
              return false;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fa2872042a6ee6b5e865c50b3f8eabab3e7d6a46..e75f3d6f0c14f49cb828e919e12d0f69c898d46f 100644
+index e729db7818024842925dcf28cca063098a393984..c8a035d396a56e3f4c437c5524e8e67a946b1674 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -243,8 +243,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -7360,7 +7356,7 @@ index fa2872042a6ee6b5e865c50b3f8eabab3e7d6a46..e75f3d6f0c14f49cb828e919e12d0f69
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a3d5c050ad73697573970e3a4db72845671de9c8..cf9bbc1334a151dfd96be91e6f2cf3cb9afd9384 100644
+index 2c824ead41389bc7d2085536ecb8d0d2b6515ddb..6807507017bbb171657ba230223f281b083da28a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1182,4 +1182,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -7624,7 +7620,7 @@ index 0000000000000000000000000000000000000000..909b2c98e7a9117d2f737245e4661792
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 8d8f76feea13c2daeef310a572dec8f75f0f6103..3c41b9d3d7bdb0b2657eeb337499dfcca5ec4068 100644
+index 141f7c287252ae319e88d8c279e5661524baa1bf..381cfd86fc1158dc9a7c1e76c3ada962b0964373 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -104,8 +104,17 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0010-Adventure.patch b/patches/unapplied/server/0010-Adventure.patch
index 4d97b5b649..4d97b5b649 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/unapplied/server/0010-Adventure.patch
diff --git a/patches/server/0011-Paper-command.patch b/patches/unapplied/server/0011-Paper-command.patch
index 749ce4916f..749ce4916f 100644
--- a/patches/server/0011-Paper-command.patch
+++ b/patches/unapplied/server/0011-Paper-command.patch
diff --git a/patches/server/0012-Paper-Metrics.patch b/patches/unapplied/server/0012-Paper-Metrics.patch
index a9c188207e..a9c188207e 100644
--- a/patches/server/0012-Paper-Metrics.patch
+++ b/patches/unapplied/server/0012-Paper-Metrics.patch
diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/unapplied/server/0013-Paper-Plugins.patch
index b3e48e233f..b3e48e233f 100644
--- a/patches/server/0013-Paper-Plugins.patch
+++ b/patches/unapplied/server/0013-Paper-Plugins.patch
diff --git a/patches/server/0014-Timings-v2.patch b/patches/unapplied/server/0014-Timings-v2.patch
index f6323f63c3..f6323f63c3 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/unapplied/server/0014-Timings-v2.patch
diff --git a/patches/server/0015-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0015-Rewrite-dataconverter-system.patch
index 66028568bf..66028568bf 100644
--- a/patches/server/0015-Rewrite-dataconverter-system.patch
+++ b/patches/unapplied/server/0015-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0016-Starlight.patch b/patches/unapplied/server/0016-Starlight.patch
index 6a81c4dc2a..6a81c4dc2a 100644
--- a/patches/server/0016-Starlight.patch
+++ b/patches/unapplied/server/0016-Starlight.patch
diff --git a/patches/server/0017-Add-TickThread.patch b/patches/unapplied/server/0017-Add-TickThread.patch
index 462a214912..462a214912 100644
--- a/patches/server/0017-Add-TickThread.patch
+++ b/patches/unapplied/server/0017-Add-TickThread.patch
diff --git a/patches/server/0018-Rewrite-chunk-system.patch b/patches/unapplied/server/0018-Rewrite-chunk-system.patch
index 4480292070..4480292070 100644
--- a/patches/server/0018-Rewrite-chunk-system.patch
+++ b/patches/unapplied/server/0018-Rewrite-chunk-system.patch
diff --git a/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index baa3e386df..baa3e386df 100644
--- a/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch
index 11ae2153e0..11ae2153e0 100644
--- a/patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch
+++ b/patches/unapplied/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0021-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0021-Configurable-baby-zombie-movement-speed.patch
index 7b0cc4765a..7b0cc4765a 100644
--- a/patches/server/0021-Configurable-baby-zombie-movement-speed.patch
+++ b/patches/unapplied/server/0021-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0022-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0022-Configurable-fishing-time-ranges.patch
index e0fa197128..e0fa197128 100644
--- a/patches/server/0022-Configurable-fishing-time-ranges.patch
+++ b/patches/unapplied/server/0022-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
index d4c8f5b2f9..d4c8f5b2f9 100644
--- a/patches/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
+++ b/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
diff --git a/patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch
index 6eebfac0de..6eebfac0de 100644
--- a/patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch
diff --git a/patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0025-Allow-for-toggling-of-spawn-chunks.patch
index 1264d36158..1264d36158 100644
--- a/patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch
+++ b/patches/unapplied/server/0025-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 411a92ee08..411a92ee08 100644
--- a/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 5cbdc9847d..5cbdc9847d 100644
--- a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
diff --git a/patches/server/0028-Implement-Paper-VersionChecker.patch b/patches/unapplied/server/0028-Implement-Paper-VersionChecker.patch
index 093d770192..093d770192 100644
--- a/patches/server/0028-Implement-Paper-VersionChecker.patch
+++ b/patches/unapplied/server/0028-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0029-Add-version-history-to-version-command.patch b/patches/unapplied/server/0029-Add-version-history-to-version-command.patch
index a2b3a140fd..a2b3a140fd 100644
--- a/patches/server/0029-Add-version-history-to-version-command.patch
+++ b/patches/unapplied/server/0029-Add-version-history-to-version-command.patch
diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/unapplied/server/0030-Player-affects-spawning-API.patch
index a2d8b6f9a7..a2d8b6f9a7 100644
--- a/patches/server/0030-Player-affects-spawning-API.patch
+++ b/patches/unapplied/server/0030-Player-affects-spawning-API.patch
diff --git a/patches/server/0031-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0031-Further-improve-server-tick-loop.patch
index eb933e0675..eb933e0675 100644
--- a/patches/server/0031-Further-improve-server-tick-loop.patch
+++ b/patches/unapplied/server/0031-Further-improve-server-tick-loop.patch
diff --git a/patches/server/0032-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0032-Only-refresh-abilities-if-needed.patch
index 8a6cfeb628..8a6cfeb628 100644
--- a/patches/server/0032-Only-refresh-abilities-if-needed.patch
+++ b/patches/unapplied/server/0032-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0033-Entity-Origin-API.patch b/patches/unapplied/server/0033-Entity-Origin-API.patch
index 0d17921bed..0d17921bed 100644
--- a/patches/server/0033-Entity-Origin-API.patch
+++ b/patches/unapplied/server/0033-Entity-Origin-API.patch
diff --git a/patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/0034-Prevent-tile-entity-and-entity-crashes.patch
index c6ee88b9e7..c6ee88b9e7 100644
--- a/patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/unapplied/server/0034-Prevent-tile-entity-and-entity-crashes.patch
diff --git a/patches/server/0035-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0035-Configurable-top-of-nether-void-damage.patch
index d06d473f2c..d06d473f2c 100644
--- a/patches/server/0035-Configurable-top-of-nether-void-damage.patch
+++ b/patches/unapplied/server/0035-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch
index 0bdc8c4d4c..0bdc8c4d4c 100644
--- a/patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/unapplied/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0037-Always-tick-falling-blocks.patch b/patches/unapplied/server/0037-Always-tick-falling-blocks.patch
index 39f37a0fd0..39f37a0fd0 100644
--- a/patches/server/0037-Always-tick-falling-blocks.patch
+++ b/patches/unapplied/server/0037-Always-tick-falling-blocks.patch
diff --git a/patches/server/0038-Configurable-end-credits.patch b/patches/unapplied/server/0038-Configurable-end-credits.patch
index 21f1d38435..21f1d38435 100644
--- a/patches/server/0038-Configurable-end-credits.patch
+++ b/patches/unapplied/server/0038-Configurable-end-credits.patch
diff --git a/patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch
index eeb8a45109..eeb8a45109 100644
--- a/patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/unapplied/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0040-Optimize-explosions.patch b/patches/unapplied/server/0040-Optimize-explosions.patch
index 8c280d9053..8c280d9053 100644
--- a/patches/server/0040-Optimize-explosions.patch
+++ b/patches/unapplied/server/0040-Optimize-explosions.patch
diff --git a/patches/server/0041-Disable-explosion-knockback.patch b/patches/unapplied/server/0041-Disable-explosion-knockback.patch
index aef40b8672..aef40b8672 100644
--- a/patches/server/0041-Disable-explosion-knockback.patch
+++ b/patches/unapplied/server/0041-Disable-explosion-knockback.patch
diff --git a/patches/server/0042-Disable-thunder.patch b/patches/unapplied/server/0042-Disable-thunder.patch
index 392dc2a741..392dc2a741 100644
--- a/patches/server/0042-Disable-thunder.patch
+++ b/patches/unapplied/server/0042-Disable-thunder.patch
diff --git a/patches/server/0043-Disable-ice-and-snow.patch b/patches/unapplied/server/0043-Disable-ice-and-snow.patch
index 923a36155e..923a36155e 100644
--- a/patches/server/0043-Disable-ice-and-snow.patch
+++ b/patches/unapplied/server/0043-Disable-ice-and-snow.patch
diff --git a/patches/server/0044-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch
index 3d56a5f489..3d56a5f489 100644
--- a/patches/server/0044-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/0045-Implement-PlayerLocaleChangeEvent.patch
index fc5846b32e..fc5846b32e 100644
--- a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/unapplied/server/0045-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0046-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0046-Add-BeaconEffectEvent.patch
index ea3de2967b..ea3de2967b 100644
--- a/patches/server/0046-Add-BeaconEffectEvent.patch
+++ b/patches/unapplied/server/0046-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0047-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch
index 22da87ba81..22da87ba81 100644
--- a/patches/server/0047-Configurable-container-update-tick-rate.patch
+++ b/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch
diff --git a/patches/server/0048-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0048-Use-UserCache-for-player-heads.patch
index 9754d03580..9754d03580 100644
--- a/patches/server/0048-Use-UserCache-for-player-heads.patch
+++ b/patches/unapplied/server/0048-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0049-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0049-Disable-spigot-tick-limiters.patch
index 2a0a638193..2a0a638193 100644
--- a/patches/server/0049-Disable-spigot-tick-limiters.patch
+++ b/patches/unapplied/server/0049-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0050-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch
index f3e83ec3a2..f3e83ec3a2 100644
--- a/patches/server/0050-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch
index 41b3c127bd..41b3c127bd 100644
--- a/patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/unapplied/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0052-Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/0052-Ensure-commands-are-not-ran-async.patch
index a83f936b2c..a83f936b2c 100644
--- a/patches/server/0052-Ensure-commands-are-not-ran-async.patch
+++ b/patches/unapplied/server/0052-Ensure-commands-are-not-ran-async.patch
diff --git a/patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch
index 2497cf2367..2497cf2367 100644
--- a/patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/unapplied/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0054-Expose-server-CommandMap.patch b/patches/unapplied/server/0054-Expose-server-CommandMap.patch
index e85a87473c..e85a87473c 100644
--- a/patches/server/0054-Expose-server-CommandMap.patch
+++ b/patches/unapplied/server/0054-Expose-server-CommandMap.patch
diff --git a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 59b0315e79..59b0315e79 100644
--- a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch
index 5d66ceedc0..5d66ceedc0 100644
--- a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/server/0057-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch
index dc3426b46b..dc3426b46b 100644
--- a/patches/server/0057-Add-configurable-portal-search-radius.patch
+++ b/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0058-Add-velocity-warnings.patch b/patches/unapplied/server/0058-Add-velocity-warnings.patch
index a433e4e7c8..a433e4e7c8 100644
--- a/patches/server/0058-Add-velocity-warnings.patch
+++ b/patches/unapplied/server/0058-Add-velocity-warnings.patch
diff --git a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch
index 05975c8bfb..05975c8bfb 100644
--- a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0060-Add-exception-reporting-event.patch b/patches/unapplied/server/0060-Add-exception-reporting-event.patch
index bb47a3a6ac..bb47a3a6ac 100644
--- a/patches/server/0060-Add-exception-reporting-event.patch
+++ b/patches/unapplied/server/0060-Add-exception-reporting-event.patch
diff --git a/patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 2150c56cd7..2150c56cd7 100644
--- a/patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/patches/unapplied/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
index 39d2e64cff..39d2e64cff 100644
--- a/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index ea0e8d4bb9..ea0e8d4bb9 100644
--- a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/unapplied/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0064-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0064-Chunk-Save-Reattempt.patch
index d58537d3da..d58537d3da 100644
--- a/patches/server/0064-Chunk-Save-Reattempt.patch
+++ b/patches/unapplied/server/0064-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0065-Complete-resource-pack-API.patch b/patches/unapplied/server/0065-Complete-resource-pack-API.patch
index cb2efb14cc..cb2efb14cc 100644
--- a/patches/server/0065-Complete-resource-pack-API.patch
+++ b/patches/unapplied/server/0065-Complete-resource-pack-API.patch
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 b7b8b809eb..b7b8b809eb 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 dc71963571..dc71963571 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 79989a5374..79989a5374 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 d9e8b7e6d6..d9e8b7e6d6 100644
--- a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/unapplied/server/0069-Handle-Item-Meta-Inconsistencies.patch
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 993acf56fe..993acf56fe 100644
--- a/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/unapplied/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0071-Add-World-Util-Methods.patch b/patches/unapplied/server/0071-Add-World-Util-Methods.patch
index 414debe431..414debe431 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 bf79bf3bb6..bf79bf3bb6 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 f81b89e692..f81b89e692 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
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 ea6f2b94ba..ea6f2b94ba 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 074c8554fb..074c8554fb 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-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 7110c30c68..7110c30c68 100644
--- a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/unapplied/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index b8c43379ee..b8c43379ee 100644
--- a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/unapplied/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch
index b9dcdea640..b9dcdea640 100644
--- a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/unapplied/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0079-Configurable-Chunk-Inhabited-Time.patch
index 93cf642499..93cf642499 100644
--- a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/unapplied/server/0079-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0080-EntityPathfindEvent.patch b/patches/unapplied/server/0080-EntityPathfindEvent.patch
index cd96ad1e9e..cd96ad1e9e 100644
--- a/patches/server/0080-EntityPathfindEvent.patch
+++ b/patches/unapplied/server/0080-EntityPathfindEvent.patch
diff --git a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch
index 07739b0f45..07739b0f45 100644
--- a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/unapplied/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0082-Do-not-load-chunks-for-Pathfinding.patch
index a19d0d7dcb..a19d0d7dcb 100644
--- a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/unapplied/server/0082-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0083-Add-PlayerUseUnknownEntityEvent.patch
index 5cf35701ac..5cf35701ac 100644
--- a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/server/0083-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/0084-Configurable-Grass-Spread-Tick-Rate.patch
index 50a9c78703..50a9c78703 100644
--- a/patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/patches/unapplied/server/0084-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index f7a4a906f9..f7a4a906f9 100644
--- a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/unapplied/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0086-Optimize-DataBits.patch b/patches/unapplied/server/0086-Optimize-DataBits.patch
index 8686b1aff9..8686b1aff9 100644
--- a/patches/server/0086-Optimize-DataBits.patch
+++ b/patches/unapplied/server/0086-Optimize-DataBits.patch
diff --git a/patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 42f678c2d9..42f678c2d9 100644
--- a/patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/unapplied/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/unapplied/server/0088-Configurable-Player-Collision.patch
index 3f96fec8e0..3f96fec8e0 100644
--- a/patches/server/0088-Configurable-Player-Collision.patch
+++ b/patches/unapplied/server/0088-Configurable-Player-Collision.patch
diff --git a/patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index cbef416185..cbef416185 100644
--- a/patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0090-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0090-Configurable-RCON-IP-address.patch
index c3060e2f21..c3060e2f21 100644
--- a/patches/server/0090-Configurable-RCON-IP-address.patch
+++ b/patches/unapplied/server/0090-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
index 90d91897a0..90d91897a0 100644
--- a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0092-Add-ability-to-configure-frosted_ice-properties.patch
index 8e938c31ad..8e938c31ad 100644
--- a/patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/unapplied/server/0092-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0093-remove-null-possibility-for-getServer-singleton.patch
index ab152eca5e..ab152eca5e 100644
--- a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/unapplied/server/0093-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 2e4501d600..2e4501d600 100644
--- a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/unapplied/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch
index 18a5705aa7..18a5705aa7 100644
--- a/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/unapplied/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch
diff --git a/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index c233fb2657..c233fb2657 100644
--- a/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/unapplied/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0097-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0097-System-property-for-disabling-watchdoge.patch
index 65be04b57b..65be04b57b 100644
--- a/patches/server/0097-System-property-for-disabling-watchdoge.patch
+++ b/patches/unapplied/server/0097-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0098-Async-GameProfileCache-saving.patch b/patches/unapplied/server/0098-Async-GameProfileCache-saving.patch
index 2ebbf5fce7..2ebbf5fce7 100644
--- a/patches/server/0098-Async-GameProfileCache-saving.patch
+++ b/patches/unapplied/server/0098-Async-GameProfileCache-saving.patch
diff --git a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0099-Optional-TNT-doesn-t-move-in-water.patch
index c5141bc0af..c5141bc0af 100644
--- a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/unapplied/server/0099-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0100-Faster-redstone-torch-rapid-clock-removal.patch
index 85d53edff4..85d53edff4 100644
--- a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/unapplied/server/0100-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0101-Add-server-name-parameter.patch b/patches/unapplied/server/0101-Add-server-name-parameter.patch
index f2e3b715a9..f2e3b715a9 100644
--- a/patches/server/0101-Add-server-name-parameter.patch
+++ b/patches/unapplied/server/0101-Add-server-name-parameter.patch
diff --git a/patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/unapplied/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
index 7808ba83d9..7808ba83d9 100644
--- a/patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
+++ b/patches/unapplied/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
diff --git a/patches/server/0103-Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/0103-Fix-Old-Sign-Conversion.patch
index 3fbfa6af5a..3fbfa6af5a 100644
--- a/patches/server/0103-Fix-Old-Sign-Conversion.patch
+++ b/patches/unapplied/server/0103-Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
index 6b2244d6ee..6b2244d6ee 100644
--- a/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/unapplied/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 1e05976371..1e05976371 100644
--- a/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/unapplied/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0106-Add-setting-for-proxy-online-mode-status.patch
index d7f2c9730c..d7f2c9730c 100644
--- a/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/unapplied/server/0106-Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0107-Optimise-BlockState-s-hashCode-equals.patch
index 25c77d7328..25c77d7328 100644
--- a/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/unapplied/server/0107-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0108-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch
index 6bb43dba02..6bb43dba02 100644
--- a/patches/server/0108-Configurable-packet-in-spam-threshold.patch
+++ b/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/0109-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch
index c390ccb293..c390ccb293 100644
--- a/patches/server/0109-Configurable-flying-kick-messages.patch
+++ b/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch
diff --git a/patches/server/0110-Add-EntityZapEvent.patch b/patches/unapplied/server/0110-Add-EntityZapEvent.patch
index 5659e3e59d..5659e3e59d 100644
--- a/patches/server/0110-Add-EntityZapEvent.patch
+++ b/patches/unapplied/server/0110-Add-EntityZapEvent.patch
diff --git a/patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch b/patches/unapplied/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
index 97e3512461..97e3512461 100644
--- a/patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
+++ b/patches/unapplied/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0112-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0112-Cache-user-authenticator-threads.patch
index f213709d7c..f213709d7c 100644
--- a/patches/server/0112-Cache-user-authenticator-threads.patch
+++ b/patches/unapplied/server/0112-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0113-Allow-Reloading-of-Command-Aliases.patch
index 374e5cfdad..374e5cfdad 100644
--- a/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/server/0113-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0114-Add-source-to-PlayerExpChangeEvent.patch
index 3c14c471ea..3c14c471ea 100644
--- a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/server/0114-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0115-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch
index 4b25053508..4b25053508 100644
--- a/patches/server/0115-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
index ab2c4ff13d..ab2c4ff13d 100644
--- a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
index 294953144f..294953144f 100644
--- a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch
index ebccf361c8..ebccf361c8 100644
--- a/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch
index bd827dfdda..bd827dfdda 100644
--- a/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0120-Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/0120-Optimize-ItemStack.isEmpty.patch
index f08ead4616..f08ead4616 100644
--- a/patches/server/0120-Optimize-ItemStack.isEmpty.patch
+++ b/patches/unapplied/server/0120-Optimize-ItemStack.isEmpty.patch
diff --git a/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
index cf45718015..cf45718015 100644
--- a/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/unapplied/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0122-String-based-Action-Bar-API.patch b/patches/unapplied/server/0122-String-based-Action-Bar-API.patch
index e9f2445fe9..e9f2445fe9 100644
--- a/patches/server/0122-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/server/0122-String-based-Action-Bar-API.patch
diff --git a/patches/server/0123-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0123-Properly-fix-item-duplication-bug.patch
index e374d16f4e..e374d16f4e 100644
--- a/patches/server/0123-Properly-fix-item-duplication-bug.patch
+++ b/patches/unapplied/server/0123-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0124-Firework-API-s.patch b/patches/unapplied/server/0124-Firework-API-s.patch
index 1b23b10a05..1b23b10a05 100644
--- a/patches/server/0124-Firework-API-s.patch
+++ b/patches/unapplied/server/0124-Firework-API-s.patch
diff --git a/patches/server/0125-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0125-PlayerTeleportEndGatewayEvent.patch
index 98163ff384..98163ff384 100644
--- a/patches/server/0125-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0125-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
index 1470d48e7a..1470d48e7a 100644
--- a/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0127-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0127-Enforce-Sync-Player-Saves.patch
index 309ffb9171..309ffb9171 100644
--- a/patches/server/0127-Enforce-Sync-Player-Saves.patch
+++ b/patches/unapplied/server/0127-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
index bd6c93d1d0..bd6c93d1d0 100644
--- a/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/patches/unapplied/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 4d3809cf68..4d3809cf68 100644
--- a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0130-Cap-Entity-Collisions.patch b/patches/unapplied/server/0130-Cap-Entity-Collisions.patch
index 53286bcb9f..53286bcb9f 100644
--- a/patches/server/0130-Cap-Entity-Collisions.patch
+++ b/patches/unapplied/server/0130-Cap-Entity-Collisions.patch
diff --git a/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
index eacad1fb97..eacad1fb97 100644
--- a/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/unapplied/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0132-Do-not-let-armorstands-drown.patch b/patches/unapplied/server/0132-Do-not-let-armorstands-drown.patch
index d2dc0bd607..d2dc0bd607 100644
--- a/patches/server/0132-Do-not-let-armorstands-drown.patch
+++ b/patches/unapplied/server/0132-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0133-Properly-handle-async-calls-to-restart-the-server.patch
index 4274290956..4274290956 100644
--- a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/unapplied/server/0133-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index a65f274b48..a65f274b48 100644
--- a/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/unapplied/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch
index 51190e133a..51190e133a 100644
--- a/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch
index e01b91b795..e01b91b795 100644
--- a/patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/unapplied/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch
diff --git a/patches/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch
index 483f0ef3b7..483f0ef3b7 100644
--- a/patches/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/unapplied/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0138-Item-canEntityPickup.patch b/patches/unapplied/server/0138-Item-canEntityPickup.patch
index 35734d9354..35734d9354 100644
--- a/patches/server/0138-Item-canEntityPickup.patch
+++ b/patches/unapplied/server/0138-Item-canEntityPickup.patch
diff --git a/patches/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 7524649eeb..7524649eeb 100644
--- a/patches/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/unapplied/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0140-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0140-PlayerAttemptPickupItemEvent.patch
index 98a493034a..98a493034a 100644
--- a/patches/server/0140-PlayerAttemptPickupItemEvent.patch
+++ b/patches/unapplied/server/0140-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 92fd8128c8..92fd8128c8 100644
--- a/patches/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/unapplied/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0142-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0142-Add-UnknownCommandEvent.patch
index 4364eca8ac..4364eca8ac 100644
--- a/patches/server/0142-Add-UnknownCommandEvent.patch
+++ b/patches/unapplied/server/0142-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0143-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0143-Basic-PlayerProfile-API.patch
index bbce10793b..bbce10793b 100644
--- a/patches/server/0143-Basic-PlayerProfile-API.patch
+++ b/patches/unapplied/server/0143-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0144-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0144-Shoulder-Entities-Release-API.patch
index 8e5dfce6ac..8e5dfce6ac 100644
--- a/patches/server/0144-Shoulder-Entities-Release-API.patch
+++ b/patches/unapplied/server/0144-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0145-Profile-Lookup-Events.patch b/patches/unapplied/server/0145-Profile-Lookup-Events.patch
index a9a4210f19..a9a4210f19 100644
--- a/patches/server/0145-Profile-Lookup-Events.patch
+++ b/patches/unapplied/server/0145-Profile-Lookup-Events.patch
diff --git a/patches/server/0146-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0146-Block-player-logins-during-server-shutdown.patch
index e99c14fc18..e99c14fc18 100644
--- a/patches/server/0146-Block-player-logins-during-server-shutdown.patch
+++ b/patches/unapplied/server/0146-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0147-Entity-fromMobSpawner.patch b/patches/unapplied/server/0147-Entity-fromMobSpawner.patch
index 8496bc863f..8496bc863f 100644
--- a/patches/server/0147-Entity-fromMobSpawner.patch
+++ b/patches/unapplied/server/0147-Entity-fromMobSpawner.patch
diff --git a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0148-Improve-the-Saddle-API-for-Horses.patch
index ccd3b7baf4..ccd3b7baf4 100644
--- a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/unapplied/server/0148-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0149-Implement-ensureServerConversions-API.patch b/patches/unapplied/server/0149-Implement-ensureServerConversions-API.patch
index 4cc502c4d4..4cc502c4d4 100644
--- a/patches/server/0149-Implement-ensureServerConversions-API.patch
+++ b/patches/unapplied/server/0149-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0150-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0150-Implement-getI18NDisplayName.patch
index 16b68e5a8e..16b68e5a8e 100644
--- a/patches/server/0150-Implement-getI18NDisplayName.patch
+++ b/patches/unapplied/server/0150-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0151-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0151-ProfileWhitelistVerifyEvent.patch
index bdffadff3e..bdffadff3e 100644
--- a/patches/server/0151-ProfileWhitelistVerifyEvent.patch
+++ b/patches/unapplied/server/0151-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0152-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0152-Fix-this-stupid-bullshit.patch
index 281c290bf4..281c290bf4 100644
--- a/patches/server/0152-Fix-this-stupid-bullshit.patch
+++ b/patches/unapplied/server/0152-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0153-LivingEntity-setKiller.patch b/patches/unapplied/server/0153-LivingEntity-setKiller.patch
index 0612bec621..0612bec621 100644
--- a/patches/server/0153-LivingEntity-setKiller.patch
+++ b/patches/unapplied/server/0153-LivingEntity-setKiller.patch
diff --git a/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
index b5173d97af..b5173d97af 100644
--- a/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/unapplied/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 75f8dacaf9..75f8dacaf9 100644
--- a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/unapplied/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
index b579d1f764..b579d1f764 100644
--- a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/unapplied/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 4b5eaae940..4b5eaae940 100644
--- a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/unapplied/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 5afb9562c0..5afb9562c0 100644
--- a/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/unapplied/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0159-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0159-Add-PlayerJumpEvent.patch
index 18ccb44f88..18ccb44f88 100644
--- a/patches/server/0159-Add-PlayerJumpEvent.patch
+++ b/patches/unapplied/server/0159-Add-PlayerJumpEvent.patch
diff --git a/patches/server/0160-handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/0160-handle-ServerboundKeepAlivePacket-async.patch
index fbbf59b122..fbbf59b122 100644
--- a/patches/server/0160-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/unapplied/server/0160-handle-ServerboundKeepAlivePacket-async.patch
diff --git a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0161-Expose-client-protocol-version-and-virtual-host.patch
index 7132084e0b..7132084e0b 100644
--- a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/server/0161-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0162-revert-serverside-behavior-of-keepalives.patch
index 6362aa4721..6362aa4721 100644
--- a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/unapplied/server/0162-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 2f898fc06c..2f898fc06c 100644
--- a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/unapplied/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0164-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0164-Add-PlayerArmorChangeEvent.patch
index a9e743e1b2..a9e743e1b2 100644
--- a/patches/server/0164-Add-PlayerArmorChangeEvent.patch
+++ b/patches/unapplied/server/0164-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
index a1ad28135c..a1ad28135c 100644
--- a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/unapplied/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index a8def578b2..a8def578b2 100644
--- a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/unapplied/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
index 6f0c6755d7..6f0c6755d7 100644
--- a/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/unapplied/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
index 02b8d29dfb..02b8d29dfb 100644
--- a/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0169-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0169-AsyncTabCompleteEvent.patch
index 187e3b1feb..187e3b1feb 100644
--- a/patches/server/0169-AsyncTabCompleteEvent.patch
+++ b/patches/unapplied/server/0169-AsyncTabCompleteEvent.patch
diff --git a/patches/server/0170-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0170-PlayerPickupExperienceEvent.patch
index 272e78a563..272e78a563 100644
--- a/patches/server/0170-PlayerPickupExperienceEvent.patch
+++ b/patches/unapplied/server/0170-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0171-Ability-to-apply-mending-to-XP-API.patch
index 097ebe86c7..097ebe86c7 100644
--- a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/unapplied/server/0171-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0172-PlayerNaturallySpawnCreaturesEvent.patch
index 2a9a3263df..2a9a3263df 100644
--- a/patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/unapplied/server/0172-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0173-Add-setPlayerProfile-API-for-Skulls.patch
index 45c86f49cd..45c86f49cd 100644
--- a/patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/unapplied/server/0173-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0174-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0174-PreCreatureSpawnEvent.patch
index 2b7d92db4d..2b7d92db4d 100644
--- a/patches/server/0174-PreCreatureSpawnEvent.patch
+++ b/patches/unapplied/server/0174-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0175-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0175-Fill-Profile-Property-Events.patch
index 30643d081c..30643d081c 100644
--- a/patches/server/0175-Fill-Profile-Property-Events.patch
+++ b/patches/unapplied/server/0175-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0176-PlayerAdvancementCriterionGrantEvent.patch
index 4686111f3c..4686111f3c 100644
--- a/patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/unapplied/server/0176-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0177-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0177-Add-ArmorStand-Item-Meta.patch
index 269523a382..269523a382 100644
--- a/patches/server/0177-Add-ArmorStand-Item-Meta.patch
+++ b/patches/unapplied/server/0177-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0178-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0178-Extend-Player-Interact-cancellation.patch
index e30b6c7fc7..e30b6c7fc7 100644
--- a/patches/server/0178-Extend-Player-Interact-cancellation.patch
+++ b/patches/unapplied/server/0178-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0179-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0179-Tameable-getOwnerUniqueId-API.patch
index 7fca628e8a..7fca628e8a 100644
--- a/patches/server/0179-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/unapplied/server/0179-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index ad97c05b3b..ad97c05b3b 100644
--- a/patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/patches/unapplied/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0181-Disable-Explicit-Network-Manager-Flushing.patch
index 7463a5b3a0..7463a5b3a0 100644
--- a/patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/unapplied/server/0181-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0182-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0182-Implement-extended-PaperServerListPingEvent.patch
index 0c804da246..0c804da246 100644
--- a/patches/server/0182-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/server/0182-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index b33e4f9545..b33e4f9545 100644
--- a/patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/unapplied/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0184-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0184-Player.setPlayerProfile-API.patch
index 293c40d7a8..293c40d7a8 100644
--- a/patches/server/0184-Player.setPlayerProfile-API.patch
+++ b/patches/unapplied/server/0184-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0185-getPlayerUniqueId-API.patch b/patches/unapplied/server/0185-getPlayerUniqueId-API.patch
index a2089261b8..a2089261b8 100644
--- a/patches/server/0185-getPlayerUniqueId-API.patch
+++ b/patches/unapplied/server/0185-getPlayerUniqueId-API.patch
diff --git a/patches/server/0186-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0186-Improved-Async-Task-Scheduler.patch
index b62fddc7b9..b62fddc7b9 100644
--- a/patches/server/0186-Improved-Async-Task-Scheduler.patch
+++ b/patches/unapplied/server/0186-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0187-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0187-Make-legacy-ping-handler-more-reliable.patch
index e14bdb70cb..e14bdb70cb 100644
--- a/patches/server/0187-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/unapplied/server/0187-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch
index c404fd6c23..c404fd6c23 100644
--- a/patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/unapplied/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0189-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0189-Flag-to-disable-the-channel-limit.patch
index 4e0b086404..4e0b086404 100644
--- a/patches/server/0189-Flag-to-disable-the-channel-limit.patch
+++ b/patches/unapplied/server/0189-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0190-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0190-Add-openSign-method-to-HumanEntity.patch
index 318ce16abc..318ce16abc 100644
--- a/patches/server/0190-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/unapplied/server/0190-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0191-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0191-Configurable-sprint-interruption-on-attack.patch
index ca640fad99..ca640fad99 100644
--- a/patches/server/0191-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/unapplied/server/0191-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 22ffad4aa5..22ffad4aa5 100644
--- a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0193-EndermanEscapeEvent.patch b/patches/unapplied/server/0193-EndermanEscapeEvent.patch
index bb6d3e50a2..bb6d3e50a2 100644
--- a/patches/server/0193-EndermanEscapeEvent.patch
+++ b/patches/unapplied/server/0193-EndermanEscapeEvent.patch
diff --git a/patches/server/0194-Enderman.teleportRandomly.patch b/patches/unapplied/server/0194-Enderman.teleportRandomly.patch
index 01d4d56d34..01d4d56d34 100644
--- a/patches/server/0194-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/server/0194-Enderman.teleportRandomly.patch
diff --git a/patches/server/0195-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0195-Block-Enderpearl-Travel-Exploit.patch
index 40b6b1199e..40b6b1199e 100644
--- a/patches/server/0195-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/unapplied/server/0195-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch
index 31c2d5de92..31c2d5de92 100644
--- a/patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index b9c45b572d..b9c45b572d 100644
--- a/patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/patches/unapplied/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0198-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0198-EndermanAttackPlayerEvent.patch
index 24eb75efb2..24eb75efb2 100644
--- a/patches/server/0198-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/server/0198-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0199-WitchConsumePotionEvent.patch b/patches/unapplied/server/0199-WitchConsumePotionEvent.patch
index b232d801bd..b232d801bd 100644
--- a/patches/server/0199-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/server/0199-WitchConsumePotionEvent.patch
diff --git a/patches/server/0200-WitchThrowPotionEvent.patch b/patches/unapplied/server/0200-WitchThrowPotionEvent.patch
index 5322db36e0..5322db36e0 100644
--- a/patches/server/0200-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/server/0200-WitchThrowPotionEvent.patch
diff --git a/patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index e1cb9142a0..e1cb9142a0 100644
--- a/patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/unapplied/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0202-WitchReadyPotionEvent.patch b/patches/unapplied/server/0202-WitchReadyPotionEvent.patch
index 09f53b3547..09f53b3547 100644
--- a/patches/server/0202-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/server/0202-WitchReadyPotionEvent.patch
diff --git a/patches/server/0203-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0203-ItemStack-getMaxItemUseDuration.patch
index b271ea72ef..b271ea72ef 100644
--- a/patches/server/0203-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/server/0203-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0204-Implement-EntityTeleportEndGatewayEvent.patch
index e8767054d5..e8767054d5 100644
--- a/patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0204-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index c5443c55ef..c5443c55ef 100644
--- a/patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/unapplied/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0206-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0206-Fix-CraftEntity-hashCode.patch
index 38b7cbc59b..38b7cbc59b 100644
--- a/patches/server/0206-Fix-CraftEntity-hashCode.patch
+++ b/patches/unapplied/server/0206-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch
index 40dce864c6..40dce864c6 100644
--- a/patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/unapplied/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0208-Print-Error-details-when-failing-to-save-player-data.patch
index fbed4e0bbf..fbed4e0bbf 100644
--- a/patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/unapplied/server/0208-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0209-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0209-Make-shield-blocking-delay-configurable.patch
index 5ae1aedc89..5ae1aedc89 100644
--- a/patches/server/0209-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/server/0209-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0210-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0210-Improve-EntityShootBowEvent.patch
index 781edc26c2..781edc26c2 100644
--- a/patches/server/0210-Improve-EntityShootBowEvent.patch
+++ b/patches/unapplied/server/0210-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0211-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0211-PlayerReadyArrowEvent.patch
index de8e004ded..de8e004ded 100644
--- a/patches/server/0211-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/server/0211-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/unapplied/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
index 96dd04011d..96dd04011d 100644
--- a/patches/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
+++ b/patches/unapplied/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
diff --git a/patches/server/0213-Expand-Explosions-API.patch b/patches/unapplied/server/0213-Expand-Explosions-API.patch
index 9536fa8f7f..9536fa8f7f 100644
--- a/patches/server/0213-Expand-Explosions-API.patch
+++ b/patches/unapplied/server/0213-Expand-Explosions-API.patch
diff --git a/patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch
index aaaa299a9a..aaaa299a9a 100644
--- a/patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/unapplied/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0215-RangedEntity-API.patch b/patches/unapplied/server/0215-RangedEntity-API.patch
index 72412771be..72412771be 100644
--- a/patches/server/0215-RangedEntity-API.patch
+++ b/patches/unapplied/server/0215-RangedEntity-API.patch
diff --git a/patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch
index b4b36f84c0..b4b36f84c0 100644
--- a/patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/unapplied/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0217-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0217-Implement-World.getEntity-UUID-API.patch
index 982a15f655..982a15f655 100644
--- a/patches/server/0217-Implement-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/server/0217-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0218-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0218-InventoryCloseEvent-Reason-API.patch
index 192e54ddb1..192e54ddb1 100644
--- a/patches/server/0218-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/server/0218-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0219-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0219-Vex-get-setSummoner-API.patch
index 61ba4a29fe..61ba4a29fe 100644
--- a/patches/server/0219-Vex-get-setSummoner-API.patch
+++ b/patches/unapplied/server/0219-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 655c368ca5..655c368ca5 100644
--- a/patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/unapplied/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index e95d8952ce..e95d8952ce 100644
--- a/patches/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/unapplied/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0222-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0222-add-more-information-to-Entity.toString.patch
index fe3ae30a1e..fe3ae30a1e 100644
--- a/patches/server/0222-add-more-information-to-Entity.toString.patch
+++ b/patches/unapplied/server/0222-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0223-EnderDragon-Events.patch b/patches/unapplied/server/0223-EnderDragon-Events.patch
index 6368f8e07f..6368f8e07f 100644
--- a/patches/server/0223-EnderDragon-Events.patch
+++ b/patches/unapplied/server/0223-EnderDragon-Events.patch
diff --git a/patches/server/0224-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0224-PlayerElytraBoostEvent.patch
index e99be47ba0..e99be47ba0 100644
--- a/patches/server/0224-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/server/0224-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0225-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch
index 16a5be1670..16a5be1670 100644
--- a/patches/server/0225-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0226-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch
index 208af75831..208af75831 100644
--- a/patches/server/0226-Improve-BlockPosition-inlining.patch
+++ b/patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index ccc7098c42..ccc7098c42 100644
--- a/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0228-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch
index f2b8dd2ac7..f2b8dd2ac7 100644
--- a/patches/server/0228-Vanished-players-don-t-have-rights.patch
+++ b/patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch
index 861b4b3b1e..861b4b3b1e 100644
--- a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0230-SkeletonHorse-Additions.patch b/patches/unapplied/server/0230-SkeletonHorse-Additions.patch
index 0ff3d41afa..0ff3d41afa 100644
--- a/patches/server/0230-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/server/0230-SkeletonHorse-Additions.patch
diff --git a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 749cbf37f3..749cbf37f3 100644
--- a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0232-Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch
index 646e0ab722..646e0ab722 100644
--- a/patches/server/0232-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0233-AnvilDamageEvent.patch b/patches/unapplied/server/0233-AnvilDamageEvent.patch
index 677b0c90af..677b0c90af 100644
--- a/patches/server/0233-AnvilDamageEvent.patch
+++ b/patches/unapplied/server/0233-AnvilDamageEvent.patch
diff --git a/patches/server/0234-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0234-Add-TNTPrimeEvent.patch
index fe2676104d..fe2676104d 100644
--- a/patches/server/0234-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/server/0234-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
index cc05eb2d65..cc05eb2d65 100644
--- a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0236-Fix-NBT-type-issues.patch b/patches/unapplied/server/0236-Fix-NBT-type-issues.patch
index eb338da33c..eb338da33c 100644
--- a/patches/server/0236-Fix-NBT-type-issues.patch
+++ b/patches/unapplied/server/0236-Fix-NBT-type-issues.patch
diff --git a/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch
index 440197b5f8..440197b5f8 100644
--- a/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index ca437a8314..ca437a8314 100644
--- a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
index eacf13b578..eacf13b578 100644
--- a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
index 983ab3d413..983ab3d413 100644
--- a/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch
index 2d4b743e17..2d4b743e17 100644
--- a/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 8d9d0ca5c2..8d9d0ca5c2 100644
--- a/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0243-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch
index b4589d2aa0..b4589d2aa0 100644
--- a/patches/server/0243-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index 765c83db85..765c83db85 100644
--- a/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0245-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0245-Slime-Pathfinder-Events.patch
index 8178245fab..8178245fab 100644
--- a/patches/server/0245-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/server/0245-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
index 05e4b14d22..05e4b14d22 100644
--- a/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0247-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch
index 9586bc5275..9586bc5275 100644
--- a/patches/server/0247-Optimize-CraftBlockData-Creation.patch
+++ b/patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0248-Optimize-MappedRegistry.patch b/patches/unapplied/server/0248-Optimize-MappedRegistry.patch
index 0ef4033b74..0ef4033b74 100644
--- a/patches/server/0248-Optimize-MappedRegistry.patch
+++ b/patches/unapplied/server/0248-Optimize-MappedRegistry.patch
diff --git a/patches/server/0249-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch
index 5f72069c23..5f72069c23 100644
--- a/patches/server/0249-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0250-Add-More-Creeper-API.patch b/patches/unapplied/server/0250-Add-More-Creeper-API.patch
index e44fbbf862..e44fbbf862 100644
--- a/patches/server/0250-Add-More-Creeper-API.patch
+++ b/patches/unapplied/server/0250-Add-More-Creeper-API.patch
diff --git a/patches/server/0251-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch
index a8ba3ecb62..a8ba3ecb62 100644
--- a/patches/server/0251-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 51eac99a27..51eac99a27 100644
--- a/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
index 9dce967673..9dce967673 100644
--- a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0254-Expose-attack-cooldown-methods-for-Player.patch
index 9358575b58..9358575b58 100644
--- a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/unapplied/server/0254-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0255-Improve-death-events.patch b/patches/unapplied/server/0255-Improve-death-events.patch
index 5b3368871f..5b3368871f 100644
--- a/patches/server/0255-Improve-death-events.patch
+++ b/patches/unapplied/server/0255-Improve-death-events.patch
diff --git a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
index df898121dc..df898121dc 100644
--- a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0257-Mob-Pathfinding-API.patch b/patches/unapplied/server/0257-Mob-Pathfinding-API.patch
index 0b246afe7a..0b246afe7a 100644
--- a/patches/server/0257-Mob-Pathfinding-API.patch
+++ b/patches/unapplied/server/0257-Mob-Pathfinding-API.patch
diff --git a/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/unapplied/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index a93ea72ff4..a93ea72ff4 100644
--- a/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/patches/unapplied/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 261d06e792..261d06e792 100644
--- a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/unapplied/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index f3130fa3c3..f3130fa3c3 100644
--- a/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/patches/unapplied/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 82476d43bf..82476d43bf 100644
--- a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/unapplied/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
index 781ffacd36..781ffacd36 100644
--- a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/unapplied/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 2d0f21e58d..2d0f21e58d 100644
--- a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0264-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0264-Honor-EntityAgeable.ageLock.patch
index c7c78c8f16..c7c78c8f16 100644
--- a/patches/server/0264-Honor-EntityAgeable.ageLock.patch
+++ b/patches/unapplied/server/0264-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0265-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0265-Configurable-connection-throttle-kick-message.patch
index 15deab12d8..15deab12d8 100644
--- a/patches/server/0265-Configurable-connection-throttle-kick-message.patch
+++ b/patches/unapplied/server/0265-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/0266-Hook-into-CB-plugin-rewrites.patch
index d40c5ed17b..d40c5ed17b 100644
--- a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/unapplied/server/0266-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0267-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0267-PreSpawnerSpawnEvent.patch
index 82ed7cac3c..82ed7cac3c 100644
--- a/patches/server/0267-PreSpawnerSpawnEvent.patch
+++ b/patches/unapplied/server/0267-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch
index 90098a5317..90098a5317 100644
--- a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0269-Add-sun-related-API.patch b/patches/unapplied/server/0269-Add-sun-related-API.patch
index a8dcbc68cb..a8dcbc68cb 100644
--- a/patches/server/0269-Add-sun-related-API.patch
+++ b/patches/unapplied/server/0269-Add-sun-related-API.patch
diff --git a/patches/server/0270-Turtle-API.patch b/patches/unapplied/server/0270-Turtle-API.patch
index cd1ffaa4f9..cd1ffaa4f9 100644
--- a/patches/server/0270-Turtle-API.patch
+++ b/patches/unapplied/server/0270-Turtle-API.patch
diff --git a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
index ca425a8898..ca425a8898 100644
--- a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/unapplied/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/unapplied/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 5c14400166..5c14400166 100644
--- a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/patches/unapplied/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0273-Add-more-Witch-API.patch b/patches/unapplied/server/0273-Add-more-Witch-API.patch
index a470414cc9..a470414cc9 100644
--- a/patches/server/0273-Add-more-Witch-API.patch
+++ b/patches/unapplied/server/0273-Add-more-Witch-API.patch
diff --git a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
index bcd2061b77..bcd2061b77 100644
--- a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/unapplied/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 874f4effbe..874f4effbe 100644
--- a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/unapplied/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0276-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0276-Reset-players-airTicks-on-respawn.patch
index e3296f5e4e..e3296f5e4e 100644
--- a/patches/server/0276-Reset-players-airTicks-on-respawn.patch
+++ b/patches/unapplied/server/0276-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index c4f99ad87b..c4f99ad87b 100644
--- a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/unapplied/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 3d6f0e7773..3d6f0e7773 100644
--- a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/unapplied/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0279-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0279-Optimize-World-Time-Updates.patch
index 7d4c0d4fe3..7d4c0d4fe3 100644
--- a/patches/server/0279-Optimize-World-Time-Updates.patch
+++ b/patches/unapplied/server/0279-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0280-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0280-Restore-custom-InventoryHolder-support.patch
index 1cce252dbb..1cce252dbb 100644
--- a/patches/server/0280-Restore-custom-InventoryHolder-support.patch
+++ b/patches/unapplied/server/0280-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/0281-Use-Vanilla-Minecart-Speeds.patch
index 436aa005d3..436aa005d3 100644
--- a/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/unapplied/server/0281-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0282-Fix-SpongeAbsortEvent-handling.patch
index a527364310..a527364310 100644
--- a/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/unapplied/server/0282-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
index d819193804..d819193804 100644
--- a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/unapplied/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0284-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0284-Make-the-default-permission-message-configurable.patch
index 52d02eee56..52d02eee56 100644
--- a/patches/server/0284-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/server/0284-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/0285-Prevent-rayTrace-from-loading-chunks.patch
index c3321b949b..c3321b949b 100644
--- a/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/unapplied/server/0285-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0286-Handle-Large-Packets-disconnecting-client.patch
index 4924f6eb7f..4924f6eb7f 100644
--- a/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/unapplied/server/0286-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0287-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0287-force-entity-dismount-during-teleportation.patch
index 2f35adc633..2f35adc633 100644
--- a/patches/server/0287-force-entity-dismount-during-teleportation.patch
+++ b/patches/unapplied/server/0287-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0288-Add-more-Zombie-API.patch b/patches/unapplied/server/0288-Add-more-Zombie-API.patch
index 69b6cbc5e0..69b6cbc5e0 100644
--- a/patches/server/0288-Add-more-Zombie-API.patch
+++ b/patches/unapplied/server/0288-Add-more-Zombie-API.patch
diff --git a/patches/server/0289-Book-Size-Limits.patch b/patches/unapplied/server/0289-Book-Size-Limits.patch
index 61221c290b..61221c290b 100644
--- a/patches/server/0289-Book-Size-Limits.patch
+++ b/patches/unapplied/server/0289-Book-Size-Limits.patch
diff --git a/patches/server/0290-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0290-Add-PlayerConnectionCloseEvent.patch
index 763365915d..763365915d 100644
--- a/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/unapplied/server/0290-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/0291-Prevent-Enderman-from-loading-chunks.patch
index 7a44b0f525..7a44b0f525 100644
--- a/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/unapplied/server/0291-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 06800dabb4..06800dabb4 100644
--- a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/unapplied/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index de3155219c..de3155219c 100644
--- a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/unapplied/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
index f8eface290..f8eface290 100644
--- a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/unapplied/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0295-BlockDestroyEvent.patch b/patches/unapplied/server/0295-BlockDestroyEvent.patch
index bd1f7f6722..bd1f7f6722 100644
--- a/patches/server/0295-BlockDestroyEvent.patch
+++ b/patches/unapplied/server/0295-BlockDestroyEvent.patch
diff --git a/patches/server/0296-Async-command-map-building.patch b/patches/unapplied/server/0296-Async-command-map-building.patch
index 67324346eb..67324346eb 100644
--- a/patches/server/0296-Async-command-map-building.patch
+++ b/patches/unapplied/server/0296-Async-command-map-building.patch
diff --git a/patches/server/0297-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0297-Implement-Brigadier-Mojang-API.patch
index cb8739471f..cb8739471f 100644
--- a/patches/server/0297-Implement-Brigadier-Mojang-API.patch
+++ b/patches/unapplied/server/0297-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/unapplied/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 210e7f09f5..210e7f09f5 100644
--- a/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/patches/unapplied/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0299-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0299-Limit-Client-Sign-length-more.patch
index 5e00371baf..5e00371baf 100644
--- a/patches/server/0299-Limit-Client-Sign-length-more.patch
+++ b/patches/unapplied/server/0299-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/unapplied/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 75d4b58525..75d4b58525 100644
--- a/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/unapplied/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index ebce2c9397..ebce2c9397 100644
--- a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
index 9e46199694..9e46199694 100644
--- a/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/unapplied/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 5da1dbf674..5da1dbf674 100644
--- a/patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/unapplied/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0304-Entity-getEntitySpawnReason.patch b/patches/unapplied/server/0304-Entity-getEntitySpawnReason.patch
index b33d8ea39b..b33d8ea39b 100644
--- a/patches/server/0304-Entity-getEntitySpawnReason.patch
+++ b/patches/unapplied/server/0304-Entity-getEntitySpawnReason.patch
diff --git a/patches/server/0305-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0305-Fire-event-on-GS4-query.patch
index 445725e8b8..445725e8b8 100644
--- a/patches/server/0305-Fire-event-on-GS4-query.patch
+++ b/patches/unapplied/server/0305-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0306-Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0306-Implement-PlayerPostRespawnEvent.patch
index b2b7f01c14..b2b7f01c14 100644
--- a/patches/server/0306-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/server/0306-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 075001f79d..075001f79d 100644
--- a/patches/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/unapplied/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0308-Server-Tick-Events.patch b/patches/unapplied/server/0308-Server-Tick-Events.patch
index 58307fa4aa..58307fa4aa 100644
--- a/patches/server/0308-Server-Tick-Events.patch
+++ b/patches/unapplied/server/0308-Server-Tick-Events.patch
diff --git a/patches/server/0309-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0309-PlayerDeathEvent-getItemsToKeep.patch
index e1017711c8..e1017711c8 100644
--- a/patches/server/0309-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/unapplied/server/0309-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0310-Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/0310-Optimize-Captured-TileEntity-Lookup.patch
index 9908d72dc3..9908d72dc3 100644
--- a/patches/server/0310-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/unapplied/server/0310-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0311-Add-Heightmap-API.patch b/patches/unapplied/server/0311-Add-Heightmap-API.patch
index 47796d72fd..47796d72fd 100644
--- a/patches/server/0311-Add-Heightmap-API.patch
+++ b/patches/unapplied/server/0311-Add-Heightmap-API.patch
diff --git a/patches/server/0312-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0312-Mob-Spawner-API-Enhancements.patch
index 72f68d4462..72f68d4462 100644
--- a/patches/server/0312-Mob-Spawner-API-Enhancements.patch
+++ b/patches/unapplied/server/0312-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch
index 9573844d11..9573844d11 100644
--- a/patches/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/unapplied/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 2212385356..2212385356 100644
--- a/patches/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/unapplied/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0315-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0315-Implement-CraftBlockSoundGroup.patch
index d3f6dfe260..d3f6dfe260 100644
--- a/patches/server/0315-Implement-CraftBlockSoundGroup.patch
+++ b/patches/unapplied/server/0315-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 647a39fb4b..647a39fb4b 100644
--- a/patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/unapplied/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0317-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0317-Allow-Saving-of-Oversized-Chunks.patch
index 295a3776f0..295a3776f0 100644
--- a/patches/server/0317-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/unapplied/server/0317-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0318-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0318-Expose-the-internal-current-tick.patch
index 4a12fa28ee..4a12fa28ee 100644
--- a/patches/server/0318-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/server/0318-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0319-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/0319-Fix-World-isChunkGenerated-calls.patch
index 0693f30fab..0693f30fab 100644
--- a/patches/server/0319-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/unapplied/server/0319-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch
index f593178909..f593178909 100644
--- a/patches/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/unapplied/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index bb52376096..bb52376096 100644
--- a/patches/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/unapplied/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0322-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0322-Configurable-projectile-relative-velocity.patch
index ca5ee9c66e..ca5ee9c66e 100644
--- a/patches/server/0322-Configurable-projectile-relative-velocity.patch
+++ b/patches/unapplied/server/0322-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0323-offset-item-frame-ticking.patch b/patches/unapplied/server/0323-offset-item-frame-ticking.patch
index b9d4075476..b9d4075476 100644
--- a/patches/server/0323-offset-item-frame-ticking.patch
+++ b/patches/unapplied/server/0323-offset-item-frame-ticking.patch
diff --git a/patches/server/0324-Fix-MC-158900.patch b/patches/unapplied/server/0324-Fix-MC-158900.patch
index ad116d0439..ad116d0439 100644
--- a/patches/server/0324-Fix-MC-158900.patch
+++ b/patches/unapplied/server/0324-Fix-MC-158900.patch
diff --git a/patches/server/0325-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0325-Prevent-consuming-the-wrong-itemstack.patch
index b1da08344d..b1da08344d 100644
--- a/patches/server/0325-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/unapplied/server/0325-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0326-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0326-Dont-send-unnecessary-sign-update.patch
index da55b6f133..da55b6f133 100644
--- a/patches/server/0326-Dont-send-unnecessary-sign-update.patch
+++ b/patches/unapplied/server/0326-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0327-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0327-Add-option-to-disable-pillager-patrols.patch
index 65d645b929..65d645b929 100644
--- a/patches/server/0327-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/unapplied/server/0327-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0328-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/0328-Flat-bedrock-generator-settings.patch
index 8b5133e435..8b5133e435 100644
--- a/patches/server/0328-Flat-bedrock-generator-settings.patch
+++ b/patches/unapplied/server/0328-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 7e151eb18d..7e151eb18d 100644
--- a/patches/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/unapplied/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 44844fef0d..44844fef0d 100644
--- a/patches/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/unapplied/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0331-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0331-Duplicate-UUID-Resolve-Option.patch
index 219c1a4609..219c1a4609 100644
--- a/patches/server/0331-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/unapplied/server/0331-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0332-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0332-PlayerDeathEvent-shouldDropExperience.patch
index 7b1dcd7f1a..7b1dcd7f1a 100644
--- a/patches/server/0332-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/server/0332-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch
index b8b3046483..b8b3046483 100644
--- a/patches/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/unapplied/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 71f28eb22f..71f28eb22f 100644
--- a/patches/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/unapplied/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch
index 05f3621ca5..05f3621ca5 100644
--- a/patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/unapplied/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch
index cada89959c..cada89959c 100644
--- a/patches/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/unapplied/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0337-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0337-Fix-items-not-falling-correctly.patch
index 02603be6a5..02603be6a5 100644
--- a/patches/server/0337-Fix-items-not-falling-correctly.patch
+++ b/patches/unapplied/server/0337-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0338-Lag-compensate-eating.patch b/patches/unapplied/server/0338-Lag-compensate-eating.patch
index bf9a765b49..bf9a765b49 100644
--- a/patches/server/0338-Lag-compensate-eating.patch
+++ b/patches/unapplied/server/0338-Lag-compensate-eating.patch
diff --git a/patches/server/0339-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0339-Optimize-call-to-getFluid-for-explosions.patch
index b77f7af0be..b77f7af0be 100644
--- a/patches/server/0339-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/unapplied/server/0339-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index b8c578f5e6..b8c578f5e6 100644
--- a/patches/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/unapplied/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0341-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0341-Entity-Activation-Range-2.0.patch
index f1a2570ac6..f1a2570ac6 100644
--- a/patches/server/0341-Entity-Activation-Range-2.0.patch
+++ b/patches/unapplied/server/0341-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0342-Increase-Light-Queue-Size.patch b/patches/unapplied/server/0342-Increase-Light-Queue-Size.patch
index 3b3f2cd829..3b3f2cd829 100644
--- a/patches/server/0342-Increase-Light-Queue-Size.patch
+++ b/patches/unapplied/server/0342-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0343-Anti-Xray.patch b/patches/unapplied/server/0343-Anti-Xray.patch
index 702db2972e..702db2972e 100644
--- a/patches/server/0343-Anti-Xray.patch
+++ b/patches/unapplied/server/0343-Anti-Xray.patch
diff --git a/patches/server/0344-Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/0344-Implement-alternative-item-despawn-rate.patch
index 14c9aa34f1..14c9aa34f1 100644
--- a/patches/server/0344-Implement-alternative-item-despawn-rate.patch
+++ b/patches/unapplied/server/0344-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0345-Tracking-Range-Improvements.patch b/patches/unapplied/server/0345-Tracking-Range-Improvements.patch
index 6663d3754d..6663d3754d 100644
--- a/patches/server/0345-Tracking-Range-Improvements.patch
+++ b/patches/unapplied/server/0345-Tracking-Range-Improvements.patch
diff --git a/patches/server/0346-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0346-Fix-items-vanishing-through-end-portal.patch
index eedf7d4044..eedf7d4044 100644
--- a/patches/server/0346-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/unapplied/server/0346-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0347-implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/0347-implement-optional-per-player-mob-spawns.patch
index 60adc768e6..60adc768e6 100644
--- a/patches/server/0347-implement-optional-per-player-mob-spawns.patch
+++ b/patches/unapplied/server/0347-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 6b9992e92f..6b9992e92f 100644
--- a/patches/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/unapplied/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0349-Improve-Block-breakNaturally-API.patch b/patches/unapplied/server/0349-Improve-Block-breakNaturally-API.patch
index 0e3a106ed7..0e3a106ed7 100644
--- a/patches/server/0349-Improve-Block-breakNaturally-API.patch
+++ b/patches/unapplied/server/0349-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 8bd19e91e1..8bd19e91e1 100644
--- a/patches/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/unapplied/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0351-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0351-Add-debug-for-sync-chunk-loads.patch
index 9384abb5bf..9384abb5bf 100644
--- a/patches/server/0351-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/unapplied/server/0351-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0352-Remove-garbage-Java-version-check.patch b/patches/unapplied/server/0352-Remove-garbage-Java-version-check.patch
index af5fd56e6c..af5fd56e6c 100644
--- a/patches/server/0352-Remove-garbage-Java-version-check.patch
+++ b/patches/unapplied/server/0352-Remove-garbage-Java-version-check.patch
diff --git a/patches/server/0353-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0353-Add-ThrownEggHatchEvent.patch
index b9c9d2b031..b9c9d2b031 100644
--- a/patches/server/0353-Add-ThrownEggHatchEvent.patch
+++ b/patches/unapplied/server/0353-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0354-Entity-Jump-API.patch b/patches/unapplied/server/0354-Entity-Jump-API.patch
index c31f7f47ff..c31f7f47ff 100644
--- a/patches/server/0354-Entity-Jump-API.patch
+++ b/patches/unapplied/server/0354-Entity-Jump-API.patch
diff --git a/patches/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 578dcb5bbb..578dcb5bbb 100644
--- a/patches/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/unapplied/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0356-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0356-Make-the-GUI-graph-fancier.patch
index b97ce20f84..b97ce20f84 100644
--- a/patches/server/0356-Make-the-GUI-graph-fancier.patch
+++ b/patches/unapplied/server/0356-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0357-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0357-add-hand-to-BlockMultiPlaceEvent.patch
index bd7339a1d5..bd7339a1d5 100644
--- a/patches/server/0357-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/unapplied/server/0357-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0358-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0358-Validate-tripwire-hook-placement-before-update.patch
index fd8a74807c..fd8a74807c 100644
--- a/patches/server/0358-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/unapplied/server/0358-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index f220859fea..f220859fea 100644
--- a/patches/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/unapplied/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0360-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0360-Configurable-chance-of-villager-zombie-infection.patch
index 5accd0d36d..5accd0d36d 100644
--- a/patches/server/0360-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/unapplied/server/0360-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0361-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0361-Optimise-Chunk-getFluid.patch
index 5d78deb156..5d78deb156 100644
--- a/patches/server/0361-Optimise-Chunk-getFluid.patch
+++ b/patches/unapplied/server/0361-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 08bc7193a2..08bc7193a2 100644
--- a/patches/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/unapplied/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0363-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0363-Add-tick-times-API-and-mspt-command.patch
index facb7a684a..facb7a684a 100644
--- a/patches/server/0363-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/unapplied/server/0363-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0364-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0364-Expose-MinecraftServer-isRunning.patch
index d60908c5e8..d60908c5e8 100644
--- a/patches/server/0364-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/server/0364-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch
index 2e3779fd29..2e3779fd29 100644
--- a/patches/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 8499fba689..8499fba689 100644
--- a/patches/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/unapplied/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index d5876d02e0..d5876d02e0 100644
--- a/patches/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/unapplied/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 807d61a122..807d61a122 100644
--- a/patches/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/unapplied/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index e5966b67e5..e5966b67e5 100644
--- a/patches/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/unapplied/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0370-Don-t-tick-dead-players.patch b/patches/unapplied/server/0370-Don-t-tick-dead-players.patch
index 4a700e795a..4a700e795a 100644
--- a/patches/server/0370-Don-t-tick-dead-players.patch
+++ b/patches/unapplied/server/0370-Don-t-tick-dead-players.patch
diff --git a/patches/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 836fcf6b72..836fcf6b72 100644
--- a/patches/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/unapplied/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0372-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0372-Optimize-Collision-to-not-load-chunks.patch
index 4adb47c4f3..4adb47c4f3 100644
--- a/patches/server/0372-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/unapplied/server/0372-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0373-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0373-Don-t-move-existing-players-to-world-spawn.patch
index 714d0165f7..714d0165f7 100644
--- a/patches/server/0373-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/unapplied/server/0373-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 70dff6f0dc..70dff6f0dc 100644
--- a/patches/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/unapplied/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0375-Improved-Watchdog-Support.patch b/patches/unapplied/server/0375-Improved-Watchdog-Support.patch
index b58af31718..b58af31718 100644
--- a/patches/server/0375-Improved-Watchdog-Support.patch
+++ b/patches/unapplied/server/0375-Improved-Watchdog-Support.patch
diff --git a/patches/server/0376-Optimize-Pathfinding.patch b/patches/unapplied/server/0376-Optimize-Pathfinding.patch
index 3a3b37c99c..3a3b37c99c 100644
--- a/patches/server/0376-Optimize-Pathfinding.patch
+++ b/patches/unapplied/server/0376-Optimize-Pathfinding.patch
diff --git a/patches/server/0377-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0377-Reduce-Either-Optional-allocation.patch
index 1833cacdfe..1833cacdfe 100644
--- a/patches/server/0377-Reduce-Either-Optional-allocation.patch
+++ b/patches/unapplied/server/0377-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch
index 9fb5402d3a..9fb5402d3a 100644
--- a/patches/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/unapplied/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0379-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0379-Prevent-opening-inventories-when-frozen.patch
index 0fbc94c923..0fbc94c923 100644
--- a/patches/server/0379-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/unapplied/server/0379-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch
index a24881a562..a24881a562 100644
--- a/patches/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/unapplied/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0381-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0381-Implement-Player-Client-Options-API.patch
index dfe55c81e4..dfe55c81e4 100644
--- a/patches/server/0381-Implement-Player-Client-Options-API.patch
+++ b/patches/unapplied/server/0381-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 1b01295738..1b01295738 100644
--- a/patches/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/unapplied/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 4d7a62672a..4d7a62672a 100644
--- a/patches/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/unapplied/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index d1daf68a0e..d1daf68a0e 100644
--- a/patches/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/unapplied/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch
index 519666c8f9..519666c8f9 100644
--- a/patches/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/unapplied/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 6c84d8b64c..6c84d8b64c 100644
--- a/patches/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/unapplied/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0387-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0387-Add-phantom-creative-and-insomniac-controls.patch
index 9a20c11a4f..9a20c11a4f 100644
--- a/patches/server/0387-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/unapplied/server/0387-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 61dce981a6..61dce981a6 100644
--- a/patches/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/unapplied/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0389-Villager-Restocks-API.patch b/patches/unapplied/server/0389-Villager-Restocks-API.patch
index 6aa68682f0..6aa68682f0 100644
--- a/patches/server/0389-Villager-Restocks-API.patch
+++ b/patches/unapplied/server/0389-Villager-Restocks-API.patch
diff --git a/patches/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 82f1ef7c08..82f1ef7c08 100644
--- a/patches/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/unapplied/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0391-Expose-game-version.patch b/patches/unapplied/server/0391-Expose-game-version.patch
index 5f07821d47..5f07821d47 100644
--- a/patches/server/0391-Expose-game-version.patch
+++ b/patches/unapplied/server/0391-Expose-game-version.patch
diff --git a/patches/server/0392-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0392-Optimize-Voxel-Shape-Merging.patch
index 2c47963e34..2c47963e34 100644
--- a/patches/server/0392-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/unapplied/server/0392-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 2ac9053313..2ac9053313 100644
--- a/patches/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/unapplied/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0394-misc-debugging-dumps.patch b/patches/unapplied/server/0394-misc-debugging-dumps.patch
index 0f4aff6ccc..0f4aff6ccc 100644
--- a/patches/server/0394-misc-debugging-dumps.patch
+++ b/patches/unapplied/server/0394-misc-debugging-dumps.patch
diff --git a/patches/server/0395-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0395-Prevent-teleporting-dead-entities.patch
index d918d0e66d..d918d0e66d 100644
--- a/patches/server/0395-Prevent-teleporting-dead-entities.patch
+++ b/patches/unapplied/server/0395-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 447763fd3a..447763fd3a 100644
--- a/patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/unapplied/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0397-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0397-Implement-Mob-Goal-API.patch
index 1237642b1b..1237642b1b 100644
--- a/patches/server/0397-Implement-Mob-Goal-API.patch
+++ b/patches/unapplied/server/0397-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0398-Add-villager-reputation-API.patch b/patches/unapplied/server/0398-Add-villager-reputation-API.patch
index a745be8032..a745be8032 100644
--- a/patches/server/0398-Add-villager-reputation-API.patch
+++ b/patches/unapplied/server/0398-Add-villager-reputation-API.patch
diff --git a/patches/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch
index 466b49e0b3..466b49e0b3 100644
--- a/patches/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/unapplied/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0400-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0400-ExperienceOrbMergeEvent.patch
index 4a0c8ba371..4a0c8ba371 100644
--- a/patches/server/0400-ExperienceOrbMergeEvent.patch
+++ b/patches/unapplied/server/0400-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0401-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0401-Fix-PotionEffect-ignores-icon-flag.patch
index cd3de7681e..cd3de7681e 100644
--- a/patches/server/0401-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/unapplied/server/0401-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0402-Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/0402-Optimize-brigadier-child-sorting-performance.patch
index 3651f34b15..3651f34b15 100644
--- a/patches/server/0402-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/unapplied/server/0402-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0403-Potential-bed-API.patch b/patches/unapplied/server/0403-Potential-bed-API.patch
index 2d479f5c15..2d479f5c15 100644
--- a/patches/server/0403-Potential-bed-API.patch
+++ b/patches/unapplied/server/0403-Potential-bed-API.patch
diff --git a/patches/server/0404-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0404-Wait-for-Async-Tasks-during-shutdown.patch
index 796b429362..796b429362 100644
--- a/patches/server/0404-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/unapplied/server/0404-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index 199f1322ac..199f1322ac 100644
--- a/patches/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/unapplied/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 8baaafa837..8baaafa837 100644
--- a/patches/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/unapplied/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch
index 1a92be0a01..1a92be0a01 100644
--- a/patches/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/patches/unapplied/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 714b084af6..714b084af6 100644
--- a/patches/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/unapplied/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0409-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0409-Ensure-safe-gateway-teleport.patch
index a77ce1d8bb..a77ce1d8bb 100644
--- a/patches/server/0409-Ensure-safe-gateway-teleport.patch
+++ b/patches/unapplied/server/0409-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0410-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0410-Add-option-for-console-having-all-permissions.patch
index d1e3317d94..d1e3317d94 100644
--- a/patches/server/0410-Add-option-for-console-having-all-permissions.patch
+++ b/patches/unapplied/server/0410-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index 14780f2fc1..14780f2fc1 100644
--- a/patches/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/unapplied/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0412-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0412-Use-distance-map-to-optimise-entity-tracker.patch
index 05af350a50..05af350a50 100644
--- a/patches/server/0412-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/unapplied/server/0412-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0413-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0413-Fix-villager-trading-demand-MC-163962.patch
index fa81bd70ac..fa81bd70ac 100644
--- a/patches/server/0413-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/unapplied/server/0413-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0414-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0414-Maps-shouldn-t-load-chunks.patch
index 568d5b6e6c..568d5b6e6c 100644
--- a/patches/server/0414-Maps-shouldn-t-load-chunks.patch
+++ b/patches/unapplied/server/0414-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 5e2416fbfd..5e2416fbfd 100644
--- a/patches/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/unapplied/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 1cafad18f3..1cafad18f3 100644
--- a/patches/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/unapplied/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch
index 1b2148c127..1b2148c127 100644
--- a/patches/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/unapplied/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0418-Fix-sand-duping.patch b/patches/unapplied/server/0418-Fix-sand-duping.patch
index 0d292a0921..0d292a0921 100644
--- a/patches/server/0418-Fix-sand-duping.patch
+++ b/patches/unapplied/server/0418-Fix-sand-duping.patch
diff --git a/patches/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch
index 979e1e474e..979e1e474e 100644
--- a/patches/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/unapplied/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch
index b0f884fd23..b0f884fd23 100644
--- a/patches/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/unapplied/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0421-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0421-Inventory-getHolder-method-without-block-snapshot.patch
index 3e77f8a1c6..3e77f8a1c6 100644
--- a/patches/server/0421-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/unapplied/server/0421-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0422-Improve-Arrow-API.patch b/patches/unapplied/server/0422-Improve-Arrow-API.patch
index 47bb897a5a..47bb897a5a 100644
--- a/patches/server/0422-Improve-Arrow-API.patch
+++ b/patches/unapplied/server/0422-Improve-Arrow-API.patch
diff --git a/patches/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 6045e95588..6045e95588 100644
--- a/patches/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/unapplied/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0424-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0424-Hide-sync-chunk-writes-behind-flag.patch
index b28eab1072..b28eab1072 100644
--- a/patches/server/0424-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/unapplied/server/0424-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0425-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0425-Add-permission-for-command-blocks.patch
index 308fb39db3..308fb39db3 100644
--- a/patches/server/0425-Add-permission-for-command-blocks.patch
+++ b/patches/unapplied/server/0425-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch
index 1435741fc5..1435741fc5 100644
--- a/patches/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/unapplied/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index e43a3a80a0..e43a3a80a0 100644
--- a/patches/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/unapplied/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0428-Paper-dumpitem-command.patch b/patches/unapplied/server/0428-Paper-dumpitem-command.patch
index 49612cd291..49612cd291 100644
--- a/patches/server/0428-Paper-dumpitem-command.patch
+++ b/patches/unapplied/server/0428-Paper-dumpitem-command.patch
diff --git a/patches/server/0429-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0429-Improve-Legacy-Component-serialization-size.patch
index 866302739f..866302739f 100644
--- a/patches/server/0429-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/unapplied/server/0429-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0430-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0430-Optimize-Bit-Operations-by-inlining.patch
index 278f49121e..278f49121e 100644
--- a/patches/server/0430-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/unapplied/server/0430-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index b30b0ed8a7..b30b0ed8a7 100644
--- a/patches/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/unapplied/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0432-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0432-incremental-chunk-and-player-saving.patch
index dbca41fb93..dbca41fb93 100644
--- a/patches/server/0432-incremental-chunk-and-player-saving.patch
+++ b/patches/unapplied/server/0432-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch
index c13f70aec1..c13f70aec1 100644
--- a/patches/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/unapplied/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0434-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0434-Support-old-UUID-format-for-NBT.patch
index 0c701ba22a..0c701ba22a 100644
--- a/patches/server/0434-Support-old-UUID-format-for-NBT.patch
+++ b/patches/unapplied/server/0434-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0435-Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/0435-Clean-up-duplicated-GameProfile-Properties.patch
index 2d55f77395..2d55f77395 100644
--- a/patches/server/0435-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/unapplied/server/0435-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0436-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0436-Convert-legacy-attributes-in-Item-Meta.patch
index e582cd59d9..e582cd59d9 100644
--- a/patches/server/0436-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/unapplied/server/0436-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0437-Remove-some-streams-from-structures.patch b/patches/unapplied/server/0437-Remove-some-streams-from-structures.patch
index b289b10692..b289b10692 100644
--- a/patches/server/0437-Remove-some-streams-from-structures.patch
+++ b/patches/unapplied/server/0437-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0438-Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/0438-Remove-streams-from-classes-related-villager-gossip.patch
index b9c37f3a08..b9c37f3a08 100644
--- a/patches/server/0438-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/unapplied/server/0438-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0439-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0439-Support-components-in-ItemMeta.patch
index 7645c0cd14..7645c0cd14 100644
--- a/patches/server/0439-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/server/0439-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch
index 9e7d65b4f7..9e7d65b4f7 100644
--- a/patches/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/unapplied/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0441-Add-entity-liquid-API.patch b/patches/unapplied/server/0441-Add-entity-liquid-API.patch
index 227db87abd..227db87abd 100644
--- a/patches/server/0441-Add-entity-liquid-API.patch
+++ b/patches/unapplied/server/0441-Add-entity-liquid-API.patch
diff --git a/patches/server/0442-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0442-Update-itemstack-legacy-name-and-lore.patch
index 4f3d35e979..4f3d35e979 100644
--- a/patches/server/0442-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/unapplied/server/0442-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0443-Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/0443-Spawn-player-in-correct-world-on-login.patch
index 08b6e1b41f..08b6e1b41f 100644
--- a/patches/server/0443-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/unapplied/server/0443-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0444-Add-PrepareResultEvent.patch b/patches/unapplied/server/0444-Add-PrepareResultEvent.patch
index 19a4825ee0..19a4825ee0 100644
--- a/patches/server/0444-Add-PrepareResultEvent.patch
+++ b/patches/unapplied/server/0444-Add-PrepareResultEvent.patch
diff --git a/patches/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 0f403623fe..0f403623fe 100644
--- a/patches/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/unapplied/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0446-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0446-Optimize-NetworkManager-Exception-Handling.patch
index b207ee6a24..b207ee6a24 100644
--- a/patches/server/0446-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/unapplied/server/0446-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0447-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0447-Fix-arrows-never-despawning-MC-125757.patch
index 3a2912d8b1..3a2912d8b1 100644
--- a/patches/server/0447-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/unapplied/server/0447-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0448-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0448-Thread-Safe-Vanilla-Command-permission-checking.patch
index 41ee49df99..41ee49df99 100644
--- a/patches/server/0448-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/unapplied/server/0448-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0449-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0449-Fix-SPIGOT-5989.patch
index 268acb81a9..268acb81a9 100644
--- a/patches/server/0449-Fix-SPIGOT-5989.patch
+++ b/patches/unapplied/server/0449-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0450-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0450-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 8f7b49fc0c..8f7b49fc0c 100644
--- a/patches/server/0450-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/unapplied/server/0450-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0451-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0451-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 297822e86c..297822e86c 100644
--- a/patches/server/0451-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/unapplied/server/0451-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0452-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0452-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 43380c5968..43380c5968 100644
--- a/patches/server/0452-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/unapplied/server/0452-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0453-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0453-Fix-some-rails-connecting-improperly.patch
index f612612b1c..f612612b1c 100644
--- a/patches/server/0453-Fix-some-rails-connecting-improperly.patch
+++ b/patches/unapplied/server/0453-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0454-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0454-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index be48fd5ae2..be48fd5ae2 100644
--- a/patches/server/0454-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/unapplied/server/0454-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0455-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0455-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 5d732a61b8..5d732a61b8 100644
--- a/patches/server/0455-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/unapplied/server/0455-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0456-Brand-support.patch b/patches/unapplied/server/0456-Brand-support.patch
index a982bee0d0..a982bee0d0 100644
--- a/patches/server/0456-Brand-support.patch
+++ b/patches/unapplied/server/0456-Brand-support.patch
diff --git a/patches/server/0457-Add-setMaxPlayers-API.patch b/patches/unapplied/server/0457-Add-setMaxPlayers-API.patch
index b3c38092b9..b3c38092b9 100644
--- a/patches/server/0457-Add-setMaxPlayers-API.patch
+++ b/patches/unapplied/server/0457-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0458-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0458-Add-playPickupItemAnimation-to-LivingEntity.patch
index 7b471758ee..7b471758ee 100644
--- a/patches/server/0458-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/unapplied/server/0458-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0459-Don-t-require-FACING-data.patch b/patches/unapplied/server/0459-Don-t-require-FACING-data.patch
index fd2ab14906..fd2ab14906 100644
--- a/patches/server/0459-Don-t-require-FACING-data.patch
+++ b/patches/unapplied/server/0459-Don-t-require-FACING-data.patch
diff --git a/patches/server/0460-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0460-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 873f11e7fc..873f11e7fc 100644
--- a/patches/server/0460-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/unapplied/server/0460-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0461-Add-moon-phase-API.patch b/patches/unapplied/server/0461-Add-moon-phase-API.patch
index c51ac1afea..c51ac1afea 100644
--- a/patches/server/0461-Add-moon-phase-API.patch
+++ b/patches/unapplied/server/0461-Add-moon-phase-API.patch
diff --git a/patches/server/0462-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0462-Prevent-headless-pistons-from-being-created.patch
index 943e340970..943e340970 100644
--- a/patches/server/0462-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/unapplied/server/0462-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0463-Add-BellRingEvent.patch b/patches/unapplied/server/0463-Add-BellRingEvent.patch
index 3c3ab5492d..3c3ab5492d 100644
--- a/patches/server/0463-Add-BellRingEvent.patch
+++ b/patches/unapplied/server/0463-Add-BellRingEvent.patch
diff --git a/patches/server/0464-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0464-Add-zombie-targets-turtle-egg-config.patch
index d315d92cd5..d315d92cd5 100644
--- a/patches/server/0464-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/unapplied/server/0464-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0465-Buffer-joins-to-world.patch b/patches/unapplied/server/0465-Buffer-joins-to-world.patch
index 28ead4089b..28ead4089b 100644
--- a/patches/server/0465-Buffer-joins-to-world.patch
+++ b/patches/unapplied/server/0465-Buffer-joins-to-world.patch
diff --git a/patches/server/0466-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/0466-Eigencraft-redstone-implementation.patch
index 5244808a5d..5244808a5d 100644
--- a/patches/server/0466-Eigencraft-redstone-implementation.patch
+++ b/patches/unapplied/server/0466-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0467-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0467-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 0bbb324050..0bbb324050 100644
--- a/patches/server/0467-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/unapplied/server/0467-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0468-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0468-PortalCreateEvent-needs-to-know-its-entity.patch
index dda96c41e6..dda96c41e6 100644
--- a/patches/server/0468-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/unapplied/server/0468-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0469-Fix-CraftTeam-null-check.patch b/patches/unapplied/server/0469-Fix-CraftTeam-null-check.patch
index fc8ca37076..fc8ca37076 100644
--- a/patches/server/0469-Fix-CraftTeam-null-check.patch
+++ b/patches/unapplied/server/0469-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0470-Add-more-Evoker-API.patch b/patches/unapplied/server/0470-Add-more-Evoker-API.patch
index 0fce1f166a..0fce1f166a 100644
--- a/patches/server/0470-Add-more-Evoker-API.patch
+++ b/patches/unapplied/server/0470-Add-more-Evoker-API.patch
diff --git a/patches/server/0471-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0471-Add-methods-to-get-translation-keys.patch
index 7f5caeaeff..7f5caeaeff 100644
--- a/patches/server/0471-Add-methods-to-get-translation-keys.patch
+++ b/patches/unapplied/server/0471-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0472-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0472-Create-HoverEvent-from-ItemStack-Entity.patch
index fe9f8500dd..fe9f8500dd 100644
--- a/patches/server/0472-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/unapplied/server/0472-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0473-Cache-block-data-strings.patch b/patches/unapplied/server/0473-Cache-block-data-strings.patch
index f605908561..f605908561 100644
--- a/patches/server/0473-Cache-block-data-strings.patch
+++ b/patches/unapplied/server/0473-Cache-block-data-strings.patch
diff --git a/patches/server/0474-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0474-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index dfccba2247..dfccba2247 100644
--- a/patches/server/0474-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/unapplied/server/0474-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0475-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0475-Add-additional-open-container-api-to-HumanEntity.patch
index 013bfca190..013bfca190 100644
--- a/patches/server/0475-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/unapplied/server/0475-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0476-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0476-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index b5d192ac20..b5d192ac20 100644
--- a/patches/server/0476-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/unapplied/server/0476-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0477-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0477-Extend-block-drop-capture-to-capture-all-items-added.patch
index 18d2ace0ad..18d2ace0ad 100644
--- a/patches/server/0477-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/unapplied/server/0477-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0478-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0478-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 47fc472499..47fc472499 100644
--- a/patches/server/0478-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/server/0478-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0479-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0479-Lazily-track-plugin-scoreboards-by-default.patch
index bb0fe1c990..bb0fe1c990 100644
--- a/patches/server/0479-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/unapplied/server/0479-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0480-Entity-isTicking.patch b/patches/unapplied/server/0480-Entity-isTicking.patch
index df7f36c0fc..df7f36c0fc 100644
--- a/patches/server/0480-Entity-isTicking.patch
+++ b/patches/unapplied/server/0480-Entity-isTicking.patch
diff --git a/patches/server/0481-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0481-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index ce28230d01..ce28230d01 100644
--- a/patches/server/0481-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/unapplied/server/0481-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0482-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/0482-Fix-Concurrency-issue-in-ShufflingList.patch
index 07c57efa62..07c57efa62 100644
--- a/patches/server/0482-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/unapplied/server/0482-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0483-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0483-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 8040656b2c..8040656b2c 100644
--- a/patches/server/0483-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/unapplied/server/0483-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0484-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0484-Fix-for-large-move-vectors-crashing-server.patch
index 943e1de879..943e1de879 100644
--- a/patches/server/0484-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/unapplied/server/0484-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0485-Optimise-getType-calls.patch b/patches/unapplied/server/0485-Optimise-getType-calls.patch
index 305a1e743e..305a1e743e 100644
--- a/patches/server/0485-Optimise-getType-calls.patch
+++ b/patches/unapplied/server/0485-Optimise-getType-calls.patch
diff --git a/patches/server/0486-Villager-resetOffers.patch b/patches/unapplied/server/0486-Villager-resetOffers.patch
index 1baf0aa539..1baf0aa539 100644
--- a/patches/server/0486-Villager-resetOffers.patch
+++ b/patches/unapplied/server/0486-Villager-resetOffers.patch
diff --git a/patches/server/0487-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0487-Retain-block-place-order-when-capturing-blockstates.patch
index 7b5a185559..7b5a185559 100644
--- a/patches/server/0487-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/unapplied/server/0487-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0488-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0488-Reduce-blockpos-allocation-from-pathfinding.patch
index 0008f77d44..0008f77d44 100644
--- a/patches/server/0488-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/unapplied/server/0488-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0489-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0489-Fix-item-locations-dropped-from-campfires.patch
index b69c339697..b69c339697 100644
--- a/patches/server/0489-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/unapplied/server/0489-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0490-Player-elytra-boost-API.patch b/patches/unapplied/server/0490-Player-elytra-boost-API.patch
index 6c41c479de..6c41c479de 100644
--- a/patches/server/0490-Player-elytra-boost-API.patch
+++ b/patches/unapplied/server/0490-Player-elytra-boost-API.patch
diff --git a/patches/server/0491-Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/0491-Fixed-TileEntityBell-memory-leak.patch
index 0cd7feb8d4..0cd7feb8d4 100644
--- a/patches/server/0491-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/unapplied/server/0491-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0492-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0492-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 4b7b7f82a4..4b7b7f82a4 100644
--- a/patches/server/0492-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/unapplied/server/0492-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0493-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0493-Add-getOfflinePlayerIfCached-String.patch
index 25a67e80c7..25a67e80c7 100644
--- a/patches/server/0493-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/server/0493-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0494-Add-ignore-discounts-API.patch b/patches/unapplied/server/0494-Add-ignore-discounts-API.patch
index 6ed4565a52..6ed4565a52 100644
--- a/patches/server/0494-Add-ignore-discounts-API.patch
+++ b/patches/unapplied/server/0494-Add-ignore-discounts-API.patch
diff --git a/patches/server/0495-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0495-Toggle-for-removing-existing-dragon.patch
index 8d613c75de..8d613c75de 100644
--- a/patches/server/0495-Toggle-for-removing-existing-dragon.patch
+++ b/patches/unapplied/server/0495-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0496-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0496-Fix-client-lag-on-advancement-loading.patch
index fc1d4cfbcf..fc1d4cfbcf 100644
--- a/patches/server/0496-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/unapplied/server/0496-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0497-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0497-Item-no-age-no-player-pickup.patch
index 0a59edc058..0a59edc058 100644
--- a/patches/server/0497-Item-no-age-no-player-pickup.patch
+++ b/patches/unapplied/server/0497-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0498-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0498-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 91c966567f..91c966567f 100644
--- a/patches/server/0498-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/unapplied/server/0498-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0499-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0499-Beacon-API-custom-effect-ranges.patch
index 08c28d699c..08c28d699c 100644
--- a/patches/server/0499-Beacon-API-custom-effect-ranges.patch
+++ b/patches/unapplied/server/0499-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0500-Add-API-for-quit-reason.patch b/patches/unapplied/server/0500-Add-API-for-quit-reason.patch
index df56d5e3ed..df56d5e3ed 100644
--- a/patches/server/0500-Add-API-for-quit-reason.patch
+++ b/patches/unapplied/server/0500-Add-API-for-quit-reason.patch
diff --git a/patches/server/0501-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0501-Add-Wandering-Trader-spawn-rate-config-options.patch
index 87891d128b..87891d128b 100644
--- a/patches/server/0501-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/unapplied/server/0501-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0502-Expose-world-spawn-angle.patch b/patches/unapplied/server/0502-Expose-world-spawn-angle.patch
index 80374db33e..80374db33e 100644
--- a/patches/server/0502-Expose-world-spawn-angle.patch
+++ b/patches/unapplied/server/0502-Expose-world-spawn-angle.patch
diff --git a/patches/server/0503-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0503-Add-Destroy-Speed-API.patch
index d69d702d7e..d69d702d7e 100644
--- a/patches/server/0503-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/server/0503-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index d81d5e18f9..d81d5e18f9 100644
--- a/patches/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/unapplied/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0505-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0505-Add-LivingEntity-clearActiveItem.patch
index 98b742f015..98b742f015 100644
--- a/patches/server/0505-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/unapplied/server/0505-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0506-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0506-Add-PlayerItemCooldownEvent.patch
index 751841d117..751841d117 100644
--- a/patches/server/0506-Add-PlayerItemCooldownEvent.patch
+++ b/patches/unapplied/server/0506-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0507-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0507-Significantly-improve-performance-of-the-end-generat.patch
index 95f0914262..95f0914262 100644
--- a/patches/server/0507-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/unapplied/server/0507-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0508-More-lightning-API.patch b/patches/unapplied/server/0508-More-lightning-API.patch
index f3cc50d6cc..f3cc50d6cc 100644
--- a/patches/server/0508-More-lightning-API.patch
+++ b/patches/unapplied/server/0508-More-lightning-API.patch
diff --git a/patches/server/0509-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0509-Climbing-should-not-bypass-cramming-gamerule.patch
index 21cfdd6f72..21cfdd6f72 100644
--- a/patches/server/0509-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/unapplied/server/0509-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0510-Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/0510-Added-missing-default-perms-for-commands.patch
index b28e56519d..b28e56519d 100644
--- a/patches/server/0510-Added-missing-default-perms-for-commands.patch
+++ b/patches/unapplied/server/0510-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0511-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0511-Add-PlayerShearBlockEvent.patch
index 019a28516f..019a28516f 100644
--- a/patches/server/0511-Add-PlayerShearBlockEvent.patch
+++ b/patches/unapplied/server/0511-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0512-Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/0512-Fix-curing-zombie-villager-discount-exploit.patch
index 03d56c4555..03d56c4555 100644
--- a/patches/server/0512-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/unapplied/server/0512-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0513-Limit-recipe-packets.patch b/patches/unapplied/server/0513-Limit-recipe-packets.patch
index c20f647e2a..c20f647e2a 100644
--- a/patches/server/0513-Limit-recipe-packets.patch
+++ b/patches/unapplied/server/0513-Limit-recipe-packets.patch
diff --git a/patches/server/0514-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0514-Fix-CraftSound-backwards-compatibility.patch
index 9795fec129..9795fec129 100644
--- a/patches/server/0514-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/unapplied/server/0514-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0515-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0515-Player-Chunk-Load-Unload-Events.patch
index 43fc686460..43fc686460 100644
--- a/patches/server/0515-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/server/0515-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0516-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0516-Optimize-Dynamic-get-Missing-Keys.patch
index d664f7ff69..d664f7ff69 100644
--- a/patches/server/0516-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/unapplied/server/0516-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0517-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0517-Expose-LivingEntity-hurt-direction.patch
index 94cc2314e2..94cc2314e2 100644
--- a/patches/server/0517-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/server/0517-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0518-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0518-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 4cdcac5566..4cdcac5566 100644
--- a/patches/server/0518-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/server/0518-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0519-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/0519-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index 87fc5a3895..87fc5a3895 100644
--- a/patches/server/0519-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/unapplied/server/0519-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0520-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0520-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index d50b672771..d50b672771 100644
--- a/patches/server/0520-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/unapplied/server/0520-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0521-Implement-TargetHitEvent.patch b/patches/unapplied/server/0521-Implement-TargetHitEvent.patch
index 78722933d9..78722933d9 100644
--- a/patches/server/0521-Implement-TargetHitEvent.patch
+++ b/patches/unapplied/server/0521-Implement-TargetHitEvent.patch
diff --git a/patches/server/0522-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0522-MC-4-Fix-item-position-desync.patch
index d53981f218..d53981f218 100644
--- a/patches/server/0522-MC-4-Fix-item-position-desync.patch
+++ b/patches/unapplied/server/0522-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0523-Additional-Block-Material-API-s.patch b/patches/unapplied/server/0523-Additional-Block-Material-API-s.patch
index 69adf40a37..69adf40a37 100644
--- a/patches/server/0523-Additional-Block-Material-API-s.patch
+++ b/patches/unapplied/server/0523-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0524-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0524-Fix-harming-potion-dupe.patch
index ac9c0592e5..ac9c0592e5 100644
--- a/patches/server/0524-Fix-harming-potion-dupe.patch
+++ b/patches/unapplied/server/0524-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0525-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/0525-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index f9e803f989..f9e803f989 100644
--- a/patches/server/0525-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/unapplied/server/0525-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0526-Cache-burn-durations.patch b/patches/unapplied/server/0526-Cache-burn-durations.patch
index 085140489c..085140489c 100644
--- a/patches/server/0526-Cache-burn-durations.patch
+++ b/patches/unapplied/server/0526-Cache-burn-durations.patch
diff --git a/patches/server/0527-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0527-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index c4eb2f5073..c4eb2f5073 100644
--- a/patches/server/0527-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/unapplied/server/0527-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0528-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0528-Fix-Not-a-string-Map-Conversion-spam.patch
index 7809bd0798..7809bd0798 100644
--- a/patches/server/0528-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/unapplied/server/0528-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0529-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0529-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0529-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/server/0529-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0530-Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/0530-Fix-interact-event-not-being-called-in-adventure.patch
index d6331655da..d6331655da 100644
--- a/patches/server/0530-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/unapplied/server/0530-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0531-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0531-Zombie-API-breaking-doors.patch
index 0b6d0327e3..0b6d0327e3 100644
--- a/patches/server/0531-Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/server/0531-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0532-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0532-Fix-nerfed-slime-when-splitting.patch
index 7b62c899e2..7b62c899e2 100644
--- a/patches/server/0532-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/unapplied/server/0532-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0533-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0533-Add-EntityLoadCrossbowEvent.patch
index fa93adcd63..fa93adcd63 100644
--- a/patches/server/0533-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/server/0533-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0534-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0534-Added-WorldGameRuleChangeEvent.patch
index 73072a04b3..73072a04b3 100644
--- a/patches/server/0534-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/server/0534-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0535-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0535-Added-ServerResourcesReloadedEvent.patch
index 606ddc5f7a..606ddc5f7a 100644
--- a/patches/server/0535-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/0535-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0536-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0536-Added-world-settings-for-mobs-picking-up-loot.patch
index 6c45d5d3e7..6c45d5d3e7 100644
--- a/patches/server/0536-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/unapplied/server/0536-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0537-Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0537-Implemented-BlockFailedDispenseEvent.patch
index 43c173c10c..43c173c10c 100644
--- a/patches/server/0537-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/server/0537-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0538-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0538-Added-PlayerLecternPageChangeEvent.patch
index 57485f4ee7..57485f4ee7 100644
--- a/patches/server/0538-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/server/0538-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0539-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0539-Added-PlayerLoomPatternSelectEvent.patch
index 2ccb7916d5..2ccb7916d5 100644
--- a/patches/server/0539-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/server/0539-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0540-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0540-Configurable-door-breaking-difficulty.patch
index dcccd2a0b0..dcccd2a0b0 100644
--- a/patches/server/0540-Configurable-door-breaking-difficulty.patch
+++ b/patches/unapplied/server/0540-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0541-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0541-Empty-commands-shall-not-be-dispatched.patch
index d8134ea2cf..d8134ea2cf 100644
--- a/patches/server/0541-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/unapplied/server/0541-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0542-Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/0542-Implement-API-to-expose-exact-interaction-point.patch
index 510a4d0e75..510a4d0e75 100644
--- a/patches/server/0542-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/unapplied/server/0542-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0543-Remove-stale-POIs.patch b/patches/unapplied/server/0543-Remove-stale-POIs.patch
index ffabe328d1..ffabe328d1 100644
--- a/patches/server/0543-Remove-stale-POIs.patch
+++ b/patches/unapplied/server/0543-Remove-stale-POIs.patch
diff --git a/patches/server/0544-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0544-Fix-villager-boat-exploit.patch
index e8e565dcf7..e8e565dcf7 100644
--- a/patches/server/0544-Fix-villager-boat-exploit.patch
+++ b/patches/unapplied/server/0544-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0545-Add-sendOpLevel-API.patch b/patches/unapplied/server/0545-Add-sendOpLevel-API.patch
index 9355fae2dc..9355fae2dc 100644
--- a/patches/server/0545-Add-sendOpLevel-API.patch
+++ b/patches/unapplied/server/0545-Add-sendOpLevel-API.patch
diff --git a/patches/server/0546-TODO-Registry-Modification-API.patch b/patches/unapplied/server/0546-TODO-Registry-Modification-API.patch
index 9206b252a1..9206b252a1 100644
--- a/patches/server/0546-TODO-Registry-Modification-API.patch
+++ b/patches/unapplied/server/0546-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0547-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0547-Add-StructuresLocateEvent.patch
index 61c53d9c4c..61c53d9c4c 100644
--- a/patches/server/0547-Add-StructuresLocateEvent.patch
+++ b/patches/unapplied/server/0547-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0548-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0548-Collision-option-for-requiring-a-player-participant.patch
index 0cb0acd11d..0cb0acd11d 100644
--- a/patches/server/0548-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/unapplied/server/0548-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0549-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0549-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 1eb191cb45..1eb191cb45 100644
--- a/patches/server/0549-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/unapplied/server/0549-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0550-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0550-Return-chat-component-with-empty-text-instead-of-thr.patch
index db35047751..db35047751 100644
--- a/patches/server/0550-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/server/0550-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0551-Make-schedule-command-per-world.patch b/patches/unapplied/server/0551-Make-schedule-command-per-world.patch
index 60f5d1fc66..60f5d1fc66 100644
--- a/patches/server/0551-Make-schedule-command-per-world.patch
+++ b/patches/unapplied/server/0551-Make-schedule-command-per-world.patch
diff --git a/patches/server/0552-Configurable-max-leash-distance.patch b/patches/unapplied/server/0552-Configurable-max-leash-distance.patch
index aad84993f9..aad84993f9 100644
--- a/patches/server/0552-Configurable-max-leash-distance.patch
+++ b/patches/unapplied/server/0552-Configurable-max-leash-distance.patch
diff --git a/patches/server/0553-Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/0553-Implement-BlockPreDispenseEvent.patch
index e7a3c4af5f..e7a3c4af5f 100644
--- a/patches/server/0553-Implement-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/server/0553-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0554-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0554-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 60fd6a36d4..60fd6a36d4 100644
--- a/patches/server/0554-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/server/0554-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0555-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0555-Add-toggle-for-always-placing-the-dragon-egg.patch
index c3ddac9816..c3ddac9816 100644
--- a/patches/server/0555-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/unapplied/server/0555-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0556-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0556-Added-PlayerStonecutterRecipeSelectEvent.patch
index 82a8049655..82a8049655 100644
--- a/patches/server/0556-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/server/0556-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 4a3e11183b..4a3e11183b 100644
--- a/patches/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/unapplied/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0558-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0558-Reset-shield-blocking-on-dimension-change.patch
index 15ebdb71cd..15ebdb71cd 100644
--- a/patches/server/0558-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/unapplied/server/0558-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0559-add-DragonEggFormEvent.patch b/patches/unapplied/server/0559-add-DragonEggFormEvent.patch
index 7e39c25a22..7e39c25a22 100644
--- a/patches/server/0559-add-DragonEggFormEvent.patch
+++ b/patches/unapplied/server/0559-add-DragonEggFormEvent.patch
diff --git a/patches/server/0560-EntityMoveEvent.patch b/patches/unapplied/server/0560-EntityMoveEvent.patch
index 0d3348c779..0d3348c779 100644
--- a/patches/server/0560-EntityMoveEvent.patch
+++ b/patches/unapplied/server/0560-EntityMoveEvent.patch
diff --git a/patches/server/0561-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0561-added-option-to-disable-pathfinding-updates-on-block.patch
index 9cf015f84b..9cf015f84b 100644
--- a/patches/server/0561-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/unapplied/server/0561-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0562-Inline-shift-direction-fields.patch b/patches/unapplied/server/0562-Inline-shift-direction-fields.patch
index 338237a2b0..338237a2b0 100644
--- a/patches/server/0562-Inline-shift-direction-fields.patch
+++ b/patches/unapplied/server/0562-Inline-shift-direction-fields.patch
diff --git a/patches/server/0563-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0563-Allow-adding-items-to-BlockDropItemEvent.patch
index a80491b6cb..a80491b6cb 100644
--- a/patches/server/0563-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/server/0563-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0564-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0564-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0564-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/server/0564-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0565-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0565-living-entity-allow-attribute-registration.patch
index 9ac5884f2e..9ac5884f2e 100644
--- a/patches/server/0565-living-entity-allow-attribute-registration.patch
+++ b/patches/unapplied/server/0565-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0566-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0566-fix-dead-slime-setSize-invincibility.patch
index 91a270bc9e..91a270bc9e 100644
--- a/patches/server/0566-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/unapplied/server/0566-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0567-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0567-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0567-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/unapplied/server/0567-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0568-Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/0568-Add-support-for-hex-color-codes-in-console.patch
index 9c48e211e1..9c48e211e1 100644
--- a/patches/server/0568-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/unapplied/server/0568-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0569-Expose-Tracked-Players.patch b/patches/unapplied/server/0569-Expose-Tracked-Players.patch
index 535534b13e..535534b13e 100644
--- a/patches/server/0569-Expose-Tracked-Players.patch
+++ b/patches/unapplied/server/0569-Expose-Tracked-Players.patch
diff --git a/patches/server/0570-Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/0570-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0570-Remove-streams-from-SensorNearest.patch
+++ b/patches/unapplied/server/0570-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0571-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/0571-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..e013e32526 100644
--- a/patches/server/0571-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/unapplied/server/0571-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0572-Improve-ServerGUI.patch b/patches/unapplied/server/0572-Improve-ServerGUI.patch
index e573bd2f58..e573bd2f58 100644
--- a/patches/server/0572-Improve-ServerGUI.patch
+++ b/patches/unapplied/server/0572-Improve-ServerGUI.patch
diff --git a/patches/server/0573-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/0573-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index d4e47e2e7d..d4e47e2e7d 100644
--- a/patches/server/0573-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/unapplied/server/0573-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0574-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0574-fix-converting-txt-to-json-file.patch
index aee0609038..aee0609038 100644
--- a/patches/server/0574-fix-converting-txt-to-json-file.patch
+++ b/patches/unapplied/server/0574-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0575-Add-worldborder-events.patch b/patches/unapplied/server/0575-Add-worldborder-events.patch
index 176d1259e4..176d1259e4 100644
--- a/patches/server/0575-Add-worldborder-events.patch
+++ b/patches/unapplied/server/0575-Add-worldborder-events.patch
diff --git a/patches/server/0576-added-PlayerNameEntityEvent.patch b/patches/unapplied/server/0576-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0576-added-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/server/0576-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0577-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0577-Prevent-grindstones-from-overstacking-items.patch
index 49a338cb59..49a338cb59 100644
--- a/patches/server/0577-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/unapplied/server/0577-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0578-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0578-Add-recipe-to-cook-events.patch
index 757db61442..757db61442 100644
--- a/patches/server/0578-Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/server/0578-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0579-Add-Block-isValidTool.patch b/patches/unapplied/server/0579-Add-Block-isValidTool.patch
index b4c91d8f68..b4c91d8f68 100644
--- a/patches/server/0579-Add-Block-isValidTool.patch
+++ b/patches/unapplied/server/0579-Add-Block-isValidTool.patch
diff --git a/patches/server/0580-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0580-Allow-using-signs-inside-spawn-protection.patch
index 59a2ffdf23..59a2ffdf23 100644
--- a/patches/server/0580-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/unapplied/server/0580-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0581-Expand-world-key-API.patch b/patches/unapplied/server/0581-Expand-world-key-API.patch
index a4be2c424b..a4be2c424b 100644
--- a/patches/server/0581-Expand-world-key-API.patch
+++ b/patches/unapplied/server/0581-Expand-world-key-API.patch
diff --git a/patches/server/0582-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0582-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0582-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/unapplied/server/0582-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0583-Item-Rarity-API.patch b/patches/unapplied/server/0583-Item-Rarity-API.patch
index fd42b926cd..fd42b926cd 100644
--- a/patches/server/0583-Item-Rarity-API.patch
+++ b/patches/unapplied/server/0583-Item-Rarity-API.patch
diff --git a/patches/server/0584-copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/0584-copy-TESign-isEditable-from-snapshots.patch
index b2904aa76c..b2904aa76c 100644
--- a/patches/server/0584-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/unapplied/server/0584-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0585-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0585-Drop-carried-item-when-player-has-disconnected.patch
index 5b671c35a4..5b671c35a4 100644
--- a/patches/server/0585-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/unapplied/server/0585-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0586-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0586-forced-whitelist-use-configurable-kick-message.patch
index b85180dd66..b85180dd66 100644
--- a/patches/server/0586-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/unapplied/server/0586-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0587-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0587-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 2895dbdcea..2895dbdcea 100644
--- a/patches/server/0587-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/unapplied/server/0587-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0588-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0588-Entity-load-save-limit-per-chunk.patch
index bae815e2ce..bae815e2ce 100644
--- a/patches/server/0588-Entity-load-save-limit-per-chunk.patch
+++ b/patches/unapplied/server/0588-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0589-Expose-protocol-version.patch b/patches/unapplied/server/0589-Expose-protocol-version.patch
index 41c16935b9..41c16935b9 100644
--- a/patches/server/0589-Expose-protocol-version.patch
+++ b/patches/unapplied/server/0589-Expose-protocol-version.patch
diff --git a/patches/server/0590-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0590-Enhance-console-tab-completions-for-brigadier-comman.patch
index 45270f8c43..45270f8c43 100644
--- a/patches/server/0590-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/unapplied/server/0590-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0591-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0591-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 467193ed61..467193ed61 100644
--- a/patches/server/0591-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/unapplied/server/0591-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0592-Add-bypass-host-check.patch b/patches/unapplied/server/0592-Add-bypass-host-check.patch
index 053d35e9a1..053d35e9a1 100644
--- a/patches/server/0592-Add-bypass-host-check.patch
+++ b/patches/unapplied/server/0592-Add-bypass-host-check.patch
diff --git a/patches/server/0593-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0593-Set-area-affect-cloud-rotation.patch
index 208c7c7e28..208c7c7e28 100644
--- a/patches/server/0593-Set-area-affect-cloud-rotation.patch
+++ b/patches/unapplied/server/0593-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0594-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0594-add-isDeeplySleeping-to-HumanEntity.patch
index 4f6a4d704a..4f6a4d704a 100644
--- a/patches/server/0594-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/server/0594-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0595-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0595-add-consumeFuel-to-FurnaceBurnEvent.patch
index 60496e1852..60496e1852 100644
--- a/patches/server/0595-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/server/0595-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0596-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0596-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0596-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/server/0596-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0597-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0597-fix-PigZombieAngerEvent-cancellation.patch
index c259f75104..c259f75104 100644
--- a/patches/server/0597-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/unapplied/server/0597-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0598-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0598-fix-PlayerItemHeldEvent-firing-twice.patch
index a9d69c74c8..a9d69c74c8 100644
--- a/patches/server/0598-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/unapplied/server/0598-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0599-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0599-Added-PlayerDeepSleepEvent.patch
index 52bc71899c..52bc71899c 100644
--- a/patches/server/0599-Added-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/0599-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0600-More-World-API.patch b/patches/unapplied/server/0600-More-World-API.patch
index f51804786e..f51804786e 100644
--- a/patches/server/0600-More-World-API.patch
+++ b/patches/unapplied/server/0600-More-World-API.patch
diff --git a/patches/server/0601-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0601-Added-PlayerBedFailEnterEvent.patch
index 9e0e427532..9e0e427532 100644
--- a/patches/server/0601-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/0601-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0602-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0602-Implement-methods-to-convert-between-Component-and-B.patch
index ae9be1ce8a..ae9be1ce8a 100644
--- a/patches/server/0602-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/unapplied/server/0602-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0603-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/0603-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 507ef8d1dc..507ef8d1dc 100644
--- a/patches/server/0603-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/unapplied/server/0603-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0604-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0604-Introduce-beacon-activation-deactivation-events.patch
index fb95254985..fb95254985 100644
--- a/patches/server/0604-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/server/0604-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0605-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0605-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 6511c0aae4..6511c0aae4 100644
--- a/patches/server/0605-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/unapplied/server/0605-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0606-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0606-Add-Channel-initialization-listeners.patch
index 4bbe9f2781..4bbe9f2781 100644
--- a/patches/server/0606-Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/0606-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0607-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0607-Send-empty-commands-if-tab-completion-is-disabled.patch
index 0514b1f8a6..0514b1f8a6 100644
--- a/patches/server/0607-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/unapplied/server/0607-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0608-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0608-Add-more-WanderingTrader-API.patch
index 783de0abfe..783de0abfe 100644
--- a/patches/server/0608-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/0608-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0609-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0609-Add-EntityBlockStorage-clearEntities.patch
index 5b7203c33d..5b7203c33d 100644
--- a/patches/server/0609-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/0609-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0610-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0610-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 6d052a3f61..6d052a3f61 100644
--- a/patches/server/0610-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/0610-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0611-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0611-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 32ba58aa32..32ba58aa32 100644
--- a/patches/server/0611-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0611-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0612-Inventory-close.patch b/patches/unapplied/server/0612-Inventory-close.patch
index 69dc365057..69dc365057 100644
--- a/patches/server/0612-Inventory-close.patch
+++ b/patches/unapplied/server/0612-Inventory-close.patch
diff --git a/patches/server/0613-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0613-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index a0f6decc09..a0f6decc09 100644
--- a/patches/server/0613-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/0613-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0614-Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/0614-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0614-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/unapplied/server/0614-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0615-Add-basic-Datapack-API.patch b/patches/unapplied/server/0615-Add-basic-Datapack-API.patch
index 2d6b90bc8e..2d6b90bc8e 100644
--- a/patches/server/0615-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/0615-Add-basic-Datapack-API.patch
diff --git a/patches/server/0616-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0616-Add-environment-variable-to-disable-server-gui.patch
index f3894d0d5e..f3894d0d5e 100644
--- a/patches/server/0616-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/0616-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0617-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0617-additions-to-PlayerGameModeChangeEvent.patch
index fbcce9d319..fbcce9d319 100644
--- a/patches/server/0617-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/server/0617-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0618-ItemStack-repair-check-API.patch b/patches/unapplied/server/0618-ItemStack-repair-check-API.patch
index ad363ced40..ad363ced40 100644
--- a/patches/server/0618-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/server/0618-ItemStack-repair-check-API.patch
diff --git a/patches/server/0619-More-Enchantment-API.patch b/patches/unapplied/server/0619-More-Enchantment-API.patch
index ed087b154b..ed087b154b 100644
--- a/patches/server/0619-More-Enchantment-API.patch
+++ b/patches/unapplied/server/0619-More-Enchantment-API.patch
diff --git a/patches/server/0620-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0620-Move-range-check-for-block-placing-up.patch
index 2950420d2c..2950420d2c 100644
--- a/patches/server/0620-Move-range-check-for-block-placing-up.patch
+++ b/patches/unapplied/server/0620-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0621-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0621-Fix-and-optimise-world-force-upgrading.patch
index 4cca3fdad0..4cca3fdad0 100644
--- a/patches/server/0621-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/unapplied/server/0621-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0622-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0622-Add-Mob-lookAt-API.patch
index 2179be5193..2179be5193 100644
--- a/patches/server/0622-Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/server/0622-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0623-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0623-Add-Unix-domain-socket-support.patch
index 0722771488..0722771488 100644
--- a/patches/server/0623-Add-Unix-domain-socket-support.patch
+++ b/patches/unapplied/server/0623-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0624-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0624-Add-EntityInsideBlockEvent.patch
index 1c140e7006..1c140e7006 100644
--- a/patches/server/0624-Add-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/server/0624-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0625-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0625-Attributes-API-for-item-defaults.patch
index 20960278b3..20960278b3 100644
--- a/patches/server/0625-Attributes-API-for-item-defaults.patch
+++ b/patches/unapplied/server/0625-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0626-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0626-Add-cause-to-Weather-ThunderChangeEvents.patch
index 833075861f..833075861f 100644
--- a/patches/server/0626-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/server/0626-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0627-More-Lidded-Block-API.patch b/patches/unapplied/server/0627-More-Lidded-Block-API.patch
index 135fd68698..135fd68698 100644
--- a/patches/server/0627-More-Lidded-Block-API.patch
+++ b/patches/unapplied/server/0627-More-Lidded-Block-API.patch
diff --git a/patches/server/0628-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0628-Limit-item-frame-cursors-on-maps.patch
index 8c1084fa88..8c1084fa88 100644
--- a/patches/server/0628-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/unapplied/server/0628-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0629-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0629-Add-PlayerKickEvent-causes.patch
index d769b78d19..d769b78d19 100644
--- a/patches/server/0629-Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/server/0629-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0630-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0630-Add-PufferFishStateChangeEvent.patch
index 36faf69554..36faf69554 100644
--- a/patches/server/0630-Add-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/server/0630-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0631-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0631-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index d66d11a86d..d66d11a86d 100644
--- a/patches/server/0631-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/unapplied/server/0631-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0632-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0632-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 60ec92636d..60ec92636d 100644
--- a/patches/server/0632-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/unapplied/server/0632-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0633-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0633-Add-option-to-fix-items-merging-through-walls.patch
index 8e31fc0547..8e31fc0547 100644
--- a/patches/server/0633-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/unapplied/server/0633-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0634-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0634-Add-BellRevealRaiderEvent.patch
index 7ae9f6eb2d..7ae9f6eb2d 100644
--- a/patches/server/0634-Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/server/0634-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0635-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0635-Fix-invulnerable-end-crystals.patch
index 7d94da54a8..7d94da54a8 100644
--- a/patches/server/0635-Fix-invulnerable-end-crystals.patch
+++ b/patches/unapplied/server/0635-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0636-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0636-Add-ElderGuardianAppearanceEvent.patch
index ec130af4a8..ec130af4a8 100644
--- a/patches/server/0636-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/server/0636-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0637-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0637-Fix-dangerous-end-portal-logic.patch
index a61f1a1d44..a61f1a1d44 100644
--- a/patches/server/0637-Fix-dangerous-end-portal-logic.patch
+++ b/patches/unapplied/server/0637-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0638-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0638-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index ef457d74af..ef457d74af 100644
--- a/patches/server/0638-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/unapplied/server/0638-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0639-Make-item-validations-configurable.patch b/patches/unapplied/server/0639-Make-item-validations-configurable.patch
index f8a66d7e96..f8a66d7e96 100644
--- a/patches/server/0639-Make-item-validations-configurable.patch
+++ b/patches/unapplied/server/0639-Make-item-validations-configurable.patch
diff --git a/patches/server/0640-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0640-Line-Of-Sight-Changes.patch
index d16cceff4b..d16cceff4b 100644
--- a/patches/server/0640-Line-Of-Sight-Changes.patch
+++ b/patches/unapplied/server/0640-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0641-add-per-world-spawn-limits.patch b/patches/unapplied/server/0641-add-per-world-spawn-limits.patch
index 3965764194..3965764194 100644
--- a/patches/server/0641-add-per-world-spawn-limits.patch
+++ b/patches/unapplied/server/0641-add-per-world-spawn-limits.patch
diff --git a/patches/server/0642-Fix-potions-splash-events.patch b/patches/unapplied/server/0642-Fix-potions-splash-events.patch
index 6cfdd0441b..6cfdd0441b 100644
--- a/patches/server/0642-Fix-potions-splash-events.patch
+++ b/patches/unapplied/server/0642-Fix-potions-splash-events.patch
diff --git a/patches/server/0643-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0643-Add-more-LimitedRegion-API.patch
index 0701fb43d1..0701fb43d1 100644
--- a/patches/server/0643-Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/server/0643-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0644-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0644-Fix-PlayerDropItemEvent-using-wrong-item.patch
index fb16371dda..fb16371dda 100644
--- a/patches/server/0644-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/unapplied/server/0644-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0645-Missing-Entity-Behavior-API.patch b/patches/unapplied/server/0645-Missing-Entity-Behavior-API.patch
index 4ecfa04de0..4ecfa04de0 100644
--- a/patches/server/0645-Missing-Entity-Behavior-API.patch
+++ b/patches/unapplied/server/0645-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0646-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0646-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 57b24a35b3..57b24a35b3 100644
--- a/patches/server/0646-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/unapplied/server/0646-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0647-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0647-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 045cf8c80e..045cf8c80e 100644
--- a/patches/server/0647-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/unapplied/server/0647-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0648-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0648-Use-getChunkIfLoadedImmediately-in-places.patch
index 0e843b1ab5..0e843b1ab5 100644
--- a/patches/server/0648-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/unapplied/server/0648-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0649-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0649-Fix-commands-from-signs-not-firing-command-events.patch
index 3b091b6fa5..3b091b6fa5 100644
--- a/patches/server/0649-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/unapplied/server/0649-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0650-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0650-Adds-PlayerArmSwingEvent.patch
index b60c9d8af4..b60c9d8af4 100644
--- a/patches/server/0650-Adds-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/server/0650-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0651-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0651-Fixes-kick-event-leave-message-not-being-sent.patch
index 0182db0014..0182db0014 100644
--- a/patches/server/0651-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/unapplied/server/0651-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0652-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0652-Add-config-for-mobs-immune-to-default-effects.patch
index d32d8118bb..d32d8118bb 100644
--- a/patches/server/0652-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/unapplied/server/0652-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0653-Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/0653-Fix-incorrect-message-for-outdated-client.patch
index 7f97afed9f..7f97afed9f 100644
--- a/patches/server/0653-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/unapplied/server/0653-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0654-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0654-Don-t-apply-cramming-damage-to-players.patch
index 9754dbca44..9754dbca44 100644
--- a/patches/server/0654-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/unapplied/server/0654-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0655-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0655-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 297c6b3a06..297c6b3a06 100644
--- a/patches/server/0655-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/unapplied/server/0655-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0656-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/0656-Add-a-bunch-of-missing-forceDrop-toggles.patch
index fe8ffa9fde..fe8ffa9fde 100644
--- a/patches/server/0656-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/unapplied/server/0656-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0657-Stinger-API.patch b/patches/unapplied/server/0657-Stinger-API.patch
index 205b58361d..205b58361d 100644
--- a/patches/server/0657-Stinger-API.patch
+++ b/patches/unapplied/server/0657-Stinger-API.patch
diff --git a/patches/server/0658-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0658-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index f7fd82f28b..f7fd82f28b 100644
--- a/patches/server/0658-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/unapplied/server/0658-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0659-Add-System.out-err-catcher.patch b/patches/unapplied/server/0659-Add-System.out-err-catcher.patch
index f2486da608..f2486da608 100644
--- a/patches/server/0659-Add-System.out-err-catcher.patch
+++ b/patches/unapplied/server/0659-Add-System.out-err-catcher.patch
diff --git a/patches/server/0660-Fix-test-not-bootstrapping.patch b/patches/unapplied/server/0660-Fix-test-not-bootstrapping.patch
index 6c582bf1e6..6c582bf1e6 100644
--- a/patches/server/0660-Fix-test-not-bootstrapping.patch
+++ b/patches/unapplied/server/0660-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0661-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0661-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0661-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/server/0661-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0662-Improve-boat-collision-performance.patch b/patches/unapplied/server/0662-Improve-boat-collision-performance.patch
index fa3f290859..fa3f290859 100644
--- a/patches/server/0662-Improve-boat-collision-performance.patch
+++ b/patches/unapplied/server/0662-Improve-boat-collision-performance.patch
diff --git a/patches/server/0663-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0663-Prevent-AFK-kick-while-watching-end-credits.patch
index 51f1f4e1fc..51f1f4e1fc 100644
--- a/patches/server/0663-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/unapplied/server/0663-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0664-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0664-Allow-skipping-writing-of-comments-to-server.propert.patch
index b14eca2ac6..b14eca2ac6 100644
--- a/patches/server/0664-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/unapplied/server/0664-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0665-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0665-Add-PlayerSetSpawnEvent.patch
index 6f92ddad0b..6f92ddad0b 100644
--- a/patches/server/0665-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/server/0665-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0666-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0666-Make-hoppers-respect-inventory-max-stack-size.patch
index d75e071280..d75e071280 100644
--- a/patches/server/0666-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/unapplied/server/0666-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0667-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0667-Optimize-entity-tracker-passenger-checks.patch
index d6d9a78f26..d6d9a78f26 100644
--- a/patches/server/0667-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/unapplied/server/0667-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0668-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0668-Config-option-for-Piglins-guarding-chests.patch
index abf0d8935e..abf0d8935e 100644
--- a/patches/server/0668-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/unapplied/server/0668-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0669-Added-EntityDamageItemEvent.patch b/patches/unapplied/server/0669-Added-EntityDamageItemEvent.patch
index 98611d0adb..98611d0adb 100644
--- a/patches/server/0669-Added-EntityDamageItemEvent.patch
+++ b/patches/unapplied/server/0669-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0670-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0670-Optimize-indirect-passenger-iteration.patch
index a68e70596f..a68e70596f 100644
--- a/patches/server/0670-Optimize-indirect-passenger-iteration.patch
+++ b/patches/unapplied/server/0670-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0671-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0671-Configurable-item-frame-map-cursor-update-interval.patch
index 1b37ee4f1e..1b37ee4f1e 100644
--- a/patches/server/0671-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/unapplied/server/0671-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0672-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0672-Make-EntityUnleashEvent-cancellable.patch
index b430ede2bc..b430ede2bc 100644
--- a/patches/server/0672-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/unapplied/server/0672-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0673-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0673-Clear-bucket-NBT-after-dispense.patch
index d729313893..d729313893 100644
--- a/patches/server/0673-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/unapplied/server/0673-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0674-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0674-Change-EnderEye-target-without-changing-other-things.patch
index 1ed1548ad8..1ed1548ad8 100644
--- a/patches/server/0674-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/server/0674-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0675-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0675-Add-BlockBreakBlockEvent.patch
index 39a1efcf18..39a1efcf18 100644
--- a/patches/server/0675-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/server/0675-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0676-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0676-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 6be6026009..6be6026009 100644
--- a/patches/server/0676-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/unapplied/server/0676-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0677-More-CommandBlock-API.patch b/patches/unapplied/server/0677-More-CommandBlock-API.patch
index 3cbd2436d3..3cbd2436d3 100644
--- a/patches/server/0677-More-CommandBlock-API.patch
+++ b/patches/unapplied/server/0677-More-CommandBlock-API.patch
diff --git a/patches/server/0678-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0678-Add-missing-team-sidebar-display-slots.patch
index 73e373b0ba..73e373b0ba 100644
--- a/patches/server/0678-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/server/0678-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0679-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0679-Add-back-EntityPortalExitEvent.patch
index 0f789c0462..0f789c0462 100644
--- a/patches/server/0679-Add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/server/0679-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0680-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0680-Add-methods-to-find-targets-for-lightning-strikes.patch
index 700994d8f8..700994d8f8 100644
--- a/patches/server/0680-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/server/0680-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0681-Get-entity-default-attributes.patch b/patches/unapplied/server/0681-Get-entity-default-attributes.patch
index e8d69e1314..e8d69e1314 100644
--- a/patches/server/0681-Get-entity-default-attributes.patch
+++ b/patches/unapplied/server/0681-Get-entity-default-attributes.patch
diff --git a/patches/server/0682-Left-handed-API.patch b/patches/unapplied/server/0682-Left-handed-API.patch
index 3b4077b54a..3b4077b54a 100644
--- a/patches/server/0682-Left-handed-API.patch
+++ b/patches/unapplied/server/0682-Left-handed-API.patch
diff --git a/patches/server/0683-Add-more-advancement-API.patch b/patches/unapplied/server/0683-Add-more-advancement-API.patch
index 388b714e6d..388b714e6d 100644
--- a/patches/server/0683-Add-more-advancement-API.patch
+++ b/patches/unapplied/server/0683-Add-more-advancement-API.patch
diff --git a/patches/server/0684-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0684-Add-ItemFactory-getSpawnEgg-API.patch
index 29c5f4f880..29c5f4f880 100644
--- a/patches/server/0684-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/unapplied/server/0684-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0685-Add-critical-damage-API.patch b/patches/unapplied/server/0685-Add-critical-damage-API.patch
index 84d754b4d3..84d754b4d3 100644
--- a/patches/server/0685-Add-critical-damage-API.patch
+++ b/patches/unapplied/server/0685-Add-critical-damage-API.patch
diff --git a/patches/server/0686-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0686-Fix-issues-with-mob-conversion.patch
index 8967d981ca..8967d981ca 100644
--- a/patches/server/0686-Fix-issues-with-mob-conversion.patch
+++ b/patches/unapplied/server/0686-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0687-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0687-Add-isCollidable-methods-to-various-places.patch
index 43825fcbc7..43825fcbc7 100644
--- a/patches/server/0687-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/unapplied/server/0687-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0688-Goat-ram-API.patch b/patches/unapplied/server/0688-Goat-ram-API.patch
index e48bb6d3be..e48bb6d3be 100644
--- a/patches/server/0688-Goat-ram-API.patch
+++ b/patches/unapplied/server/0688-Goat-ram-API.patch
diff --git a/patches/server/0689-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0689-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0689-Add-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/server/0689-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0690-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0690-Add-Raw-Byte-Entity-Serialization.patch
index 5522fdee7b..5522fdee7b 100644
--- a/patches/server/0690-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/server/0690-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0691-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0691-Vanilla-command-permission-fixes.patch
index 66ea8ce197..66ea8ce197 100644
--- a/patches/server/0691-Vanilla-command-permission-fixes.patch
+++ b/patches/unapplied/server/0691-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0692-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0692-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 28c6089581..28c6089581 100644
--- a/patches/server/0692-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/unapplied/server/0692-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0693-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0693-Fix-GameProfileCache-concurrency.patch
index 8c22da1dde..8c22da1dde 100644
--- a/patches/server/0693-Fix-GameProfileCache-concurrency.patch
+++ b/patches/unapplied/server/0693-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0694-Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/0694-Improve-and-expand-AsyncCatcher.patch
index 9bf935c48a..9bf935c48a 100644
--- a/patches/server/0694-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/unapplied/server/0694-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0695-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0695-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 8a9e9ba02e..8a9e9ba02e 100644
--- a/patches/server/0695-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/unapplied/server/0695-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0696-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0696-Sanitize-ResourceLocation-error-logging.patch
index d8427b5ba0..d8427b5ba0 100644
--- a/patches/server/0696-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/unapplied/server/0696-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0697-Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/0697-Allow-controlled-flushing-for-network-manager.patch
index 77361f9f13..77361f9f13 100644
--- a/patches/server/0697-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/unapplied/server/0697-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0698-Optimise-general-POI-access.patch b/patches/unapplied/server/0698-Optimise-general-POI-access.patch
index 9bf5a703de..9bf5a703de 100644
--- a/patches/server/0698-Optimise-general-POI-access.patch
+++ b/patches/unapplied/server/0698-Optimise-general-POI-access.patch
diff --git a/patches/server/0699-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0699-Optimise-chunk-tick-iteration.patch
index 27fbd41bbe..27fbd41bbe 100644
--- a/patches/server/0699-Optimise-chunk-tick-iteration.patch
+++ b/patches/unapplied/server/0699-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0700-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0700-Execute-chunk-tasks-mid-tick.patch
index ca2778eb52..ca2778eb52 100644
--- a/patches/server/0700-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/unapplied/server/0700-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0701-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0701-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 2ea18be595..2ea18be595 100644
--- a/patches/server/0701-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/unapplied/server/0701-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0702-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/0702-Custom-table-implementation-for-blockstate-state-loo.patch
index 30e208f0fe..30e208f0fe 100644
--- a/patches/server/0702-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/unapplied/server/0702-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0703-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0703-Detail-more-information-in-watchdog-dumps.patch
index 32af3d6ac4..32af3d6ac4 100644
--- a/patches/server/0703-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/unapplied/server/0703-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0704-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0704-Manually-inline-methods-in-BlockPosition.patch
index 4d6e132a91..4d6e132a91 100644
--- a/patches/server/0704-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/unapplied/server/0704-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0705-Distance-manager-tick-timings.patch b/patches/unapplied/server/0705-Distance-manager-tick-timings.patch
index 21f6004461..21f6004461 100644
--- a/patches/server/0705-Distance-manager-tick-timings.patch
+++ b/patches/unapplied/server/0705-Distance-manager-tick-timings.patch
diff --git a/patches/server/0706-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0706-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e2e0d713f0..e2e0d713f0 100644
--- a/patches/server/0706-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/unapplied/server/0706-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0707-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0707-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 8933fc8427..8933fc8427 100644
--- a/patches/server/0707-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/unapplied/server/0707-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0708-Add-packet-limiter-config.patch b/patches/unapplied/server/0708-Add-packet-limiter-config.patch
index cc497d052a..cc497d052a 100644
--- a/patches/server/0708-Add-packet-limiter-config.patch
+++ b/patches/unapplied/server/0708-Add-packet-limiter-config.patch
diff --git a/patches/server/0709-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0709-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 8de562663a..8de562663a 100644
--- a/patches/server/0709-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/unapplied/server/0709-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0710-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/0710-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 68cff490cf..68cff490cf 100644
--- a/patches/server/0710-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/unapplied/server/0710-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0711-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/0711-Don-t-lookup-fluid-state-when-raytracing.patch
index 4729a1cc96..4729a1cc96 100644
--- a/patches/server/0711-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/unapplied/server/0711-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0712-Time-scoreboard-search.patch b/patches/unapplied/server/0712-Time-scoreboard-search.patch
index 2f812b0753..2f812b0753 100644
--- a/patches/server/0712-Time-scoreboard-search.patch
+++ b/patches/unapplied/server/0712-Time-scoreboard-search.patch
diff --git a/patches/server/0713-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/0713-Send-full-pos-packets-for-hard-colliding-entities.patch
index 11d0d789c9..11d0d789c9 100644
--- a/patches/server/0713-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/unapplied/server/0713-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0714-Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/0714-Do-not-run-raytrace-logic-for-AIR.patch
index 6c36a9552b..6c36a9552b 100644
--- a/patches/server/0714-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/unapplied/server/0714-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0715-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0715-Oprimise-map-impl-for-tracked-players.patch
index a7b50b6551..a7b50b6551 100644
--- a/patches/server/0715-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/unapplied/server/0715-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0716-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0716-Optimise-BlockSoil-nearby-water-lookup.patch
index 4d0f364a33..4d0f364a33 100644
--- a/patches/server/0716-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/unapplied/server/0716-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0717-Optimise-random-block-ticking.patch b/patches/unapplied/server/0717-Optimise-random-block-ticking.patch
index 7b9486017d..7b9486017d 100644
--- a/patches/server/0717-Optimise-random-block-ticking.patch
+++ b/patches/unapplied/server/0717-Optimise-random-block-ticking.patch
diff --git a/patches/server/0718-Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/0718-Optimise-non-flush-packet-sending.patch
index d0ec3959b9..d0ec3959b9 100644
--- a/patches/server/0718-Optimise-non-flush-packet-sending.patch
+++ b/patches/unapplied/server/0718-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0719-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0719-Optimise-nearby-player-lookups.patch
index 9442ccf3ec..9442ccf3ec 100644
--- a/patches/server/0719-Optimise-nearby-player-lookups.patch
+++ b/patches/unapplied/server/0719-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0720-Remove-streams-for-villager-AI.patch b/patches/unapplied/server/0720-Remove-streams-for-villager-AI.patch
index b4ef086afb..b4ef086afb 100644
--- a/patches/server/0720-Remove-streams-for-villager-AI.patch
+++ b/patches/unapplied/server/0720-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0721-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0721-Use-Velocity-compression-and-cipher-natives.patch
index b083963b6d..b083963b6d 100644
--- a/patches/server/0721-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/unapplied/server/0721-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0722-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/0722-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 74ecf9a1d6..74ecf9a1d6 100644
--- a/patches/server/0722-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/unapplied/server/0722-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch
index efa00b82a4..efa00b82a4 100644
--- a/patches/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/unapplied/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 32a4e4160d..32a4e4160d 100644
--- a/patches/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/unapplied/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0725-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0725-Check-requirement-before-suggesting-root-nodes.patch
index d824c5f2af..d824c5f2af 100644
--- a/patches/server/0725-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/unapplied/server/0725-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 5a56b50632..5a56b50632 100644
--- a/patches/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/unapplied/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 8bc6527cd8..8bc6527cd8 100644
--- a/patches/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/unapplied/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0728-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0728-Ensure-valid-vehicle-status.patch
index 1f6079df5e..1f6079df5e 100644
--- a/patches/server/0728-Ensure-valid-vehicle-status.patch
+++ b/patches/unapplied/server/0728-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0729-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0729-Prevent-softlocked-end-exit-portal-generation.patch
index 1d63ee96cc..1d63ee96cc 100644
--- a/patches/server/0729-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/unapplied/server/0729-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/unapplied/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0731-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0731-Don-t-log-debug-logging-being-disabled.patch
index 82e266f96e..82e266f96e 100644
--- a/patches/server/0731-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/unapplied/server/0731-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0732-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0732-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0732-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/unapplied/server/0732-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0733-Preserve-overstacked-loot.patch b/patches/unapplied/server/0733-Preserve-overstacked-loot.patch
index 7c769f4be4..7c769f4be4 100644
--- a/patches/server/0733-Preserve-overstacked-loot.patch
+++ b/patches/unapplied/server/0733-Preserve-overstacked-loot.patch
diff --git a/patches/server/0734-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0734-Update-head-rotation-in-missing-places.patch
index 2c04245058..2c04245058 100644
--- a/patches/server/0734-Update-head-rotation-in-missing-places.patch
+++ b/patches/unapplied/server/0734-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0735-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0735-prevent-unintended-light-block-manipulation.patch
index 745b4cd9b5..745b4cd9b5 100644
--- a/patches/server/0735-prevent-unintended-light-block-manipulation.patch
+++ b/patches/unapplied/server/0735-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0736-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0736-Fix-CraftCriteria-defaults-map.patch
index 65eeffccea..65eeffccea 100644
--- a/patches/server/0736-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/unapplied/server/0736-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0737-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0737-Fix-upstreams-block-state-factories.patch
index b6a1321bfd..b6a1321bfd 100644
--- a/patches/server/0737-Fix-upstreams-block-state-factories.patch
+++ b/patches/unapplied/server/0737-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0738-Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/0738-Add-config-option-for-logging-player-ip-addresses.patch
index 7a7c8465cd..7a7c8465cd 100644
--- a/patches/server/0738-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/unapplied/server/0738-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0739-Configurable-feature-seeds.patch b/patches/unapplied/server/0739-Configurable-feature-seeds.patch
index 3071d1f00f..3071d1f00f 100644
--- a/patches/server/0739-Configurable-feature-seeds.patch
+++ b/patches/unapplied/server/0739-Configurable-feature-seeds.patch
diff --git a/patches/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 54bf3f7028..54bf3f7028 100644
--- a/patches/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/unapplied/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0741-Add-root-admin-user-detection.patch b/patches/unapplied/server/0741-Add-root-admin-user-detection.patch
index 543b21aa35..543b21aa35 100644
--- a/patches/server/0741-Add-root-admin-user-detection.patch
+++ b/patches/unapplied/server/0741-Add-root-admin-user-detection.patch
diff --git a/patches/server/0742-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0742-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0742-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/unapplied/server/0742-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0743-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0743-don-t-attempt-to-teleport-dead-entities.patch
index ac636acb3e..ac636acb3e 100644
--- a/patches/server/0743-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/unapplied/server/0743-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch
index af6c120dbc..af6c120dbc 100644
--- a/patches/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/unapplied/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch
index 6bed07e5a8..6bed07e5a8 100644
--- a/patches/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/unapplied/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index 6b5b270d92..6b5b270d92 100644
--- a/patches/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/unapplied/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0747-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0747-Fix-removing-recipes-from-RecipeIterator.patch
index 6b05db044c..6b05db044c 100644
--- a/patches/server/0747-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/unapplied/server/0747-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 48441b76ce..48441b76ce 100644
--- a/patches/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/unapplied/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0749-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0749-Hide-unnecessary-itemmeta-from-clients.patch
index 1c34af5e3f..1c34af5e3f 100644
--- a/patches/server/0749-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/unapplied/server/0749-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0750-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0750-Fix-Spigot-growth-modifiers.patch
index 55460b9460..55460b9460 100644
--- a/patches/server/0750-Fix-Spigot-growth-modifiers.patch
+++ b/patches/unapplied/server/0750-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/unapplied/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0752-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0752-Add-PlayerItemFrameChangeEvent.patch
index 049d7d4cad..049d7d4cad 100644
--- a/patches/server/0752-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/unapplied/server/0752-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0753-Add-player-health-update-API.patch b/patches/unapplied/server/0753-Add-player-health-update-API.patch
index 86b85b1099..86b85b1099 100644
--- a/patches/server/0753-Add-player-health-update-API.patch
+++ b/patches/unapplied/server/0753-Add-player-health-update-API.patch
diff --git a/patches/server/0754-Optimize-HashMapPalette.patch b/patches/unapplied/server/0754-Optimize-HashMapPalette.patch
index 52a28a4fd3..52a28a4fd3 100644
--- a/patches/server/0754-Optimize-HashMapPalette.patch
+++ b/patches/unapplied/server/0754-Optimize-HashMapPalette.patch
diff --git a/patches/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch
index 8c8bf099ed..8c8bf099ed 100644
--- a/patches/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/unapplied/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 4c9bde2586..4c9bde2586 100644
--- a/patches/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/unapplied/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch
index 3ff5acb132..3ff5acb132 100644
--- a/patches/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/unapplied/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 4390d53a2c..4390d53a2c 100644
--- a/patches/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/unapplied/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0759-Add-more-Campfire-API.patch b/patches/unapplied/server/0759-Add-more-Campfire-API.patch
index da279b0a50..da279b0a50 100644
--- a/patches/server/0759-Add-more-Campfire-API.patch
+++ b/patches/unapplied/server/0759-Add-more-Campfire-API.patch
diff --git a/patches/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 018059c29d..018059c29d 100644
--- a/patches/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/unapplied/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0761-Fix-tripwire-state-inconsistency.patch b/patches/unapplied/server/0761-Fix-tripwire-state-inconsistency.patch
index eba71d4136..eba71d4136 100644
--- a/patches/server/0761-Fix-tripwire-state-inconsistency.patch
+++ b/patches/unapplied/server/0761-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0762-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0762-Forward-CraftEntity-in-teleport-command.patch
index 661d2e5bd3..661d2e5bd3 100644
--- a/patches/server/0762-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/unapplied/server/0762-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0763-Improve-scoreboard-entries.patch b/patches/unapplied/server/0763-Improve-scoreboard-entries.patch
index 2a65cbf36c..2a65cbf36c 100644
--- a/patches/server/0763-Improve-scoreboard-entries.patch
+++ b/patches/unapplied/server/0763-Improve-scoreboard-entries.patch
diff --git a/patches/server/0764-Entity-powdered-snow-API.patch b/patches/unapplied/server/0764-Entity-powdered-snow-API.patch
index 67d0a8c82b..67d0a8c82b 100644
--- a/patches/server/0764-Entity-powdered-snow-API.patch
+++ b/patches/unapplied/server/0764-Entity-powdered-snow-API.patch
diff --git a/patches/server/0765-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0765-Add-API-for-item-entity-health.patch
index 66df625d46..66df625d46 100644
--- a/patches/server/0765-Add-API-for-item-entity-health.patch
+++ b/patches/unapplied/server/0765-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch
index d0e3e4efed..d0e3e4efed 100644
--- a/patches/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/unapplied/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0767-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0767-Configurable-max-block-light-for-monster-spawning.patch
index baf913d352..baf913d352 100644
--- a/patches/server/0767-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/unapplied/server/0767-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 698fbc2d5e..698fbc2d5e 100644
--- a/patches/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/unapplied/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch
index 2b10cf2e71..2b10cf2e71 100644
--- a/patches/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/unapplied/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/unapplied/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0771-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0771-Fix-bees-aging-inside-hives.patch
index 2be01a557c..2be01a557c 100644
--- a/patches/server/0771-Fix-bees-aging-inside-hives.patch
+++ b/patches/unapplied/server/0771-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0772-Bucketable-API.patch b/patches/unapplied/server/0772-Bucketable-API.patch
index 3dd4d8263f..3dd4d8263f 100644
--- a/patches/server/0772-Bucketable-API.patch
+++ b/patches/unapplied/server/0772-Bucketable-API.patch
diff --git a/patches/server/0773-Validate-usernames.patch b/patches/unapplied/server/0773-Validate-usernames.patch
index bc6a92f1f3..bc6a92f1f3 100644
--- a/patches/server/0773-Validate-usernames.patch
+++ b/patches/unapplied/server/0773-Validate-usernames.patch
diff --git a/patches/server/0774-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0774-Make-water-animal-spawn-height-configurable.patch
index 51e3451cbf..51e3451cbf 100644
--- a/patches/server/0774-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/unapplied/server/0774-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 3fa986851a..3fa986851a 100644
--- a/patches/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/unapplied/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch
index de155852d0..de155852d0 100644
--- a/patches/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/unapplied/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/unapplied/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0778-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0778-Multiple-Entries-with-Scoreboards.patch
index b644176ac9..b644176ac9 100644
--- a/patches/server/0778-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/unapplied/server/0778-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0779-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0779-Reset-placed-block-on-exception.patch
index 308089d693..308089d693 100644
--- a/patches/server/0779-Reset-placed-block-on-exception.patch
+++ b/patches/unapplied/server/0779-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0780-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0780-Add-configurable-height-for-slime-spawn.patch
index 23d604fabc..23d604fabc 100644
--- a/patches/server/0780-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/unapplied/server/0780-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index f2c95ba6c0..f2c95ba6c0 100644
--- a/patches/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0782-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0782-Fix-xp-reward-for-baby-zombies.patch
index 0d0e962337..0d0e962337 100644
--- a/patches/server/0782-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/unapplied/server/0782-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0783-Kick-on-main-for-illegal-chat.patch b/patches/unapplied/server/0783-Kick-on-main-for-illegal-chat.patch
index 9367c16b2f..9367c16b2f 100644
--- a/patches/server/0783-Kick-on-main-for-illegal-chat.patch
+++ b/patches/unapplied/server/0783-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0784-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0784-Multi-Block-Change-API-Implementation.patch
index 17526e4c9c..17526e4c9c 100644
--- a/patches/server/0784-Multi-Block-Change-API-Implementation.patch
+++ b/patches/unapplied/server/0784-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0785-Fix-NotePlayEvent.patch b/patches/unapplied/server/0785-Fix-NotePlayEvent.patch
index 6acea2e752..6acea2e752 100644
--- a/patches/server/0785-Fix-NotePlayEvent.patch
+++ b/patches/unapplied/server/0785-Fix-NotePlayEvent.patch
diff --git a/patches/server/0786-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0786-Freeze-Tick-Lock-API.patch
index 9d9f4ebc17..9d9f4ebc17 100644
--- a/patches/server/0786-Freeze-Tick-Lock-API.patch
+++ b/patches/unapplied/server/0786-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0787-Dolphin-API.patch b/patches/unapplied/server/0787-Dolphin-API.patch
index 7b62597b9e..7b62597b9e 100644
--- a/patches/server/0787-Dolphin-API.patch
+++ b/patches/unapplied/server/0787-Dolphin-API.patch
diff --git a/patches/server/0788-More-PotionEffectType-API.patch b/patches/unapplied/server/0788-More-PotionEffectType-API.patch
index 15d2f7a5ec..15d2f7a5ec 100644
--- a/patches/server/0788-More-PotionEffectType-API.patch
+++ b/patches/unapplied/server/0788-More-PotionEffectType-API.patch
diff --git a/patches/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index d457ae29d4..d457ae29d4 100644
--- a/patches/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/unapplied/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch
index 9a75c21bb9..9a75c21bb9 100644
--- a/patches/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/unapplied/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0791-Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/0791-Add-missing-structure-set-seed-configs.patch
index 113aa3c75e..113aa3c75e 100644
--- a/patches/server/0791-Add-missing-structure-set-seed-configs.patch
+++ b/patches/unapplied/server/0791-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0792-Implement-regenerateChunk.patch b/patches/unapplied/server/0792-Implement-regenerateChunk.patch
index 0c25cdefb0..0c25cdefb0 100644
--- a/patches/server/0792-Implement-regenerateChunk.patch
+++ b/patches/unapplied/server/0792-Implement-regenerateChunk.patch
diff --git a/patches/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch
index 5e05a64383..5e05a64383 100644
--- a/patches/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/unapplied/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 5edfb7b4c0..5edfb7b4c0 100644
--- a/patches/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/unapplied/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0795-Add-GameEvent-tags.patch b/patches/unapplied/server/0795-Add-GameEvent-tags.patch
index b5bf6fa37e..b5bf6fa37e 100644
--- a/patches/server/0795-Add-GameEvent-tags.patch
+++ b/patches/unapplied/server/0795-Add-GameEvent-tags.patch
diff --git a/patches/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 8908089517..8908089517 100644
--- a/patches/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/unapplied/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0797-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0797-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0797-Furnace-RecipesUsed-API.patch
+++ b/patches/unapplied/server/0797-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0798-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0798-Configurable-sculk-sensor-listener-range.patch
index 610891a504..610891a504 100644
--- a/patches/server/0798-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/unapplied/server/0798-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0799-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/0799-Add-missing-block-data-mins-and-maxes.patch
index 2096473939..2096473939 100644
--- a/patches/server/0799-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/unapplied/server/0799-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 2a1efb36be..2a1efb36be 100644
--- a/patches/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/unapplied/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0801-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0801-Put-world-into-worldlist-before-initing-the-world.patch
index 4fa22f9134..4fa22f9134 100644
--- a/patches/server/0801-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/unapplied/server/0801-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0802-Fix-Entity-Position-Desync.patch b/patches/unapplied/server/0802-Fix-Entity-Position-Desync.patch
index b2fca125c3..b2fca125c3 100644
--- a/patches/server/0802-Fix-Entity-Position-Desync.patch
+++ b/patches/unapplied/server/0802-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0803-Custom-Potion-Mixes.patch b/patches/unapplied/server/0803-Custom-Potion-Mixes.patch
index 5ff1d41aea..5ff1d41aea 100644
--- a/patches/server/0803-Custom-Potion-Mixes.patch
+++ b/patches/unapplied/server/0803-Custom-Potion-Mixes.patch
diff --git a/patches/server/0804-Force-close-world-loading-screen.patch b/patches/unapplied/server/0804-Force-close-world-loading-screen.patch
index e0a18e2a25..e0a18e2a25 100644
--- a/patches/server/0804-Force-close-world-loading-screen.patch
+++ b/patches/unapplied/server/0804-Force-close-world-loading-screen.patch
diff --git a/patches/server/0805-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0805-Fix-falling-block-spawn-methods.patch
index 574c589e62..574c589e62 100644
--- a/patches/server/0805-Fix-falling-block-spawn-methods.patch
+++ b/patches/unapplied/server/0805-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0806-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0806-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0806-Expose-furnace-minecart-push-values.patch
+++ b/patches/unapplied/server/0806-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 290836ad0e..290836ad0e 100644
--- a/patches/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/unapplied/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0808-More-Projectile-API.patch b/patches/unapplied/server/0808-More-Projectile-API.patch
index f8b0db1cea..f8b0db1cea 100644
--- a/patches/server/0808-More-Projectile-API.patch
+++ b/patches/unapplied/server/0808-More-Projectile-API.patch
diff --git a/patches/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch
index 45799b401c..45799b401c 100644
--- a/patches/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/unapplied/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 2694286a5a..2694286a5a 100644
--- a/patches/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/unapplied/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0811-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0811-Implement-getComputedBiome-API.patch
index 0c09a29719..0c09a29719 100644
--- a/patches/server/0811-Implement-getComputedBiome-API.patch
+++ b/patches/unapplied/server/0811-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0812-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0812-Make-some-itemstacks-nonnull.patch
index e2cba95fe4..e2cba95fe4 100644
--- a/patches/server/0812-Make-some-itemstacks-nonnull.patch
+++ b/patches/unapplied/server/0812-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0813-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0813-Implement-enchantWithLevels-API.patch
index f1679a729c..f1679a729c 100644
--- a/patches/server/0813-Implement-enchantWithLevels-API.patch
+++ b/patches/unapplied/server/0813-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0814-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0814-Fix-saving-in-unloadWorld.patch
index 75a57df848..75a57df848 100644
--- a/patches/server/0814-Fix-saving-in-unloadWorld.patch
+++ b/patches/unapplied/server/0814-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0815-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0815-Buffer-OOB-setBlock-calls.patch
index 4e1905eb3b..4e1905eb3b 100644
--- a/patches/server/0815-Buffer-OOB-setBlock-calls.patch
+++ b/patches/unapplied/server/0815-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0816-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0816-Add-TameableDeathMessageEvent.patch
index 1e8b7b1fb6..1e8b7b1fb6 100644
--- a/patches/server/0816-Add-TameableDeathMessageEvent.patch
+++ b/patches/unapplied/server/0816-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index d8923fa41d..d8923fa41d 100644
--- a/patches/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/unapplied/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch
index feb9503767..feb9503767 100644
--- a/patches/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/unapplied/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 2a67e2f4e2..2a67e2f4e2 100644
--- a/patches/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/unapplied/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0820-Guard-against-invalid-entity-positions.patch b/patches/unapplied/server/0820-Guard-against-invalid-entity-positions.patch
index de373cdc9c..de373cdc9c 100644
--- a/patches/server/0820-Guard-against-invalid-entity-positions.patch
+++ b/patches/unapplied/server/0820-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0821-cache-resource-keys.patch b/patches/unapplied/server/0821-cache-resource-keys.patch
index c9b22e5902..c9b22e5902 100644
--- a/patches/server/0821-cache-resource-keys.patch
+++ b/patches/unapplied/server/0821-cache-resource-keys.patch
diff --git a/patches/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/unapplied/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch
index b046117a30..b046117a30 100644
--- a/patches/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/unapplied/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 989e0ce392..989e0ce392 100644
--- a/patches/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/unapplied/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/unapplied/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index fbb9b72b07..fbb9b72b07 100644
--- a/patches/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/unapplied/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0825-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0825-Prevent-tile-entity-copies-loading-chunks.patch
index 80458627bf..80458627bf 100644
--- a/patches/server/0825-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/unapplied/server/0825-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 72ef000460..72ef000460 100644
--- a/patches/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/unapplied/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/unapplied/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 46478d6f76..46478d6f76 100644
--- a/patches/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/unapplied/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/unapplied/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch
index 062de97dd5..062de97dd5 100644
--- a/patches/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/unapplied/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index ed94088018..ed94088018 100644
--- a/patches/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/unapplied/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0830-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0830-WorldCreator-keepSpawnLoaded.patch
index 729d58a6b0..729d58a6b0 100644
--- a/patches/server/0830-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/unapplied/server/0830-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/unapplied/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch
index 5057c9d0d2..5057c9d0d2 100644
--- a/patches/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch
+++ b/patches/unapplied/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index fe4c9bae8c..fe4c9bae8c 100644
--- a/patches/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/unapplied/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index ed62b6e307..ed62b6e307 100644
--- a/patches/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/unapplied/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch
index bcc871d7bc..bcc871d7bc 100644
--- a/patches/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/unapplied/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch
index fec28b7e17..fec28b7e17 100644
--- a/patches/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/unapplied/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0836-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0836-Add-PlayerStopUsingItemEvent.patch
index 2b87b8fe29..2b87b8fe29 100644
--- a/patches/server/0836-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/unapplied/server/0836-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0837-FallingBlock-auto-expire-setting.patch b/patches/unapplied/server/0837-FallingBlock-auto-expire-setting.patch
index b2efc50d06..b2efc50d06 100644
--- a/patches/server/0837-FallingBlock-auto-expire-setting.patch
+++ b/patches/unapplied/server/0837-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0838-Don-t-tick-markers.patch b/patches/unapplied/server/0838-Don-t-tick-markers.patch
index b485fadd53..b485fadd53 100644
--- a/patches/server/0838-Don-t-tick-markers.patch
+++ b/patches/unapplied/server/0838-Don-t-tick-markers.patch
diff --git a/patches/server/0839-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0839-Do-not-accept-invalid-client-settings.patch
index 92e9dc90a5..92e9dc90a5 100644
--- a/patches/server/0839-Do-not-accept-invalid-client-settings.patch
+++ b/patches/unapplied/server/0839-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0840-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0840-Add-support-for-Proxy-Protocol.patch
index f03e3af0c7..f03e3af0c7 100644
--- a/patches/server/0840-Add-support-for-Proxy-Protocol.patch
+++ b/patches/unapplied/server/0840-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch
index f74dc698da..f74dc698da 100644
--- a/patches/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/unapplied/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/unapplied/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0843-Sanitize-Sent-BlockEntity-NBT.patch b/patches/unapplied/server/0843-Sanitize-Sent-BlockEntity-NBT.patch
index 3aa08abdb0..3aa08abdb0 100644
--- a/patches/server/0843-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/unapplied/server/0843-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0844-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0844-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0844-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/unapplied/server/0844-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0845-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0845-Prevent-entity-loading-causing-async-lookups.patch
index 29b61b8947..29b61b8947 100644
--- a/patches/server/0845-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/unapplied/server/0845-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0846-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0846-Throw-exception-on-world-create-while-being-ticked.patch
index 61d320df25..61d320df25 100644
--- a/patches/server/0846-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/unapplied/server/0846-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0847-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/0847-Add-Alternate-Current-redstone-implementation.patch
index 5748fc24d2..5748fc24d2 100644
--- a/patches/server/0847-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/unapplied/server/0847-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0848-Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/0848-Dont-resent-entity-on-art-update.patch
index ff4ac47ad6..ff4ac47ad6 100644
--- a/patches/server/0848-Dont-resent-entity-on-art-update.patch
+++ b/patches/unapplied/server/0848-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0849-Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/0849-Add-WardenAngerChangeEvent.patch
index fb3d1a79bb..fb3d1a79bb 100644
--- a/patches/server/0849-Add-WardenAngerChangeEvent.patch
+++ b/patches/unapplied/server/0849-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0850-Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/0850-Add-option-for-strict-advancement-dimension-checks.patch
index 22c108d157..22c108d157 100644
--- a/patches/server/0850-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/unapplied/server/0850-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0851-Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/0851-Add-missing-important-BlockStateListPopulator-method.patch
index cdb1bc89a3..cdb1bc89a3 100644
--- a/patches/server/0851-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/unapplied/server/0851-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0852-Nameable-Banner-API.patch b/patches/unapplied/server/0852-Nameable-Banner-API.patch
index 78f176be32..78f176be32 100644
--- a/patches/server/0852-Nameable-Banner-API.patch
+++ b/patches/unapplied/server/0852-Nameable-Banner-API.patch
diff --git a/patches/server/0853-Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/0853-Don-t-broadcast-messages-to-command-blocks.patch
index e8ab4ec5b7..e8ab4ec5b7 100644
--- a/patches/server/0853-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/unapplied/server/0853-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0854-Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/0854-Prevent-empty-items-from-being-added-to-world.patch
index 728b81e026..728b81e026 100644
--- a/patches/server/0854-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/unapplied/server/0854-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index ad894dbcce..ad894dbcce 100644
--- a/patches/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/unapplied/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/unapplied/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch
index c1293f4258..c1293f4258 100644
--- a/patches/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/unapplied/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0857-Add-Player-getFishHook.patch b/patches/unapplied/server/0857-Add-Player-getFishHook.patch
index 29b7b33f1c..29b7b33f1c 100644
--- a/patches/server/0857-Add-Player-getFishHook.patch
+++ b/patches/unapplied/server/0857-Add-Player-getFishHook.patch
diff --git a/patches/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 7ff6d28d74..7ff6d28d74 100644
--- a/patches/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/unapplied/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch
index c2bbb2f736..c2bbb2f736 100644
--- a/patches/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/unapplied/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/unapplied/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch
index ef123472fb..ef123472fb 100644
--- a/patches/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/unapplied/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0861-Fix-Bee-flower-NPE.patch b/patches/unapplied/server/0861-Fix-Bee-flower-NPE.patch
index 478f69a912..478f69a912 100644
--- a/patches/server/0861-Fix-Bee-flower-NPE.patch
+++ b/patches/unapplied/server/0861-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index d27aea2a84..d27aea2a84 100644
--- a/patches/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/unapplied/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0863-More-Teleport-API.patch b/patches/unapplied/server/0863-More-Teleport-API.patch
index 0980af0e90..0980af0e90 100644
--- a/patches/server/0863-More-Teleport-API.patch
+++ b/patches/unapplied/server/0863-More-Teleport-API.patch
diff --git a/patches/server/0864-Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/0864-Add-EntityPortalReadyEvent.patch
index 7f95e0ef54..7f95e0ef54 100644
--- a/patches/server/0864-Add-EntityPortalReadyEvent.patch
+++ b/patches/unapplied/server/0864-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0865-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0865-Don-t-use-level-random-in-entity-constructors.patch
index 342c4ce11a..342c4ce11a 100644
--- a/patches/server/0865-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/unapplied/server/0865-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0866-Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/0866-Send-block-entities-after-destroy-prediction.patch
index 0e11a088c0..0e11a088c0 100644
--- a/patches/server/0866-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/unapplied/server/0866-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch
index 83817c9ee8..83817c9ee8 100644
--- a/patches/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/unapplied/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/0868-Custom-Chat-Completion-Suggestions-API.patch
index 254af7f763..254af7f763 100644
--- a/patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/unapplied/server/0868-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0869-Add-missing-BlockFadeEvents.patch b/patches/unapplied/server/0869-Add-missing-BlockFadeEvents.patch
index e939b49a21..e939b49a21 100644
--- a/patches/server/0869-Add-missing-BlockFadeEvents.patch
+++ b/patches/unapplied/server/0869-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0870-Collision-API.patch b/patches/unapplied/server/0870-Collision-API.patch
index 36e708c8de..36e708c8de 100644
--- a/patches/server/0870-Collision-API.patch
+++ b/patches/unapplied/server/0870-Collision-API.patch
diff --git a/patches/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 868ea3a3e6..868ea3a3e6 100644
--- a/patches/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/unapplied/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0872-Remove-invalid-signature-login-stacktrace.patch b/patches/unapplied/server/0872-Remove-invalid-signature-login-stacktrace.patch
index f7887653d9..f7887653d9 100644
--- a/patches/server/0872-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/unapplied/server/0872-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0873-Block-Ticking-API.patch b/patches/unapplied/server/0873-Block-Ticking-API.patch
index 4137528899..4137528899 100644
--- a/patches/server/0873-Block-Ticking-API.patch
+++ b/patches/unapplied/server/0873-Block-Ticking-API.patch
diff --git a/patches/server/0874-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0874-Add-Velocity-IP-Forwarding-Support.patch
index 4c81a074dd..4c81a074dd 100644
--- a/patches/server/0874-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/unapplied/server/0874-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/unapplied/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 2e38ad24c3..2e38ad24c3 100644
--- a/patches/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/unapplied/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0876-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/0876-Add-NamespacedKey-biome-methods.patch
index 80d9f65e0b..80d9f65e0b 100644
--- a/patches/server/0876-Add-NamespacedKey-biome-methods.patch
+++ b/patches/unapplied/server/0876-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0877-Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/0877-Fix-plugin-loggers-on-server-shutdown.patch
index 9a7c82b944..9a7c82b944 100644
--- a/patches/server/0877-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/unapplied/server/0877-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/unapplied/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch
index fc85faf87c..fc85faf87c 100644
--- a/patches/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch
+++ b/patches/unapplied/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0879-Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/0879-Stop-large-look-changes-from-crashing-the-server.patch
index c1d9c8b1b2..c1d9c8b1b2 100644
--- a/patches/server/0879-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/unapplied/server/0879-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/unapplied/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
index 7a4404512c..7a4404512c 100644
--- a/patches/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
+++ b/patches/unapplied/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch
index a41505c2ea..a41505c2ea 100644
--- a/patches/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/unapplied/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0882-Missing-eating-regain-reason.patch b/patches/unapplied/server/0882-Missing-eating-regain-reason.patch
index 8a23bd4de4..8a23bd4de4 100644
--- a/patches/server/0882-Missing-eating-regain-reason.patch
+++ b/patches/unapplied/server/0882-Missing-eating-regain-reason.patch
diff --git a/patches/server/0883-Missing-effect-cause.patch b/patches/unapplied/server/0883-Missing-effect-cause.patch
index 193dbee015..193dbee015 100644
--- a/patches/server/0883-Missing-effect-cause.patch
+++ b/patches/unapplied/server/0883-Missing-effect-cause.patch
diff --git a/patches/server/0884-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/0884-Added-byte-array-serialization-deserialization-for-P.patch
index 3553cbd00c..3553cbd00c 100644
--- a/patches/server/0884-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/unapplied/server/0884-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index d028d6d5e9..d028d6d5e9 100644
--- a/patches/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/unapplied/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0886-Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/0886-Call-BlockPhysicsEvent-more-often.patch
index 532418a20f..532418a20f 100644
--- a/patches/server/0886-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/unapplied/server/0886-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0887-Configurable-chat-thread-limit.patch b/patches/unapplied/server/0887-Configurable-chat-thread-limit.patch
index e23447bc3e..e23447bc3e 100644
--- a/patches/server/0887-Configurable-chat-thread-limit.patch
+++ b/patches/unapplied/server/0887-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 793883a2f4..793883a2f4 100644
--- a/patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/unapplied/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0889-Set-position-before-player-sending-on-dimension-chan.patch b/patches/unapplied/server/0889-Set-position-before-player-sending-on-dimension-chan.patch
index 3c700c1411..3c700c1411 100644
--- a/patches/server/0889-Set-position-before-player-sending-on-dimension-chan.patch
+++ b/patches/unapplied/server/0889-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0890-fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/0890-fix-Jigsaw-block-kicking-user.patch
index 6206d8d028..6206d8d028 100644
--- a/patches/server/0890-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/unapplied/server/0890-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 584695d3c9..584695d3c9 100644
--- a/patches/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/unapplied/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0892-Add-getDrops-to-BlockState.patch b/patches/unapplied/server/0892-Add-getDrops-to-BlockState.patch
index 2984a969f8..2984a969f8 100644
--- a/patches/server/0892-Add-getDrops-to-BlockState.patch
+++ b/patches/unapplied/server/0892-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/0893-Fix-a-bunch-of-vanilla-bugs.patch
index fcc68392b4..fcc68392b4 100644
--- a/patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/unapplied/server/0893-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch
index d44526fff6..d44526fff6 100644
--- a/patches/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/unapplied/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0895-Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/0895-Fix-custom-piglin-loved-items.patch
index 66144b5596..66144b5596 100644
--- a/patches/server/0895-Fix-custom-piglin-loved-items.patch
+++ b/patches/unapplied/server/0895-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0896-EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/0896-EntityPickupItemEvent-fixes.patch
index b8ba8cba65..b8ba8cba65 100644
--- a/patches/server/0896-EntityPickupItemEvent-fixes.patch
+++ b/patches/unapplied/server/0896-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch
index 3c87b5be58..3c87b5be58 100644
--- a/patches/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/unapplied/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0898-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/0898-Add-PlayerInventorySlotChangeEvent.patch
index d9b7732756..d9b7732756 100644
--- a/patches/server/0898-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/unapplied/server/0898-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0899-Elder-Guardian-appearance-API.patch b/patches/unapplied/server/0899-Elder-Guardian-appearance-API.patch
index 841e9c0e64..841e9c0e64 100644
--- a/patches/server/0899-Elder-Guardian-appearance-API.patch
+++ b/patches/unapplied/server/0899-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0900-Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/server/0900-Allow-changing-bed-s-occupied-property.patch
index 4d0128b6d3..4d0128b6d3 100644
--- a/patches/server/0900-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/unapplied/server/0900-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0901-Add-entity-knockback-API.patch b/patches/unapplied/server/0901-Add-entity-knockback-API.patch
index 9accc7491c..9accc7491c 100644
--- a/patches/server/0901-Add-entity-knockback-API.patch
+++ b/patches/unapplied/server/0901-Add-entity-knockback-API.patch
diff --git a/patches/server/0902-Detect-headless-JREs.patch b/patches/unapplied/server/0902-Detect-headless-JREs.patch
index 2af5fb20b5..2af5fb20b5 100644
--- a/patches/server/0902-Detect-headless-JREs.patch
+++ b/patches/unapplied/server/0902-Detect-headless-JREs.patch
diff --git a/patches/server/0903-fixed-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/0903-fixed-entity-vehicle-collision-event-not-called.patch
index 8e79007256..8e79007256 100644
--- a/patches/server/0903-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/unapplied/server/0903-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0904-optimized-dirt-and-snow-spreading.patch b/patches/unapplied/server/0904-optimized-dirt-and-snow-spreading.patch
index a146caa330..a146caa330 100644
--- a/patches/server/0904-optimized-dirt-and-snow-spreading.patch
+++ b/patches/unapplied/server/0904-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0905-Added-EntityToggleSitEvent.patch b/patches/unapplied/server/0905-Added-EntityToggleSitEvent.patch
index bcf83ec157..bcf83ec157 100644
--- a/patches/server/0905-Added-EntityToggleSitEvent.patch
+++ b/patches/unapplied/server/0905-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0906-Add-fire-tick-delay-option.patch b/patches/unapplied/server/0906-Add-fire-tick-delay-option.patch
index d8e916dcdb..d8e916dcdb 100644
--- a/patches/server/0906-Add-fire-tick-delay-option.patch
+++ b/patches/unapplied/server/0906-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0907-Add-Moving-Piston-API.patch b/patches/unapplied/server/0907-Add-Moving-Piston-API.patch
index 53df041ba1..53df041ba1 100644
--- a/patches/server/0907-Add-Moving-Piston-API.patch
+++ b/patches/unapplied/server/0907-Add-Moving-Piston-API.patch
diff --git a/patches/server/0908-Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/0908-Ignore-impossible-spawn-tick.patch
index 6c8f1c65d1..6c8f1c65d1 100644
--- a/patches/server/0908-Ignore-impossible-spawn-tick.patch
+++ b/patches/unapplied/server/0908-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/unapplied/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch
index b74d96a4fe..b74d96a4fe 100644
--- a/patches/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/unapplied/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/unapplied/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index af543e8884..af543e8884 100644
--- a/patches/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/unapplied/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index afa98f920a..afa98f920a 100644
--- a/patches/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/unapplied/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0912-Prevent-compass-from-loading-chunks.patch b/patches/unapplied/server/0912-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0912-Prevent-compass-from-loading-chunks.patch
+++ b/patches/unapplied/server/0912-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0913-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/0913-Add-PrePlayerAttackEntityEvent.patch
index 666945e26b..666945e26b 100644
--- a/patches/server/0913-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/unapplied/server/0913-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0914-ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/0914-ensure-reset-EnderDragon-boss-event-name.patch
index 369164484e..369164484e 100644
--- a/patches/server/0914-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/unapplied/server/0914-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/unapplied/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 0f696efd4d..0f696efd4d 100644
--- a/patches/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/unapplied/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0916-Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/0916-Add-Player-Warden-Warning-API.patch
index 42d71b377d..42d71b377d 100644
--- a/patches/server/0916-Add-Player-Warden-Warning-API.patch
+++ b/patches/unapplied/server/0916-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0917-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/0917-More-vanilla-friendly-methods-to-update-trades.patch
index 03775bc1a0..03775bc1a0 100644
--- a/patches/server/0917-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/unapplied/server/0917-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0918-Add-paper-dumplisteners-command.patch b/patches/unapplied/server/0918-Add-paper-dumplisteners-command.patch
index cbf1598dd5..cbf1598dd5 100644
--- a/patches/server/0918-Add-paper-dumplisteners-command.patch
+++ b/patches/unapplied/server/0918-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0919-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0919-check-global-player-list-where-appropriate.patch
index 9cf8b0a7ed..9cf8b0a7ed 100644
--- a/patches/server/0919-check-global-player-list-where-appropriate.patch
+++ b/patches/unapplied/server/0919-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch
index 5209787a11..5209787a11 100644
--- a/patches/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/unapplied/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0921-ItemStack-damage-API.patch b/patches/unapplied/server/0921-ItemStack-damage-API.patch
index 1bab672181..1bab672181 100644
--- a/patches/server/0921-ItemStack-damage-API.patch
+++ b/patches/unapplied/server/0921-ItemStack-damage-API.patch
diff --git a/patches/server/0922-Friction-API.patch b/patches/unapplied/server/0922-Friction-API.patch
index 78de584ef6..78de584ef6 100644
--- a/patches/server/0922-Friction-API.patch
+++ b/patches/unapplied/server/0922-Friction-API.patch
diff --git a/patches/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a2a1265494..a2a1265494 100644
--- a/patches/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/unapplied/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0924-Fix-player-kick-on-shutdown.patch b/patches/unapplied/server/0924-Fix-player-kick-on-shutdown.patch
index b954657690..b954657690 100644
--- a/patches/server/0924-Fix-player-kick-on-shutdown.patch
+++ b/patches/unapplied/server/0924-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0925-Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/0925-Sync-offhand-slot-in-menus.patch
index 35bcdf17eb..35bcdf17eb 100644
--- a/patches/server/0925-Sync-offhand-slot-in-menus.patch
+++ b/patches/unapplied/server/0925-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0926-Player-Entity-Tracking-Events.patch b/patches/unapplied/server/0926-Player-Entity-Tracking-Events.patch
index 1e82fc3864..1e82fc3864 100644
--- a/patches/server/0926-Player-Entity-Tracking-Events.patch
+++ b/patches/unapplied/server/0926-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0927-Limit-pet-look-distance.patch b/patches/unapplied/server/0927-Limit-pet-look-distance.patch
index 8309939ccb..8309939ccb 100644
--- a/patches/server/0927-Limit-pet-look-distance.patch
+++ b/patches/unapplied/server/0927-Limit-pet-look-distance.patch
diff --git a/patches/server/0928-Properly-resend-entities.patch b/patches/unapplied/server/0928-Properly-resend-entities.patch
index 750e60cab6..750e60cab6 100644
--- a/patches/server/0928-Properly-resend-entities.patch
+++ b/patches/unapplied/server/0928-Properly-resend-entities.patch
diff --git a/patches/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/unapplied/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch
index 8a818be552..8a818be552 100644
--- a/patches/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/unapplied/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0930-fix-Instruments.patch b/patches/unapplied/server/0930-fix-Instruments.patch
index fe391bb96c..fe391bb96c 100644
--- a/patches/server/0930-fix-Instruments.patch
+++ b/patches/unapplied/server/0930-fix-Instruments.patch
diff --git a/patches/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/unapplied/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index cef783939a..cef783939a 100644
--- a/patches/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/unapplied/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0932-Fix-MapLike-Codec-missing-key-selector.patch b/patches/unapplied/server/0932-Fix-MapLike-Codec-missing-key-selector.patch
index 4902873c14..4902873c14 100644
--- a/patches/server/0932-Fix-MapLike-Codec-missing-key-selector.patch
+++ b/patches/unapplied/server/0932-Fix-MapLike-Codec-missing-key-selector.patch
diff --git a/patches/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/unapplied/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 01f0b970d7..01f0b970d7 100644
--- a/patches/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/unapplied/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0934-Improve-logging-and-errors.patch b/patches/unapplied/server/0934-Improve-logging-and-errors.patch
index 5f9461d68e..5f9461d68e 100644
--- a/patches/server/0934-Improve-logging-and-errors.patch
+++ b/patches/unapplied/server/0934-Improve-logging-and-errors.patch
diff --git a/patches/server/0935-Add-BlockLockCheckEvent.patch b/patches/unapplied/server/0935-Add-BlockLockCheckEvent.patch
index 418beed161..418beed161 100644
--- a/patches/server/0935-Add-BlockLockCheckEvent.patch
+++ b/patches/unapplied/server/0935-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0936-Add-Sneaking-API-for-Entities.patch b/patches/unapplied/server/0936-Add-Sneaking-API-for-Entities.patch
index e96f4985cd..e96f4985cd 100644
--- a/patches/server/0936-Add-Sneaking-API-for-Entities.patch
+++ b/patches/unapplied/server/0936-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0937-Improve-PortalEvents.patch b/patches/unapplied/server/0937-Improve-PortalEvents.patch
index 29dcd0269f..29dcd0269f 100644
--- a/patches/server/0937-Improve-PortalEvents.patch
+++ b/patches/unapplied/server/0937-Improve-PortalEvents.patch
diff --git a/patches/server/0938-Add-config-option-for-spider-worldborder-climbing.patch b/patches/unapplied/server/0938-Add-config-option-for-spider-worldborder-climbing.patch
index a084e68488..a084e68488 100644
--- a/patches/server/0938-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/unapplied/server/0938-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0939-Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/0939-Add-missing-SpigotConfig-logCommands-check.patch
index 6937ab476d..6937ab476d 100644
--- a/patches/server/0939-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/unapplied/server/0939-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/unapplied/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 04dbb4d045..04dbb4d045 100644
--- a/patches/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/unapplied/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0941-Flying-Fall-Damage.patch b/patches/unapplied/server/0941-Flying-Fall-Damage.patch
index 6d43a33074..6d43a33074 100644
--- a/patches/server/0941-Flying-Fall-Damage.patch
+++ b/patches/unapplied/server/0941-Flying-Fall-Damage.patch
diff --git a/patches/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/unapplied/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch
index df81323db0..df81323db0 100644
--- a/patches/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch
+++ b/patches/unapplied/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index bcd8b80d4e..bcd8b80d4e 100644
--- a/patches/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/unapplied/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0944-config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/0944-config-for-disabling-entity-tag-tags.patch
index 9cbe2afe45..9cbe2afe45 100644
--- a/patches/server/0944-config-for-disabling-entity-tag-tags.patch
+++ b/patches/unapplied/server/0944-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0945-Use-single-player-info-update-packet-on-join.patch b/patches/unapplied/server/0945-Use-single-player-info-update-packet-on-join.patch
index 7a256909c7..7a256909c7 100644
--- a/patches/server/0945-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/unapplied/server/0945-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 4f235fdee4..4f235fdee4 100644
--- a/patches/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/unapplied/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0947-Win-Screen-API.patch b/patches/unapplied/server/0947-Win-Screen-API.patch
index 6a489994f1..6a489994f1 100644
--- a/patches/server/0947-Win-Screen-API.patch
+++ b/patches/unapplied/server/0947-Win-Screen-API.patch
diff --git a/patches/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch
index e07a332e83..e07a332e83 100644
--- a/patches/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/unapplied/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0949-Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/0949-Fix-force-opening-enchantment-tables.patch
index eb92847f0e..eb92847f0e 100644
--- a/patches/server/0949-Fix-force-opening-enchantment-tables.patch
+++ b/patches/unapplied/server/0949-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0950-Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/0950-Add-Entity-Body-Yaw-API.patch
index 44d216b486..44d216b486 100644
--- a/patches/server/0950-Add-Entity-Body-Yaw-API.patch
+++ b/patches/unapplied/server/0950-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/unapplied/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/unapplied/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/unapplied/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch
index b2d97d5308..b2d97d5308 100644
--- a/patches/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/unapplied/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0953-Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/0953-Add-EntityFertilizeEggEvent.patch
index 6adba33ca2..6adba33ca2 100644
--- a/patches/server/0953-Add-EntityFertilizeEggEvent.patch
+++ b/patches/unapplied/server/0953-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/unapplied/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index c73b1fa213..c73b1fa213 100644
--- a/patches/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/unapplied/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 32a904e5df..32a904e5df 100644
--- a/patches/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/unapplied/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0956-Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/0956-Correctly-handle-ArmorStand-invisibility.patch
index 103ddcbb11..103ddcbb11 100644
--- a/patches/server/0956-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/unapplied/server/0956-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0957-Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/0957-Fix-advancement-triggers-for-entity-damage.patch
index e5025e0d38..e5025e0d38 100644
--- a/patches/server/0957-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/unapplied/server/0957-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0958-Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/0958-Fix-text-display-error-on-spawn.patch
index a486841821..a486841821 100644
--- a/patches/server/0958-Fix-text-display-error-on-spawn.patch
+++ b/patches/unapplied/server/0958-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0959-Fix-certain-inventories-returning-null-Locations.patch b/patches/unapplied/server/0959-Fix-certain-inventories-returning-null-Locations.patch
index 3cd182f806..3cd182f806 100644
--- a/patches/server/0959-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/unapplied/server/0959-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0960-Add-Shearable-API.patch b/patches/unapplied/server/0960-Add-Shearable-API.patch
index 950ecc2beb..950ecc2beb 100644
--- a/patches/server/0960-Add-Shearable-API.patch
+++ b/patches/unapplied/server/0960-Add-Shearable-API.patch
diff --git a/patches/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 4c90082c28..4c90082c28 100644
--- a/patches/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/unapplied/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/unapplied/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
index 7d6b194d1b..7d6b194d1b 100644
--- a/patches/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
+++ b/patches/unapplied/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0963-Optimize-Hoppers.patch b/patches/unapplied/server/0963-Optimize-Hoppers.patch
index b78a4f581e..b78a4f581e 100644
--- a/patches/server/0963-Optimize-Hoppers.patch
+++ b/patches/unapplied/server/0963-Optimize-Hoppers.patch
diff --git a/patches/server/0964-Fix-beehives-generating-from-using-bonemeal.patch b/patches/unapplied/server/0964-Fix-beehives-generating-from-using-bonemeal.patch
index f48130ef67..f48130ef67 100644
--- a/patches/server/0964-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/unapplied/server/0964-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0965-Fix-api-checking-banned-ips.patch b/patches/unapplied/server/0965-Fix-api-checking-banned-ips.patch
index a69b2e70fd..a69b2e70fd 100644
--- a/patches/server/0965-Fix-api-checking-banned-ips.patch
+++ b/patches/unapplied/server/0965-Fix-api-checking-banned-ips.patch
diff --git a/patches/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/unapplied/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 59f3bf134a..59f3bf134a 100644
--- a/patches/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/unapplied/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0967-Treat-sequence-violations-like-they-should-be.patch b/patches/unapplied/server/0967-Treat-sequence-violations-like-they-should-be.patch
index 91b302ad20..91b302ad20 100644
--- a/patches/server/0967-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/unapplied/server/0967-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0968-remove-duplicate-animate-packet-for-records.patch b/patches/unapplied/server/0968-remove-duplicate-animate-packet-for-records.patch
index 0958982027..0958982027 100644
--- a/patches/server/0968-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/unapplied/server/0968-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/unapplied/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch
index db2a91cc88..db2a91cc88 100644
--- a/patches/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/unapplied/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/unapplied/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 73b980dd13..73b980dd13 100644
--- a/patches/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/unapplied/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0971-Use-array-for-gamerule-storage.patch b/patches/unapplied/server/0971-Use-array-for-gamerule-storage.patch
index 52052561af..52052561af 100644
--- a/patches/server/0971-Use-array-for-gamerule-storage.patch
+++ b/patches/unapplied/server/0971-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0972-Fix-block-place-logic.patch b/patches/unapplied/server/0972-Fix-block-place-logic.patch
index 6d40e97afc..6d40e97afc 100644
--- a/patches/server/0972-Fix-block-place-logic.patch
+++ b/patches/unapplied/server/0972-Fix-block-place-logic.patch
diff --git a/patches/server/0973-Fix-a-couple-of-upstream-bed-issues.patch b/patches/unapplied/server/0973-Fix-a-couple-of-upstream-bed-issues.patch
index ebc52cbeb3..ebc52cbeb3 100644
--- a/patches/server/0973-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/unapplied/server/0973-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0974-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/0974-Fix-demo-flag-not-enabling-demo-mode.patch
index 7f2f6820eb..7f2f6820eb 100644
--- a/patches/server/0974-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/unapplied/server/0974-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0975-Disable-allowListing-before-received-from-client.patch b/patches/unapplied/server/0975-Disable-allowListing-before-received-from-client.patch
index a1900d6beb..a1900d6beb 100644
--- a/patches/server/0975-Disable-allowListing-before-received-from-client.patch
+++ b/patches/unapplied/server/0975-Disable-allowListing-before-received-from-client.patch
diff --git a/patches/server/0976-Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/0976-Add-Mob-Experience-reward-API.patch
index 3c07d5e971..3c07d5e971 100644
--- a/patches/server/0976-Add-Mob-Experience-reward-API.patch
+++ b/patches/unapplied/server/0976-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0977-Break-redstone-on-top-of-trap-doors-early.patch b/patches/unapplied/server/0977-Break-redstone-on-top-of-trap-doors-early.patch
index 5142b3f57d..5142b3f57d 100644
--- a/patches/server/0977-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/unapplied/server/0977-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0978-Fix-DamageCause-for-Falling-Blocks.patch b/patches/unapplied/server/0978-Fix-DamageCause-for-Falling-Blocks.patch
index 430a94b984..430a94b984 100644
--- a/patches/server/0978-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/unapplied/server/0978-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0979-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/0979-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0979-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/unapplied/server/0979-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0980-More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/0980-More-accurate-isInOpenWater-impl.patch
index eaedd4c5e5..eaedd4c5e5 100644
--- a/patches/server/0980-More-accurate-isInOpenWater-impl.patch
+++ b/patches/unapplied/server/0980-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0981-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/unapplied/server/0981-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 4879c51f2a..4879c51f2a 100644
--- a/patches/server/0981-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/unapplied/server/0981-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0982-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/unapplied/server/0982-Optimise-recalcBlockCounts-for-empty-sections.patch
index 7380d66f2b..7380d66f2b 100644
--- a/patches/server/0982-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/unapplied/server/0982-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0983-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/unapplied/server/0983-Fix-destroying-beehive-without-any-players-nearby-th.patch
index 0a231f55e6..0a231f55e6 100644
--- a/patches/server/0983-Fix-destroying-beehive-without-any-players-nearby-th.patch
+++ b/patches/unapplied/server/0983-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0984-Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/0984-Expand-PlayerItemMendEvent.patch
index f85a71b43c..f85a71b43c 100644
--- a/patches/server/0984-Expand-PlayerItemMendEvent.patch
+++ b/patches/unapplied/server/0984-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0985-Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/0985-Refresh-ProjectileSource-for-projectiles.patch
index bce07f367f..bce07f367f 100644
--- a/patches/server/0985-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/unapplied/server/0985-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0986-Add-transient-modifier-API.patch b/patches/unapplied/server/0986-Add-transient-modifier-API.patch
index e3b704e242..e3b704e242 100644
--- a/patches/server/0986-Add-transient-modifier-API.patch
+++ b/patches/unapplied/server/0986-Add-transient-modifier-API.patch
diff --git a/work/BuildData b/work/BuildData
-Subproject 4d9436f7b66190ad21fe4e3975b73a36b7ad2a7
+Subproject 2881c6b6dd146126596342d4025d37a9a84a0b0
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 5dbedae1cbbc70791dcfc374c4c8da35db309a4
+Subproject 3635fe1a771a768acc67a9ab8b3ea184fc724ba
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 2270366cdd98ff02eaa62212b7881084feadd76
+Subproject e1188ed3a2f295cba417e59645ca22c97b4587a
diff --git a/work/Spigot b/work/Spigot
-Subproject 7d7b241e353e86ee90ad025dab0262b050a6fe4
+Subproject 81b9def3c89c26289118ed0e43ec4df167edd56