Begin update to 1.20.5

1409 files changed, 1126 insertions, 1273 deletions

diff --git a/README.md b/README.md
index 14b8aa097e..f11287dc07 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.20.4-R0.1-SNAPSHOT</version>
+    <version>1.20.5-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,17 +53,17 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.20.5-R0.1-SNAPSHOT")
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 ```
 
 How To (Compiling Jar From Source)
 ------
-To compile Paper, you need JDK 17 and an internet connection.
+To compile Paper, you need JDK 21 and an internet connection.
 
 Clone this repo, run `./gradlew applyPatches`, then `./gradlew createReobfBundlerJar` from your terminal. You can find the compiled jar in the project root's `build/libs` directory.
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 73ac5cedc6..803c1d07c8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(17)
+            languageVersion = JavaLanguageVersion.of(21)
         }
     }
 }
@@ -30,7 +30,7 @@ val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 subprojects {
     tasks.withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        options.release = 17
+        options.release = 21
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()
@@ -67,10 +67,10 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.20.4+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.20.5+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
-    spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
+    spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.12")
     paperclip("io.papermc:paperclip:3.0.3")
 }
 
diff --git a/gradle.properties b/gradle.properties
index 794f7c1540..06573bcbf9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 group=io.papermc.paper
-version=1.20.4-R0.1-SNAPSHOT
-mcVersion=1.20.4
+version=1.20.5-R0.1-SNAPSHOT
+mcVersion=1.20.5
 
 # Set to true while updating Minecraft version
-updatingMinecraft=false
+updatingMinecraft=true
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index f58981795e..e65b211bf2 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -124,10 +124,10 @@ index 0000000000000000000000000000000000000000..4756a5aa04f8a8f0a8f9ff2c7aa6776b
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 931d1a0215f54a4ff172b1b6db2ab06c41cd0c39..0000000000000000000000000000000000000000
+index 35e6845d86cbfed386f666307add6d6f3e67dd1c..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,277 +0,0 @@
+@@ -1,276 +0,0 @@
 -
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -135,7 +135,7 @@ index 931d1a0215f54a4ff172b1b6db2ab06c41cd0c39..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.20.4-R0.1-SNAPSHOT</version>
+-    <version>1.20.5-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -144,8 +144,7 @@ index 931d1a0215f54a4ff172b1b6db2ab06c41cd0c39..00000000000000000000000000000000
 -
 -    <properties>
 -        <skipTests>true</skipTests>
--        <maven.compiler.source>17</maven.compiler.source>
--        <maven.compiler.target>17</maven.compiler.target>
+-        <maven.compiler.release>17</maven.compiler.release>
 -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -    </properties>
 -
@@ -266,7 +265,7 @@ index 931d1a0215f54a4ff172b1b6db2ab06c41cd0c39..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-compiler-plugin</artifactId>
--                <version>3.11.0</version>
+-                <version>3.13.0</version>
 -                <configuration>
 -                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
 -                    <compilerId>eclipse</compilerId>
@@ -277,7 +276,7 @@ index 931d1a0215f54a4ff172b1b6db2ab06c41cd0c39..00000000000000000000000000000000
 -                    <dependency>
 -                        <groupId>org.codehaus.plexus</groupId>
 -                        <artifactId>plexus-compiler-eclipse</artifactId>
--                        <version>2.13.0</version>
+-                        <version>2.15.0</version>
 -                    </dependency>
 -                </dependencies>
 -            </plugin>
diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
index 28009e5408..e2ce0357bc 100644
--- a/patches/api/0006-Adventure.patch
+++ b/patches/api/0006-Adventure.patch
@@ -778,10 +778,10 @@ index 0000000000000000000000000000000000000000..6e94562d79206d88b74b53814f9423f1
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce7641be7910 100644
+index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172efa1864648 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -420,7 +420,9 @@ public final class Bukkit {
+@@ -422,7 +422,9 @@ public final class Bukkit {
       *
       * @param message the message
       * @return the number of players
@@ -791,7 +791,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      public static int broadcastMessage(@NotNull String message) {
          return server.broadcastMessage(message);
      }
-@@ -1211,6 +1213,19 @@ public final class Bukkit {
+@@ -1223,6 +1225,19 @@ public final class Bukkit {
          server.shutdown();
      }
  
@@ -811,7 +811,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      /**
       * Broadcasts the specified message to every user with the given
       * permission name.
-@@ -1220,6 +1235,21 @@ public final class Bukkit {
+@@ -1232,6 +1247,21 @@ public final class Bukkit {
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
       */
@@ -833,7 +833,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      public static int broadcast(@NotNull String message, @NotNull String permission) {
          return server.broadcast(message, permission);
      }
-@@ -1481,6 +1511,7 @@ public final class Bukkit {
+@@ -1493,6 +1523,7 @@ public final class Bukkit {
          return server.createInventory(owner, type);
      }
  
@@ -841,7 +841,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      /**
       * Creates an empty inventory with the specified type and title. If the type
       * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1506,6 +1537,38 @@ public final class Bukkit {
+@@ -1518,6 +1549,38 @@ public final class Bukkit {
       * @see InventoryType#isCreatable()
       */
      @NotNull
@@ -880,7 +880,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
          return server.createInventory(owner, type, title);
      }
-@@ -1524,6 +1587,7 @@ public final class Bukkit {
+@@ -1536,6 +1599,7 @@ public final class Bukkit {
          return server.createInventory(owner, size);
      }
  
@@ -888,7 +888,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1536,10 +1600,30 @@ public final class Bukkit {
+@@ -1548,10 +1612,30 @@ public final class Bukkit {
       * @throws IllegalArgumentException if the size is not a multiple of 9
       */
      @NotNull
@@ -919,7 +919,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      /**
       * Creates an empty merchant.
       *
-@@ -1547,7 +1631,20 @@ public final class Bukkit {
+@@ -1559,7 +1643,20 @@ public final class Bukkit {
       * when the merchant inventory is viewed
       * @return a new merchant
       */
@@ -940,7 +940,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      public static Merchant createMerchant(@Nullable String title) {
          return server.createMerchant(title);
      }
-@@ -1664,12 +1761,43 @@ public final class Bukkit {
+@@ -1676,12 +1773,43 @@ public final class Bukkit {
          return server.isPrimaryThread();
      }
  
@@ -984,7 +984,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      public static String getMotd() {
          return server.getMotd();
      }
-@@ -1678,7 +1806,9 @@ public final class Bukkit {
+@@ -1690,7 +1818,9 @@ public final class Bukkit {
       * Set the message that is displayed on the server list.
       *
       * @param motd The message to be displayed
@@ -994,7 +994,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
      public static void setMotd(@NotNull String motd) {
          server.setMotd(motd);
      }
-@@ -1687,8 +1817,10 @@ public final class Bukkit {
+@@ -1699,8 +1829,10 @@ public final class Bukkit {
       * Gets the default message that is displayed when the server is stopped.
       *
       * @return the shutdown message
@@ -1176,10 +1176,10 @@ index ae7b51341fb66c41b8a7c4604fd273d876e311be..4034fcb9abc39b12f0de47c4b679f2ef
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc0b0afd8a 100644
+index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -63,13 +63,13 @@ import org.jetbrains.annotations.Nullable;
+@@ -65,13 +65,13 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a server implementation.
   */
@@ -1195,7 +1195,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
       */
      public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin";
  
-@@ -77,7 +77,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -79,7 +79,7 @@ public interface Server extends PluginMessageRecipient {
       * Used for all announcement messages, such as informing users that a
       * player has joined.
       * <p>
@@ -1204,7 +1204,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
       */
      public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
  
-@@ -353,7 +353,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -355,7 +355,9 @@ public interface Server extends PluginMessageRecipient {
       *
       * @param message the message
       * @return the number of players
@@ -1214,7 +1214,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
      public int broadcastMessage(@NotNull String message);
  
      /**
-@@ -1039,8 +1041,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -1049,8 +1051,33 @@ public interface Server extends PluginMessageRecipient {
       * @param permission the required permission {@link Permissible
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
@@ -1248,7 +1248,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
  
      /**
       * Gets the player by the given name, regardless if they are offline or
-@@ -1257,6 +1284,35 @@ public interface Server extends PluginMessageRecipient {
+@@ -1267,6 +1294,35 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
  
@@ -1284,7 +1284,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
      /**
       * Creates an empty inventory with the specified type and title. If the type
       * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1278,9 +1334,11 @@ public interface Server extends PluginMessageRecipient {
+@@ -1288,9 +1344,11 @@ public interface Server extends PluginMessageRecipient {
       * @return The new inventory.
       * @throws IllegalArgumentException if the {@link InventoryType} cannot be
       * viewed.
@@ -1296,7 +1296,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
  
-@@ -1296,6 +1354,22 @@ public interface Server extends PluginMessageRecipient {
+@@ -1306,6 +1364,22 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
  
@@ -1319,7 +1319,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1306,18 +1380,32 @@ public interface Server extends PluginMessageRecipient {
+@@ -1316,18 +1390,32 @@ public interface Server extends PluginMessageRecipient {
       *     viewed
       * @return a new inventory
       * @throws IllegalArgumentException if the size is not a multiple of 9
@@ -1352,7 +1352,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
      Merchant createMerchant(@Nullable String title);
  
      /**
-@@ -1413,27 +1501,56 @@ public interface Server extends PluginMessageRecipient {
+@@ -1423,27 +1511,56 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean isPrimaryThread();
  
@@ -1409,7 +1409,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
      String getShutdownMessage();
  
      /**
-@@ -1815,7 +1932,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1834,7 +1951,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends the component to the player
           *
           * @param component the components to send
@@ -1419,7 +1419,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
          public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1824,7 +1943,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1843,7 +1962,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends an array of components as a single message to the player
           *
           * @param components the components to send
@@ -1430,7 +1430,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
              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 9b1247cdf8a2fed812c46c55193d574aafc3bc94..72ea6ddd00eed73459d700d657929f83ba1ca7ee 100644
+index bd3861c4c2eabca93065c0a6e24e0d3603d86db2..ddc4c5097214371108dc945371e1d28811352c38 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
 @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
@@ -1442,7 +1442,7 @@ index 9b1247cdf8a2fed812c46c55193d574aafc3bc94..72ea6ddd00eed73459d700d657929f83
  
      AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"),
      AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"),
-@@ -1614,4 +1614,11 @@ public enum Sound implements Keyed {
+@@ -1727,4 +1727,11 @@ public enum Sound implements Keyed {
      public NamespacedKey getKey() {
          return key;
      }
@@ -1523,7 +1523,7 @@ index efb97712cc9dc7c1e12a59f5b94e4f2ad7c6b7d8..3024468af4c073324e536c1cb26beffb
                  return warning == null || warning.value();
              }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 28193b8e3c79e14af2ce47857a717f9dd4f1fa42..b53f24c0368ff4e4f5287f1699643a0c00579031 100644
+index 3132e6754ab462eca0b7de1e7ad64c955316296d..a9858c2559f0921613b19710135cc6e060488e96 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
@@ -1743,7 +1743,7 @@ index 0f4ae7bd2ad379b5edb40f49f93de9e18c38f415..575e545a69b5279b90067d7ebee08b7b
  
      /**
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1ad391cba 100644
+index ac89f041dc983485174a174e79cd21159fdfba1e..f3cdf13f22aa789ee8cc235b61fda4035b254219 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -32,7 +32,7 @@ public abstract class Command {
@@ -1770,35 +1770,25 @@ index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1
          }
  
          return false;
-@@ -317,10 +317,12 @@ public abstract class Command {
-      * command
-      *
-      * @return Permission check failed message
-+     * @deprecated use {@link #permissionMessage()}
-      */
+@@ -327,7 +327,7 @@ public abstract class Command {
+     @Deprecated
      @Nullable
-+    @Deprecated // Paper
      public String getPermissionMessage() {
 -        return permissionMessage;
 +        return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serializeOrNull(permissionMessage); // Paper
      }
  
      /**
-@@ -381,10 +383,12 @@ public abstract class Command {
-      * @param permissionMessage new permission message, null to indicate
-      *     default message, or an empty string to indicate no message
-      * @return this command object, for chaining
-+     * @deprecated use {@link #permissionMessage(net.kyori.adventure.text.Component)}
-      */
+@@ -398,7 +398,7 @@ public abstract class Command {
+     @Deprecated
      @NotNull
-+    @Deprecated // Paper
      public Command setPermissionMessage(@Nullable String permissionMessage) {
 -        this.permissionMessage = permissionMessage;
 +        this.permissionMessage = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserializeOrNull(permissionMessage); // Paper
          return this;
      }
  
-@@ -399,13 +403,47 @@ public abstract class Command {
+@@ -413,13 +413,61 @@ public abstract class Command {
          this.usageMessage = (usage == null) ? "" : usage;
          return this;
      }
@@ -1807,7 +1797,14 @@ index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1
 +     * Gets the permission message.
 +     *
 +     * @return the permission message
++     * @deprecated permission messages have not worked for player-executed
++     * commands since 1.13 as clients without permission to execute a command
++     * are unaware of its existence and therefore will not send an unknown
++     * command execution to the server. This message will only ever be shown to
++     * consoles or when this command is executed with
++     * {@link Bukkit#dispatchCommand(CommandSender, String)}.
 +     */
++    @Deprecated
 +    public net.kyori.adventure.text.@Nullable Component permissionMessage() {
 +        return this.permissionMessage;
 +    }
@@ -1816,7 +1813,14 @@ index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1
 +     * Sets the permission message.
 +     *
 +     * @param permissionMessage the permission message
++     * @deprecated permission messages have not worked for player-executed
++     * commands since 1.13 as clients without permission to execute a command
++     * are unaware of its existence and therefore will not send an unknown
++     * command execution to the server. This message will only ever be shown to
++     * consoles or when this command is executed with
++     * {@link Bukkit#dispatchCommand(CommandSender, String)}.
 +     */
++    @Deprecated
 +    public void permissionMessage(net.kyori.adventure.text.@Nullable Component permissionMessage) {
 +        this.permissionMessage = permissionMessage;
 +    }
@@ -1847,7 +1851,7 @@ index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1
  
          if (source instanceof BlockCommandSender) {
              BlockCommandSender blockCommandSender = (BlockCommandSender) source;
-@@ -424,7 +462,12 @@ public abstract class Command {
+@@ -438,7 +486,12 @@ public abstract class Command {
          }
  
          Set<Permissible> users = Bukkit.getPluginManager().getPermissionSubscriptions(Server.BROADCAST_CHANNEL_ADMINISTRATIVE);
@@ -2178,10 +2182,10 @@ index b7d8dd30360a38dbdc7bbce40c8e6ced7261f833..0817f2395c2b18828565435568ce651f
      public void sendRawMessage(@Nullable UUID sender, @NotNull String message);
  }
 diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index a456e43308b95f51beed2159e6baf00f32702a71..350d52f4dd97a7e6a6a9a967e1c6a8781feda22e 100644
+index f9965740ffa267caa698f854120a5d89727c6d37..dddd0e74962d5713c4bb6219fba48aae5763e9ea 100644
 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java
 +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -296,6 +296,19 @@ public abstract class Enchantment implements Keyed, Translatable {
+@@ -317,6 +317,19 @@ public abstract class Enchantment implements Keyed, Translatable {
       * @return True if the enchantment may be applied, otherwise False
       */
      public abstract boolean canEnchantItem(@NotNull ItemStack item);
@@ -2218,7 +2222,7 @@ index 7ad7bcf9a9333c8d6d1d7cab53a6d457ec20bbf6..c4f86ba1037f3f0e5d697a0962d71d6f
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 53450c104a25151094961a58ffa0d809e3b9a064..474765f40801a766c853018ea6e1adcd010375d2 100644
+index 558fe6e23f562ee873fc84112f930c6ea19a09f4..c78fb359bd28b8dc1ba242642ec612e856525993 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
@@ -2230,7 +2234,7 @@ index 53450c104a25151094961a58ffa0d809e3b9a064..474765f40801a766c853018ea6e1adcd
  
      /**
       * Gets the entity's current position
-@@ -765,4 +765,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -776,4 +776,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      @Override
      Spigot spigot();
      // Spigot end
@@ -2252,10 +2256,10 @@ index 53450c104a25151094961a58ffa0d809e3b9a064..474765f40801a766c853018ea6e1adcd
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a8904c998ea 100644
+index 712c0a8ae919ed9e7cb84cebd4b6a415ddaa63eb..4e9ba039669c7059180f5776ee2f7188f2dd01b5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -54,7 +54,41 @@ import org.jetbrains.annotations.Nullable;
+@@ -56,7 +56,41 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */
@@ -2298,7 +2302,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
  
      /**
       * {@inheritDoc}
-@@ -71,7 +105,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -73,7 +107,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * places defined by plugins.
       *
       * @return the friendly name
@@ -2308,7 +2312,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      @NotNull
      public String getDisplayName();
  
-@@ -83,15 +119,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -85,15 +121,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * places defined by plugins.
       *
       * @param name The new display name.
@@ -2359,7 +2363,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public String getPlayerListName();
  
      /**
-@@ -100,14 +171,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -102,14 +173,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * If the value is null, the name will be identical to {@link #getName()}.
       *
       * @param name new player list name
@@ -2378,7 +2382,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      @Nullable
      public String getPlayerListHeader();
  
-@@ -115,7 +190,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -117,7 +192,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Gets the currently displayed player list footer for this player.
       *
       * @return player list header or null
@@ -2388,7 +2392,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      @Nullable
      public String getPlayerListFooter();
  
-@@ -123,14 +200,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -125,14 +202,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Sets the currently displayed player list header for this player.
       *
       * @param header player list header, null for empty
@@ -2407,7 +2411,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public void setPlayerListFooter(@Nullable String footer);
  
      /**
-@@ -139,7 +220,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -141,7 +222,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param header player list header, null for empty
       * @param footer player list footer, null for empty
@@ -2417,7 +2421,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
  
      /**
-@@ -177,9 +260,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -221,9 +304,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Kicks player with custom kick message.
       *
       * @param message kick message
@@ -2443,7 +2447,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      /**
       * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
       * update the entry.
-@@ -842,6 +941,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -886,6 +985,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map<EquipmentSlot, ItemStack> items);
  
@@ -2550,7 +2554,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      /**
       * 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.
-@@ -859,7 +1058,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -903,7 +1102,11 @@ 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
@@ -2562,7 +2566,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
  
      /**
-@@ -881,7 +1084,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -925,7 +1128,11 @@ 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
@@ -2574,7 +2578,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
  
      /**
-@@ -904,7 +1111,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -948,7 +1155,11 @@ 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
@@ -2586,7 +2590,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
  
      /**
-@@ -1372,7 +1583,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1416,7 +1627,7 @@ 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.
       * @deprecated Minecraft no longer uses textures packs. Instead you
@@ -2595,7 +2599,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
       */
      @Deprecated
      public void setTexturePack(@NotNull String url);
-@@ -1408,7 +1619,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1452,7 +1663,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.
@@ -2605,7 +2609,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -1440,6 +1653,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1484,6 +1697,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -2613,7 +2617,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
       * @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.
-@@ -1452,6 +1666,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1496,6 +1710,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2621,7 +2625,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public void setResourcePack(@NotNull String url, @Nullable byte[] hash);
  
      /**
-@@ -1476,12 +1691,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1520,12 +1735,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
       * <li>To remove a resource pack you can use
@@ -2636,7 +2640,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
       * @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.
-@@ -1495,8 +1711,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1539,8 +1755,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2647,7 +2651,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1519,7 +1737,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1563,7 +1781,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
       * <li>To remove a resource pack you can use
@@ -2703,7 +2707,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
       * <li>The request is sent with empty string as the hash when the hash is
       *     not provided. This might result in newer versions not loading the
       *     pack correctly.
-@@ -1538,7 +1803,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1582,7 +1847,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     length restriction is an implementation specific arbitrary value.
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
@@ -2713,7 +2717,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public void setResourcePack(@NotNull String url, @Nullable byte[] hash, boolean force);
  
      /**
-@@ -1563,7 +1830,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1607,7 +1874,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
       * <li>To remove a resource pack you can use
@@ -2722,7 +2726,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
       * <li>The request is sent with empty string as the hash when the hash is
       *     not provided. This might result in newer versions not loading the
       *     pack correctly.
-@@ -1583,9 +1850,61 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1627,9 +1894,61 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     length restriction is an implementation specific arbitrary value.
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
@@ -2784,7 +2788,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1608,7 +1927,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1652,7 +1971,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
       * <li>To remove a resource pack you can use
@@ -2793,7 +2797,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
       * <li>The request is sent with empty string as the hash when the hash is
       *     not provided. This might result in newer versions not loading the
       *     pack correctly.
-@@ -1629,9 +1948,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1673,9 +1992,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     length restriction is an implementation specific arbitrary value.
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
@@ -2854,7 +2858,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      /**
       * Request that the player's client download and include another resource pack.
       * <p>
-@@ -1684,12 +2054,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1728,12 +2098,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param id the id of the resource pack.
       * @throws IllegalArgumentException If the ID is null.
@@ -2869,7 +2873,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
       */
      public void removeResourcePacks();
  
-@@ -1827,7 +2199,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1871,7 +2243,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param title Title text
       * @param subtitle Subtitle text
@@ -2878,7 +2882,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
       */
      @Deprecated
      public void sendTitle(@Nullable String title, @Nullable String subtitle);
-@@ -1846,7 +2218,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1890,7 +2262,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.
@@ -2888,7 +2892,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
  
      /**
-@@ -2073,6 +2447,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2117,6 +2491,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public int getClientViewDistance();
  
@@ -2903,7 +2907,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      /**
       * Gets the player's estimated ping in milliseconds.
       *
-@@ -2098,8 +2480,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2142,8 +2524,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * they wish.
       *
       * @return the player's locale
@@ -2914,7 +2918,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      public String getLocale();
  
      /**
-@@ -2151,6 +2535,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2195,6 +2579,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public boolean isAllowingServerListings();
  
@@ -2929,7 +2933,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
      // Spigot start
      public class Spigot extends Entity.Spigot {
  
-@@ -2182,11 +2574,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2226,11 +2618,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2943,7 +2947,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
          @Override
          public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
-@@ -2197,7 +2591,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2241,7 +2635,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param component the components to send
@@ -2953,7 +2957,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
          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.");
          }
-@@ -2207,7 +2603,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2251,7 +2647,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param components the components to send
@@ -2963,7 +2967,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
          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.");
          }
-@@ -2218,7 +2616,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2262,7 +2660,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
@@ -2973,7 +2977,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
          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.");
          }
-@@ -2229,7 +2629,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2273,7 +2673,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
@@ -2984,7 +2988,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
              throw new UnsupportedOperationException("Not supported yet.");
          }
 diff --git a/src/main/java/org/bukkit/entity/TextDisplay.java b/src/main/java/org/bukkit/entity/TextDisplay.java
-index d6d7ada3d3ff9a033ce3f780b104ef3e176f9083..f101ffde9e7b3f6c3ab6f1cffb8d6f4e720634b2 100644
+index bbce00a6d84aaad4a0ec892ec5cb1b995a0a5a05..a8277270e81bc3d9bbc64c029fe11e3d11e1d9ac 100644
 --- a/src/main/java/org/bukkit/entity/TextDisplay.java
 +++ b/src/main/java/org/bukkit/entity/TextDisplay.java
 @@ -13,17 +13,37 @@ public interface TextDisplay extends Display {
@@ -3330,7 +3334,7 @@ index 9c68c3f2d61500479f48b80264f625aaae2f3204..399afcd19fcb6acd24857ed6ab48cf0d
      private static final HandlerList handlers = new HandlerList();
      private boolean cancel = false;
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269ef3cb9f4 100644
+index 7ca90f318a013786931043c9a10a93cf6aede199..004f1fd55c143e6c21be74d0a6b9ee8b2e12cc59 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 @@ -10,11 +10,18 @@ import org.jetbrains.annotations.NotNull;
@@ -3353,8 +3357,8 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
      private final String name;
      private final InetAddress ipAddress;
      private final UUID uniqueId;
-@@ -27,7 +34,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
+@@ -33,7 +40,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred) {
          super(true);
          this.result = Result.ALLOWED;
 -        this.message = "";
@@ -3362,7 +3366,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
          this.name = name;
          this.ipAddress = ipAddress;
          this.uniqueId = uniqueId;
-@@ -79,6 +86,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -86,6 +93,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
          this.result = result == null ? null : Result.valueOf(result.name());
      }
  
@@ -3370,7 +3374,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
      /**
       * Gets the current kick message that will be used if getResult() !=
       * Result.ALLOWED
-@@ -86,7 +94,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -93,7 +101,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
       * @return Current kick message
       */
      @NotNull
@@ -3379,7 +3383,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
          return message;
      }
  
-@@ -95,16 +103,66 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -102,16 +110,66 @@ public class AsyncPlayerPreLoginEvent extends Event {
       *
       * @param message New kick message
       */
@@ -3448,7 +3452,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
      }
  
      /**
-@@ -112,10 +170,12 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -119,10 +177,12 @@ public class AsyncPlayerPreLoginEvent extends Event {
       *
       * @param result New result for disallowing the player
       * @param message Kick message to display to the user
@@ -3462,7 +3466,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
      }
  
      /**
-@@ -130,7 +190,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -137,7 +197,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
      @Deprecated
      public void disallow(@NotNull final PlayerPreLoginEvent.Result result, @NotNull final String message) {
          this.result = result == null ? null : Result.valueOf(result.name());
@@ -4354,19 +4358,179 @@ index 88cdce67e6a55712cb56e946f2f09c82ddbc1d15..e76c847e57f3d32757129d56922862a4
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f006905d6a988 100644
+index 9bab73c3c2ca759b8e1c7d07d98cc593c961666a..7cc66e5dd6f19295728d3c0e6c0898338281b8a7 100644
 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-@@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -124,8 +124,10 @@ public interface BookMeta extends WritableBookMeta {
+          *
+          * @param page the page number to get
+          * @return the page from the book
++         * @deprecated in favour of {@link #page(int)}
+          */
+         @NotNull
++        @Deprecated // Paper
+         public BaseComponent[] getPage(int page) {
+             throw new UnsupportedOperationException("Not supported yet.");
+         }
+@@ -139,7 +141,9 @@ public interface BookMeta extends WritableBookMeta {
+          *
+          * @param page the page number to set
+          * @param data the data to set for that page
++         * @deprecated in favour of {@link #page(int, net.kyori.adventure.text.Component)}
+          */
++        @Deprecated // Paper
+         public void setPage(int page, @Nullable BaseComponent... data) {
+             throw new UnsupportedOperationException("Not supported yet.");
+         }
+@@ -148,8 +152,10 @@ public interface BookMeta extends WritableBookMeta {
+          * Gets all the pages in the book.
+          *
+          * @return list of all the pages in the book
++         * @deprecated in favour of {@link #pages()}
+          */
+         @NotNull
++        @Deprecated // Paper
+         public List<BaseComponent[]> getPages() {
+             throw new UnsupportedOperationException("Not supported yet.");
+         }
+@@ -159,7 +165,9 @@ public interface BookMeta extends WritableBookMeta {
+          * pages. Maximum 50 pages with 256 characters per page.
+          *
+          * @param pages A list of pages to set the book to use
++         * @deprecated in favour of {@link #pages(java.util.List)}
+          */
++        @Deprecated // Paper
+         public void setPages(@NotNull List<BaseComponent[]> pages) {
+             throw new UnsupportedOperationException("Not supported yet.");
+         }
+@@ -169,7 +177,9 @@ public interface BookMeta extends WritableBookMeta {
+          * pages. Maximum 50 pages with 256 characters per page.
+          *
+          * @param pages A list of component arrays, each being a page
++         * @deprecated in favour of {@link #pages(net.kyori.adventure.text.Component...)}
+          */
++        @Deprecated // Paper
+         public void setPages(@NotNull BaseComponent[]... pages) {
+             throw new UnsupportedOperationException("Not supported yet.");
+         }
+@@ -179,7 +189,9 @@ public interface BookMeta extends WritableBookMeta {
+          * with 256 characters per page.
+          *
+          * @param pages A list of component arrays, each being a page
++         * @deprecated in favour of {@link #addPages(net.kyori.adventure.text.Component...)}
+          */
++        @Deprecated // Paper
+         public void addPage(@NotNull BaseComponent[]... pages) {
+             throw new UnsupportedOperationException("Not supported yet.");
+         }
+diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+index 255f79d5bca15620cb17d7b54ffebb6ff00bff6b..d7c178b3584db5866a5a21c6ddaab876b94058b9 100644
+--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
++++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+@@ -34,6 +34,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+      */
+     boolean hasDisplayName();
+ 
++    // Paper start
++    /**
++     * Gets the display name.
++     *
++     * <p>Plugins should check that {@link #hasDisplayName()} returns <code>true</code> before calling this method.</p>
++     *
++     * @return the display name
++     */
++    net.kyori.adventure.text.@Nullable Component displayName();
++
++    /**
++     * Sets the display name.
++     *
++     * @param displayName the display name to set
++     */
++    void displayName(final net.kyori.adventure.text.@Nullable Component displayName);
++    // Paper end
++
+     /**
+      * Gets the display name that is set.
+      * <p>
+@@ -41,7 +59,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+      * before calling this method.
+      *
+      * @return the display name that is set
++     * @deprecated in favour of {@link #displayName()}
+      */
++    @Deprecated // Paper
+     @NotNull
+     String getDisplayName();
+ 
+@@ -49,7 +69,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+      * Sets the display name.
+      *
+      * @param name the name to set
++     * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
+      */
++    @Deprecated // Paper
+     void setDisplayName(@Nullable String name);
+ 
+     /**
+@@ -124,6 +146,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+      */
+     boolean hasLore();
+ 
++    // Paper start
++    /**
++     * Gets the lore.
++     *
++     * <p>Plugins should check that {@link #hasLore()} returns <code>true</code> before calling this method.</p>
++     *
++     * @return the lore
++     */
++    @Nullable List<net.kyori.adventure.text.Component> lore();
++
++    /**
++     * Sets the lore.
++     *
++     * @param lore the lore to set
++     */
++    void lore(final @Nullable List<? extends net.kyori.adventure.text.Component> lore);
++    // Paper end
++
+     /**
+      * Gets the lore that is set.
+      * <p>
+@@ -131,7 +171,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+      * calling this method.
+      *
+      * @return a list of lore that is set
++     * @deprecated in favour of {@link #lore()}
+      */
++    @Deprecated // Paper
+     @Nullable
+     List<String> getLore();
+ 
+@@ -140,7 +182,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+      * Removes lore when given null.
+      *
+      * @param lore the lore that will be set
++     * @deprecated in favour of {@link #lore(List)}
+      */
++    @Deprecated // Paper
+     void setLore(@Nullable List<String> lore);
+ 
+     /**
+diff --git a/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java b/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java
+index 12595536080ffe09df2b6ecdb83d846f50100d38..dec77fc3aff1baf21aeff8d8d681a46f597935c9 100644
+--- a/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java
++++ b/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java
+@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
   * Represents a book ({@link Material#WRITABLE_BOOK} or {@link
-  * Material#WRITTEN_BOOK}) that can have a title, an author, and pages.
+  * Material#WRITTEN_BOOK}) that can have pages.
   */
--public interface BookMeta extends ItemMeta {
-+public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { // Paper
+-public interface WritableBookMeta extends ItemMeta {
++public interface WritableBookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { // Paper
  
      /**
-      * Represents the generation (or level of copying) of a written book
-@@ -119,6 +119,109 @@ public interface BookMeta extends ItemMeta {
+      * Checks for the existence of pages in the book.
+@@ -17,6 +17,108 @@ public interface WritableBookMeta extends ItemMeta {
       */
      boolean hasPages();
  
@@ -4380,7 +4544,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
 +     * @return the title of the book
 +     */
 +    @Override
-+    net.kyori.adventure.text.@Nullable Component title();
++    [email protected] Component title();
 +
 +    /**
 +     * Sets the title of the book.
@@ -4392,7 +4556,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
 +     */
 +    @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false)
 +    @Override
-+    @NotNull BookMeta title(net.kyori.adventure.text.@Nullable Component title);
++    @NotNull BookMeta title([email protected] Component title);
 +
 +    /**
 +     * Gets the author of the book.
@@ -4403,7 +4567,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
 +     * @return the author of the book
 +     */
 +    @Override
-+    net.kyori.adventure.text.@Nullable Component author();
++    [email protected] Component author();
 +
 +    /**
 +     * Sets the author of the book. Removes author when given null.
@@ -4413,7 +4577,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
 +     */
 +    @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false)
 +    @Override
-+    @NotNull BookMeta author(net.kyori.adventure.text.@Nullable Component author);
++    @NotNull BookMeta author([email protected] Component author);
 +
 +    /**
 +     * Gets the specified page in the book. The page must exist.
@@ -4447,13 +4611,13 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
 +     */
 +    void addPages(net.kyori.adventure.text.@NotNull Component @NotNull ... pages);
 +
-+    interface BookMetaBuilder extends Builder {
++    interface BookMetaBuilder extends net.kyori.adventure.inventory.Book.Builder {
 +
 +        @Override
-+        @NotNull BookMetaBuilder title(net.kyori.adventure.text.@Nullable Component title);
++        @NotNull BookMetaBuilder title([email protected] Component title);
 +
 +        @Override
-+        @NotNull BookMetaBuilder author(net.kyori.adventure.text.@Nullable Component author);
++        @NotNull BookMetaBuilder author([email protected] Component author);
 +
 +        @Override
 +        @NotNull BookMetaBuilder addPage(net.kyori.adventure.text.@NotNull Component page);
@@ -4470,13 +4634,12 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
 +
 +    @Override
 +    @NotNull BookMetaBuilder toBuilder();
-+
 +    // Paper end
 +
      /**
       * Gets the specified page in the book. The given page must exist.
       * <p>
-@@ -126,8 +229,10 @@ public interface BookMeta extends ItemMeta {
+@@ -24,8 +126,10 @@ public interface WritableBookMeta extends ItemMeta {
       *
       * @param page the page number to get, in range [1, getPageCount()]
       * @return the page from the book
@@ -4487,7 +4650,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
      String getPage(int page);
  
      /**
-@@ -141,15 +246,19 @@ public interface BookMeta extends ItemMeta {
+@@ -39,15 +143,19 @@ public interface WritableBookMeta extends ItemMeta {
       *
       * @param page the page number to set, in range [1, getPageCount()]
       * @param data the data to set for that page
@@ -4507,7 +4670,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
      List<String> getPages();
  
      /**
-@@ -157,7 +266,9 @@ public interface BookMeta extends ItemMeta {
+@@ -55,7 +163,9 @@ public interface WritableBookMeta extends ItemMeta {
       * pages. Maximum 100 pages with 1024 characters per page.
       *
       * @param pages A list of pages to set the book to use
@@ -4517,7 +4680,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
      void setPages(@NotNull List<String> pages);
  
      /**
-@@ -165,7 +276,9 @@ public interface BookMeta extends ItemMeta {
+@@ -63,7 +173,9 @@ public interface WritableBookMeta extends ItemMeta {
       * pages. Maximum 100 pages with 1024 characters per page.
       *
       * @param pages A list of strings, each being a page
@@ -4527,7 +4690,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
      void setPages(@NotNull String... pages);
  
      /**
-@@ -173,7 +286,9 @@ public interface BookMeta extends ItemMeta {
+@@ -71,7 +183,9 @@ public interface WritableBookMeta extends ItemMeta {
       * 1024 characters per page.
       *
       * @param pages A list of strings, each being a page
@@ -4537,162 +4700,6 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
      void addPage(@NotNull String... pages);
  
      /**
-@@ -195,8 +310,10 @@ public interface BookMeta extends ItemMeta {
-          *
-          * @param page the page number to get
-          * @return the page from the book
-+         * @deprecated in favour of {@link #page(int)}
-          */
-         @NotNull
-+        @Deprecated // Paper
-         public BaseComponent[] getPage(int page) {
-             throw new UnsupportedOperationException("Not supported yet.");
-         }
-@@ -210,7 +327,9 @@ public interface BookMeta extends ItemMeta {
-          *
-          * @param page the page number to set
-          * @param data the data to set for that page
-+         * @deprecated in favour of {@link #page(int, net.kyori.adventure.text.Component)}
-          */
-+        @Deprecated // Paper
-         public void setPage(int page, @Nullable BaseComponent... data) {
-             throw new UnsupportedOperationException("Not supported yet.");
-         }
-@@ -219,8 +338,10 @@ public interface BookMeta extends ItemMeta {
-          * Gets all the pages in the book.
-          *
-          * @return list of all the pages in the book
-+         * @deprecated in favour of {@link #pages()}
-          */
-         @NotNull
-+        @Deprecated // Paper
-         public List<BaseComponent[]> getPages() {
-             throw new UnsupportedOperationException("Not supported yet.");
-         }
-@@ -230,7 +351,9 @@ public interface BookMeta extends ItemMeta {
-          * pages. Maximum 50 pages with 256 characters per page.
-          *
-          * @param pages A list of pages to set the book to use
-+         * @deprecated in favour of {@link #pages(java.util.List)}
-          */
-+        @Deprecated // Paper
-         public void setPages(@NotNull List<BaseComponent[]> pages) {
-             throw new UnsupportedOperationException("Not supported yet.");
-         }
-@@ -240,7 +363,9 @@ public interface BookMeta extends ItemMeta {
-          * pages. Maximum 50 pages with 256 characters per page.
-          *
-          * @param pages A list of component arrays, each being a page
-+         * @deprecated in favour of {@link #pages(net.kyori.adventure.text.Component...)}
-          */
-+        @Deprecated // Paper
-         public void setPages(@NotNull BaseComponent[]... pages) {
-             throw new UnsupportedOperationException("Not supported yet.");
-         }
-@@ -250,7 +375,9 @@ public interface BookMeta extends ItemMeta {
-          * with 256 characters per page.
-          *
-          * @param pages A list of component arrays, each being a page
-+         * @deprecated in favour of {@link #addPages(net.kyori.adventure.text.Component...)}
-          */
-+        @Deprecated // Paper
-         public void addPage(@NotNull BaseComponent[]... pages) {
-             throw new UnsupportedOperationException("Not supported yet.");
-         }
-diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 9f159ac909ad5287b719cee331db5c44654ec547..f1fcc844d563a0108230676dec84ef25485756b3 100644
---- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -32,6 +32,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
-      */
-     boolean hasDisplayName();
- 
-+    // Paper start
-+    /**
-+     * Gets the display name.
-+     *
-+     * <p>Plugins should check that {@link #hasDisplayName()} returns <code>true</code> before calling this method.</p>
-+     *
-+     * @return the display name
-+     */
-+    net.kyori.adventure.text.@Nullable Component displayName();
-+
-+    /**
-+     * Sets the display name.
-+     *
-+     * @param displayName the display name to set
-+     */
-+    void displayName(final net.kyori.adventure.text.@Nullable Component displayName);
-+    // Paper end
-+
-     /**
-      * Gets the display name that is set.
-      * <p>
-@@ -39,7 +57,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
-      * before calling this method.
-      *
-      * @return the display name that is set
-+     * @deprecated in favour of {@link #displayName()}
-      */
-+    @Deprecated // Paper
-     @NotNull
-     String getDisplayName();
- 
-@@ -47,7 +67,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
-      * Sets the display name.
-      *
-      * @param name the name to set
-+     * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
-      */
-+    @Deprecated // Paper
-     void setDisplayName(@Nullable String name);
- 
-     /**
-@@ -82,6 +104,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
-      */
-     boolean hasLore();
- 
-+    // Paper start
-+    /**
-+     * Gets the lore.
-+     *
-+     * <p>Plugins should check that {@link #hasLore()} returns <code>true</code> before calling this method.</p>
-+     *
-+     * @return the lore
-+     */
-+    @Nullable List<net.kyori.adventure.text.Component> lore();
-+
-+    /**
-+     * Sets the lore.
-+     *
-+     * @param lore the lore to set
-+     */
-+    void lore(final @Nullable List<? extends net.kyori.adventure.text.Component> lore);
-+    // Paper end
-+
-     /**
-      * Gets the lore that is set.
-      * <p>
-@@ -89,7 +129,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
-      * calling this method.
-      *
-      * @return a list of lore that is set
-+     * @deprecated in favour of {@link #lore()}
-      */
-+    @Deprecated // Paper
-     @Nullable
-     List<String> getLore();
- 
-@@ -98,7 +140,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
-      * Removes lore when given null.
-      *
-      * @param lore the lore that will be set
-+     * @deprecated in favour of {@link #lore(List)}
-      */
-+    @Deprecated // Paper
-     void setLore(@Nullable List<String> lore);
- 
-     /**
 diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
 index eb80f24da65918a21a2fa6691eeb64b621febaf4..941fac4eee338870d8c30cb1f64cab572cf54548 100644
 --- a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
@@ -4720,13 +4727,13 @@ index eb80f24da65918a21a2fa6691eeb64b621febaf4..941fac4eee338870d8c30cb1f64cab57
 +    // Paper end - adventure
  }
 diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
-index ccf02c79e2784de75273f5ad7f83ce5c33a688fe..3fa087d09c7c2d864eea25659951a537359c9589 100644
+index bd512a7840d4686759097ee4cbd8b375c530956b..f2242ddc4085f7e7cdd748d860857822e3d9b007 100644
 --- a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
 +++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
-@@ -75,4 +75,21 @@ public interface TrimPattern extends Keyed, Translatable {
-      * {@link Material#HOST_ARMOR_TRIM_SMITHING_TEMPLATE}.
+@@ -83,4 +83,21 @@ public interface TrimPattern extends Keyed, Translatable {
+      * {@link Material#BOLT_ARMOR_TRIM_SMITHING_TEMPLATE}.
       */
-     public static final TrimPattern HOST = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft("host"));
+     public static final TrimPattern BOLT = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft("bolt"));
 +
 +    // Paper start - adventure
 +    /**
@@ -4746,10 +4753,10 @@ index ccf02c79e2784de75273f5ad7f83ce5c33a688fe..3fa087d09c7c2d864eea25659951a537
 +    // Paper end - adventure
  }
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51 100644
+index 4ddddc5d91a5febba2fd4dea3a15092f4ec32a6f..f9803c7483f7458fed1f22ddfda6e7ef03cfc688 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java
 +++ b/src/main/java/org/bukkit/map/MapCursor.java
-@@ -10,7 +10,7 @@ public final class MapCursor {
+@@ -12,7 +12,7 @@ public final class MapCursor {
      private byte x, y;
      private byte direction, type;
      private boolean visible;
@@ -4758,7 +4765,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
  
      /**
       * Initialize the map cursor.
-@@ -24,7 +24,7 @@ public final class MapCursor {
+@@ -26,7 +26,7 @@ public final class MapCursor {
       */
      @Deprecated
      public MapCursor(byte x, byte y, byte direction, byte type, boolean visible) {
@@ -4767,7 +4774,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
      }
  
      /**
-@@ -37,7 +37,7 @@ public final class MapCursor {
+@@ -39,7 +39,7 @@ public final class MapCursor {
       * @param visible Whether the cursor is visible by default.
       */
      public MapCursor(byte x, byte y, byte direction, @NotNull Type type, boolean visible) {
@@ -4776,7 +4783,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
      }
  
      /**
-@@ -49,7 +49,7 @@ public final class MapCursor {
+@@ -51,7 +51,7 @@ public final class MapCursor {
       * @param type The type (color/style) of the map cursor.
       * @param visible Whether the cursor is visible by default.
       * @param caption cursor caption
@@ -4785,7 +4792,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
       */
      @Deprecated
      public MapCursor(byte x, byte y, byte direction, byte type, boolean visible, @Nullable String caption) {
-@@ -58,8 +58,42 @@ public final class MapCursor {
+@@ -60,8 +60,42 @@ public final class MapCursor {
          setDirection(direction);
          setRawType(type);
          this.visible = visible;
@@ -4829,7 +4836,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
  
      /**
       * Initialize the map cursor.
-@@ -77,7 +111,7 @@ public final class MapCursor {
+@@ -79,7 +113,7 @@ public final class MapCursor {
          setDirection(direction);
          setType(type);
          this.visible = visible;
@@ -4838,7 +4845,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
      }
  
      /**
-@@ -200,23 +234,45 @@ public final class MapCursor {
+@@ -202,23 +236,45 @@ public final class MapCursor {
          this.visible = visible;
      }
  
diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch
index f938e2be49..4c0bd33025 100644
--- a/patches/api/0009-Paper-Plugins.patch
+++ b/patches/api/0009-Paper-Plugins.patch
@@ -1545,7 +1545,7 @@ index a88733f1cd1ddb5d85ab1b0e6af4fd5b80bbc1c6..cb530369e667c426c842da356c31304b
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java
-index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..03213fde8315384ec56c16031cfc606ade2e8091 100644
+index ae3e68562c29992fab627428db3ff0006d8216f9..47153dee66782a00b980ecf15e8774ab6f3d887d 100644
 --- a/src/main/java/org/bukkit/plugin/PluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/PluginManager.java
 @@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable;
@@ -1565,7 +1565,7 @@ index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..03213fde8315384ec56c16031cfc606a
      public void registerInterface(@NotNull Class<? extends PluginLoader> loader) throws IllegalArgumentException;
  
      /**
-@@ -303,4 +304,17 @@ public interface PluginManager {
+@@ -312,4 +313,17 @@ public interface PluginManager {
       * @return True if event timings are to be used
       */
      public boolean useTimings();
@@ -1584,7 +1584,7 @@ index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..03213fde8315384ec56c16031cfc606a
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e7666711998eb4e 100644
+index 34830d2815d331a1b611f22eca08f53d815ea08a..40794a8f60f7ba139e69c38e4fcbb7f4333f8608 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -43,6 +43,8 @@ import org.jetbrains.annotations.Nullable;
@@ -1626,7 +1626,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          Preconditions.checkArgument(directory != null, "Directory cannot be null");
          Preconditions.checkArgument(directory.isDirectory(), "Directory must be a directory");
  
-@@ -378,6 +388,15 @@ public final class SimplePluginManager implements PluginManager {
+@@ -389,6 +399,15 @@ public final class SimplePluginManager implements PluginManager {
      @Nullable
      public synchronized Plugin loadPlugin(@NotNull File file) throws InvalidPluginException, UnknownDependencyException {
          Preconditions.checkArgument(file != null, "File cannot be null");
@@ -1642,7 +1642,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
  
          checkUpdate(file);
  
-@@ -428,12 +447,14 @@ public final class SimplePluginManager implements PluginManager {
+@@ -439,12 +458,14 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @Nullable
      public synchronized Plugin getPlugin(@NotNull String name) {
@@ -1657,7 +1657,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          return plugins.toArray(new Plugin[plugins.size()]);
      }
  
-@@ -447,6 +468,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -458,6 +479,7 @@ public final class SimplePluginManager implements PluginManager {
       */
      @Override
      public boolean isPluginEnabled(@NotNull String name) {
@@ -1665,7 +1665,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          Plugin plugin = getPlugin(name);
  
          return isPluginEnabled(plugin);
-@@ -460,6 +482,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -471,6 +493,7 @@ public final class SimplePluginManager implements PluginManager {
       */
      @Override
      public boolean isPluginEnabled(@Nullable Plugin plugin) {
@@ -1673,7 +1673,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          if ((plugin != null) && (plugins.contains(plugin))) {
              return plugin.isEnabled();
          } else {
-@@ -469,6 +492,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -480,6 +503,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void enablePlugin(@NotNull final Plugin plugin) {
@@ -1681,7 +1681,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          if (!plugin.isEnabled()) {
              List<Command> pluginCommands = PluginCommandYamlParser.parse(plugin);
  
-@@ -488,6 +512,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -499,6 +523,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void disablePlugins() {
@@ -1689,7 +1689,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          Plugin[] plugins = getPlugins();
          for (int i = plugins.length - 1; i >= 0; i--) {
              disablePlugin(plugins[i]);
-@@ -496,6 +521,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -507,6 +532,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void disablePlugin(@NotNull final Plugin plugin) {
@@ -1697,7 +1697,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          if (plugin.isEnabled()) {
              try {
                  plugin.getPluginLoader().disablePlugin(plugin);
-@@ -540,6 +566,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -551,6 +577,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void clearPlugins() {
@@ -1705,7 +1705,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          synchronized (this) {
              disablePlugins();
              plugins.clear();
-@@ -560,6 +587,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -571,6 +598,7 @@ public final class SimplePluginManager implements PluginManager {
       */
      @Override
      public void callEvent(@NotNull Event event) {
@@ -1713,7 +1713,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          if (event.isAsynchronous()) {
              if (Thread.holdsLock(this)) {
                  throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.");
-@@ -608,6 +636,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -619,6 +647,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void registerEvents(@NotNull Listener listener, @NotNull Plugin plugin) {
@@ -1721,7 +1721,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          if (!plugin.isEnabled()) {
              throw new IllegalPluginAccessException("Plugin attempted to register " + listener + " while not enabled");
          }
-@@ -641,6 +670,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -652,6 +681,7 @@ public final class SimplePluginManager implements PluginManager {
          Preconditions.checkArgument(priority != null, "Priority cannot be null");
          Preconditions.checkArgument(executor != null, "Executor cannot be null");
          Preconditions.checkArgument(plugin != null, "Plugin cannot be null");
@@ -1729,7 +1729,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
  
          if (!plugin.isEnabled()) {
              throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
-@@ -688,16 +718,19 @@ public final class SimplePluginManager implements PluginManager {
+@@ -699,16 +729,19 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @Nullable
      public Permission getPermission(@NotNull String name) {
@@ -1749,7 +1749,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          String name = perm.getName().toLowerCase(java.util.Locale.ENGLISH);
  
          if (permissions.containsKey(name)) {
-@@ -711,21 +744,25 @@ public final class SimplePluginManager implements PluginManager {
+@@ -722,21 +755,25 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Set<Permission> getDefaultPermissions(boolean op) {
@@ -1775,7 +1775,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          if (perm != null && permissions.containsKey(perm.getName().toLowerCase(java.util.Locale.ENGLISH))) {
              defaultPerms.get(true).remove(perm);
              defaultPerms.get(false).remove(perm);
-@@ -765,6 +802,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -776,6 +813,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void subscribeToPermission(@NotNull String permission, @NotNull Permissible permissible) {
@@ -1783,7 +1783,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          String name = permission.toLowerCase(java.util.Locale.ENGLISH);
          Map<Permissible, Boolean> map = permSubs.get(name);
  
-@@ -778,6 +816,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -789,6 +827,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void unsubscribeFromPermission(@NotNull String permission, @NotNull Permissible permissible) {
@@ -1791,7 +1791,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          String name = permission.toLowerCase(java.util.Locale.ENGLISH);
          Map<Permissible, Boolean> map = permSubs.get(name);
  
-@@ -793,6 +832,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -804,6 +843,7 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Set<Permissible> getPermissionSubscriptions(@NotNull String permission) {
@@ -1799,7 +1799,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          String name = permission.toLowerCase(java.util.Locale.ENGLISH);
          Map<Permissible, Boolean> map = permSubs.get(name);
  
-@@ -805,6 +845,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -816,6 +856,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void subscribeToDefaultPerms(boolean op, @NotNull Permissible permissible) {
@@ -1807,7 +1807,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          Map<Permissible, Boolean> map = defSubs.get(op);
  
          if (map == null) {
-@@ -817,6 +858,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -828,6 +869,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void unsubscribeFromDefaultPerms(boolean op, @NotNull Permissible permissible) {
@@ -1815,7 +1815,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          Map<Permissible, Boolean> map = defSubs.get(op);
  
          if (map != null) {
-@@ -831,6 +873,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -842,6 +884,7 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Set<Permissible> getDefaultPermSubscriptions(boolean op) {
@@ -1823,7 +1823,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          Map<Permissible, Boolean> map = defSubs.get(op);
  
          if (map == null) {
-@@ -843,6 +886,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -854,6 +897,7 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Set<Permission> getPermissions() {
@@ -1831,7 +1831,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          return new HashSet<Permission>(permissions.values());
      }
  
-@@ -866,6 +910,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -877,6 +921,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public boolean useTimings() {
@@ -1839,7 +1839,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
          return useTimings;
      }
  
-@@ -877,4 +922,28 @@ public final class SimplePluginManager implements PluginManager {
+@@ -888,4 +933,28 @@ public final class SimplePluginManager implements PluginManager {
      public void useTimings(boolean use) {
          useTimings = use;
      }
diff --git a/patches/api/0011-Timings-v2.patch b/patches/api/0011-Timings-v2.patch
index d2e13bb2d4..7c1d573059 100644
--- a/patches/api/0011-Timings-v2.patch
+++ b/patches/api/0011-Timings-v2.patch
@@ -2854,10 +2854,10 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index bd1a010bb4e18a16d02549d64333ce7641be7910..07d393152320270e38f495120dd19e35ece73149 100644
+index 6425151b7003a1376977717dca6172efa1864648..e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -864,7 +864,6 @@ public final class Bukkit {
+@@ -866,7 +866,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2866,10 +2866,10 @@ index bd1a010bb4e18a16d02549d64333ce7641be7910..07d393152320270e38f495120dd19e35
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6aed59819cc3d70f1b5975c3c7df40cc0b0afd8a..baa02b5223769755670c611ca4d6acc7bf202116 100644
+index 3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b..77f8b0889cd7039bf041fc052fba33b60aa77e17 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1928,6 +1928,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1947,6 +1947,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2949,7 +2949,7 @@ index 0000000000000000000000000000000000000000..f9a00aecca5ec41b460bf41dfe1c6969
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 75759131bd94b672bec4cd8e271ebff1ad391cba..5cfd88eec9bf02e83d77b6fce1a5c14b7687f48b 100644
+index f3cdf13f22aa789ee8cc235b61fda4035b254219..33c0a60e71f4bd29966c10ea60b22f14e56c1de4 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -33,7 +33,8 @@ public abstract class Command {
@@ -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 5c55715c8cdd79f2214b265a81d94a8904c998ea..a714877c44e6a6c5e90d0e0c5bf6eb30937e1037 100644
+index 4e9ba039669c7059180f5776ee2f7188f2dd01b5..5b526d602057ab70b4a058142e01a0195694c28f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2634,7 +2634,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2678,7 +2678,19 @@ 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.");
@@ -3479,10 +3479,10 @@ index 5c55715c8cdd79f2214b265a81d94a8904c998ea..a714877c44e6a6c5e90d0e0c5bf6eb30
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94904a3d17 100644
+index 40794a8f60f7ba139e69c38e4fcbb7f4333f8608..c75fd7ce01ca11535563ad7ebe1944eb61e65600 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -368,7 +368,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -379,7 +379,6 @@ public final class SimplePluginManager implements PluginManager {
              }
          }
  
@@ -3490,7 +3490,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
          return result.toArray(new Plugin[result.size()]);
      }
  
-@@ -416,9 +415,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -427,9 +426,9 @@ public final class SimplePluginManager implements PluginManager {
  
          if (result != null) {
              plugins.add(result);
@@ -3502,7 +3502,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
              }
          }
  
-@@ -448,7 +447,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -459,7 +458,7 @@ public final class SimplePluginManager implements PluginManager {
      @Nullable
      public synchronized Plugin getPlugin(@NotNull String name) {
          if (true) {return this.paperPluginManager.getPlugin(name);} // Paper
@@ -3511,7 +3511,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
      }
  
      @Override
-@@ -676,7 +675,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -687,7 +686,8 @@ public final class SimplePluginManager implements PluginManager {
              throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
          }
  
@@ -3521,7 +3521,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
              getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
          } else {
              getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-@@ -911,7 +911,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -922,7 +922,7 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      public boolean useTimings() {
          if (true) {return this.paperPluginManager.useTimings();} // Paper
@@ -3530,7 +3530,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
      }
  
      /**
-@@ -920,7 +920,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -931,7 +931,7 @@ public final class SimplePluginManager implements PluginManager {
       * @param use True if per event timing code should be used
       */
      public void useTimings(boolean use) {
diff --git a/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index a9ee212a3c..6e7c583872 100644
--- a/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 07d393152320270e38f495120dd19e35ece73149..026c1accb03bdd42981a2eaf9189d7b2fe6e7339 100644
+index e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b..336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -80,6 +80,20 @@ public final class Bukkit {
+@@ -82,6 +82,20 @@ public final class Bukkit {
          return server;
      }
  
@@ -32,10 +32,10 @@ index 07d393152320270e38f495120dd19e35ece73149..026c1accb03bdd42981a2eaf9189d7b2
       * Attempts to set the {@link Server} singleton.
       * <p>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index baa02b5223769755670c611ca4d6acc7bf202116..523f5ac54f7662c7c96182a352236732d2d3b122 100644
+index 77f8b0889cd7039bf041fc052fba33b60aa77e17..09012ce27344c60730b9c5fcde85712a8e7a69fb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -65,6 +65,18 @@ import org.jetbrains.annotations.Nullable;
+@@ -67,6 +67,18 @@ import org.jetbrains.annotations.Nullable;
   */
  public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
  
@@ -55,7 +55,7 @@ index baa02b5223769755670c611ca4d6acc7bf202116..523f5ac54f7662c7c96182a352236732
       * Used for all administrative messages, such as an operator using a
       * command.
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 63389474a2b3f0e283b42e7004aa6a94904a3d17..974ff7116b294473ec450757e8a9341540f43dcd 100644
+index c75fd7ce01ca11535563ad7ebe1944eb61e65600..f896cfb30b967b9c21ee94893534201123e6ec72 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -116,9 +116,22 @@ public final class SimplePluginManager implements PluginManager {
diff --git a/patches/api/0013-Player-affects-spawning-API.patch b/patches/api/0013-Player-affects-spawning-API.patch
index 7ec789cb09..4578c494e8 100644
--- a/patches/api/0013-Player-affects-spawning-API.patch
+++ b/patches/api/0013-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 a714877c44e6a6c5e90d0e0c5bf6eb30937e1037..35de65a773146c4b4162df777a8ec594a22ca62c 100644
+index 5b526d602057ab70b4a058142e01a0195694c28f..f868eb1609f7c905fe6ebcf088a0a3030af55e92 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2486,6 +2486,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2530,6 +2530,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Deprecated // Paper
      public String getLocale();
  
diff --git a/patches/api/0014-Add-getTPS-method.patch b/patches/api/0014-Add-getTPS-method.patch
index 3a5b0bf7b5..dc2c6a1882 100644
--- a/patches/api/0014-Add-getTPS-method.patch
+++ b/patches/api/0014-Add-getTPS-method.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 026c1accb03bdd42981a2eaf9189d7b2fe6e7339..d640d6e8e919e410b54920502d7e26f2519d9e3c 100644
+index 336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744..ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2070,6 +2070,17 @@ public final class Bukkit {
+@@ -2093,6 +2093,17 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -27,10 +27,10 @@ index 026c1accb03bdd42981a2eaf9189d7b2fe6e7339..d640d6e8e919e410b54920502d7e26f2
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 523f5ac54f7662c7c96182a352236732d2d3b122..7ae7db87b8507e726b6c28400bd3e7eb9413ffb0 100644
+index 09012ce27344c60730b9c5fcde85712a8e7a69fb..e37649ce4b3981f2cff96b64ed3bd4093c015346 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1765,6 +1765,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1784,6 +1784,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  
diff --git a/patches/api/0016-Entity-Origin-API.patch b/patches/api/0016-Entity-Origin-API.patch
index 79acd7187d..ff7c566968 100644
--- a/patches/api/0016-Entity-Origin-API.patch
+++ b/patches/api/0016-Entity-Origin-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 474765f40801a766c853018ea6e1adcd010375d2..b0967614bfdba06b5e11c910186aa66ac7e2d503 100644
+index c78fb359bd28b8dc1ba242642ec612e856525993..4e1fb0974d061d5bb64899cac576318d2e6f8bf6 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -780,5 +780,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -791,5 +791,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      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.customName())));
      }
diff --git a/patches/api/0018-Add-view-distance-API.patch b/patches/api/0018-Add-view-distance-API.patch
index 7de7e75f55..717285adff 100644
--- a/patches/api/0018-Add-view-distance-API.patch
+++ b/patches/api/0018-Add-view-distance-API.patch
@@ -8,10 +8,10 @@ Add per player no-tick, tick, and send view distances.
 Also add send/no-tick view distance to World.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b53f24c0368ff4e4f5287f1699643a0c00579031..7176e37b37c0d22605240f3c5fd34ff7846256c9 100644
+index a9858c2559f0921613b19710135cc6e060488e96..890ae536fdaff11055b72b1be0fbf3766a41812c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2925,6 +2925,66 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2941,6 +2941,66 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @NotNull
      public Set<FeatureFlag> getFeatureFlags();
  
@@ -79,10 +79,10 @@ index b53f24c0368ff4e4f5287f1699643a0c00579031..7176e37b37c0d22605240f3c5fd34ff7
       * Gets all generated structures that intersect the chunk at the given
       * coordinates. <br>
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 35de65a773146c4b4162df777a8ec594a22ca62c..b66f9264ceb38677d7422b47e379a0e860bcac07 100644
+index f868eb1609f7c905fe6ebcf088a0a3030af55e92..5d5d37e2ebbbe4d2641177c7d174059ba29bb688 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2500,6 +2500,82 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2544,6 +2544,82 @@ 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-Expose-server-CommandMap.patch b/patches/api/0021-Expose-server-CommandMap.patch
index 697a4cca7c..b57f0c2eff 100644
--- a/patches/api/0021-Expose-server-CommandMap.patch
+++ b/patches/api/0021-Expose-server-CommandMap.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d640d6e8e919e410b54920502d7e26f2519d9e3c..3d6c51fdd549a94a73fa3d19c0937aa2ec72b42e 100644
+index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..c427d9dd916db6fe5078fb570eb57cfbd0766080 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2271,6 +2271,19 @@ public final class Bukkit {
+@@ -2294,6 +2294,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index d640d6e8e919e410b54920502d7e26f2519d9e3c..3d6c51fdd549a94a73fa3d19c0937aa2
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7ae7db87b8507e726b6c28400bd3e7eb9413ffb0..95c9016e67c6c17ae8bac35fd01f62eae96ecf6a 100644
+index e37649ce4b3981f2cff96b64ed3bd4093c015346..fbe2f6e349f242a2c4e64e63aa8ffdff7fa7dc81 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1775,6 +1775,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1794,6 +1794,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public double[] getTPS();
      // Paper end
  
diff --git a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 73014012bc..b1812dae36 100644
--- a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3d6c51fdd549a94a73fa3d19c0937aa2ec72b42e..bafbb72996cb0cacf17b5741a7efbb1583277c6e 100644
+index c427d9dd916db6fe5078fb570eb57cfbd0766080..19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -441,6 +441,30 @@ public final class Bukkit {
+@@ -443,6 +443,30 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -41,10 +41,10 @@ index 3d6c51fdd549a94a73fa3d19c0937aa2ec72b42e..bafbb72996cb0cacf17b5741a7efbb15
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 95c9016e67c6c17ae8bac35fd01f62eae96ecf6a..7edac90aa6f37c9c3ebbe7260186ae3e279cea0b 100644
+index fbe2f6e349f242a2c4e64e63aa8ffdff7fa7dc81..4c9c14b60eb6fd1d9845632c2c2fa765d882a741 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -370,6 +370,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -372,6 +372,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Deprecated // Paper
      public int broadcastMessage(@NotNull String message);
  
@@ -76,10 +76,10 @@ index 95c9016e67c6c17ae8bac35fd01f62eae96ecf6a..7edac90aa6f37c9c3ebbe7260186ae3e
       * 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 b66f9264ceb38677d7422b47e379a0e860bcac07..0ffe5812e2d59d3fbf56061eea0a2f391cde6758 100644
+index 5d5d37e2ebbbe4d2641177c7d174059ba29bb688..881c75e84ef31390a3519549985af2711e2828b5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1172,6 +1172,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1216,6 +1216,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/patches/api/0023-Add-exception-reporting-event.patch b/patches/api/0023-Add-exception-reporting-event.patch
index 8b7d7bf596..d9e743cbd2 100644
--- a/patches/api/0023-Add-exception-reporting-event.patch
+++ b/patches/api/0023-Add-exception-reporting-event.patch
@@ -496,10 +496,10 @@ index 4205649948a9e2a72f64c3f007112245abac6d50..b3b32ce429edbf1ed040354dbe28ab86
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc70445f411 100644
+index f896cfb30b967b9c21ee94893534201123e6ec72..2ff417f91492a441085ac1b7ddd248726f05de0a 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 {
+@@ -526,7 +526,8 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().enablePlugin(plugin);
              } catch (Throwable ex) {
@@ -509,7 +509,7 @@ index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc7
              }
  
              HandlerList.bakeAll();
-@@ -538,32 +539,37 @@ public final class SimplePluginManager implements PluginManager {
+@@ -549,32 +550,37 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().disablePlugin(plugin);
              } catch (Throwable ex) {
@@ -552,7 +552,7 @@ index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc7
              }
  
              try {
-@@ -576,6 +582,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -587,6 +593,13 @@ public final class SimplePluginManager implements PluginManager {
          }
      }
  
@@ -566,7 +566,7 @@ index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc7
      @Override
      public void clearPlugins() {
          if (true) {this.paperPluginManager.clearPlugins(); return;} // Paper
-@@ -641,7 +654,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -652,7 +665,13 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {
diff --git a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch b/patches/api/0026-Player-Tab-List-and-Title-APIs.patch
index f918234392..10fbe0175b 100644
--- a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/0026-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 0ffe5812e2d59d3fbf56061eea0a2f391cde6758..ba58936116ce1e2e805a03251bb19484058e4f0f 100644
+index 881c75e84ef31390a3519549985af2711e2828b5..fc8c807ae9793452bbf3fbab5e72d05676e6fa83 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1206,6 +1206,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1250,6 +1250,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-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index d8850b339e..471ee35ff8 100644
--- a/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -7,7 +7,7 @@ Upstream added methods for this so the original methods
 are now deprecated
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 67632eae9249f2c65a9dfe04c72a3002a9e8b25b..10eeb304bc0785e0ea182ac99d32ed2554b4755f 100644
+index 67115810d5e837f154c3accd92dbb5e4192d264f..32e89741ffd895e31af0104a0126c2f72742a1bb 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -243,12 +243,44 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -56,7 +56,7 @@ index 67632eae9249f2c65a9dfe04c72a3002a9e8b25b..10eeb304bc0785e0ea182ac99d32ed25
  
      /**
       * Returns the living entity's current maximum no damage ticks.
-@@ -775,4 +807,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -777,4 +809,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @return Whether the entity is invisible
       */
      public boolean isInvisible();
diff --git a/patches/api/0028-Complete-resource-pack-API.patch b/patches/api/0028-Complete-resource-pack-API.patch
index 3a19d14165..30d84dbda9 100644
--- a/patches/api/0028-Complete-resource-pack-API.patch
+++ b/patches/api/0028-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 ba58936116ce1e2e805a03251bb19484058e4f0f..6a8f5720ef33b54b3a89d4299462827ab304e0d9 100644
+index fc8c807ae9793452bbf3fbab5e72d05676e6fa83..6a7d63691fa3be09da0ade66cf07a41ae08d4190 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2163,6 +2163,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2207,6 +2207,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void setResourcePack(@NotNull UUID uuid, @NotNull String url, byte @Nullable [] hash, net.kyori.adventure.text.@Nullable Component prompt, boolean force);
      // Paper end
  
diff --git a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
index b3773538b8..e0fa8b2dd0 100644
--- a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index bafbb72996cb0cacf17b5741a7efbb1583277c6e..0ce6fda182e4d87b1ef7abe4d8bd9e3a06891412 100644
+index 19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083..c9be84560ee18ffe1bb84f159b2ed61c79f9e971 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2306,6 +2306,13 @@ public final class Bukkit {
+@@ -2329,6 +2329,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index bafbb72996cb0cacf17b5741a7efbb1583277c6e..0ce6fda182e4d87b1ef7abe4d8bd9e3a
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7edac90aa6f37c9c3ebbe7260186ae3e279cea0b..f9dcb6728afb646f9c27e6642bb3b0d91e4448e9 100644
+index 4c9c14b60eb6fd1d9845632c2c2fa765d882a741..c0c61a29ba8d3c95ff76c36e4333740320302b4a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2036,4 +2036,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2055,4 +2055,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      Spigot spigot();
      // Spigot end
diff --git a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
index 2c0c9c2344..d0b3ec2335 100644
--- a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0ce6fda182e4d87b1ef7abe4d8bd9e3a06891412..cf5cf4375f3a0bd68bb00dc061a039c9c1de0b5e 100644
+index c9be84560ee18ffe1bb84f159b2ed61c79f9e971..2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2313,6 +2313,15 @@ public final class Bukkit {
+@@ -2336,6 +2336,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 0ce6fda182e4d87b1ef7abe4d8bd9e3a06891412..cf5cf4375f3a0bd68bb00dc061a039c9
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f9dcb6728afb646f9c27e6642bb3b0d91e4448e9..d15b926de36f29ced80e0cfef7594ce0646b988e 100644
+index c0c61a29ba8d3c95ff76c36e4333740320302b4a..422a000ec33163f2f07502a05302b5d8851b2318 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2038,4 +2038,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2057,4 +2057,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Spigot end
  
      void reloadPermissions(); // Paper
diff --git a/patches/api/0047-Add-String-based-Action-Bar-API.patch b/patches/api/0047-Add-String-based-Action-Bar-API.patch
index fd2181f8a0..1420aad8b9 100644
--- a/patches/api/0047-Add-String-based-Action-Bar-API.patch
+++ b/patches/api/0047-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 6a8f5720ef33b54b3a89d4299462827ab304e0d9..83f9026e86223bc763990a90da5fda26dec2785f 100644
+index 6a7d63691fa3be09da0ade66cf07a41ae08d4190..252390260f62ee945c21267cd8717b7725158a21 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1173,6 +1173,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1217,6 +1217,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -48,7 +48,7 @@ index 6a8f5720ef33b54b3a89d4299462827ab304e0d9..83f9026e86223bc763990a90da5fda26
      /**
       * Sends the component to the player
       *
-@@ -1200,9 +1233,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1244,9 +1277,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/0052-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
index f53ba6d986..65bf8c19a6 100644
--- a/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7176e37b37c0d22605240f3c5fd34ff7846256c9..2b38b328187b853f5b36d796d3b6b359497647d8 100644
+index 890ae536fdaff11055b72b1be0fbf3766a41812c..4dc687f16a8181876fb7b3e56b39a55ea5507408 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -49,6 +49,33 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
index a04f9b446f..39e334dd8c 100644
--- a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cf5cf4375f3a0bd68bb00dc061a039c9c1de0b5e..5f758640ae71bca8c5e532af21362011a0aafb89 100644
+index 2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5..6b3a332f556e7c49796a62f20fd33241bbcde09e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2322,6 +2322,16 @@ public final class Bukkit {
+@@ -2345,6 +2345,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index cf5cf4375f3a0bd68bb00dc061a039c9c1de0b5e..5f758640ae71bca8c5e532af21362011
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d15b926de36f29ced80e0cfef7594ce0646b988e..e3136651ce083e67a1a7cb976d27df5666843401 100644
+index 422a000ec33163f2f07502a05302b5d8851b2318..9088bd9dfb515381d5df1c255ae3319f9cdde81e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2040,4 +2040,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2059,4 +2059,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
@@ -46,7 +46,7 @@ index d15b926de36f29ced80e0cfef7594ce0646b988e..e3136651ce083e67a1a7cb976d27df56
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 5cfd88eec9bf02e83d77b6fce1a5c14b7687f48b..1c6205cc667bbec8f6aca479f13b3e9cfcd63ab2 100644
+index 33c0a60e71f4bd29966c10ea60b22f14e56c1de4..f7b78198d9983610fc2185124c3080e6b1c0fa35 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -99,7 +99,7 @@ public abstract class Command {
diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch
index f31a77e295..aa59cb418a 100644
--- a/patches/api/0056-Fix-upstream-javadocs.patch
+++ b/patches/api/0056-Fix-upstream-javadocs.patch
@@ -49,10 +49,10 @@ index a04cde615f8c4bc593f8d9f8f6f1438008aaa707..548f6d28c28d74bed8b58ee828759093
       * @param target the target to remove from this list
       */
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5f758640ae71bca8c5e532af21362011a0aafb89..2bdba56855d3427a1c48bfada0e6416085386cdb 100644
+index 6b3a332f556e7c49796a62f20fd33241bbcde09e..3b7087d5c71a498f513f67514db9e118780363c7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1494,6 +1494,8 @@ public final class Bukkit {
+@@ -1506,6 +1506,8 @@ public final class Bukkit {
  
      /**
       * Gets every player that has ever played on this server.
@@ -114,10 +114,10 @@ index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc6
       * @param statePredicate The predicate which should get used to test if a block should be set or not.
       * @return true if the tree was created successfully, otherwise false
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e3136651ce083e67a1a7cb976d27df5666843401..50e8c25cc378b02b09ef57643cc753fa58ec1166 100644
+index 9088bd9dfb515381d5df1c255ae3319f9cdde81e..012b5954a2f9dc61fb8ad29c4b8bce2648ddc681 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -568,13 +568,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -570,13 +570,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * </ul>
       * <p>
       * <b>Note:</b> If set to 0, {@link SpawnCategory} mobs spawning will be disabled.
@@ -132,7 +132,7 @@ index e3136651ce083e67a1a7cb976d27df5666843401..50e8c25cc378b02b09ef57643cc753fa
       */
      public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
  
-@@ -1274,6 +1271,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1284,6 +1281,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
      /**
       * Gets every player that has ever played on this server.
@@ -142,10 +142,10 @@ index e3136651ce083e67a1a7cb976d27df5666843401..50e8c25cc378b02b09ef57643cc753fa
       * @return an array containing all previous players
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2b38b328187b853f5b36d796d3b6b359497647d8..a55e92dc09202437abac9cb5b7aacf3c275f5b9c 100644
+index 4dc687f16a8181876fb7b3e56b39a55ea5507408..98e3c12801cc36c868f08b15d1188295ea4364e0 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2723,7 +2723,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2739,7 +2739,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      /**
       * Find the closest nearby structure of a given {@link StructureType}.
       * Finding unexplored structures can, and will, block if the world is
@@ -154,7 +154,7 @@ index 2b38b328187b853f5b36d796d3b6b359497647d8..a55e92dc09202437abac9cb5b7aacf3c
       * temporarily freezing while locating an unexplored structure.
       * <p>
       * The {@code radius} is not a rigid square radius. Each structure may alter
-@@ -2757,7 +2757,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2773,7 +2773,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      /**
       * Find the closest nearby structure of a given {@link StructureType}.
       * Finding unexplored structures can, and will, block if the world is
@@ -163,7 +163,7 @@ index 2b38b328187b853f5b36d796d3b6b359497647d8..a55e92dc09202437abac9cb5b7aacf3c
       * temporarily freezing while locating an unexplored structure.
       * <p>
       * The {@code radius} is not a rigid square radius. Each structure may alter
-@@ -2790,7 +2790,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2806,7 +2806,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      /**
       * Find the closest nearby structure of a given {@link Structure}. Finding
       * unexplored structures can, and will, block if the world is looking in
@@ -343,10 +343,10 @@ index 91fc11dda99de506be83d40df8929bf7cd8e8d85..7dc631ebd009f5f5c3ac1699c3f3515c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 8eb0cf31b1ce6d714a14cf65bbb117ff163ae2f3..8e57082e8b19a2fd9625816c2ea4a90d41f78ca5 100644
+index bd1116adc891b2a4243da205127f5ece76089925..4d4c9efb81ac14950b24a07edcfe1c46ab3caf91 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -93,7 +93,7 @@ public interface Arrow extends AbstractArrow {
+@@ -73,7 +73,7 @@ public interface Arrow extends AbstractArrow {
       * Removes a custom potion effect from this arrow.
       *
       * @param type the potion effect type to remove
@@ -426,10 +426,10 @@ 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 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ede1b0e7b6 100644
+index 252390260f62ee945c21267cd8717b7725158a21..cd00d2a064ee4c86b394a7861182fba9cf79cfb3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -434,15 +434,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -478,15 +478,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Saves the players current location, health, inventory, motion, and
@@ -449,7 +449,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
       * <p>
       * Note: This will overwrite the players current inventory, health,
       * motion, etc, with the state from the saved dat file.
-@@ -779,7 +779,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -823,7 +823,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Plays an effect to just this player.
       *
@@ -458,7 +458,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
       * @param loc the location to play the effect at
       * @param effect the {@link Effect}
       * @param data a data bit needed for some effects
-@@ -1190,7 +1190,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1234,7 +1234,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -467,7 +467,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
       * @param message The message to send
       * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
       */
-@@ -1656,7 +1656,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1700,7 +1700,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see a player that was previously hidden. If
@@ -476,7 +476,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
       * remain hidden until the other plugin calls this method too.
       *
       * @param plugin Plugin that wants to show the player
-@@ -1683,7 +1683,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1727,7 +1727,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see an entity that was previously hidden. If
@@ -485,7 +485,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
       * remain hidden until the other plugin calls this method too.
       *
       * @param plugin Plugin that wants to show the entity
-@@ -1766,9 +1766,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1810,9 +1810,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     case this method will have no affect on them. Use the
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
@@ -495,7 +495,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
       * <li>The request is send with "null" as the hash. This might result
       *     in newer versions not loading the pack correctly.
       * </ul>
-@@ -1802,9 +1799,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1846,9 +1843,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     case this method will have no affect on them. Use the
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
@@ -505,7 +505,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
       * <li>The request is send with empty string as the hash. This might result
       *     in newer versions not loading the pack correctly.
       * </ul>
-@@ -1841,9 +1835,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1885,9 +1879,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     case this method will have no affect on them. Use the
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
@@ -1438,10 +1438,10 @@ index 07c3dff4d6190ef388d9c1e1c36f67f00a3e8e66..597a18a767b68b47e81454b7d44613c7
       * @param input The input choice.
       * @return The changed recipe, so you can chain calls.
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f1fcc844d563a0108230676dec84ef25485756b3..80836c5f87c15d688f27af5247b4e114cea7028d 100644
+index d7c178b3584db5866a5a21c6ddaab876b94058b9..dff32cedf47e95fe14a865898d76b62748dee5f3 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -311,7 +311,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -483,7 +483,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Return an immutable copy of all {@link Attribute}s and their
       * {@link AttributeModifier}s for a given {@link EquipmentSlot}.<br>
diff --git a/patches/api/0060-Basic-PlayerProfile-API.patch b/patches/api/0060-Basic-PlayerProfile-API.patch
index 4a664dab73..b4bd6d5e6f 100644
--- a/patches/api/0060-Basic-PlayerProfile-API.patch
+++ b/patches/api/0060-Basic-PlayerProfile-API.patch
@@ -321,10 +321,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2bdba56855d3427a1c48bfada0e6416085386cdb..48cce5c4a31ce9df3f2fe0aba4dd50e0547493b6 100644
+index 3b7087d5c71a498f513f67514db9e118780363c7..b165a4f99802ced243f1fb56af2bcf2c2ab7abf1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2334,6 +2334,83 @@ public final class Bukkit {
+@@ -2357,6 +2357,83 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -409,10 +409,10 @@ index 2bdba56855d3427a1c48bfada0e6416085386cdb..48cce5c4a31ce9df3f2fe0aba4dd50e0
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 50e8c25cc378b02b09ef57643cc753fa58ec1166..7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e 100644
+index 012b5954a2f9dc61fb8ad29c4b8bce2648ddc681..8e4bf531c0a2f7101c2a3733fe33733d31c611fd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2048,5 +2048,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2067,5 +2067,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
diff --git a/patches/api/0063-Entity-fromMobSpawner.patch b/patches/api/0063-Entity-fromMobSpawner.patch
index 99bfacca7d..cf3a1dbcb7 100644
--- a/patches/api/0063-Entity-fromMobSpawner.patch
+++ b/patches/api/0063-Entity-fromMobSpawner.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b0967614bfdba06b5e11c910186aa66ac7e2d503..b422a949b22edf412b518abb3e5ca0847c73d36b 100644
+index 4e1fb0974d061d5bb64899cac576318d2e6f8bf6..45f475b42bbef1c5dc461b3891a48c8fb6feefd3 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -790,5 +790,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -801,5 +801,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @Nullable
      Location getOrigin();
diff --git a/patches/api/0068-LivingEntity-setKiller.patch b/patches/api/0068-LivingEntity-setKiller.patch
index bab1378afb..fb3719a679 100644
--- a/patches/api/0068-LivingEntity-setKiller.patch
+++ b/patches/api/0068-LivingEntity-setKiller.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 10eeb304bc0785e0ea182ac99d32ed2554b4755f..40634f46fa238a68f70f19b664bad7400ef07709 100644
+index 32e89741ffd895e31af0104a0126c2f72742a1bb..f154c5607b1dc3585052d9f02cf8b28cf8a3c886 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -365,6 +365,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch
index 95708e688a..5c858d8508 100644
--- a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch
@@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d507aeb5b906b5b68d1daa5bfd2d98ede1b0e7b6..74ccef3361a8089a2bf03cc3d2e0826f067b647e 100644
+index cd00d2a064ee4c86b394a7861182fba9cf79cfb3..401a43573eb84c1192261377a8b58dd73b895d76 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -54,7 +54,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -56,7 +56,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */
diff --git a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
index 5515a779ea..426ac50e39 100644
--- a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/api/0081-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 74ccef3361a8089a2bf03cc3d2e0826f067b647e..8ec100779944579f83cfc1be4b124a4c780cdc07 100644
+index 401a43573eb84c1192261377a8b58dd73b895d76..8b92f258a85b4184d67d0af396c18400ded38a67 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1499,6 +1499,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1543,6 +1543,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
@@ -29,7 +29,7 @@ index 74ccef3361a8089a2bf03cc3d2e0826f067b647e..8ec100779944579f83cfc1be4b124a4c
      /**
       * Gets the player's cooldown between picking up experience orbs.
       *
-@@ -1524,8 +1533,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1568,8 +1577,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/0090-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
index 21b5ed3e5f..5159a46def 100644
--- a/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
+++ b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
@@ -7,50 +7,43 @@ Co-authored-by: Connor Linfoot <[email protected]>
 Co-authored-by: MCMDEV <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a16781e89 100644
+index 004f1fd55c143e6c21be74d0a6b9ee8b2e12cc59..ae02788536d0c6736aba4ccf812844df4f9789f1 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-@@ -2,6 +2,8 @@ package org.bukkit.event.player;
- 
- import java.net.InetAddress;
- import java.util.UUID;
-+import com.destroystokyo.paper.profile.PlayerProfile;
-+import org.bukkit.Bukkit;
- import org.bukkit.event.Event;
- import org.bukkit.event.HandlerList;
- import org.jetbrains.annotations.NotNull;
-@@ -22,9 +24,10 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -22,9 +22,10 @@ public class AsyncPlayerPreLoginEvent extends Event {
      private static final HandlerList handlers = new HandlerList();
      private Result result;
      private net.kyori.adventure.text.Component message; // Paper
 -    private final String name;
      private final InetAddress ipAddress;
 -    private final UUID uniqueId;
-+    private PlayerProfile profile; // Paper
++    private com.destroystokyo.paper.profile.PlayerProfile profile; // Paper
 +    private final InetAddress rawAddress; // Paper
 +    private final String hostname; // Paper
+     private final boolean transferred;
  
      @Deprecated
-     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
-@@ -32,12 +35,29 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -38,12 +39,30 @@ public class AsyncPlayerPreLoginEvent extends Event {
      }
  
-     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
+     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred) {
 +        // Paper start
-+        this(name, ipAddress, uniqueId, Bukkit.createProfile(uniqueId, name));
++        this(name, ipAddress, uniqueId, transferred, org.bukkit.Bukkit.createProfile(uniqueId, name));
 +    }
 +
 +    @Deprecated(forRemoval = true)
-+    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
-+        this(name, ipAddress, ipAddress, uniqueId, profile);
++    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile) {
++        this(name, ipAddress, ipAddress, uniqueId, transferred, profile);
 +    }
 +
 +    @Deprecated(forRemoval = true)
-+    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
-+        this(name, ipAddress, rawAddress, uniqueId, profile, "");
++    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile) {
++        this(name, ipAddress, rawAddress, uniqueId, transferred, profile, "");
 +    }
 +
-+    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile, @NotNull String hostname) {
++    @org.jetbrains.annotations.ApiStatus.Internal
++    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile, @NotNull String hostname) {
++        // Paper end
          super(true);
          this.result = Result.ALLOWED;
          this.message = net.kyori.adventure.text.Component.empty(); // Paper
@@ -58,13 +51,12 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
 +        this.profile = profile;
          this.ipAddress = ipAddress;
 -        this.uniqueId = uniqueId;
-+        this.rawAddress = rawAddress;
-+        this.hostname = hostname;
-+        // Paper end
++        this.rawAddress = rawAddress; // Paper
++        this.hostname = hostname; // Paper
+         this.transferred = transferred;
      }
  
-     /**
-@@ -200,7 +220,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -207,7 +226,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
       */
      @NotNull
      public String getName() {
@@ -73,7 +65,7 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
      }
  
      /**
-@@ -220,9 +240,48 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -227,9 +246,48 @@ public class AsyncPlayerPreLoginEvent extends Event {
       */
      @NotNull
      public UUID getUniqueId() {
@@ -87,7 +79,7 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
 +     * @return The Profile
 +     */
 +    @NotNull
-+    public PlayerProfile getPlayerProfile() {
++    public com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile() {
 +        return profile;
 +    }
 +
@@ -95,7 +87,7 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
 +     * Changes the PlayerProfile the player will login as
 +     * @param profile The profile to use
 +     */
-+    public void setPlayerProfile(@NotNull PlayerProfile profile) {
++    public void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile) {
 +        this.profile = profile;
 +    }
 +
@@ -120,6 +112,6 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
 +    }
 +    // Paper end
 +
-     @NotNull
-     @Override
-     public HandlerList getHandlers() {
+     /**
+      * Gets if this connection has been transferred from another server.
+      *
diff --git a/patches/api/0092-Player.setPlayerProfile-API.patch b/patches/api/0092-Player.setPlayerProfile-API.patch
index 0d0b10e019..c821f93d0d 100644
--- a/patches/api/0092-Player.setPlayerProfile-API.patch
+++ b/patches/api/0092-Player.setPlayerProfile-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 48cce5c4a31ce9df3f2fe0aba4dd50e0547493b6..990436521c4d080d7adbd0a8c55f03690f17c1ec 100644
+index b165a4f99802ced243f1fb56af2bcf2c2ab7abf1..3ea17583766a462317a6a609ac693b5e488e006d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1336,8 +1336,10 @@ public final class Bukkit {
+@@ -1348,8 +1348,10 @@ public final class Bukkit {
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if both the unique id is
       * <code>null</code> and the name is <code>null</code> or blank
@@ -20,7 +20,7 @@ index 48cce5c4a31ce9df3f2fe0aba4dd50e0547493b6..990436521c4d080d7adbd0a8c55f0369
      public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
          return server.createPlayerProfile(uniqueId, name);
      }
-@@ -1348,8 +1350,10 @@ public final class Bukkit {
+@@ -1360,8 +1362,10 @@ public final class Bukkit {
       * @param uniqueId the unique id
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the unique id is <code>null</code>
@@ -31,7 +31,7 @@ index 48cce5c4a31ce9df3f2fe0aba4dd50e0547493b6..990436521c4d080d7adbd0a8c55f0369
      public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
          return server.createPlayerProfile(uniqueId);
      }
-@@ -1361,8 +1365,10 @@ public final class Bukkit {
+@@ -1373,8 +1377,10 @@ public final class Bukkit {
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the name is <code>null</code> or
       * blank
@@ -56,10 +56,10 @@ index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46
      /**
       * Checks if this player has had their profile banned.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e..c60be47a0ac646133211ab4bf17b4fad4d1893db 100644
+index 8e4bf531c0a2f7101c2a3733fe33733d31c611fd..427b49836becbb0c9e1cb2e94fab7eb1db452ad9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1143,8 +1143,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1153,8 +1153,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if both the unique id is
       * <code>null</code> and the name is <code>null</code> or blank
@@ -70,7 +70,7 @@ index 7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e..c60be47a0ac646133211ab4bf17b4fad
      PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
  
      /**
-@@ -1153,8 +1155,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1163,8 +1165,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param uniqueId the unique id
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the unique id is <code>null</code>
@@ -81,7 +81,7 @@ index 7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e..c60be47a0ac646133211ab4bf17b4fad
      PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
  
      /**
-@@ -1164,8 +1168,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1174,8 +1178,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the name is <code>null</code> or
       * blank
@@ -93,10 +93,10 @@ index 7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e..c60be47a0ac646133211ab4bf17b4fad
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8ec100779944579f83cfc1be4b124a4c780cdc07..ecc99524f20e1d7072bfad3ac310cccc4514e40f 100644
+index 8b92f258a85b4184d67d0af396c18400ded38a67..56eed06cd3dbb238330973c1428bffc6d5286019 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3017,6 +3017,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3061,6 +3061,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      }
      // Paper end
  
diff --git a/patches/api/0093-getPlayerUniqueId-API.patch b/patches/api/0093-getPlayerUniqueId-API.patch
index 64497be958..cc120a8b1a 100644
--- a/patches/api/0093-getPlayerUniqueId-API.patch
+++ b/patches/api/0093-getPlayerUniqueId-API.patch
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 990436521c4d080d7adbd0a8c55f03690f17c1ec..4f9ebcd991875d0bf486a8ebb39909f2ac32493b 100644
+index 3ea17583766a462317a6a609ac693b5e488e006d..3e32a6bbf593b269f1af23c7e2fdafaccc0d2110 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -719,6 +719,20 @@ public final class Bukkit {
+@@ -721,6 +721,20 @@ public final class Bukkit {
          return server.getPlayer(id);
      }
  
@@ -34,10 +34,10 @@ index 990436521c4d080d7adbd0a8c55f03690f17c1ec..4f9ebcd991875d0bf486a8ebb39909f2
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c60be47a0ac646133211ab4bf17b4fad4d1893db..7c53979f407a6a24c6d16bbfb205a8ac0321e5dc 100644
+index 427b49836becbb0c9e1cb2e94fab7eb1db452ad9..19e6cee94caabfe93c841da783c86a3c283ebcb9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -617,6 +617,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -619,6 +619,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      public Player getPlayer(@NotNull UUID id);
  
diff --git a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
index ea763e9a13..4c28dd6d8c 100644
--- a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
@@ -36,10 +36,10 @@ index c426bdea5ef71a095cf2af9a8a83a162db3c05b7..2308fa3ca898bcb6c0ac2d4853f82a33
      /**
       * 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 ecc99524f20e1d7072bfad3ac310cccc4514e40f..d06f9b4d0117515fb8fcf78d416dcd2b4ef6fb4b 100644
+index 56eed06cd3dbb238330973c1428bffc6d5286019..d68a055ef2b309da6db2de385f27d841adca1f66 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2978,10 +2978,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3022,10 +3022,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Open a Sign for editing by the Player.
       *
diff --git a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
index 4efdc4fed1..c1a286c848 100644
--- a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
@@ -86,10 +86,10 @@ index abbf3d6f11350ab2dd47a277771d9f46221036bd..ef85e57f812c501fac7abe7dd27c9370
      /**
       * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d06f9b4d0117515fb8fcf78d416dcd2b4ef6fb4b..3b80cb874dccf2ed4fde4c621f0f022ba1112bcd 100644
+index d68a055ef2b309da6db2de385f27d841adca1f66..9dcec906cea7d4eb6da99ef3100a98218a280594 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1173,6 +1173,186 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1217,6 +1217,186 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
diff --git a/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch
index ef4b091e49..05b73f46b1 100644
--- a/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch
+++ b/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a55e92dc09202437abac9cb5b7aacf3c275f5b9c..e2cd4750ec51da5e6a93f31a9b644516f64f7972 100644
+index 98e3c12801cc36c868f08b15d1188295ea4364e0..c489140bffdfdfa1e34e71489d308ed10cf10b21 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@
diff --git a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
index 26b74a496c..6d7aa33b1f 100644
--- a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -594,10 +594,10 @@ index 0000000000000000000000000000000000000000..507343f971fd42eada8ce3346b025daa
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index ca6d0eaa9d9a37c07f3e1630b83a79bf98211edb..26d02aa5da444112f8fa84c07e3080bb669983a1 100644
+index 698ffe0c76adeb1b00e7e789ce7d164c6adc759d..690cf2aedf558396a71b20ba2b8ce737c61dfe43 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -204,6 +204,18 @@ public enum Particle implements Keyed {
+@@ -207,6 +207,18 @@ public enum Particle implements Keyed {
          return key;
      }
  
@@ -617,10 +617,10 @@ index ca6d0eaa9d9a37c07f3e1630b83a79bf98211edb..26d02aa5da444112f8fa84c07e3080bb
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e2cd4750ec51da5e6a93f31a9b644516f64f7972..6f084f081bd20b006c9a8e1090b6ad0e838810cb 100644
+index c489140bffdfdfa1e34e71489d308ed10cf10b21..b6d08d50c26aa0e69d2479d188fc3c690e8ed357 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2905,7 +2905,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2921,7 +2921,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
       */
diff --git a/patches/api/0110-Make-shield-blocking-delay-configurable.patch b/patches/api/0110-Make-shield-blocking-delay-configurable.patch
index 39f25d89b5..e6c6e635ca 100644
--- a/patches/api/0110-Make-shield-blocking-delay-configurable.patch
+++ b/patches/api/0110-Make-shield-blocking-delay-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 40634f46fa238a68f70f19b664bad7400ef07709..4a4a749449bc561a73e6747386c8ad51e623fc1e 100644
+index f154c5607b1dc3585052d9f02cf8b28cf8a3c886..7b53064364e206bc1a0f4b7af4931f6c658b7c55 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -835,5 +835,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -837,5 +837,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      @Deprecated
      void setArrowsStuck(int arrows);
diff --git a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 71a82a8eae..420b0ca896 100644
--- a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-index d4d7ad9c3c953680342c121f39ddaef476549047..719d0d878320c1903b44076053989ba99fa0e92a 100644
+index 1a8366f6757431baaba4f3d48abea3cf0ec1f1ad..1cde639c5dc7e746209488b1a58c2a81080ab3d7 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 @@ -22,7 +22,32 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
diff --git a/patches/api/0115-Expand-Explosions-API.patch b/patches/api/0115-Expand-Explosions-API.patch
index c4c0e69ee6..369694a376 100644
--- a/patches/api/0115-Expand-Explosions-API.patch
+++ b/patches/api/0115-Expand-Explosions-API.patch
@@ -108,10 +108,10 @@ index 3161eae2fa5f03b7d3a5e9945ab659c15cf568c6..af737017ee397f80c44ee02c6cc60cef
      /**
       * Returns a list of entities within a bounding box centered around a Location.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6f084f081bd20b006c9a8e1090b6ad0e838810cb..5ec220aa224c210c55517ef47aa5809ee26209e7 100644
+index b6d08d50c26aa0e69d2479d188fc3c690e8ed357..a735dcdb9a0684accf81674b4810928ff20eb7e6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1391,6 +1391,88 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -1397,6 +1397,88 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       */
      public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
  
diff --git a/patches/api/0117-LivingEntity-Active-Item-API.patch b/patches/api/0117-LivingEntity-Active-Item-API.patch
index 1324ec1fdc..268d315eb2 100644
--- a/patches/api/0117-LivingEntity-Active-Item-API.patch
+++ b/patches/api/0117-LivingEntity-Active-Item-API.patch
@@ -23,7 +23,7 @@ index 2308fa3ca898bcb6c0ac2d4853f82a3398bf51f3..15115b1049bc5053796b84539acbf576
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4a4a749449bc561a73e6747386c8ad51e623fc1e..81a851580f81b2d6f6a2b2ebec38530f1d68530d 100644
+index 7b53064364e206bc1a0f4b7af4931f6c658b7c55..0ed64618b3f62ee984fe4f99dc6a52d5fad7b3cc 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -202,15 +202,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -56,7 +56,7 @@ index 4a4a749449bc561a73e6747386c8ad51e623fc1e..81a851580f81b2d6f6a2b2ebec38530f
      public void setItemInUseTicks(int ticks);
  
      /**
-@@ -850,4 +856,130 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -852,4 +858,130 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setShieldBlockingDelay(int delay);
      // Paper end
diff --git a/patches/api/0119-Add-World.getEntity-UUID-API.patch b/patches/api/0119-Add-World.getEntity-UUID-API.patch
index 2b7e2e2815..89065f63d6 100644
--- a/patches/api/0119-Add-World.getEntity-UUID-API.patch
+++ b/patches/api/0119-Add-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5ec220aa224c210c55517ef47aa5809ee26209e7..2aafd966778ee0f6adcbb3ea3772cb2104f8e687 100644
+index a735dcdb9a0684accf81674b4810928ff20eb7e6..b34eca520c34c70152860f5bad978cf3bed044fa 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -905,6 +905,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0122-Entity-getChunk-API.patch b/patches/api/0122-Entity-getChunk-API.patch
index 0dbc27f2d1..8a3e473331 100644
--- a/patches/api/0122-Entity-getChunk-API.patch
+++ b/patches/api/0122-Entity-getChunk-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b422a949b22edf412b518abb3e5ca0847c73d36b..57a1d07d0430019fd38c72b9f58c7145927ecd02 100644
+index 45f475b42bbef1c5dc461b3891a48c8fb6feefd3..1e43deadce5a1a0e97521b1f69fee3106f5a0b9e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index b422a949b22edf412b518abb3e5ca0847c73d36b..57a1d07d0430019fd38c72b9f58c7145
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Nameable;
-@@ -797,5 +798,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -808,5 +809,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if entity spawned from a mob spawner
       */
      boolean fromMobSpawner();
diff --git a/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
index d2a1664557..2aff921ee0 100644
--- a/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -44,7 +44,7 @@ index a25f112f4d679946ddcb5ec9b4d0a0e2d1795bd3..57976bbe682d2309f7d15d5dcd3ad7f8
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2aafd966778ee0f6adcbb3ea3772cb2104f8e687..9e941753819214e75b9d712bb59e8d49427e6f8b 100644
+index b34eca520c34c70152860f5bad978cf3bed044fa..273c50b6e4f26457415779000cf09aeaffd21733 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -182,6 +182,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index 6e66f2ae02..c2205057df 100644
--- a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -50,7 +50,7 @@ index 41125de49db8eafce4be59cc110ce5be06836a47..042d69e6d4584eb6d678b8ea13a3e4be
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9e941753819214e75b9d712bb59e8d49427e6f8b..48f2c64491f93e5ac720bdb19a20f3f435a7e888 100644
+index 273c50b6e4f26457415779000cf09aeaffd21733..575fd50b8456beed7c5049a392fca011271a8fe4 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -99,6 +99,41 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0141-isChunkGenerated-API.patch b/patches/api/0141-isChunkGenerated-API.patch
index bfe9b14df9..aba6214696 100644
--- a/patches/api/0141-isChunkGenerated-API.patch
+++ b/patches/api/0141-isChunkGenerated-API.patch
@@ -37,7 +37,7 @@ index 042d69e6d4584eb6d678b8ea13a3e4bea78703b8..02b4ffa6b918269bd64f7c518fcceef1
  
      /**
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 48f2c64491f93e5ac720bdb19a20f3f435a7e888..8bef6168caf0932a5a64cf69eb7988fa3191b13a 100644
+index 575fd50b8456beed7c5049a392fca011271a8fe4..b3098ce9134acf24f49d23fc1babe79c6bf502f1 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -248,6 +248,19 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0143-Async-Chunks-API.patch b/patches/api/0143-Async-Chunks-API.patch
index 30c484e7aa..68867e8a37 100644
--- a/patches/api/0143-Async-Chunks-API.patch
+++ b/patches/api/0143-Async-Chunks-API.patch
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8bef6168caf0932a5a64cf69eb7988fa3191b13a..ab183821b93dcfed1e881b481f0a3166f465ecfb 100644
+index b3098ce9134acf24f49d23fc1babe79c6bf502f1..5efe33cef4d9c153d760fc71606721ff8abafbfc 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -950,6 +950,472 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -485,7 +485,7 @@ index 8bef6168caf0932a5a64cf69eb7988fa3191b13a..ab183821b93dcfed1e881b481f0a3166
       * Get a list of all players in this World
       *
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 57a1d07d0430019fd38c72b9f58c7145927ecd02..8a7a4a8cf5f0b88664859cd43b0b01e6d261715d 100644
+index 1e43deadce5a1a0e97521b1f69fee3106f5a0b9e..f1fc42ad24648ee481b9a5d4c4cc58ae8c0a93c1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -168,6 +168,39 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
index 46969f1d74..5a9655eafe 100644
--- a/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -78,7 +78,7 @@ index 0000000000000000000000000000000000000000..c896d172519a8552a132031cb956378d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 81a851580f81b2d6f6a2b2ebec38530f1d68530d..e6e0e16d122d78a160af549e4419e49dc046fb08 100644
+index 0ed64618b3f62ee984fe4f99dc6a52d5fad7b3cc..b41152d81c1ec89a65eaee2a606f4f1b0d421bc7 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -85,6 +85,98 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch
index d91baa6170..0727dbdfbb 100644
--- a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0145-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 3b80cb874dccf2ed4fde4c621f0f022ba1112bcd..5e17bab05276de4340c5f06866f2efce81a9ab65 100644
+index 9dcec906cea7d4eb6da99ef3100a98218a280594..92a83edc03fa8d11f026ac312b989329fa6a7e88 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3219,6 +3219,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3263,6 +3263,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void setPlayerProfile(com.destroystokyo.paper.profile.@NotNull PlayerProfile profile);
      // Paper end - Player Profile API
  
diff --git a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch
index 847ce11745..6c3f8d857b 100644
--- a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch
@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4f9ebcd991875d0bf486a8ebb39909f2ac32493b..c61096f724ea6a1ae7bc8990e9eaa44a16f5847e 100644
+index 3e32a6bbf593b269f1af23c7e2fdafaccc0d2110..d60780a26e10f5f9c80446693552384281327b51 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -58,6 +58,7 @@ import org.bukkit.util.CachedServerIcon;
+@@ -60,6 +60,7 @@ import org.bukkit.util.CachedServerIcon;
  import org.jetbrains.annotations.Contract;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
@@ -59,7 +59,7 @@ index 4f9ebcd991875d0bf486a8ebb39909f2ac32493b..c61096f724ea6a1ae7bc8990e9eaa44a
  
  /**
   * Represents the Bukkit core, for version and Server singleton handling
-@@ -107,7 +108,25 @@ public final class Bukkit {
+@@ -109,7 +110,25 @@ public final class Bukkit {
          }
  
          Bukkit.server = server;
diff --git a/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index b5c087c089..316ea7f83d 100644
--- a/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -226,10 +226,10 @@ index 4034fcb9abc39b12f0de47c4b679f2ef82353c89..6fa219aef009f8dfb8a2b1e5ee0603b1
          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 80836c5f87c15d688f27af5247b4e114cea7028d..f800e776329c1b42f834cb30ebf2d0ace195d1a2 100644
+index dff32cedf47e95fe14a865898d76b62748dee5f3..de38d9b667e04852c7bdccfa17cbabb1512f4c19 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -450,4 +450,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -622,4 +622,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @SuppressWarnings("javadoc")
      @NotNull
      ItemMeta clone();
diff --git a/patches/api/0153-Material-API-additions.patch b/patches/api/0153-Material-API-additions.patch
index bf1a41d231..7fdeb9b3eb 100644
--- a/patches/api/0153-Material-API-additions.patch
+++ b/patches/api/0153-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 e15219c93995ff959a6730c17920618c0cdb3311..55fa9e8385e26aecb5690f623c2893972dc2a234 100644
+index d593dbace48998e5582c2f0c168275e0d59fe1cf..7ce1a0ee5504d4faf548be73be784e87cd4049fe 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -121,6 +121,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -122,6 +122,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * An enum of all material IDs accepted by the official server and client
   */
@@ -16,7 +16,7 @@ index e15219c93995ff959a6730c17920618c0cdb3311..55fa9e8385e26aecb5690f623c289397
  public enum Material implements Keyed, Translatable {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -4684,6 +4685,22 @@ public enum Material implements Keyed, Translatable {
+@@ -4722,6 +4723,22 @@ public enum Material implements Keyed, Translatable {
          }
      }
  
diff --git a/patches/api/0154-Add-Material-Tags.patch b/patches/api/0154-Add-Material-Tags.patch
index 12194664b8..87e49d154c 100644
--- a/patches/api/0154-Add-Material-Tags.patch
+++ b/patches/api/0154-Add-Material-Tags.patch
@@ -1132,7 +1132,7 @@ index 0000000000000000000000000000000000000000..5376e51adf5af15572b0d760b17f2de6
 +        .ensureSize("WATER_BASED", 11).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index ec50179dd92402ad016bb2100251db5c5bf9d0c2..894e72aa97cd272ae57a91165cca0737a6d5742d 100644
+index 1be862110e94654be12fcef5980388abf242ac7f..298ae1294a122705bca6bd74ea540185839d1ed5 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
 @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0156-Add-LivingEntity-getTargetEntity.patch b/patches/api/0156-Add-LivingEntity-getTargetEntity.patch
index 8447dca548..171a95979a 100644
--- a/patches/api/0156-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/api/0156-Add-LivingEntity-getTargetEntity.patch
@@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..af8765b213390cf75fe02a6eb68aecf7
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e6e0e16d122d78a160af549e4419e49dc046fb08..d8ac9ce8e448f8b3bc39ec6c140db0e25d14cec7 100644
+index b41152d81c1ec89a65eaee2a606f4f1b0d421bc7..8cd525dd8ded0ddbd405c66e9c0fbeb40f788521 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -175,6 +175,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0157-Add-sun-related-API.patch b/patches/api/0157-Add-sun-related-API.patch
index 59c4495962..7132b29be0 100644
--- a/patches/api/0157-Add-sun-related-API.patch
+++ b/patches/api/0157-Add-sun-related-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ab183821b93dcfed1e881b481f0a3166f465ecfb..675dea2e1e9742043c18098774b9fde2e6f4602f 100644
+index 5efe33cef4d9c153d760fc71606721ff8abafbfc..b6ca63afb74b345e381d35646cc8faf52a2c7cbc 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1771,6 +1771,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0161-Make-the-default-permission-message-configurable.patch b/patches/api/0161-Make-the-default-permission-message-configurable.patch
index cad7e3c310..8dac5d0ae4 100644
--- a/patches/api/0161-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0161-Make-the-default-permission-message-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c61096f724ea6a1ae7bc8990e9eaa44a16f5847e..ac84e6d10a337f767477177ef90ad10d754341e6 100644
+index d60780a26e10f5f9c80446693552384281327b51..f248515862c3bc418b42b8e197feb43addfd122d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2374,6 +2374,28 @@ public final class Bukkit {
+@@ -2397,6 +2397,28 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -38,10 +38,10 @@ index c61096f724ea6a1ae7bc8990e9eaa44a16f5847e..ac84e6d10a337f767477177ef90ad10d
       * Creates a PlayerProfile for the specified uuid, with name as null.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7c53979f407a6a24c6d16bbfb205a8ac0321e5dc..050cdd5147814b39d158f0ce0fa8f5aa20894cf7 100644
+index 19e6cee94caabfe93c841da783c86a3c283ebcb9..69f236d965c631510b008a7eb38aa1b62a4e196a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2067,6 +2067,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2086,6 +2086,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
@@ -66,7 +66,7 @@ index 7c53979f407a6a24c6d16bbfb205a8ac0321e5dc..050cdd5147814b39d158f0ce0fa8f5aa
       * Creates a PlayerProfile for the specified uuid, with name as null.
       *
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 1c6205cc667bbec8f6aca479f13b3e9cfcd63ab2..b791358f90fe92bc2264d9a26492245763813af3 100644
+index f7b78198d9983610fc2185124c3080e6b1c0fa35..b3a2c274f05156fd603bcc7a68ab41265f2eaf44 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -184,10 +184,9 @@ public abstract class Command {
diff --git a/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
index b600b869ba..420a97487d 100644
--- a/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -105,47 +105,3 @@ index 963b9ead4ca0426b2e95c5641b0e89317c48853d..39f6afd2f9cbcff6a74a91a21dcc3e29
      @NotNull
      @Override
      public HandlerList getHandlers() {
-diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-index be9560ffaa2d136ff1b5cd944baa678c1a938533..6533d1e0c5cb23e4a5e2831a56c5dbebe2d20f76 100644
---- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-@@ -21,10 +21,19 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable {
-     private static final HandlerList handlers = new HandlerList();
-     private boolean cancelled;
-     private final Entity dismounted;
-+    private final boolean isCancellable; // Paper
- 
-     public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted) {
--        super(what);
-+        // Paper start
-+        this(what, dismounted, true);
-+    }
-+
-+
-+    public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted, boolean isCancellable) {
-+        // Paper end
-+        super( what );
-         this.dismounted = dismounted;
-+        this.isCancellable = isCancellable; // Paper
-     }
- 
-     @NotNull
-@@ -39,9 +48,18 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable {
- 
-     @Override
-     public void setCancelled(boolean cancel) {
-+        // Paper start
-+        if (cancel && !isCancellable) {
-+            return;
-+        }
-         this.cancelled = cancel;
-     }
- 
-+    public boolean isCancellable() {
-+        return isCancellable;
-+        // Paper end
-+    }
-+
-     @NotNull
-     @Override
-     public HandlerList getHandlers() {
diff --git a/patches/api/0172-Entity-getEntitySpawnReason.patch b/patches/api/0172-Entity-getEntitySpawnReason.patch
index 25cf10b844..ef25308f6c 100644
--- a/patches/api/0172-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0172-Entity-getEntitySpawnReason.patch
@@ -12,10 +12,10 @@ or DEFAULT since data was not stored.
 Co-authored-by: Aurora <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8a7a4a8cf5f0b88664859cd43b0b01e6d261715d..11a77f977c6abc031cf5a4d58924bc7af5e7ea53 100644
+index f1fc42ad24648ee481b9a5d4c4cc58ae8c0a93c1..66716da0b475524917d4153e481100b795ea11a9 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -842,5 +842,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -853,5 +853,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
          // TODO remove impl here
          return getLocation().getChunk();
      }
diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
index 1f17f45353..afaaad281a 100644
--- a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
@@ -40,10 +40,10 @@ index ac420f0059fc50d3e1294f85df7515c9e17ff78f..24daba85ce4129fb0babe67570059ca8
      public static Art getById(int id) {
          return BY_ID.get(id);
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ac84e6d10a337f767477177ef90ad10d754341e6..4716b9a9ebaf3deb0a262d4ea1da492547be4913 100644
+index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949574f3f59 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -868,9 +868,8 @@ public final class Bukkit {
+@@ -870,9 +870,8 @@ public final class Bukkit {
       *
       * @param id the id of the map to get
       * @return a map view if it exists, or null otherwise
@@ -54,7 +54,7 @@ index ac84e6d10a337f767477177ef90ad10d754341e6..4716b9a9ebaf3deb0a262d4ea1da4925
      @Nullable
      public static MapView getMap(int id) {
          return server.getMap(id);
-@@ -949,8 +948,14 @@ public final class Bukkit {
+@@ -951,8 +950,14 @@ public final class Bukkit {
       * Returns the primary logger associated with this server instance.
       *
       * @return Logger associated with this server
@@ -69,7 +69,7 @@ index ac84e6d10a337f767477177ef90ad10d754341e6..4716b9a9ebaf3deb0a262d4ea1da4925
      public static Logger getLogger() {
          return server.getLogger();
      }
-@@ -1337,10 +1342,8 @@ public final class Bukkit {
+@@ -1349,10 +1354,8 @@ public final class Bukkit {
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -81,7 +81,7 @@ index ac84e6d10a337f767477177ef90ad10d754341e6..4716b9a9ebaf3deb0a262d4ea1da4925
      @NotNull
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
-@@ -1931,7 +1934,7 @@ public final class Bukkit {
+@@ -1954,7 +1957,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -183,10 +183,10 @@ index bd213cabddd8752e609544f24cfba95405726155..47df858e095c4423c20e49e029d72f0f
      public static DyeColor legacyValueOf(@Nullable String name) {
          return "SILVER".equals(name) ? DyeColor.LIGHT_GRAY : DyeColor.valueOf(name);
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index 879d637691683ca862045402f74b751a892bf3ff..611b7df0e31de932f15c2f13bd8ed286e0b3b43f 100644
+index 0d0777771485a76d960da2f16e963b19d2cf6c2d..fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
-@@ -358,9 +358,9 @@ public enum Effect {
+@@ -357,9 +357,9 @@ public enum Effect {
       * Gets the ID for this effect.
       *
       * @return ID of this effect
@@ -198,7 +198,7 @@ index 879d637691683ca862045402f74b751a892bf3ff..611b7df0e31de932f15c2f13bd8ed286
      public int getId() {
          return this.id;
      }
-@@ -387,9 +387,9 @@ public enum Effect {
+@@ -386,9 +386,9 @@ public enum Effect {
       *
       * @param id ID of the Effect to return
       * @return Effect with the given ID
@@ -300,10 +300,10 @@ index 02b4ffa6b918269bd64f7c518fcceef1f6990737..f0878c7539696cc0676e6010e88914d3
          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 55fa9e8385e26aecb5690f623c2893972dc2a234..c24fe19600fa8440c130eaea247d5874da3873ec 100644
+index 7ce1a0ee5504d4faf548be73be784e87cd4049fe..76c96e1a82366aafa0148a1260500a38cea12f37 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4705,20 +4705,20 @@ public enum Material implements Keyed, Translatable {
+@@ -4743,20 +4743,20 @@ public enum Material implements Keyed, Translatable {
       * Do not use for any reason.
       *
       * @return ID of this material
@@ -328,7 +328,7 @@ index 55fa9e8385e26aecb5690f623c2893972dc2a234..c24fe19600fa8440c130eaea247d5874
      public boolean isLegacy() {
          return legacy;
      }
-@@ -4789,8 +4789,10 @@ public enum Material implements Keyed, Translatable {
+@@ -4827,8 +4827,10 @@ public enum Material implements Keyed, Translatable {
       * Gets the MaterialData class associated with this Material
       *
       * @return MaterialData associated with this Material
@@ -339,7 +339,7 @@ index 55fa9e8385e26aecb5690f623c2893972dc2a234..c24fe19600fa8440c130eaea247d5874
      public Class<? extends MaterialData> getData() {
          Preconditions.checkArgument(legacy, "Cannot get data class of Modern Material");
          return ctor.getDeclaringClass();
-@@ -9052,7 +9054,11 @@ public enum Material implements Keyed, Translatable {
+@@ -9095,7 +9097,11 @@ public enum Material implements Keyed, Translatable {
       * material.
       *
       * @return true if this material can be interacted with.
@@ -452,47 +452,11 @@ index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f
      public byte getId() {
          return note;
      }
-diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 26d02aa5da444112f8fa84c07e3080bb669983a1..0cb15350704955f4a1aeff184a8b60d9a9871ded 100644
---- a/src/main/java/org/bukkit/Particle.java
-+++ b/src/main/java/org/bukkit/Particle.java
-@@ -54,7 +54,9 @@ public enum Particle implements Keyed {
-     BLOCK_CRACK("block", BlockData.class),
-     /**
-      * Uses {@link BlockData} as DataType
-+     * @deprecated use {@link #BLOCK_CRACK}
-      */
-+    @Deprecated // Paper
-     BLOCK_DUST("block", BlockData.class, false),
-     WATER_DROP("rain"),
-     MOB_APPEARANCE("elder_guardian"),
-@@ -148,15 +150,21 @@ public enum Particle implements Keyed {
-     // ----- Legacy Separator -----
-     /**
-      * Uses {@link MaterialData} as DataType
-+     * @deprecated {@link MaterialData} is deprecated API
-      */
-+    @Deprecated // Paper
-     LEGACY_BLOCK_CRACK(null, MaterialData.class, false),
-     /**
-      * Uses {@link MaterialData} as DataType
-+     * @deprecated {@link MaterialData} is deprecated API
-      */
-+    @Deprecated // Paper
-     LEGACY_BLOCK_DUST(null, MaterialData.class, false),
-     /**
-      * Uses {@link MaterialData} as DataType
-+     * @deprecated {@link MaterialData} is deprecated API
-      */
-+    @Deprecated // Paper
-     LEGACY_FALLING_DUST(null, MaterialData.class, false);
- 
-     private final NamespacedKey key;
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index db45423936d48835dee35d01ee502cdfdce4f68a..b3f8a2611ceb57f5d0b5c300fa80d8bad121498d 100644
+index ccc84e35dd8b94b5d9ddbac0341c2fae7a8e7115..18be407d4fb401d89f3a46a9bce044bacd8a888f 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -199,14 +199,12 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -201,14 +201,12 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
       *
       * @see TrimMaterial
       */
@@ -507,7 +471,7 @@ index db45423936d48835dee35d01ee502cdfdce4f68a..b3f8a2611ceb57f5d0b5c300fa80d8ba
      Registry<TrimPattern> TRIM_PATTERN = Bukkit.getRegistry(TrimPattern.class);
      /**
       * Damage types.
-@@ -295,8 +293,11 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -310,8 +308,11 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
       *
       * @param input non-null input
       * @return registered object or null if does not exist
@@ -534,10 +498,10 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..10f5cfb1885833a1d2c1027c03974da4
      CRACKED(0x0),
      GLYPHED(0x1),
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..1f98a99eea0fb9a7ebef5d650640e7dac392416e 100644
+index 69f236d965c631510b008a7eb38aa1b62a4e196a..2382322bc4f30ff3163b2941650692d9a13328ac 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -728,9 +728,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -730,9 +730,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @param id the id of the map to get
       * @return a map view if it exists, or null otherwise
@@ -548,7 +512,7 @@ index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..1f98a99eea0fb9a7ebef5d650640e7da
      @Nullable
      public MapView getMap(int id);
  
-@@ -797,8 +796,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -799,8 +798,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * Returns the primary logger associated with this server instance.
       *
       * @return Logger associated with this server
@@ -563,7 +527,7 @@ index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..1f98a99eea0fb9a7ebef5d650640e7da
      public Logger getLogger();
  
      /**
-@@ -1127,10 +1132,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1137,10 +1142,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -575,7 +539,7 @@ index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..1f98a99eea0fb9a7ebef5d650640e7da
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
-@@ -1630,7 +1633,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1649,7 +1652,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -628,7 +592,7 @@ index e455eb21abf121dc6ff10ff8a13dd06f67096a8f..bbc01e7c192ae6689c301670047ff114
          return origin;
      }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8c03acf0d 100644
+index b6ca63afb74b345e381d35646cc8faf52a2c7cbc..a523d1725f175c924ab1a7d544d389ec81b68bcf 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -418,9 +418,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -642,7 +606,7 @@ index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8
      public boolean refreshChunk(int x, int z);
  
      /**
-@@ -3754,6 +3753,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3770,6 +3769,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
  
      // Spigot start
@@ -650,7 +614,7 @@ index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8
      public class Spigot {
  
          /**
-@@ -3787,7 +3787,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3803,7 +3803,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
          }
      }
  
@@ -662,7 +626,7 @@ index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8
      Spigot spigot();
      // Spigot end
  
-@@ -4005,9 +4009,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4021,9 +4025,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
           * Gets the dimension ID of this environment
           *
           * @return dimension ID
@@ -674,7 +638,7 @@ index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8
          public int getId() {
              return id;
          }
-@@ -4017,9 +4021,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4033,9 +4037,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
           *
           * @param id The ID of the environment
           * @return The environment
@@ -700,7 +664,7 @@ index a71001677e2b1b0b6225a7be63b8ea5ce4456862..c7ef0386a09a07a2317c56274ed41218
      /**
       * Returns if the given item is a preferred choice to break this Block.
 diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index 7c5438fa92053cdbd7a01483a9baa4d48df07b24..a4f0a5270693e1c4af4fad827fa0a2ce753e07b5 100644
+index 3e07fc1bc0e08d0cfd998711c7fd547b2b7b6b73..fd4a9bdcfb6775dfbdb7492e6c9eb90722d2ecdc 100644
 --- a/src/main/java/org/bukkit/block/BlockState.java
 +++ b/src/main/java/org/bukkit/block/BlockState.java
 @@ -36,8 +36,10 @@ public interface BlockState extends Metadatable {
@@ -714,7 +678,7 @@ index 7c5438fa92053cdbd7a01483a9baa4d48df07b24..a4f0a5270693e1c4af4fad827fa0a2ce
      MaterialData getData();
  
      /**
-@@ -141,7 +143,9 @@ public interface BlockState extends Metadatable {
+@@ -151,7 +153,9 @@ public interface BlockState extends Metadatable {
       * Sets the metadata for this block state.
       *
       * @param data New block specific metadata
@@ -790,10 +754,10 @@ index 3afe2787de576f7190d87c796bea0ab34dc30248..58191017244f3949f6174fb108e3a245
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index e3f440c9d9ce3b5710ed1b7f71522899fb98459f..a4578c520aa1078a741aac4b12fe89bf82b3c465 100644
+index b975f11d342ca4357362de9aaae3f1af6716049e..c52e386ffa08abbbd38683792b281665cc98bd31 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -397,9 +397,9 @@ public enum EntityType implements Keyed, Translatable {
+@@ -392,9 +392,9 @@ public enum EntityType implements Keyed, Translatable {
       *
       * @param name the entity type's name
       * @return the matching entity type or null
@@ -848,7 +812,7 @@ index f124b35ec76e6cb6a1a0dc464005087043c3efd0..f50aaddf8582be55fd4860ad374d8f22
 +@Deprecated(forRemoval = true) // Paper
  public interface LingeringPotion extends ThrownPotion { }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index d8ac9ce8e448f8b3bc39ec6c140db0e25d14cec7..2f9299f407692c51dca17ca38a6135dde259b895 100644
+index 8cd525dd8ded0ddbd405c66e9c0fbeb40f788521..a6bcdcbe47e17ebdd423bb0e1fb4e29eb9de01c4 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -716,7 +716,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -887,10 +851,10 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5e17bab05276de4340c5f06866f2efce81a9ab65..8f2a6f8ac70a7d5c2b8f9c17199b6eb88750a703 100644
+index 92a83edc03fa8d11f026ac312b989329fa6a7e88..33547e9e3f8f7c906a5d91b75eb62327cc1f2a3a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1591,11 +1591,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1635,11 +1635,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Forces an update of the player's entire inventory.
@@ -939,32 +903,6 @@ index 9cb08fe7201a9f91e88c7b1ee22c17889a7bf1c3..c0fcfccdf476106b48e626a099658c04
 -@Deprecated
 +@Deprecated(forRemoval = true) // Paper
  public interface SplashPotion extends ThrownPotion { }
-diff --git a/src/main/java/org/bukkit/entity/TextDisplay.java b/src/main/java/org/bukkit/entity/TextDisplay.java
-index f101ffde9e7b3f6c3ab6f1cffb8d6f4e720634b2..8abc129f5953807e7a451166dabcf3e14e55483f 100644
---- a/src/main/java/org/bukkit/entity/TextDisplay.java
-+++ b/src/main/java/org/bukkit/entity/TextDisplay.java
-@@ -62,19 +62,17 @@ public interface TextDisplay extends Display {
-      * Gets the text background color.
-      *
-      * @return the background color
--     * @deprecated API subject to change
-      */
-     @Nullable
--    @Deprecated
-+    // @Deprecated // Paper - is stable API
-     Color getBackgroundColor();
- 
-     /**
-      * Sets the text background color.
-      *
-      * @param color new background color
--     * @deprecated API subject to change
-      */
--    @Deprecated
-+    // @Deprecated // Paper - is stable API
-     void setBackgroundColor(@Nullable Color color);
- 
-     /**
 diff --git a/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
 index 8f601e85df580ef8106eaff8b9eafb5691a4874b..d615c006c9153fb65024241604b744fbfc383efc 100644
 --- a/src/main/java/org/bukkit/entity/memory/MemoryKey.java
@@ -1642,41 +1580,37 @@ index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb6
      public ItemStack getInput() {
          return this.ingredient.getItemStack();
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f800e776329c1b42f834cb30ebf2d0ace195d1a2..f23c0c942f200a68d2620f225ab90399a9057dfc 100644
+index de38d9b667e04852c7bdccfa17cbabb1512f4c19..348ad8932fc55830f83ccc60d5cc4aaf8a29d164 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -75,8 +75,10 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -111,6 +111,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Checks for existence of a localized name.
       *
 +     * @deprecated Use {@link ItemMeta#displayName()} and check if it is instanceof a {@link net.kyori.adventure.text.TranslatableComponent}.
       * @return true if this has a localized name
+      * @deprecated meta no longer exists
       */
-+    @Deprecated // Paper - Deprecate old localized API
-     boolean hasLocalizedName();
- 
-     /**
-@@ -85,16 +87,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -123,9 +124,11 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Plugins should check that hasLocalizedName() returns <code>true</code>
       * before calling this method.
       *
 +     * @deprecated Use {@link ItemMeta#displayName()} and cast it to a {@link net.kyori.adventure.text.TranslatableComponent}. No longer used by the client.
       * @return the localized name that is set
+      * @deprecated meta no longer exists
       */
 +    @Deprecated // Paper - Deprecate old localized API
      @NotNull
+     @Deprecated(forRemoval = true)
      String getLocalizedName();
- 
+@@ -133,6 +136,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Sets the localized name.
       *
 +     * @deprecated Use {@link ItemMeta#displayName(Component)} with a {@link net.kyori.adventure.text.TranslatableComponent}. No longer used by the client.
       * @param name the name to set
+      * @deprecated meta no longer exists
       */
-+    @Deprecated // Paper - Deprecate old localized API
-     void setLocalizedName(@Nullable String name);
- 
-     /**
 diff --git a/src/main/java/org/bukkit/inventory/meta/MapMeta.java b/src/main/java/org/bukkit/inventory/meta/MapMeta.java
 index 32055a8890425e0b819930f3059da5ea9dfca553..26a336dade83baee97d20eb39a058925659f5777 100644
 --- a/src/main/java/org/bukkit/inventory/meta/MapMeta.java
@@ -1740,10 +1674,10 @@ index 00437719722830c087ff925015086c29bbb04497..ae9bcc8262dbf6eb8673ca82395d0916
  
      /**
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index 7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51..599399e4d8ca7c46747439ad2dd0186d0a289a19 100644
+index f9803c7483f7458fed1f22ddfda6e7ef03cfc688..9abea12cb949f7ffa1b72aabf2a3c059b64f3557 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java
 +++ b/src/main/java/org/bukkit/map/MapCursor.java
-@@ -156,9 +156,9 @@ public final class MapCursor {
+@@ -158,9 +158,9 @@ public final class MapCursor {
       * Get the type of this cursor.
       *
       * @return The type (color/style) of the map cursor.
@@ -1755,7 +1689,7 @@ index 7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51..599399e4d8ca7c46747439ad2dd0186d
      public byte getRawType() {
          return type;
      }
-@@ -215,9 +215,9 @@ public final class MapCursor {
+@@ -217,9 +217,9 @@ public final class MapCursor {
       * Set the type of this cursor.
       *
       * @param type The type (color/style) of the map cursor.
@@ -1767,7 +1701,7 @@ index 7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51..599399e4d8ca7c46747439ad2dd0186d
      public void setRawType(byte type) {
          if (type < 0 || type > 26) {
              throw new IllegalArgumentException("Type must be in the range 0-26");
-@@ -328,9 +328,9 @@ public final class MapCursor {
+@@ -339,9 +339,9 @@ public final class MapCursor {
           * Gets the internal value of the cursor.
           *
           * @return the value
@@ -1779,7 +1713,7 @@ index 7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51..599399e4d8ca7c46747439ad2dd0186d
          public byte getValue() {
              return value;
          }
-@@ -340,9 +340,9 @@ public final class MapCursor {
+@@ -351,9 +351,9 @@ public final class MapCursor {
           *
           * @param value the value
           * @return the matching type
@@ -1933,10 +1867,10 @@ index 0ea9c6b2420a0f990bd1fdf50fc015e37a7060d8..e99644eae1c662b117aa19060d2484ac
  
      /**
 diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
-index 28dd05c706211f78eb27329a4284e2f21c5f5eb5..f97dff2fd90cc8c35cbde04d1ace81320a8e4658 100644
+index 7feeb33f8938be968b20c19437723d8c968690fa..e045e6a74821f291938cc6af86e313c1f1c4626c 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
-@@ -240,9 +240,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
+@@ -270,9 +270,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
       * Returns the unique ID of this type.
       *
       * @return Unique ID
@@ -1948,7 +1882,7 @@ index 28dd05c706211f78eb27329a4284e2f21c5f5eb5..f97dff2fd90cc8c35cbde04d1ace8132
      public abstract int getId();
  
      /**
-@@ -278,9 +278,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
+@@ -308,9 +308,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
       *
       * @param id Unique ID to fetch
       * @return Resulting type, or null if not found.
diff --git a/patches/api/0176-Add-Heightmap-API.patch b/patches/api/0176-Add-Heightmap-API.patch
index bfa338c360..9c0ab69035 100644
--- a/patches/api/0176-Add-Heightmap-API.patch
+++ b/patches/api/0176-Add-Heightmap-API.patch
@@ -102,7 +102,7 @@ index f0878c7539696cc0676e6010e88914d3850acf20..c6049747fc286acb4e8053901fcc517e
      /**
       * Creates explosion at this location with given power
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0023b9737353c3c7dcfb38a143761bd8c03acf0d..0a7c97aa289687cfbf6ae1a222f5eb2850f8f43e 100644
+index a523d1725f175c924ab1a7d544d389ec81b68bcf..77314fdbd99a5cc34e7a1df4692ba8a1685ef002 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -153,6 +153,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0181-Expose-the-internal-current-tick.patch b/patches/api/0181-Expose-the-internal-current-tick.patch
index 4db7cb0ddf..7cd95c46f8 100644
--- a/patches/api/0181-Expose-the-internal-current-tick.patch
+++ b/patches/api/0181-Expose-the-internal-current-tick.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4716b9a9ebaf3deb0a262d4ea1da492547be4913..999f72af999a95642b5865144d1da9bd9f86aaee 100644
+index 395d7245aac45a1b805e15ee1fdb9949574f3f59..d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2475,6 +2475,10 @@ public final class Bukkit {
+@@ -2498,6 +2498,10 @@ public final class Bukkit {
      public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
          return server.createProfileExact(uuid, name);
      }
@@ -20,10 +20,10 @@ index 4716b9a9ebaf3deb0a262d4ea1da492547be4913..999f72af999a95642b5865144d1da9bd
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1f98a99eea0fb9a7ebef5d650640e7dac392416e..8445a62af2ca5dd47b4905d75b31d9d6ea0623ea 100644
+index 2382322bc4f30ff3163b2941650692d9a13328ac..cf242e2e6d538d3d38b7b10321ab375e018b24b1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2155,5 +2155,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2174,5 +2174,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name);
diff --git a/patches/api/0185-Entity-Jump-API.patch b/patches/api/0185-Entity-Jump-API.patch
index 8d8898f3c1..86c29fafdc 100644
--- a/patches/api/0185-Entity-Jump-API.patch
+++ b/patches/api/0185-Entity-Jump-API.patch
@@ -61,10 +61,10 @@ index 0000000000000000000000000000000000000000..a6306c957fcacdcbcc8037b4ee33a167
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 2f9299f407692c51dca17ca38a6135dde259b895..1a7d802e8c3204408402ce58377108ffac2662b9 100644
+index a6bcdcbe47e17ebdd423bb0e1fb4e29eb9de01c4..90466c457657e15796b81ebe50ae873aa9f1774b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1147,4 +1147,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1149,4 +1149,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
          return this.getActiveItemHand();
      }
      // Paper end - active item API
diff --git a/patches/api/0187-Add-tick-times-API.patch b/patches/api/0187-Add-tick-times-API.patch
index 350b7fda96..40cbc279eb 100644
--- a/patches/api/0187-Add-tick-times-API.patch
+++ b/patches/api/0187-Add-tick-times-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 999f72af999a95642b5865144d1da9bd9f86aaee..10aea8b80b49a6c47b04de4d3f33eb786f08651b 100644
+index d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1..385be33869f3850f8b1d3e690c8e0fc43adcbdce 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2147,6 +2147,25 @@ public final class Bukkit {
+@@ -2170,6 +2170,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
@@ -35,10 +35,10 @@ index 999f72af999a95642b5865144d1da9bd9f86aaee..10aea8b80b49a6c47b04de4d3f33eb78
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8445a62af2ca5dd47b4905d75b31d9d6ea0623ea..4b3fadfc90299cc717d85cb9856662e2b3230872 100644
+index cf242e2e6d538d3d38b7b10321ab375e018b24b1..d6d83b22389aee98967adda2631fa65ecbf00781 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1817,6 +1817,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1836,6 +1836,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      public double[] getTPS();
diff --git a/patches/api/0188-Expose-MinecraftServer-isRunning.patch b/patches/api/0188-Expose-MinecraftServer-isRunning.patch
index 7800f62ac6..0f50363b31 100644
--- a/patches/api/0188-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0188-Expose-MinecraftServer-isRunning.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 10aea8b80b49a6c47b04de4d3f33eb786f08651b..803ca460cf91f6760d7b16e1310a23d6b09725b3 100644
+index 385be33869f3850f8b1d3e690c8e0fc43adcbdce..f24d57a89dc4fdf73298bbb4cc187794c7bd6706 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2498,6 +2498,15 @@ public final class Bukkit {
+@@ -2521,6 +2521,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
@@ -26,10 +26,10 @@ index 10aea8b80b49a6c47b04de4d3f33eb786f08651b..803ca460cf91f6760d7b16e1310a23d6
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 4b3fadfc90299cc717d85cb9856662e2b3230872..1575218ee7eb563b17b542b578c10d125889a7be 100644
+index d6d83b22389aee98967adda2631fa65ecbf00781..015f1167bdc752fe6665807866caa0cda5ba0571 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2177,5 +2177,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2196,5 +2196,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return Current tick
       */
      int getCurrentTick();
diff --git a/patches/api/0190-Add-Player-Client-Options-API.patch b/patches/api/0190-Add-Player-Client-Options-API.patch
index 988d0832be..e4057fe25a 100644
--- a/patches/api/0190-Add-Player-Client-Options-API.patch
+++ b/patches/api/0190-Add-Player-Client-Options-API.patch
@@ -231,10 +231,10 @@ index 0000000000000000000000000000000000000000..1757055d821d9ec7c728aa6c1b52fa6a
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8f2a6f8ac70a7d5c2b8f9c17199b6eb88750a703..962cfd7b81a38e8e0bf4371d7c3aca80f40636af 100644
+index 33547e9e3f8f7c906a5d91b75eb62327cc1f2a3a..7429666fd1af4f4a924cf93572df5b826782af05 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3238,6 +3238,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3282,6 +3282,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void resetCooldown();
      // Paper end - attack cooldown API
  
diff --git a/patches/api/0193-Add-item-slot-convenience-methods.patch b/patches/api/0192-Add-item-slot-convenience-methods.patch
index 20638212e8..20638212e8 100644
--- a/patches/api/0193-Add-item-slot-convenience-methods.patch
+++ b/patches/api/0192-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
deleted file mode 100644
index 2fa02a7788..0000000000
--- a/patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Wesley Smith <[email protected]>
-Date: Fri, 24 Apr 2020 18:30:26 -0400
-Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded
- constructor values.
-
-While the Potion class is deprecated, it is still used in some plugins for cross-version potion handling. This issue has existed for a long time, and has caused many heaches along the way.
-
-diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
-index 266547c6da0e3270af5c9ca81268934294a7c48d..69e7ce61090e3e3a7a337a96b380c8ffe78ffb8d 100644
---- a/src/main/java/org/bukkit/potion/Potion.java
-+++ b/src/main/java/org/bukkit/potion/Potion.java
-@@ -267,7 +267,7 @@ public class Potion {
-         }
-         ItemStack itemStack = new ItemStack(material, amount);
-         PotionMeta meta = (PotionMeta) itemStack.getItemMeta();
--        meta.setBasePotionData(new PotionData(type, level == 2, extended));
-+        meta.setBasePotionData(new PotionData(type, extended, level == 2)); // Paper - fix swapped values
-         itemStack.setItemMeta(meta);
-         return itemStack;
-     }
diff --git a/patches/api/0194-Villager-Restocks-API.patch b/patches/api/0193-Villager-Restocks-API.patch
index 5b3898429d..5b3898429d 100644
--- a/patches/api/0194-Villager-Restocks-API.patch
+++ b/patches/api/0193-Villager-Restocks-API.patch
diff --git a/patches/api/0195-Expose-game-version.patch b/patches/api/0194-Expose-game-version.patch
index 698a089e9a..785d8563d2 100644
--- a/patches/api/0195-Expose-game-version.patch
+++ b/patches/api/0194-Expose-game-version.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 803ca460cf91f6760d7b16e1310a23d6b09725b3..377e9979c5bbc50398d521ff038956f80d7376b1 100644
+index f24d57a89dc4fdf73298bbb4cc187794c7bd6706..b608a6dc26bfc6d08f1e31107fed8ef1aaf90e1d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -159,6 +159,18 @@ public final class Bukkit {
+@@ -161,6 +161,18 @@ public final class Bukkit {
          return server.getBukkitVersion();
      }
  
@@ -28,10 +28,10 @@ index 803ca460cf91f6760d7b16e1310a23d6b09725b3..377e9979c5bbc50398d521ff038956f8
       * Gets a view of all currently logged in players. This {@linkplain
       * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1575218ee7eb563b17b542b578c10d125889a7be..7ed98561c6320132501c89d70254870e6ec03e77 100644
+index 015f1167bdc752fe6665807866caa0cda5ba0571..987e01f48f7f8b19fd6292a11988b1aeb90a09f6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -117,6 +117,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -119,6 +119,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public String getBukkitVersion();
  
diff --git a/patches/api/0196-Add-Mob-Goal-API.patch b/patches/api/0195-Add-Mob-Goal-API.patch
index 4b35a66541..102b780fac 100644
--- a/patches/api/0196-Add-Mob-Goal-API.patch
+++ b/patches/api/0195-Add-Mob-Goal-API.patch
@@ -226,10 +226,10 @@ index 0000000000000000000000000000000000000000..e21f7574763dd4f13794f91bbef192ef
 +    <T extends Mob> Collection<Goal<T>> getRunningGoalsWithout(@NotNull T mob, @NotNull GoalType type);
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 377e9979c5bbc50398d521ff038956f80d7376b1..9e14744feb0c5ad0b8df1bcbaf19d75327ad2148 100644
+index b608a6dc26bfc6d08f1e31107fed8ef1aaf90e1d..79db7b5c25a7c824b107a5c79f40c61983d2757c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2519,6 +2519,16 @@ public final class Bukkit {
+@@ -2542,6 +2542,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
@@ -247,10 +247,10 @@ index 377e9979c5bbc50398d521ff038956f80d7376b1..9e14744feb0c5ad0b8df1bcbaf19d753
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7ed98561c6320132501c89d70254870e6ec03e77..1fda10dcabdcfe0cd51c3532576bddeb4fa877b8 100644
+index 987e01f48f7f8b19fd6292a11988b1aeb90a09f6..8aba385b9d1a9b71c3304f1d802f18d4434f34d5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2194,5 +2194,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2213,5 +2213,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if server is in the process of being shutdown
       */
      boolean isStopping();
diff --git a/patches/api/0197-Add-villager-reputation-API.patch b/patches/api/0196-Add-villager-reputation-API.patch
index 4a2093aab9..4a2093aab9 100644
--- a/patches/api/0197-Add-villager-reputation-API.patch
+++ b/patches/api/0196-Add-villager-reputation-API.patch
diff --git a/patches/api/0198-Spawn-Reason-API.patch b/patches/api/0197-Spawn-Reason-API.patch
index 97edb6ab3f..97edb6ab3f 100644
--- a/patches/api/0198-Spawn-Reason-API.patch
+++ b/patches/api/0197-Spawn-Reason-API.patch
diff --git a/patches/api/0199-Potential-bed-API.patch b/patches/api/0198-Potential-bed-API.patch
index a842554f35..a842554f35 100644
--- a/patches/api/0199-Potential-bed-API.patch
+++ b/patches/api/0198-Potential-bed-API.patch
diff --git a/patches/api/0200-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch
index d834d6cdb3..d834d6cdb3 100644
--- a/patches/api/0200-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0200-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 4fe75c486c..4fe75c486c 100644
--- a/patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/api/0200-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0202-Support-components-in-ItemMeta.patch b/patches/api/0201-Support-components-in-ItemMeta.patch
index dc804cc5b2..e3707f1e60 100644
--- a/patches/api/0202-Support-components-in-ItemMeta.patch
+++ b/patches/api/0201-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 f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08df7837a5d 100644
+index 348ad8932fc55830f83ccc60d5cc4aaf8a29d164..b039fc170c0760f15fa0f9220da2032a23e5c455 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -5,6 +5,7 @@ import java.util.Collection;
@@ -16,7 +16,7 @@ index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08d
  import org.bukkit.attribute.Attribute;
  import org.bukkit.attribute.AttributeModifier;
  import org.bukkit.configuration.serialization.ConfigurationSerializable;
-@@ -63,6 +64,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -65,6 +66,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @NotNull
      String getDisplayName();
  
@@ -37,7 +37,7 @@ index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08d
      /**
       * Sets the display name.
       *
-@@ -72,6 +87,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -74,6 +89,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @Deprecated // Paper
      void setDisplayName(@Nullable String name);
  
@@ -52,9 +52,9 @@ index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08d
 +    void setDisplayNameComponent(@Nullable net.md_5.bungee.api.chat.BaseComponent[] component);
 +    // Paper end
      /**
-      * Checks for existence of a localized name.
-      *
-@@ -141,6 +166,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+      * Checks for existence of an item name.
+      * <br>
+@@ -181,6 +206,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @Nullable
      List<String> getLore();
  
@@ -74,7 +74,7 @@ index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08d
      /**
       * Sets the lore for this item.
       * Removes lore when given null.
-@@ -151,6 +189,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -191,6 +229,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @Deprecated // Paper
      void setLore(@Nullable List<String> lore);
  
diff --git a/patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0202-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
index 6c725bc833..6c725bc833 100644
--- a/patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/api/0202-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0204-Add-entity-liquid-API.patch b/patches/api/0203-Add-entity-liquid-API.patch
index f1e3bccd46..a1ac30dc85 100644
--- a/patches/api/0204-Add-entity-liquid-API.patch
+++ b/patches/api/0203-Add-entity-liquid-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 11a77f977c6abc031cf5a4d58924bc7af5e7ea53..3deccdf110c2cb74444b5d715082fbbdaa8f20ce 100644
+index 66716da0b475524917d4153e481100b795ea11a9..6a9cd00110988a0d0bd89f0252cc0f21c36982c0 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -848,5 +848,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -859,5 +859,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull
      org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
diff --git a/patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0204-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
index 3906e443da..3906e443da 100644
--- a/patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/api/0204-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0206-Add-BellRingEvent.patch b/patches/api/0205-Add-BellRingEvent.patch
index 2d5cb2a8b3..2d5cb2a8b3 100644
--- a/patches/api/0206-Add-BellRingEvent.patch
+++ b/patches/api/0205-Add-BellRingEvent.patch
diff --git a/patches/api/0207-Brand-support.patch b/patches/api/0206-Brand-support.patch
index 9b1680d885..31a2278550 100644
--- a/patches/api/0207-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 962cfd7b81a38e8e0bf4371d7c3aca80f40636af..219a819731ec081fea4fe3ac75e617f8cd6afbbf 100644
+index 7429666fd1af4f4a924cf93572df5b826782af05..b0c0fd6687af5676d85094304ced25c1c444bc90 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3351,6 +3351,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3395,6 +3395,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          // Paper end
      }
  
diff --git a/patches/api/0208-Add-moon-phase-API.patch b/patches/api/0207-Add-moon-phase-API.patch
index d949b274a6..d949b274a6 100644
--- a/patches/api/0208-Add-moon-phase-API.patch
+++ b/patches/api/0207-Add-moon-phase-API.patch
diff --git a/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch
index e862e67086..19b048763f 100644
--- a/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 1a7d802e8c3204408402ce58377108ffac2662b9..7dbb3737cd175365b89a5c8d0542b16e812b8629 100644
+index 90466c457657e15796b81ebe50ae873aa9f1774b..79ef7733ba6fd7d34f8bf87218779af5ba74d084 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1169,4 +1169,29 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1171,4 +1171,29 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setJumping(boolean jumping);
      // Paper end - entity jump API
diff --git a/patches/api/0210-Add-more-Evoker-API.patch b/patches/api/0209-Add-more-Evoker-API.patch
index 0d6f0f7328..0d6f0f7328 100644
--- a/patches/api/0210-Add-more-Evoker-API.patch
+++ b/patches/api/0209-Add-more-Evoker-API.patch
diff --git a/patches/api/0211-Add-methods-to-get-translation-keys.patch b/patches/api/0210-Add-methods-to-get-translation-keys.patch
index 4208d897a6..72c9ae1cbf 100644
--- a/patches/api/0211-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0210-Add-methods-to-get-translation-keys.patch
@@ -119,7 +119,7 @@ index 81e45984a88fc84acd0f76d825abf4ddaed0ac3b..fdc42a79c5af30fdade41ee99245e664
  
      /**
 diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java
-index cca5267019052f77149f9913babd8b17abafe94f..be827e7fef0acb17bd41aeff9dc3dc4da3718e5e 100644
+index dc66bd69646ac949d1386ce8f6ff913e9475439d..4482e8f2c617c2f51b2b53762e775d118002363a 100644
 --- a/src/main/java/org/bukkit/GameRule.java
 +++ b/src/main/java/org/bukkit/GameRule.java
 @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable;
@@ -131,7 +131,7 @@ index cca5267019052f77149f9913babd8b17abafe94f..be827e7fef0acb17bd41aeff9dc3dc4d
  
      private static Map<String, GameRule<?>> gameRules = new HashMap<>();
      // Boolean rules
-@@ -350,4 +350,11 @@ public final class GameRule<T> {
+@@ -355,4 +355,11 @@ public final class GameRule<T> {
      public static GameRule<?>[] values() {
          return gameRules.values().toArray(new GameRule<?>[gameRules.size()]);
      }
@@ -144,10 +144,10 @@ index cca5267019052f77149f9913babd8b17abafe94f..be827e7fef0acb17bd41aeff9dc3dc4d
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index c24fe19600fa8440c130eaea247d5874da3873ec..af1dca2385215e8fd19353aa6e9c024d4ad814e1 100644
+index 76c96e1a82366aafa0148a1260500a38cea12f37..6551bb9409f9714033532b5cfe9219ed84e438f2 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -122,7 +122,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -123,7 +123,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 c24fe19600fa8440c130eaea247d5874da3873ec..af1dca2385215e8fd19353aa6e9c024d
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
      STONE(22948),
-@@ -4699,6 +4699,15 @@ public enum Material implements Keyed, Translatable {
+@@ -4737,6 +4737,15 @@ public enum Material implements Keyed, Translatable {
          }
          return false;
      }
@@ -172,7 +172,7 @@ index c24fe19600fa8440c130eaea247d5874da3873ec..af1dca2385215e8fd19353aa6e9c024d
      // Paper end
  
      /**
-@@ -11402,9 +11411,11 @@ public enum Material implements Keyed, Translatable {
+@@ -11473,9 +11482,11 @@ public enum Material implements Keyed, Translatable {
       * material
       * @see #getBlockTranslationKey()
       * @see #getItemTranslationKey()
@@ -185,7 +185,7 @@ index c24fe19600fa8440c130eaea247d5874da3873ec..af1dca2385215e8fd19353aa6e9c024d
          if (this.isItem()) {
              return Bukkit.getUnsafe().getItemTranslationKey(this);
 diff --git a/src/main/java/org/bukkit/MusicInstrument.java b/src/main/java/org/bukkit/MusicInstrument.java
-index a7573ce8c6dff9862c97ce74650284b4a42e7989..ee5368372e136541eafe1d7ffb395de670fe4843 100644
+index eae90e72b1dff5ab3b1a4fdcfe57187e85fe4d49..62d2b3f950860dee0898d77b0a29635c3f9a7e23 100644
 --- a/src/main/java/org/bukkit/MusicInstrument.java
 +++ b/src/main/java/org/bukkit/MusicInstrument.java
 @@ -7,7 +7,7 @@ import java.util.Collections;
@@ -195,8 +195,8 @@ index a7573ce8c6dff9862c97ce74650284b4a42e7989..ee5368372e136541eafe1d7ffb395de6
 -public abstract class MusicInstrument implements Keyed {
 +public abstract class MusicInstrument implements Keyed, net.kyori.adventure.translation.Translatable { // Paper - translation keys
  
-     public static final MusicInstrument PONDER = getInstrument("ponder_goat_horn");
-     public static final MusicInstrument SING = getInstrument("sing_goat_horn");
+     public static final MusicInstrument PONDER_GOAT_HORN = getInstrument("ponder_goat_horn");
+     public static final MusicInstrument SING_GOAT_HORN = getInstrument("sing_goat_horn");
 @@ -52,4 +52,11 @@ public abstract class MusicInstrument implements Keyed {
  
          return instrument;
@@ -233,7 +233,7 @@ index e3faa2c675c85a9cbdbbb1debec0ff81c58a1bbd..fd1629c2d2028a88fb3d56b0aeb833d1
      String getTranslationKey();
  }
 diff --git a/src/main/java/org/bukkit/attribute/Attribute.java b/src/main/java/org/bukkit/attribute/Attribute.java
-index 7d5e6961e7e836f57cb7114ae7cef9dbd95ad0a1..66027c2ea32d44a5d2df18d6414668d847f6fd9c 100644
+index 3a7f6fd862dc2dd72366089ce99a0e96d07c0fdc..063cb21e33d039933e9ef295564db595cfd9f8c9 100644
 --- a/src/main/java/org/bukkit/attribute/Attribute.java
 +++ b/src/main/java/org/bukkit/attribute/Attribute.java
 @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
@@ -245,7 +245,7 @@ index 7d5e6961e7e836f57cb7114ae7cef9dbd95ad0a1..66027c2ea32d44a5d2df18d6414668d8
  
      /**
       * Maximum health of an Entity.
-@@ -85,4 +85,12 @@ public enum Attribute implements Keyed, Translatable {
+@@ -117,4 +117,12 @@ public enum Attribute implements Keyed, Translatable {
      public String getTranslationKey() {
          return Bukkit.getUnsafe().getTranslationKey(this);
      }
@@ -310,10 +310,10 @@ index bf29d9b733afc7c62725d259f4920c4f211cc6d0..1d3812db989a55b6f31bb30dffe70323
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index 350d52f4dd97a7e6a6a9a967e1c6a8781feda22e..13f25ff4a4dd5a98f5f690c54e5cba6ef145c2d0 100644
+index dddd0e74962d5713c4bb6219fba48aae5763e9ea..5b831dc9666b68fd9f4497aa3b07beba13fb215f 100644
 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java
 +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * The various type of enchantments that may be added to armour or weapons
   */
@@ -338,7 +338,7 @@ index c4f86ba1037f3f0e5d697a0962d71d6f8c7c1fbe..ac0371285370594d4de1554871b19bbc
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index a4578c520aa1078a741aac4b12fe89bf82b3c465..550d66e0d41878717c6a92caade4a8413674f012 100644
+index c52e386ffa08abbbd38683792b281665cc98bd31..4ff2f0b70a89b3d1fb3f588d014e09b3cf8ed16f 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;
@@ -350,7 +350,7 @@ index a4578c520aa1078a741aac4b12fe89bf82b3c465..550d66e0d41878717c6a92caade4a841
  
      // These strings MUST match the strings in nms.EntityTypes and are case sensitive.
      /**
-@@ -443,10 +443,22 @@ public enum EntityType implements Keyed, Translatable {
+@@ -438,10 +438,22 @@ public enum EntityType implements Keyed, Translatable {
  
      @Override
      @NotNull
diff --git a/patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0211-Create-HoverEvent-from-ItemStack-Entity.patch
index 2ed2600f9a..2ed2600f9a 100644
--- a/patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/api/0211-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0212-Add-additional-open-container-api-to-HumanEntity.patch
index 43e6937d05..43e6937d05 100644
--- a/patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/api/0212-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0213-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 75dff33979..75dff33979 100644
--- a/patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/api/0213-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0215-Entity-isTicking.patch b/patches/api/0214-Entity-isTicking.patch
index 778cc4b6a6..37d0f8dce3 100644
--- a/patches/api/0215-Entity-isTicking.patch
+++ b/patches/api/0214-Entity-isTicking.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 3deccdf110c2cb74444b5d715082fbbdaa8f20ce..9711a8077238383f23fb7aa2c20b2c089776e3f8 100644
+index 6a9cd00110988a0d0bd89f0252cc0f21c36982c0..e9c3c5c4099f7bf7f83bde0b47fd193a3b401f0a 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -883,5 +883,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -894,5 +894,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * Check if entity is in lava
       */
      boolean isInLava();
diff --git a/patches/api/0216-Villager-resetOffers.patch b/patches/api/0215-Villager-resetOffers.patch
index 60fedfba0f..60fedfba0f 100644
--- a/patches/api/0216-Villager-resetOffers.patch
+++ b/patches/api/0215-Villager-resetOffers.patch
diff --git a/patches/api/0217-Player-elytra-boost-API.patch b/patches/api/0216-Player-elytra-boost-API.patch
index 62287ccf59..29d5923494 100644
--- a/patches/api/0217-Player-elytra-boost-API.patch
+++ b/patches/api/0216-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 219a819731ec081fea4fe3ac75e617f8cd6afbbf..f52f35902cc6a8af5ee60cf815caef7a43372158 100644
+index b0c0fd6687af5676d85094304ced25c1c444bc90..28a811be93b29f105dad1db91a8adccbdf9fcaf7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3245,6 +3245,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3289,6 +3289,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      <T> @NotNull T getClientOption(com.destroystokyo.paper.@NotNull ClientOption<T> option);
      // Paper end - client option API
  
diff --git a/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0217-Add-getOfflinePlayerIfCached-String.patch
index 2e8d4ad4b3..402eff8c38 100644
--- a/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0217-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9e14744feb0c5ad0b8df1bcbaf19d75327ad2148..e832c6a8a10bc29d9ab20cbdf394cf836eb2f6a5 100644
+index 79db7b5c25a7c824b107a5c79f40c61983d2757c..732ed3724e784ad659cb4411dbd73b42a8330a2c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1361,6 +1361,27 @@ public final class Bukkit {
+@@ -1373,6 +1373,27 @@ public final class Bukkit {
          return server.getOfflinePlayer(name);
      }
  
@@ -37,10 +37,10 @@ index 9e14744feb0c5ad0b8df1bcbaf19d75327ad2148..e832c6a8a10bc29d9ab20cbdf394cf83
       * Gets the player by the given UUID, regardless if they are offline or
       * online.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1fda10dcabdcfe0cd51c3532576bddeb4fa877b8..9477563308adc64fff065eb0a50654baa0d22b84 100644
+index 8aba385b9d1a9b71c3304f1d802f18d4434f34d5..395f7910f535bfd33a5676b011ab62a53e30e140 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1147,6 +1147,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1157,6 +1157,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
diff --git a/patches/api/0219-Add-ignore-discounts-API.patch b/patches/api/0218-Add-ignore-discounts-API.patch
index 89655ddef8..89655ddef8 100644
--- a/patches/api/0219-Add-ignore-discounts-API.patch
+++ b/patches/api/0218-Add-ignore-discounts-API.patch
diff --git a/patches/api/0220-Item-no-age-no-player-pickup.patch b/patches/api/0219-Item-no-age-no-player-pickup.patch
index d3be2301af..d3be2301af 100644
--- a/patches/api/0220-Item-no-age-no-player-pickup.patch
+++ b/patches/api/0219-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0221-Beacon-API-custom-effect-ranges.patch b/patches/api/0220-Beacon-API-custom-effect-ranges.patch
index effd7b3ae9..effd7b3ae9 100644
--- a/patches/api/0221-Beacon-API-custom-effect-ranges.patch
+++ b/patches/api/0220-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0222-Add-API-for-quit-reason.patch b/patches/api/0221-Add-API-for-quit-reason.patch
index 0350afaf92..0350afaf92 100644
--- a/patches/api/0222-Add-API-for-quit-reason.patch
+++ b/patches/api/0221-Add-API-for-quit-reason.patch
diff --git a/patches/api/0223-Add-Destroy-Speed-API.patch b/patches/api/0222-Add-Destroy-Speed-API.patch
index cdf304d00b..cdf304d00b 100644
--- a/patches/api/0223-Add-Destroy-Speed-API.patch
+++ b/patches/api/0222-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0224-Add-LivingEntity-clearActiveItem.patch b/patches/api/0223-Add-LivingEntity-clearActiveItem.patch
index c90bd62fa6..ae2af3de67 100644
--- a/patches/api/0224-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0223-Add-LivingEntity-clearActiveItem.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 7dbb3737cd175365b89a5c8d0542b16e812b8629..bd871bf479cb9f4b31832ac5cb363f314b32a047 100644
+index 79ef7733ba6fd7d34f8bf87218779af5ba74d084..739a8ef8b0d141dd01a15df8666f31fef4fd590e 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1059,6 +1059,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1061,6 +1061,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      org.bukkit.inventory.@NotNull ItemStack getActiveItem();
  
diff --git a/patches/api/0225-Add-PlayerItemCooldownEvent.patch b/patches/api/0224-Add-PlayerItemCooldownEvent.patch
index ae5118c7da..ae5118c7da 100644
--- a/patches/api/0225-Add-PlayerItemCooldownEvent.patch
+++ b/patches/api/0224-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0226-More-lightning-API.patch b/patches/api/0225-More-lightning-API.patch
index c4924dcdf2..c4924dcdf2 100644
--- a/patches/api/0226-More-lightning-API.patch
+++ b/patches/api/0225-More-lightning-API.patch
diff --git a/patches/api/0227-Add-PlayerShearBlockEvent.patch b/patches/api/0226-Add-PlayerShearBlockEvent.patch
index 1506924937..1506924937 100644
--- a/patches/api/0227-Add-PlayerShearBlockEvent.patch
+++ b/patches/api/0226-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0228-Player-Chunk-Load-Unload-Events.patch b/patches/api/0227-Player-Chunk-Load-Unload-Events.patch
index c1779bb840..c1779bb840 100644
--- a/patches/api/0228-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/api/0227-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0229-Expose-LivingEntity-hurt-direction.patch b/patches/api/0228-Expose-LivingEntity-hurt-direction.patch
index 2bff91fc78..49b8ae1828 100644
--- a/patches/api/0229-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0228-Expose-LivingEntity-hurt-direction.patch
@@ -26,10 +26,10 @@ index 5ecfb98540c00da05b13bc5370debb89c52cc76f..083d5798ccc7f37c6df5e234c7ef2332
       * Get the sleep ticks of the player. This value may be capped.
       *
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index bd871bf479cb9f4b31832ac5cb363f314b32a047..54cdbfdc5d2280069045317bac919ff4689872f5 100644
+index 739a8ef8b0d141dd01a15df8666f31fef4fd590e..ac0f03b6b3d451b4540dd2efee729b32f7f9e371 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1199,4 +1199,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1201,4 +1201,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void playPickupItemAnimation(@NotNull Item item, int quantity);
      // Paper end - pickup animation API
diff --git a/patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0229-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 00552e9137..00552e9137 100644
--- a/patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0229-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0231-Added-PlayerTradeEvent.patch b/patches/api/0230-Added-PlayerTradeEvent.patch
index 11ad019021..11ad019021 100644
--- a/patches/api/0231-Added-PlayerTradeEvent.patch
+++ b/patches/api/0230-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0232-Add-TargetHitEvent-API.patch b/patches/api/0231-Add-TargetHitEvent-API.patch
index 6c68224363..6c68224363 100644
--- a/patches/api/0232-Add-TargetHitEvent-API.patch
+++ b/patches/api/0231-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0233-Additional-Block-Material-API-s.patch b/patches/api/0232-Additional-Block-Material-API-s.patch
index ab3e6f9ac6..ab3e6f9ac6 100644
--- a/patches/api/0233-Additional-Block-Material-API-s.patch
+++ b/patches/api/0232-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0233-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index d297dd5c24..d297dd5c24 100644
--- a/patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0233-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0234-Add-PlayerFlowerPotManipulateEvent.patch
index cb08fd1404..cb08fd1404 100644
--- a/patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/api/0234-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0236-Zombie-API-breaking-doors.patch b/patches/api/0235-Zombie-API-breaking-doors.patch
index 24118c13ee..24118c13ee 100644
--- a/patches/api/0236-Zombie-API-breaking-doors.patch
+++ b/patches/api/0235-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0237-Add-EntityLoadCrossbowEvent.patch b/patches/api/0236-Add-EntityLoadCrossbowEvent.patch
index 2a60c84538..2a60c84538 100644
--- a/patches/api/0237-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/api/0236-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0238-Added-WorldGameRuleChangeEvent.patch b/patches/api/0237-Added-WorldGameRuleChangeEvent.patch
index 348efda0ca..348efda0ca 100644
--- a/patches/api/0238-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/api/0237-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0239-Added-ServerResourcesReloadedEvent.patch b/patches/api/0238-Added-ServerResourcesReloadedEvent.patch
index 150b70e6cc..150b70e6cc 100644
--- a/patches/api/0239-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/api/0238-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0240-Add-BlockFailedDispenseEvent.patch b/patches/api/0239-Add-BlockFailedDispenseEvent.patch
index 4f480e7417..4f480e7417 100644
--- a/patches/api/0240-Add-BlockFailedDispenseEvent.patch
+++ b/patches/api/0239-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0241-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0240-Added-PlayerLecternPageChangeEvent.patch
index 3c9f223aa5..3c9f223aa5 100644
--- a/patches/api/0241-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/api/0240-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0241-Added-PlayerLoomPatternSelectEvent.patch
index 766e838ec8..766e838ec8 100644
--- a/patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/api/0241-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0242-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index c25fbd796f..c25fbd796f 100644
--- a/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/api/0242-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0244-Add-sendOpLevel-API.patch b/patches/api/0243-Add-sendOpLevel-API.patch
index 3ea062cd8c..c6d0eae4c3 100644
--- a/patches/api/0244-Add-sendOpLevel-API.patch
+++ b/patches/api/0243-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 f52f35902cc6a8af5ee60cf815caef7a43372158..d735ed635022d170c6b1080ed87f3c2a799202f6 100644
+index 28a811be93b29f105dad1db91a8adccbdf9fcaf7..752b2bac47588c0f75a13a7e6ec2be3c2f5a149e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3264,6 +3264,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3308,6 +3308,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      }
      // Paper end - elytra boost API
  
diff --git a/patches/api/0245-Add-PaperRegistry.patch b/patches/api/0244-Add-PaperRegistry.patch
index 8cc1e1b931..8cc1e1b931 100644
--- a/patches/api/0245-Add-PaperRegistry.patch
+++ b/patches/api/0244-Add-PaperRegistry.patch
diff --git a/patches/api/0246-Add-StructuresLocateEvent.patch b/patches/api/0245-Add-StructuresLocateEvent.patch
index 746b674c5d..eacbdcf8ea 100644
--- a/patches/api/0246-Add-StructuresLocateEvent.patch
+++ b/patches/api/0245-Add-StructuresLocateEvent.patch
@@ -513,10 +513,10 @@ index 0000000000000000000000000000000000000000..1e7b53f9bc13dcd5a0a4a40004591e4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index b3f8a2611ceb57f5d0b5c300fa80d8bad121498d..4bc53793aade0887fa650a4bbf51d2e57678bd90 100644
+index 18be407d4fb401d89f3a46a9bce044bacd8a888f..af3dab66c904d1fc0bbbdb8898e9ff8b2631bca7 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -268,6 +268,17 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -283,6 +283,17 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
       * @see GameEvent
       */
      Registry<GameEvent> GAME_EVENT = Objects.requireNonNull(Bukkit.getRegistry(GameEvent.class), "No registry present for GameEvent. This is a bug.");
diff --git a/patches/api/0247-Add-BlockPreDispenseEvent.patch b/patches/api/0246-Add-BlockPreDispenseEvent.patch
index 6a8e491828..6a8e491828 100644
--- a/patches/api/0247-Add-BlockPreDispenseEvent.patch
+++ b/patches/api/0246-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0247-Added-PlayerChangeBeaconEffectEvent.patch
index 4d84c9e1b1..4d84c9e1b1 100644
--- a/patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/api/0247-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0248-Added-PlayerStonecutterRecipeSelectEvent.patch
index 46377a6798..46377a6798 100644
--- a/patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/api/0248-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0249-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index f85f2a4f26..f85f2a4f26 100644
--- a/patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0249-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0251-add-DragonEggFormEvent.patch b/patches/api/0250-add-DragonEggFormEvent.patch
index 3b40a9f99d..3b40a9f99d 100644
--- a/patches/api/0251-add-DragonEggFormEvent.patch
+++ b/patches/api/0250-add-DragonEggFormEvent.patch
diff --git a/patches/api/0252-EntityMoveEvent.patch b/patches/api/0251-EntityMoveEvent.patch
index d9e828eb8c..d9e828eb8c 100644
--- a/patches/api/0252-EntityMoveEvent.patch
+++ b/patches/api/0251-EntityMoveEvent.patch
diff --git a/patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0252-Allow-adding-items-to-BlockDropItemEvent.patch
index c6b7565fe4..c6b7565fe4 100644
--- a/patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/api/0252-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0253-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 7cc686da5a..7cc686da5a 100644
--- a/patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/api/0253-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0255-living-entity-allow-attribute-registration.patch b/patches/api/0254-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0255-living-entity-allow-attribute-registration.patch
+++ b/patches/api/0254-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0256-Add-missing-effects.patch b/patches/api/0255-Add-missing-effects.patch
index 63c42ebfec..63710b51cc 100644
--- a/patches/api/0256-Add-missing-effects.patch
+++ b/patches/api/0255-Add-missing-effects.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add missing effects
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef639e810bd 100644
+index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..2d50f5e3f95e280ae5741514d5eba6440d9966ce 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
-@@ -132,12 +132,12 @@ public enum Effect {
+@@ -131,9 +131,9 @@ public enum Effect {
      /**
       * Sound of a block breaking. Needs block ID as additional info.
       */
@@ -20,12 +20,8 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef6
 +     * Visual effect of a splash potion breaking. Needs color data value as
       * additional info.
       */
--    POTION_BREAK(2002, Type.VISUAL, Potion.class),
-+    POTION_BREAK(2002, Type.VISUAL, Color.class, Potion.class), // Paper - color is correct
-     /**
-      * Visual effect of an instant splash potion breaking. Needs color data
-      * value as additional info.
-@@ -337,21 +337,146 @@ public enum Effect {
+     POTION_BREAK(2002, Type.VISUAL, Color.class),
+@@ -336,21 +336,146 @@ public enum Effect {
       * block.
       */
      OXIDISED_COPPER_SCRAPE(3005, Type.VISUAL),
@@ -176,7 +172,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef6
      }
  
      /**
-@@ -367,8 +492,10 @@ public enum Effect {
+@@ -366,8 +491,10 @@ public enum Effect {
  
      /**
       * @return The type of the effect.
@@ -187,7 +183,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef6
      public Type getType() {
          return this.type;
      }
-@@ -379,8 +506,15 @@ public enum Effect {
+@@ -378,8 +505,15 @@ public enum Effect {
       */
      @Nullable
      public Class<?> getData() {
@@ -204,7 +200,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef6
  
      /**
       * Gets the Effect associated with the given ID.
-@@ -397,12 +531,26 @@ public enum Effect {
+@@ -396,12 +530,26 @@ public enum Effect {
  
      static {
          for (Effect effect : values()) {
diff --git a/patches/api/0257-Expose-Tracked-Players.patch b/patches/api/0256-Expose-Tracked-Players.patch
index 6c5f47bccd..368fb84d94 100644
--- a/patches/api/0257-Expose-Tracked-Players.patch
+++ b/patches/api/0256-Expose-Tracked-Players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 9711a8077238383f23fb7aa2c20b2c089776e3f8..b32683b5e4431950d9dccec3ae11f6377c7b0da7 100644
+index e9c3c5c4099f7bf7f83bde0b47fd193a3b401f0a..c7d6a328def83619dca9b6122aeb5870e4585e70 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -888,5 +888,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -899,5 +899,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * Check if entity is inside a ticking chunk
       */
      boolean isTicking();
diff --git a/patches/api/0258-Cache-the-result-of-Material-isBlock.patch b/patches/api/0257-Cache-the-result-of-Material-isBlock.patch
index ee04af53bb..6077bfb54d 100644
--- a/patches/api/0258-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0257-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 af1dca2385215e8fd19353aa6e9c024d4ad814e1..85604d2c364c41fed24257a9b02ceeb58712f6a2 100644
+index 6551bb9409f9714033532b5cfe9219ed84e438f2..852217efbb8dfab445e625a61f8e7f7ba51e5fd6 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4643,6 +4643,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4681,6 +4681,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 af1dca2385215e8fd19353aa6e9c024d4ad814e1..85604d2c364c41fed24257a9b02ceeb5
  
      private Material(final int id) {
          this(id, 64);
-@@ -4841,6 +4842,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4879,6 +4880,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 af1dca2385215e8fd19353aa6e9c024d4ad814e1..85604d2c364c41fed24257a9b02ceeb5
          switch (this) {
              //<editor-fold defaultstate="collapsed" desc="isBlock">
              case ACACIA_BUTTON:
-@@ -6082,6 +6088,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -6123,6 +6129,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/0259-Add-worldborder-events.patch b/patches/api/0258-Add-worldborder-events.patch
index 9f3ae70435..9f3ae70435 100644
--- a/patches/api/0259-Add-worldborder-events.patch
+++ b/patches/api/0258-Add-worldborder-events.patch
diff --git a/patches/api/0260-added-PlayerNameEntityEvent.patch b/patches/api/0259-added-PlayerNameEntityEvent.patch
index 69bd20d13e..69bd20d13e 100644
--- a/patches/api/0260-added-PlayerNameEntityEvent.patch
+++ b/patches/api/0259-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0261-Add-recipe-to-cook-events.patch b/patches/api/0260-Add-recipe-to-cook-events.patch
index 8c8712541e..8c8712541e 100644
--- a/patches/api/0261-Add-recipe-to-cook-events.patch
+++ b/patches/api/0260-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0262-Add-Block-isValidTool.patch b/patches/api/0261-Add-Block-isValidTool.patch
index 835cf73b7a..835cf73b7a 100644
--- a/patches/api/0262-Add-Block-isValidTool.patch
+++ b/patches/api/0261-Add-Block-isValidTool.patch
diff --git a/patches/api/0263-Expand-world-key-API.patch b/patches/api/0262-Expand-world-key-API.patch
index a6e79339f4..0beb2158ec 100644
--- a/patches/api/0263-Expand-world-key-API.patch
+++ b/patches/api/0262-Expand-world-key-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e832c6a8a10bc29d9ab20cbdf394cf836eb2f6a5..4b3c91575f2609ad1b1177384f6f21151a535054 100644
+index 732ed3724e784ad659cb4411dbd73b42a8330a2c..d078ea797cf4c6ab291aec3ad7fbd4740017286c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -862,6 +862,18 @@ public final class Bukkit {
+@@ -864,6 +864,18 @@ public final class Bukkit {
      public static World getWorld(@NotNull UUID uid) {
          return server.getWorld(uid);
      }
@@ -56,10 +56,10 @@ index 27eff0826d5b5b48697fefd9571886e7bbce74b1..d8b1fa79dc24138dc71e32c14bda71c1
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9477563308adc64fff065eb0a50654baa0d22b84..5bb94245c33105e57131b3d0867ef707c4aed79c 100644
+index 395f7910f535bfd33a5676b011ab62a53e30e140..e6598c36cfc98282f30a57105986a295f1c94676 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -720,6 +720,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -722,6 +722,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      public World getWorld(@NotNull UUID uid);
  
diff --git a/patches/api/0264-Item-Rarity-API.patch b/patches/api/0263-Item-Rarity-API.patch
index b074dce96b..88e0562beb 100644
--- a/patches/api/0264-Item-Rarity-API.patch
+++ b/patches/api/0263-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 85604d2c364c41fed24257a9b02ceeb58712f6a2..8fd928cfe61ab6f06c52eb5e4561fd6860e1f8d9 100644
+index 852217efbb8dfab445e625a61f8e7f7ba51e5fd6..b58383b5e3077cbd5df65b8147693aa9543493ef 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4709,6 +4709,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4747,6 +4747,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
              return Bukkit.getUnsafe().getBlockTranslationKey(this);
          }
      }
diff --git a/patches/api/0265-Expose-protocol-version.patch b/patches/api/0264-Expose-protocol-version.patch
index 3fbc03ad3e..3fbc03ad3e 100644
--- a/patches/api/0265-Expose-protocol-version.patch
+++ b/patches/api/0264-Expose-protocol-version.patch
diff --git a/patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0265-add-isDeeplySleeping-to-HumanEntity.patch
index 45207a6064..45207a6064 100644
--- a/patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0265-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0266-add-consumeFuel-to-FurnaceBurnEvent.patch
index 07036efb43..07036efb43 100644
--- a/patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0266-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0267-add-get-set-drop-chance-to-EntityEquipment.patch
index d75f180c94..d75f180c94 100644
--- a/patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0267-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0269-Added-PlayerDeepSleepEvent.patch b/patches/api/0268-Added-PlayerDeepSleepEvent.patch
index b333894788..b333894788 100644
--- a/patches/api/0269-Added-PlayerDeepSleepEvent.patch
+++ b/patches/api/0268-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0270-More-World-API.patch b/patches/api/0269-More-World-API.patch
index 139bb504c0..7340819de5 100644
--- a/patches/api/0270-More-World-API.patch
+++ b/patches/api/0269-More-World-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0a7c97aa289687cfbf6ae1a222f5eb2850f8f43e..4f724c337da08da6bbc8b1452dbd64eefd54a879 100644
+index 77314fdbd99a5cc34e7a1df4692ba8a1685ef002..f4d31d9d0f4cbd2621adf97a20b65ae83e5fd064 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3833,6 +3833,122 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3849,6 +3849,122 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
  
diff --git a/patches/api/0271-Added-PlayerBedFailEnterEvent.patch b/patches/api/0270-Added-PlayerBedFailEnterEvent.patch
index 6f9decf5fc..6f9decf5fc 100644
--- a/patches/api/0271-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/api/0270-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0272-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0271-Introduce-beacon-activation-deactivation-events.patch
index 4e173b3d6c..4e173b3d6c 100644
--- a/patches/api/0272-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/api/0271-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0273-PlayerMoveEvent-Improvements.patch b/patches/api/0272-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0273-PlayerMoveEvent-Improvements.patch
+++ b/patches/api/0272-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0273-add-RespawnFlags-to-PlayerRespawnEvent.patch
index c596be8b98..c596be8b98 100644
--- a/patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/api/0273-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0275-Add-more-WanderingTrader-API.patch b/patches/api/0274-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0275-Add-more-WanderingTrader-API.patch
+++ b/patches/api/0274-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0276-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0275-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0276-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/api/0275-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0276-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/api/0276-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0278-Inventory-close.patch b/patches/api/0277-Inventory-close.patch
index 87dfa1a083..87dfa1a083 100644
--- a/patches/api/0278-Inventory-close.patch
+++ b/patches/api/0277-Inventory-close.patch
diff --git a/patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0278-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 3103f1ce2c..3103f1ce2c 100644
--- a/patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/api/0278-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0280-Add-basic-Datapack-API.patch b/patches/api/0279-Add-basic-Datapack-API.patch
index 61600f3668..6d8473b377 100644
--- a/patches/api/0280-Add-basic-Datapack-API.patch
+++ b/patches/api/0279-Add-basic-Datapack-API.patch
@@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4b3c91575f2609ad1b1177384f6f21151a535054..6ac4c0c6c2245e6bee9575ff4804994648112d78 100644
+index d078ea797cf4c6ab291aec3ad7fbd4740017286c..c3d3c7d05a03658157d49c6ff1ea1d7d085a6fd4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -328,9 +328,11 @@ public final class Bukkit {
+@@ -330,9 +330,11 @@ public final class Bukkit {
      /**
       * Get the DataPack Manager.
       *
@@ -85,7 +85,7 @@ index 4b3c91575f2609ad1b1177384f6f21151a535054..6ac4c0c6c2245e6bee9575ff48049946
      public static DataPackManager getDataPackManager() {
          return server.getDataPackManager();
      }
-@@ -2562,6 +2564,14 @@ public final class Bukkit {
+@@ -2585,6 +2587,14 @@ public final class Bukkit {
      public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return server.getMobGoals();
      }
@@ -101,10 +101,10 @@ index 4b3c91575f2609ad1b1177384f6f21151a535054..6ac4c0c6c2245e6bee9575ff48049946
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5bb94245c33105e57131b3d0867ef707c4aed79c..052d0e420f2631ff925bb5df4a41a1cecc2d7e16 100644
+index e6598c36cfc98282f30a57105986a295f1c94676..61ee087ec4a75ee8b10e204b4cdd1bab5f066819 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -264,9 +264,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -266,9 +266,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      /**
       * Get the DataPack Manager.
       *
@@ -116,7 +116,7 @@ index 5bb94245c33105e57131b3d0867ef707c4aed79c..052d0e420f2631ff925bb5df4a41a1ce
      public DataPackManager getDataPackManager();
  
      /**
-@@ -2232,5 +2234,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2251,5 +2253,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
diff --git a/patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0280-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/api/0280-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0282-ItemStack-repair-check-API.patch b/patches/api/0281-ItemStack-repair-check-API.patch
index 0a9c5b65db..0a9c5b65db 100644
--- a/patches/api/0282-ItemStack-repair-check-API.patch
+++ b/patches/api/0281-ItemStack-repair-check-API.patch
diff --git a/patches/api/0283-More-Enchantment-API.patch b/patches/api/0282-More-Enchantment-API.patch
index e6ccd01964..8348605555 100644
--- a/patches/api/0283-More-Enchantment-API.patch
+++ b/patches/api/0282-More-Enchantment-API.patch
@@ -36,10 +36,10 @@ index 0000000000000000000000000000000000000000..e6a40c1fcea761bd66743b50e3da3d14
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index 13f25ff4a4dd5a98f5f690c54e5cba6ef145c2d0..4264c6eb7e5794019859cfca592b57e574fcd833 100644
+index 5b831dc9666b68fd9f4497aa3b07beba13fb215f..9db31242d736a5be15b48f6cfada5a5121c212dd 100644
 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java
 +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -270,11 +270,7 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
+@@ -291,11 +291,7 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
       * Cursed enchantments are found the same way treasure enchantments are
       *
       * @return true if the enchantment is cursed
@@ -51,7 +51,7 @@ index 13f25ff4a4dd5a98f5f690c54e5cba6ef145c2d0..4264c6eb7e5794019859cfca592b57e5
      public abstract boolean isCursed();
  
      /**
-@@ -308,6 +304,70 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
+@@ -329,6 +325,70 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
       * @return the name of the enchantment with {@code level} applied
       */
      public abstract net.kyori.adventure.text.@NotNull Component displayName(int level);
diff --git a/patches/api/0284-Add-Mob-lookAt-API.patch b/patches/api/0283-Add-Mob-lookAt-API.patch
index 0dd5126905..0dd5126905 100644
--- a/patches/api/0284-Add-Mob-lookAt-API.patch
+++ b/patches/api/0283-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0285-ItemStack-editMeta.patch b/patches/api/0284-ItemStack-editMeta.patch
index 5996dc1000..5996dc1000 100644
--- a/patches/api/0285-ItemStack-editMeta.patch
+++ b/patches/api/0284-ItemStack-editMeta.patch
diff --git a/patches/api/0286-Add-EntityInsideBlockEvent.patch b/patches/api/0285-Add-EntityInsideBlockEvent.patch
index 2805c40dcc..2805c40dcc 100644
--- a/patches/api/0286-Add-EntityInsideBlockEvent.patch
+++ b/patches/api/0285-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0287-Attributes-API-for-item-defaults.patch b/patches/api/0286-Attributes-API-for-item-defaults.patch
index ce95405628..ca7f6859c0 100644
--- a/patches/api/0287-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0286-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 8fd928cfe61ab6f06c52eb5e4561fd6860e1f8d9..64ca3c676703eed55b4ac8a2d4561d483c6935b1 100644
+index b58383b5e3077cbd5df65b8147693aa9543493ef..d5bdd25f6243d99b6b8c0acd6980db977f75c7e4 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4720,6 +4720,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4758,6 +4758,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/0288-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0287-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/api/0287-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0289-More-Lidded-Block-API.patch b/patches/api/0288-More-Lidded-Block-API.patch
index a89f206f9a..a89f206f9a 100644
--- a/patches/api/0289-More-Lidded-Block-API.patch
+++ b/patches/api/0288-More-Lidded-Block-API.patch
diff --git a/patches/api/0290-Add-PlayerKickEvent-causes.patch b/patches/api/0289-Add-PlayerKickEvent-causes.patch
index b23128c57d..eea9e754d1 100644
--- a/patches/api/0290-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0289-Add-PlayerKickEvent-causes.patch
@@ -5,10 +5,10 @@ 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 d735ed635022d170c6b1080ed87f3c2a799202f6..4906bec154d0f60420fbe2cffa8c7df0918ca61b 100644
+index 752b2bac47588c0f75a13a7e6ec2be3c2f5a149e..b177daa7a974125dc4ccf1bc6d119ad42dba3514 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -277,6 +277,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -321,6 +321,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param message kick message
       */
      void kick(final net.kyori.adventure.text.@Nullable Component message);
diff --git a/patches/api/0291-Add-PufferFishStateChangeEvent.patch b/patches/api/0290-Add-PufferFishStateChangeEvent.patch
index 7a719777e3..7a719777e3 100644
--- a/patches/api/0291-Add-PufferFishStateChangeEvent.patch
+++ b/patches/api/0290-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0292-Add-BellRevealRaiderEvent.patch b/patches/api/0291-Add-BellRevealRaiderEvent.patch
index c45f89fd4b..c45f89fd4b 100644
--- a/patches/api/0292-Add-BellRevealRaiderEvent.patch
+++ b/patches/api/0291-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0293-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0292-Add-ElderGuardianAppearanceEvent.patch
index 23897b7390..23897b7390 100644
--- a/patches/api/0293-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/api/0292-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0294-Add-more-line-of-sight-methods.patch b/patches/api/0293-Add-more-line-of-sight-methods.patch
index cd8d86699e..01d7f5db31 100644
--- a/patches/api/0294-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0293-Add-more-line-of-sight-methods.patch
@@ -23,7 +23,7 @@ index d8b1fa79dc24138dc71e32c14bda71c1d570ed88..b68367f123f029c3ff47eab6bfabd7a8
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 54cdbfdc5d2280069045317bac919ff4689872f5..42ece8fd69f35fe38d9e49eed1d578d19229d721 100644
+index ac0f03b6b3d451b4540dd2efee729b32f7f9e371..19aecfc5d9387d9ae94890036f845b58a9327642 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -622,6 +622,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0295-Add-WaterBottleSplashEvent.patch b/patches/api/0294-Add-WaterBottleSplashEvent.patch
index f5525245fa..f5525245fa 100644
--- a/patches/api/0295-Add-WaterBottleSplashEvent.patch
+++ b/patches/api/0294-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0296-Add-more-LimitedRegion-API.patch b/patches/api/0295-Add-more-LimitedRegion-API.patch
index 292f95c890..292f95c890 100644
--- a/patches/api/0296-Add-more-LimitedRegion-API.patch
+++ b/patches/api/0295-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0297-Missing-Entity-API.patch b/patches/api/0296-Missing-Entity-API.patch
index 76a4b85361..ed30fe8df6 100644
--- a/patches/api/0297-Missing-Entity-API.patch
+++ b/patches/api/0296-Missing-Entity-API.patch
@@ -143,10 +143,10 @@ index 0d88dce9978243a1f995c5fb448c5d71b01136eb..8b1048c94dffd058eb9fd9144f7f59fc
 +    // Paper end - Horse API
  }
 diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index 8d6caae8ba11e1fe73cd5f88657eaac5f66c9d3d..fc59d6d4c2d43b09aef3a6f30b73d26280e831fa 100644
+index 3c65da551aca046986fc0302de3ccc149ee9526c..7f989f2025d16b368829c45f08b8cc8537c99e13 100644
 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-@@ -259,4 +259,20 @@ public interface AreaEffectCloud extends Entity {
+@@ -239,4 +239,20 @@ public interface AreaEffectCloud extends Entity {
       * @param source the {@link ProjectileSource} that threw the LingeringPotion
       */
      public void setSource(@Nullable ProjectileSource source);
@@ -417,7 +417,7 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..138d2530de2410f4a9424dabd3e5ce0c
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b32683b5e4431950d9dccec3ae11f6377c7b0da7..b2466aa08ebb26f3a5edd6a4b2c7e12f7a90ef0a 100644
+index c7d6a328def83619dca9b6122aeb5870e4585e70..795e799fec7cfd65a0e08bb3f941148d85ff4c3b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -289,6 +289,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -585,10 +585,10 @@ index 6b3c9bef9a8a34ddc6ff42cf358541a2665bf5e3..9c618a27d590f186f29c5d9094fc565e
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 42ece8fd69f35fe38d9e49eed1d578d19229d721..5d62d7393dde2ccf56e9c09d44e17fdde79cf760 100644
+index 19aecfc5d9387d9ae94890036f845b58a9327642..0b789c2732e2d86f3201e65004543322a9a28b8b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -992,6 +992,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -994,6 +994,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       *
       * @param invisible If the entity is invisible
       */
@@ -596,7 +596,7 @@ index 42ece8fd69f35fe38d9e49eed1d578d19229d721..5d62d7393dde2ccf56e9c09d44e17fdd
      public void setInvisible(boolean invisible);
  
      /**
-@@ -999,6 +1000,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1001,6 +1002,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       *
       * @return Whether the entity is invisible
       */
@@ -604,7 +604,7 @@ index 42ece8fd69f35fe38d9e49eed1d578d19229d721..5d62d7393dde2ccf56e9c09d44e17fdd
      public boolean isInvisible();
  
      // Paper start
-@@ -1035,6 +1037,57 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1037,6 +1039,57 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      void setShieldBlockingDelay(int delay);
      // Paper end
  
diff --git a/patches/api/0298-Adds-PlayerArmSwingEvent.patch b/patches/api/0297-Adds-PlayerArmSwingEvent.patch
index 48e43517eb..48e43517eb 100644
--- a/patches/api/0298-Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/0297-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0298-Add-PlayerSignCommandPreprocessEvent.patch
index 8882c35337..8882c35337 100644
--- a/patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/api/0298-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0300-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0299-fix-empty-array-elements-in-command-arguments.patch
index 4b66990211..4b66990211 100644
--- a/patches/api/0300-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/api/0299-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0301-Stinger-API.patch b/patches/api/0300-Stinger-API.patch
index bef937b254..14aff16ae5 100644
--- a/patches/api/0301-Stinger-API.patch
+++ b/patches/api/0300-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5d62d7393dde2ccf56e9c09d44e17fdde79cf760..be9fa1b6209a41712767283c6329046ca2795c09 100644
+index 0b789c2732e2d86f3201e65004543322a9a28b8b..b5551eed2e9090dcbbe97cae25a0c0545285c64f 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -451,6 +451,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0301-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index aefa20a2d9..aefa20a2d9 100644
--- a/patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/api/0301-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0303-Add-PlayerSetSpawnEvent.patch b/patches/api/0302-Add-PlayerSetSpawnEvent.patch
index 42bce4d456..42bce4d456 100644
--- a/patches/api/0303-Add-PlayerSetSpawnEvent.patch
+++ b/patches/api/0302-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0304-Added-EntityDamageItemEvent.patch b/patches/api/0303-Added-EntityDamageItemEvent.patch
index 60513a1cbd..60513a1cbd 100644
--- a/patches/api/0304-Added-EntityDamageItemEvent.patch
+++ b/patches/api/0303-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0305-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0304-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0305-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/api/0304-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0305-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/api/0305-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0307-Add-BlockBreakBlockEvent.patch b/patches/api/0306-Add-BlockBreakBlockEvent.patch
index dd02c33432..dd02c33432 100644
--- a/patches/api/0307-Add-BlockBreakBlockEvent.patch
+++ b/patches/api/0306-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0307-Add-helpers-for-left-right-click-to-Action.patch
index 9dac2fe612..9dac2fe612 100644
--- a/patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch
+++ b/patches/api/0307-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0308-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 7e61d68783..7e61d68783 100644
--- a/patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/api/0308-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0310-More-CommandBlock-API.patch b/patches/api/0309-More-CommandBlock-API.patch
index c8c52c7587..c8c52c7587 100644
--- a/patches/api/0310-More-CommandBlock-API.patch
+++ b/patches/api/0309-More-CommandBlock-API.patch
diff --git a/patches/api/0311-Add-missing-team-sidebar-display-slots.patch b/patches/api/0310-Add-missing-team-sidebar-display-slots.patch
index cdecbd1764..cdecbd1764 100644
--- a/patches/api/0311-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/api/0310-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0312-add-back-EntityPortalExitEvent.patch b/patches/api/0311-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0312-add-back-EntityPortalExitEvent.patch
+++ b/patches/api/0311-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0312-Add-methods-to-find-targets-for-lightning-strikes.patch
index 9c34b1a23f..ffa6fc8f05 100644
--- a/patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0312-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 4f724c337da08da6bbc8b1452dbd64eefd54a879..5c61b9964e9abe76b5604c73bdd211a9c1c9b619 100644
+index f4d31d9d0f4cbd2621adf97a20b65ae83e5fd064..6953851a5177e9df3746f7a743f27ef02845e522 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -746,6 +746,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0314-Get-entity-default-attributes.patch b/patches/api/0313-Get-entity-default-attributes.patch
index 281ddf96f2..4da56e835d 100644
--- a/patches/api/0314-Get-entity-default-attributes.patch
+++ b/patches/api/0313-Get-entity-default-attributes.patch
@@ -32,10 +32,10 @@ index db8ffa9b303b9128be175f383fdf838a4e0719e5..b205937d1cd627c1dd660277f69891b5
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 550d66e0d41878717c6a92caade4a8413674f012..4aaf268f58038cd5d4101ec3fbfdc20b544d6678 100644
+index 4ff2f0b70a89b3d1fb3f588d014e09b3cf8ed16f..3f8ca9c4c51b14818fe1bebf56a032e10f14c758 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -457,6 +457,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
+@@ -452,6 +452,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/0315-Left-handed-API.patch b/patches/api/0314-Left-handed-API.patch
index cae17a697b..cae17a697b 100644
--- a/patches/api/0315-Left-handed-API.patch
+++ b/patches/api/0314-Left-handed-API.patch
diff --git a/patches/api/0316-Add-critical-damage-API.patch b/patches/api/0315-Add-critical-damage-API.patch
index f04ac65ac5..f04ac65ac5 100644
--- a/patches/api/0316-Add-critical-damage-API.patch
+++ b/patches/api/0315-Add-critical-damage-API.patch
diff --git a/patches/api/0317-Add-more-advancement-API.patch b/patches/api/0316-Add-more-advancement-API.patch
index 179dbdc225..179dbdc225 100644
--- a/patches/api/0317-Add-more-advancement-API.patch
+++ b/patches/api/0316-Add-more-advancement-API.patch
diff --git a/patches/api/0318-Fix-issues-with-mob-conversion.patch b/patches/api/0317-Fix-issues-with-mob-conversion.patch
index f451d967b6..f451d967b6 100644
--- a/patches/api/0318-Fix-issues-with-mob-conversion.patch
+++ b/patches/api/0317-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0319-Add-isCollidable-methods-to-various-places.patch b/patches/api/0318-Add-isCollidable-methods-to-various-places.patch
index 65ecfe9e6c..d6f48e9138 100644
--- a/patches/api/0319-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0318-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 64ca3c676703eed55b4ac8a2d4561d483c6935b1..9f86ad25a57b3f6e6bda1ce657833837cb3b2292 100644
+index d5bdd25f6243d99b6b8c0acd6980db977f75c7e4..fab8dfb1bd80490f6891687914997cc8580542cd 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4735,6 +4735,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4773,6 +4773,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);
      }
@@ -63,10 +63,10 @@ index b5fe76a6353816a2d009dfa5921f8ada92984f34..42cc4f2ee960c0abf9c6688aeee41507
  
      /**
 diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index a4f0a5270693e1c4af4fad827fa0a2ce753e07b5..c439cf0bb6c50db2b3304c60e50046f096392f9f 100644
+index fd4a9bdcfb6775dfbdb7492e6c9eb90722d2ecdc..e573e70d9e74e444783a7363e6cdac126124d86d 100644
 --- a/src/main/java/org/bukkit/block/BlockState.java
 +++ b/src/main/java/org/bukkit/block/BlockState.java
-@@ -235,4 +235,13 @@ public interface BlockState extends Metadatable {
+@@ -245,4 +245,13 @@ public interface BlockState extends Metadatable {
       *         or 'virtual' (e.g. on an itemstack)
       */
      boolean isPlaced();
diff --git a/patches/api/0320-Goat-ram-API.patch b/patches/api/0319-Goat-ram-API.patch
index 06d426a786..06d426a786 100644
--- a/patches/api/0320-Goat-ram-API.patch
+++ b/patches/api/0319-Goat-ram-API.patch
diff --git a/patches/api/0321-Add-API-for-resetting-a-single-score.patch b/patches/api/0320-Add-API-for-resetting-a-single-score.patch
index 14142e8f6c..14142e8f6c 100644
--- a/patches/api/0321-Add-API-for-resetting-a-single-score.patch
+++ b/patches/api/0320-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0321-Add-Raw-Byte-Entity-Serialization.patch
index 9e3ef08d86..d23f9d0469 100644
--- a/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0321-Add-Raw-Byte-Entity-Serialization.patch
@@ -24,10 +24,10 @@ index ca0b126bff245ed3fe69bc49c28499f7a7aa9556..6426d8585bba71b3e998b1eb078ac0fc
       * Creates and returns the next EntityId available.
       * <p>
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b2466aa08ebb26f3a5edd6a4b2c7e12f7a90ef0a..d4f84318265343242a9fca565e456c7a8c1d68f7 100644
+index 795e799fec7cfd65a0e08bb3f941148d85ff4c3b..461a48f8aa049e9b9e13acca3d54978212d9688c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -931,5 +931,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -942,5 +942,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @Deprecated
      @NotNull Set<Player> getTrackedPlayers();
diff --git a/patches/api/0323-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0322-Add-PlayerItemFrameChangeEvent.patch
index b5d6cf7bd1..b5d6cf7bd1 100644
--- a/patches/api/0323-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/api/0322-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0323-Allow-delegation-to-vanilla-chunk-gen.patch
index df4b25e905..664279d84f 100644
--- a/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0323-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6ac4c0c6c2245e6bee9575ff4804994648112d78..3d0e5045f0d6bf3bee4a94e552a57d2b7d481c02 100644
+index c3d3c7d05a03658157d49c6ff1ea1d7d085a6fd4..fa7a63ea108971790c28c4f32d280ee6f2a86c0b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2082,6 +2082,24 @@ public final class Bukkit {
+@@ -2105,6 +2105,24 @@ public final class Bukkit {
          return server.createChunkData(world);
      }
  
@@ -34,10 +34,10 @@ index 6ac4c0c6c2245e6bee9575ff4804994648112d78..3d0e5045f0d6bf3bee4a94e552a57d2b
       * Creates a boss bar instance to display to players. The progress
       * defaults to 1.0
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 052d0e420f2631ff925bb5df4a41a1cecc2d7e16..b4e520b82c026c62e5bd3840aa80cdc8d177b6f1 100644
+index 61ee087ec4a75ee8b10e204b4cdd1bab5f066819..90b1368303562e1b4af2e658e60ac564bd49ad5f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1760,6 +1760,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1779,6 +1779,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
  
diff --git a/patches/api/0325-Add-more-Campfire-API.patch b/patches/api/0324-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0325-Add-more-Campfire-API.patch
+++ b/patches/api/0324-Add-more-Campfire-API.patch
diff --git a/patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0325-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
index 5f5a4f4140..5f5a4f4140 100644
--- a/patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
+++ b/patches/api/0325-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
diff --git a/patches/api/0327-Improve-scoreboard-entries.patch b/patches/api/0326-Improve-scoreboard-entries.patch
index 0dcc796b4d..0dcc796b4d 100644
--- a/patches/api/0327-Improve-scoreboard-entries.patch
+++ b/patches/api/0326-Improve-scoreboard-entries.patch
diff --git a/patches/api/0328-Entity-powdered-snow-API.patch b/patches/api/0327-Entity-powdered-snow-API.patch
index 0eaf448d96..b00af3e946 100644
--- a/patches/api/0328-Entity-powdered-snow-API.patch
+++ b/patches/api/0327-Entity-powdered-snow-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d4f84318265343242a9fca565e456c7a8c1d68f7..6db147a2330e8046c1bfb5ec2acd8dd30827d475 100644
+index 461a48f8aa049e9b9e13acca3d54978212d9688c..1cfeb862f6a036cfd68b60cdc2364834f353f4b4 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -958,5 +958,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -969,5 +969,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return Whether the entity was successfully spawned.
       */
      public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason);
@@ -22,7 +22,7 @@ index d4f84318265343242a9fca565e456c7a8c1d68f7..6db147a2330e8046c1bfb5ec2acd8dd3
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index 01d838a60d056bf4b4a8ef9d0ac18c6f91f412e6..c61eba5f400d146a8643542048904e353df94f4b 100644
+index e0ccc090a0be507ced4d5669491311e410f60a67..472a71ca8dad0d49f0723e5fdf58bf00a55190f2 100644
 --- a/src/main/java/org/bukkit/entity/Skeleton.java
 +++ b/src/main/java/org/bukkit/entity/Skeleton.java
 @@ -41,6 +41,16 @@ public interface Skeleton extends AbstractSkeleton {
diff --git a/patches/api/0329-Add-API-for-item-entity-health.patch b/patches/api/0328-Add-API-for-item-entity-health.patch
index 572034e557..572034e557 100644
--- a/patches/api/0329-Add-API-for-item-entity-health.patch
+++ b/patches/api/0328-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0329-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/api/0329-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0331-Bucketable-API.patch b/patches/api/0330-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0331-Bucketable-API.patch
+++ b/patches/api/0330-Bucketable-API.patch
diff --git a/patches/api/0332-System-prop-for-default-config-comment-parsing.patch b/patches/api/0331-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..632f71e519 100644
--- a/patches/api/0332-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0331-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0332-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/api/0332-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0334-Multiple-Entries-with-Scoreboards.patch b/patches/api/0333-Multiple-Entries-with-Scoreboards.patch
index 920c2f117e..920c2f117e 100644
--- a/patches/api/0334-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0333-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0335-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0334-Warn-on-strange-EventHandler-return-types.patch
index c7807b823b..c7807b823b 100644
--- a/patches/api/0335-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/api/0334-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0336-Multi-Block-Change-API.patch b/patches/api/0335-Multi-Block-Change-API.patch
index 8aa5be5a5c..46d8adeb56 100644
--- a/patches/api/0336-Multi-Block-Change-API.patch
+++ b/patches/api/0335-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 4906bec154d0f60420fbe2cffa8c7df0918ca61b..2501533048e4de25672d9cc0a52fa1150e6d8adb 100644
+index b177daa7a974125dc4ccf1bc6d119ad42dba3514..cd2d59a8a098227ec7725d121a63cc90e2a139fa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -895,6 +895,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -939,6 +939,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendBlockDamage(@NotNull Location loc, float progress);
  
diff --git a/patches/api/0337-Fix-NotePlayEvent.patch b/patches/api/0336-Fix-NotePlayEvent.patch
index d3f827bfd8..d3f827bfd8 100644
--- a/patches/api/0337-Fix-NotePlayEvent.patch
+++ b/patches/api/0336-Fix-NotePlayEvent.patch
diff --git a/patches/api/0338-Freeze-Tick-Lock-API.patch b/patches/api/0337-Freeze-Tick-Lock-API.patch
index a6c48fa931..baaf0b2462 100644
--- a/patches/api/0338-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0337-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6db147a2330e8046c1bfb5ec2acd8dd30827d475..8827defeb26593cb2c2391e505b008f1190b01f3 100644
+index 1cfeb862f6a036cfd68b60cdc2364834f353f4b4..0cbf946c4f0f47ddfb59b23905968313f25294b1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -323,6 +323,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0339-Dolphin-API.patch b/patches/api/0338-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0339-Dolphin-API.patch
+++ b/patches/api/0338-Dolphin-API.patch
diff --git a/patches/api/0340-More-PotionEffectType-API.patch b/patches/api/0339-More-PotionEffectType-API.patch
index 68309b095d..bb5ee7ea75 100644
--- a/patches/api/0340-More-PotionEffectType-API.patch
+++ b/patches/api/0339-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 4bc53793aade0887fa650a4bbf51d2e57678bd90..18c672f3855a329bf8f87a9de81b677e8e360b41 100644
+index af3dab66c904d1fc0bbbdb8898e9ff8b2631bca7..ff870d18f3870d1432167516b166cece075d77bc 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -277,6 +277,31 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -292,6 +292,31 @@ 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);
@@ -41,7 +41,7 @@ index 4bc53793aade0887fa650a4bbf51d2e57678bd90..18c672f3855a329bf8f87a9de81b677e
  
      /**
 diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
-index f97dff2fd90cc8c35cbde04d1ace81320a8e4658..7d2f2fb6d4a786d15d61fde2ef03783b85d0c47b 100644
+index e045e6a74821f291938cc6af86e313c1f1c4626c..e77cf365cefafbeba09123187e70fd5274f10d53 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
 @@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
@@ -53,10 +53,11 @@ index f97dff2fd90cc8c35cbde04d1ace81320a8e4658..7d2f2fb6d4a786d15d61fde2ef03783b
      private static final BiMap<Integer, PotionEffectType> ID_MAP = HashBiMap.create();
  
      /**
-@@ -352,4 +352,56 @@ public abstract class PotionEffectType implements Keyed, Translatable {
- 
-         return from;
+@@ -352,4 +352,57 @@ public abstract class PotionEffectType implements Keyed, Translatable {
+     public static PotionEffectType[] values() {
+         return Lists.newArrayList(Registry.EFFECT).toArray(new PotionEffectType[0]);
      }
++
 +    // Paper start
 +    /**
 +     * Gets the effect attributes in an immutable map.
diff --git a/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0340-API-for-creating-command-sender-which-forwards-feedb.patch
index b73fdc4cb4..13d096a366 100644
--- a/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0340-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for creating command sender which forwards feedback
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3d0e5045f0d6bf3bee4a94e552a57d2b7d481c02..f941836afda889d8824b1f89bfe9a66cf71ed2a0 100644
+index fa7a63ea108971790c28c4f32d280ee6f2a86c0b..fb6a3b71cf3c304c5d0177747bc098e134b22d58 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1571,6 +1571,20 @@ public final class Bukkit {
+@@ -1583,6 +1583,20 @@ public final class Bukkit {
          return server.getConsoleSender();
      }
  
@@ -30,10 +30,10 @@ index 3d0e5045f0d6bf3bee4a94e552a57d2b7d481c02..f941836afda889d8824b1f89bfe9a66c
       * Gets the folder that contains all of the various {@link World}s.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b4e520b82c026c62e5bd3840aa80cdc8d177b6f1..aee14b81d16c26c3c7e1c5849a829bfe012aa5fb 100644
+index 90b1368303562e1b4af2e658e60ac564bd49ad5f..43b049b68a8af548cd05c67dafc23dabd07bab27 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1324,6 +1324,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1334,6 +1334,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ConsoleCommandSender getConsoleSender();
  
diff --git a/patches/api/0342-Implement-regenerateChunk.patch b/patches/api/0341-Implement-regenerateChunk.patch
index 923a9fbcd0..8f63e4dd7a 100644
--- a/patches/api/0342-Implement-regenerateChunk.patch
+++ b/patches/api/0341-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 5c61b9964e9abe76b5604c73bdd211a9c1c9b619..7ff0ac9c78c3793791afbfa344a9ced3821d9638 100644
+index 6953851a5177e9df3746f7a743f27ef02845e522..d7f4a9c634b3a7b2668f296dce108cc6fc3046df 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -486,8 +486,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0343-Add-GameEvent-tags.patch b/patches/api/0342-Add-GameEvent-tags.patch
index 1bbdc9c696..73554bb169 100644
--- a/patches/api/0343-Add-GameEvent-tags.patch
+++ b/patches/api/0342-Add-GameEvent-tags.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add GameEvent tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 894e72aa97cd272ae57a91165cca0737a6d5742d..dd509bd1f7e80a04a63d2ba6eca1ff845d12fb2d 100644
+index 298ae1294a122705bca6bd74ea540185839d1ed5..cb5890e0e7bccfee2ba32dd4776f1ae1fdd539e8 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -983,6 +983,25 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -1306,6 +1306,25 @@ public interface Tag<T extends Keyed> extends Keyed {
       */
-     Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
+     Tag<EntityType> ENTITY_TYPES_REDIRECTABLE_PROJECTILE = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("redirectable_projectile"), EntityType.class);
  
 +    // Paper start
 +    String REGISTRY_GAME_EVENTS = "game_events";
diff --git a/patches/api/0344-Furnace-RecipesUsed-API.patch b/patches/api/0343-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0344-Furnace-RecipesUsed-API.patch
+++ b/patches/api/0343-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0345-Configurable-sculk-sensor-listener-range.patch b/patches/api/0344-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0345-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/api/0344-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0346-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0345-Add-missing-block-data-mins-and-maxes.patch
index 63a647706a..63a647706a 100644
--- a/patches/api/0346-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0345-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0347-Custom-Potion-Mixes.patch b/patches/api/0346-Custom-Potion-Mixes.patch
index e070ceabb2..1e3c724a0e 100644
--- a/patches/api/0347-Custom-Potion-Mixes.patch
+++ b/patches/api/0346-Custom-Potion-Mixes.patch
@@ -155,10 +155,10 @@ index 0000000000000000000000000000000000000000..3ede1e8f7bf0436fdc5bf395c0f9eaf1
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f941836afda889d8824b1f89bfe9a66cf71ed2a0..22ec7dda6853db6539e98e8d39d8a13be8926f07 100644
+index fb6a3b71cf3c304c5d0177747bc098e134b22d58..eb6d59bad1e4f0b394290d683f5dfed6ba6dd75b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2604,6 +2604,15 @@ public final class Bukkit {
+@@ -2627,6 +2627,15 @@ public final class Bukkit {
      public static io.papermc.paper.datapack.DatapackManager getDatapackManager() {
          return server.getDatapackManager();
      }
@@ -175,10 +175,10 @@ index f941836afda889d8824b1f89bfe9a66cf71ed2a0..22ec7dda6853db6539e98e8d39d8a13b
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index aee14b81d16c26c3c7e1c5849a829bfe012aa5fb..96f9f3ac492eb6f4628d47f0be4239ab9bc7df54 100644
+index 43b049b68a8af548cd05c67dafc23dabd07bab27..6da6c20b684eba64b85d67db2482b4a968749070 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2268,5 +2268,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2287,5 +2287,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      io.papermc.paper.datapack.DatapackManager getDatapackManager();
diff --git a/patches/api/0348-Expose-furnace-minecart-push-values.patch b/patches/api/0347-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0348-Expose-furnace-minecart-push-values.patch
+++ b/patches/api/0347-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0349-More-Projectile-API.patch b/patches/api/0348-More-Projectile-API.patch
index ba63dbcd3b..ba63dbcd3b 100644
--- a/patches/api/0349-More-Projectile-API.patch
+++ b/patches/api/0348-More-Projectile-API.patch
diff --git a/patches/api/0350-Add-getComputedBiome-API.patch b/patches/api/0349-Add-getComputedBiome-API.patch
index 6d24c2c66a..6d24c2c66a 100644
--- a/patches/api/0350-Add-getComputedBiome-API.patch
+++ b/patches/api/0349-Add-getComputedBiome-API.patch
diff --git a/patches/api/0351-Add-enchantWithLevels-API.patch b/patches/api/0350-Add-enchantWithLevels-API.patch
index 1c94264d8f..1c94264d8f 100644
--- a/patches/api/0351-Add-enchantWithLevels-API.patch
+++ b/patches/api/0350-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0352-Add-TameableDeathMessageEvent.patch b/patches/api/0351-Add-TameableDeathMessageEvent.patch
index aec53f13ba..aec53f13ba 100644
--- a/patches/api/0352-Add-TameableDeathMessageEvent.patch
+++ b/patches/api/0351-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0352-Allow-to-change-the-podium-of-the-EnderDragon.patch
index 08ffa1fdde..08ffa1fdde 100644
--- a/patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch
+++ b/patches/api/0352-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0353-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
index 21b3f85c0b..21b3f85c0b 100644
--- a/patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
+++ b/patches/api/0353-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
diff --git a/patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0354-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 5775b6f33c..5775b6f33c 100644
--- a/patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/api/0354-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0356-WorldCreator-keepSpawnLoaded.patch b/patches/api/0355-WorldCreator-keepSpawnLoaded.patch
index 287c313c58..287c313c58 100644
--- a/patches/api/0356-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/api/0355-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0356-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 9b70c2dc74..8fa20db188 100644
--- a/patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/api/0356-Add-EntityDyeEvent-and-CollarColorable-interface.patch
@@ -152,10 +152,10 @@ index 0534fbc228f64cf3b361ab097d9b88212bdb0f36..d03adfaa4176617ef2ace2754fe02b63
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
-index 6d5597a8d48ee65a1b54422c7a39a0f5b461b711..84db38388bf7a58e66d6cd29620b4fe64b0a897e 100644
+index 59efc8d5e9bb2bec2e5cff3bf8eaaf01351954d9..0a308ea9bf631b45afa1b13d385e3c64119493ee 100644
 --- a/src/main/java/org/bukkit/entity/Wolf.java
 +++ b/src/main/java/org/bukkit/entity/Wolf.java
-@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
  /**
   * Represents a Wolf
   */
@@ -164,7 +164,7 @@ index 6d5597a8d48ee65a1b54422c7a39a0f5b461b711..84db38388bf7a58e66d6cd29620b4fe6
  
      /**
       * Checks if this wolf is angry
-@@ -31,6 +31,7 @@ public interface Wolf extends Tameable, Sittable {
+@@ -34,6 +34,7 @@ public interface Wolf extends Tameable, Sittable {
       * @return the color of the collar
       */
      @NotNull
@@ -172,7 +172,7 @@ index 6d5597a8d48ee65a1b54422c7a39a0f5b461b711..84db38388bf7a58e66d6cd29620b4fe6
      public DyeColor getCollarColor();
  
      /**
-@@ -38,6 +39,7 @@ public interface Wolf extends Tameable, Sittable {
+@@ -41,6 +42,7 @@ public interface Wolf extends Tameable, Sittable {
       *
       * @param color the color to apply
       */
diff --git a/patches/api/0358-Add-PlayerStopUsingItemEvent.patch b/patches/api/0357-Add-PlayerStopUsingItemEvent.patch
index c8de1f6ed0..c8de1f6ed0 100644
--- a/patches/api/0358-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/api/0357-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0359-Expand-FallingBlock-API.patch b/patches/api/0358-Expand-FallingBlock-API.patch
index 0f65eb8961..d98776cf63 100644
--- a/patches/api/0359-Expand-FallingBlock-API.patch
+++ b/patches/api/0358-Expand-FallingBlock-API.patch
@@ -10,10 +10,10 @@ Subject: [PATCH] Expand FallingBlock API
 Co-authored-by: Lukas Planz <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7ff0ac9c78c3793791afbfa344a9ced3821d9638..fa81e440ad20ab8740cb073f515d1671dc6ea9a0 100644
+index d7f4a9c634b3a7b2668f296dce108cc6fc3046df..00fbc02a1751902edda327236e51a6991f5366f8 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2270,8 +2270,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2282,8 +2282,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The spawned {@link FallingBlock} instance
       * @throws IllegalArgumentException if {@link Location} or {@link
       *     MaterialData} are null or {@link Material} of the {@link MaterialData} is not a block
@@ -24,7 +24,7 @@ index 7ff0ac9c78c3793791afbfa344a9ced3821d9638..fa81e440ad20ab8740cb073f515d1671
      public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull MaterialData data) throws IllegalArgumentException;
  
      /**
-@@ -2284,8 +2286,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2296,8 +2298,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The spawned {@link FallingBlock} instance
       * @throws IllegalArgumentException if {@link Location} or {@link
       *     BlockData} are null
@@ -35,7 +35,7 @@ index 7ff0ac9c78c3793791afbfa344a9ced3821d9638..fa81e440ad20ab8740cb073f515d1671
      public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull BlockData data) throws IllegalArgumentException;
  
      /**
-@@ -2302,7 +2306,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2314,7 +2318,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The spawned {@link FallingBlock} instance
       * @throws IllegalArgumentException if {@link Location} or {@link
       *     Material} are null or {@link Material} is not a block
diff --git a/patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0359-Add-method-isTickingWorlds-to-Bukkit.patch
index 40b7bec1d7..eb982e565a 100644
--- a/patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0359-Add-method-isTickingWorlds-to-Bukkit.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit.
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 22ec7dda6853db6539e98e8d39d8a13be8926f07..a24de4474114af533e1e8b78c4fd0e8c5edd14b8 100644
+index eb6d59bad1e4f0b394290d683f5dfed6ba6dd75b..a2e5e917a7a0f6763f2ac13583dc28d9ea35ca64 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -806,12 +806,26 @@ public final class Bukkit {
+@@ -808,12 +808,26 @@ public final class Bukkit {
          return server.getWorlds();
      }
  
@@ -35,7 +35,7 @@ index 22ec7dda6853db6539e98e8d39d8a13be8926f07..a24de4474114af533e1e8b78c4fd0e8c
       *
       * @param creator the options to use when creating the world
       * @return newly created or loaded world
-@@ -823,6 +837,9 @@ public final class Bukkit {
+@@ -825,6 +839,9 @@ public final class Bukkit {
  
      /**
       * Unloads a world with the given name.
@@ -45,7 +45,7 @@ index 22ec7dda6853db6539e98e8d39d8a13be8926f07..a24de4474114af533e1e8b78c4fd0e8c
       *
       * @param name Name of the world to unload
       * @param save whether to save the chunks before unloading
-@@ -834,6 +851,9 @@ public final class Bukkit {
+@@ -836,6 +853,9 @@ public final class Bukkit {
  
      /**
       * Unloads the given world.
@@ -56,10 +56,10 @@ index 22ec7dda6853db6539e98e8d39d8a13be8926f07..a24de4474114af533e1e8b78c4fd0e8c
       * @param world the world to unload
       * @param save whether to save the chunks before unloading
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 96f9f3ac492eb6f4628d47f0be4239ab9bc7df54..c8704bc90a4f7040e5fa1c0377d5533bd14a4249 100644
+index 6da6c20b684eba64b85d67db2482b4a968749070..708ea9556510b2e9de2f7f1c381572e3bde540d1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -673,34 +673,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -675,34 +675,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public List<World> getWorlds();
  
diff --git a/patches/api/0361-Add-WardenAngerChangeEvent.patch b/patches/api/0360-Add-WardenAngerChangeEvent.patch
index 4291ccd615..4291ccd615 100644
--- a/patches/api/0361-Add-WardenAngerChangeEvent.patch
+++ b/patches/api/0360-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0362-Nameable-Banner-API.patch b/patches/api/0361-Nameable-Banner-API.patch
index eba196daaf..eba196daaf 100644
--- a/patches/api/0362-Nameable-Banner-API.patch
+++ b/patches/api/0361-Nameable-Banner-API.patch
diff --git a/patches/api/0363-Add-Player-getFishHook.patch b/patches/api/0362-Add-Player-getFishHook.patch
index feae3b2e47..feae3b2e47 100644
--- a/patches/api/0363-Add-Player-getFishHook.patch
+++ b/patches/api/0362-Add-Player-getFishHook.patch
diff --git a/patches/api/0364-More-Teleport-API.patch b/patches/api/0363-More-Teleport-API.patch
index 7f4f75ceac..eb36f5ee5d 100644
--- a/patches/api/0364-More-Teleport-API.patch
+++ b/patches/api/0363-More-Teleport-API.patch
@@ -120,7 +120,7 @@ index 0000000000000000000000000000000000000000..c8b5b570d44da9524bfc59c7e11b2ae5
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8827defeb26593cb2c2391e505b008f1190b01f3..bc1547381b08d1acbbef885d9c3ecd63f3550426 100644
+index 0cbf946c4f0f47ddfb59b23905968313f25294b1..a2223907c6e6780ca25dae255f321f9add11c912 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -158,10 +158,10 @@ index 8827defeb26593cb2c2391e505b008f1190b01f3..bc1547381b08d1acbbef885d9c3ecd63
       * 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 2501533048e4de25672d9cc0a52fa1150e6d8adb..d598eb27f131a265c163ea96ab5fb56d4cf6ecb9 100644
+index cd2d59a8a098227ec7725d121a63cc90e2a139fa..25064aafd5871a7168e8a0ba3e87d6de89e2b083 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3424,6 +3424,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3468,6 +3468,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  
diff --git a/patches/api/0365-Add-EntityPortalReadyEvent.patch b/patches/api/0364-Add-EntityPortalReadyEvent.patch
index b9321a8e0d..b9321a8e0d 100644
--- a/patches/api/0365-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0364-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0365-Custom-Chat-Completion-Suggestions-API.patch
index 90d9c68dee..e22c1feefa 100644
--- a/patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0365-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 d598eb27f131a265c163ea96ab5fb56d4cf6ecb9..f7c1b6380389d81ac94005408429ac5bd79f19a6 100644
+index 25064aafd5871a7168e8a0ba3e87d6de89e2b083..ac9227472443ecb819cc7480a217cd78a98a9b35 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3308,6 +3308,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3352,6 +3352,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void sendOpLevel(byte level);
      // Paper end - sendOpLevel API
  
diff --git a/patches/api/0367-Collision-API.patch b/patches/api/0366-Collision-API.patch
index ced31795fc..f59dc05fbb 100644
--- a/patches/api/0367-Collision-API.patch
+++ b/patches/api/0366-Collision-API.patch
@@ -25,10 +25,10 @@ index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index bc1547381b08d1acbbef885d9c3ecd63f3550426..8e2fa4dba0337a175acfee24fc59423ab4714977 100644
+index a2223907c6e6780ca25dae255f321f9add11c912..11885ef53ed97738d0a50e5f459a9f76c975c085 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1008,4 +1008,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1019,4 +1019,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean isInPowderedSnow();
      // Paper end
diff --git a/patches/api/0368-Block-Ticking-API.patch b/patches/api/0367-Block-Ticking-API.patch
index 02fed74c9e..02fed74c9e 100644
--- a/patches/api/0368-Block-Ticking-API.patch
+++ b/patches/api/0367-Block-Ticking-API.patch
diff --git a/patches/api/0369-Add-NamespacedKey-biome-methods.patch b/patches/api/0368-Add-NamespacedKey-biome-methods.patch
index 97a47e3b8e..97a47e3b8e 100644
--- a/patches/api/0369-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0368-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0370-Also-load-resources-from-LibraryLoader.patch b/patches/api/0369-Also-load-resources-from-LibraryLoader.patch
index c2a41c2e53..c2a41c2e53 100644
--- a/patches/api/0370-Also-load-resources-from-LibraryLoader.patch
+++ b/patches/api/0369-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0370-Added-byte-array-serialization-deserialization-for-P.patch
index 9b71f12681..9b71f12681 100644
--- a/patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/api/0370-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0371-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 291761dadb..291761dadb 100644
--- a/patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/api/0371-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0372-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 9b5ef25cf4..9b5ef25cf4 100644
--- a/patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0372-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0374-Add-getDrops-to-BlockState.patch b/patches/api/0373-Add-getDrops-to-BlockState.patch
index f25ab4169f..f9e8152229 100644
--- a/patches/api/0374-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0373-Add-getDrops-to-BlockState.patch
@@ -7,10 +7,10 @@ Originally added isPreferredTool to BlockData but
 upstream added that.
 
 diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index c439cf0bb6c50db2b3304c60e50046f096392f9f..19837f0eae67854f48e777bc7d4a13b53fa4b436 100644
+index e573e70d9e74e444783a7363e6cdac126124d86d..80e5d39afe8a6cf882b29c0da78450b958812137 100644
 --- a/src/main/java/org/bukkit/block/BlockState.java
 +++ b/src/main/java/org/bukkit/block/BlockState.java
-@@ -243,5 +243,41 @@ public interface BlockState extends Metadatable {
+@@ -253,5 +253,41 @@ public interface BlockState extends Metadatable {
       * @return true if collidable
       */
      boolean isCollidable();
diff --git a/patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0374-Add-PlayerInventorySlotChangeEvent.patch
index d76df6d87d..d76df6d87d 100644
--- a/patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/api/0374-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0376-Elder-Guardian-appearance-API.patch b/patches/api/0375-Elder-Guardian-appearance-API.patch
index ca5e23620f..3490b6d5db 100644
--- a/patches/api/0376-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0375-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 f7c1b6380389d81ac94005408429ac5bd79f19a6..deea445fe7b69d36de61e001f617a837c9a0eb2d 100644
+index ac9227472443ecb819cc7480a217cd78a98a9b35..ad61c664af66a15e214c5db14a5c9e172f5309ae 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3488,6 +3488,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3532,6 +3532,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/0377-Allow-changing-bed-s-occupied-property.patch b/patches/api/0376-Allow-changing-bed-s-occupied-property.patch
index 8dfafd6d33..8dfafd6d33 100644
--- a/patches/api/0377-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/api/0376-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0378-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0377-Add-EquipmentSlot-convenience-methods.patch
index 0ef6b4c9b0..64857c2af9 100644
--- a/patches/api/0378-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0377-Add-EquipmentSlot-convenience-methods.patch
@@ -5,15 +5,14 @@ Subject: [PATCH] Add EquipmentSlot convenience methods
 
 
 diff --git a/src/main/java/org/bukkit/inventory/EquipmentSlot.java b/src/main/java/org/bukkit/inventory/EquipmentSlot.java
-index 1e7d77118a55ca9db99eabb94894e6ef3409946b..8f793982d0ceeb949422fe3f125fb08229d3266a 100644
+index d776a0c183737efcaf94f0911f3a8c1adc2c5ada..e19e708e9bda10e99c07763d162cb140d0189147 100644
 --- a/src/main/java/org/bukkit/inventory/EquipmentSlot.java
 +++ b/src/main/java/org/bukkit/inventory/EquipmentSlot.java
-@@ -8,4 +8,28 @@ public enum EquipmentSlot {
-     LEGS,
-     CHEST,
-     HEAD
+@@ -32,4 +32,27 @@ public enum EquipmentSlot {
+     public EquipmentSlotGroup getGroup() {
+         return group;
+     }
 +    // Paper start
-+    ;
 +    /**
 +     * Checks whether this equipment slot is a hand:
 +     * either {@link #HAND} or {@link #OFF_HAND}
@@ -28,12 +27,12 @@ index 1e7d77118a55ca9db99eabb94894e6ef3409946b..8f793982d0ceeb949422fe3f125fb082
 +     * Checks whether this equipment slot
 +     * is one of the armor slots:
 +     * {@link #HEAD}, {@link #CHEST},
-+     * {@link #LEGS}, or {@link #FEET}
++     * {@link #LEGS}, {@link #FEET}, or {@link #BODY}
 +     *
 +     * @return whether this is an armor slot
 +     */
 +    public boolean isArmor() {
-+        return this == HEAD || this == CHEST || this == LEGS || this == FEET;
++        return this == HEAD || this == CHEST || this == LEGS || this == FEET || this == BODY;
 +    }
 +    // Paper end
  }
diff --git a/patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index 05a81d55ae..e854d90687 100644
--- a/patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index be9fa1b6209a41712767283c6329046ca2795c09..35b0eb94e291dae7a4705fa85b10d23fcd38f49e 100644
+index b5551eed2e9090dcbbe97cae25a0c0545285c64f..1041af2b645e15d8a94fe388cb88f1a8adde16f0 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1329,4 +1329,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1331,4 +1331,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      @Deprecated
      void setHurtDirection(float hurtDirection);
      // Paper end - hurt direction API
diff --git a/patches/api/0380-Add-entity-knockback-API.patch b/patches/api/0379-Add-entity-knockback-API.patch
index 5d411c2968..1bd8f3077b 100644
--- a/patches/api/0380-Add-entity-knockback-API.patch
+++ b/patches/api/0379-Add-entity-knockback-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 35b0eb94e291dae7a4705fa85b10d23fcd38f49e..41c5559058df9701e345f39d9d3c23e45b6d49c3 100644
+index 1041af2b645e15d8a94fe388cb88f1a8adde16f0..30e87d632d12326c70507b3ec9f464af1fb05650 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1349,4 +1349,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1351,4 +1351,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
          }
      }
      // Paper end - swing hand API
diff --git a/patches/api/0381-Added-EntityToggleSitEvent.patch b/patches/api/0380-Added-EntityToggleSitEvent.patch
index d5a8c46dc8..d5a8c46dc8 100644
--- a/patches/api/0381-Added-EntityToggleSitEvent.patch
+++ b/patches/api/0380-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0382-Add-Moving-Piston-API.patch b/patches/api/0381-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0382-Add-Moving-Piston-API.patch
+++ b/patches/api/0381-Add-Moving-Piston-API.patch
diff --git a/patches/api/0383-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0382-Add-PrePlayerAttackEntityEvent.patch
index ac0ebedde7..ac0ebedde7 100644
--- a/patches/api/0383-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/api/0382-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0384-Add-Player-Warden-Warning-API.patch b/patches/api/0383-Add-Player-Warden-Warning-API.patch
index fdc917934f..42426a3ae4 100644
--- a/patches/api/0384-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0383-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 deea445fe7b69d36de61e001f617a837c9a0eb2d..e855cddf37c453ea3f8f0f4fc21dd2358258e28d 100644
+index ad61c664af66a15e214c5db14a5c9e172f5309ae..537ebbad48191741f666aa2a30c8584562dfcb83 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3504,6 +3504,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3548,6 +3548,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/0385-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0384-More-vanilla-friendly-methods-to-update-trades.patch
index f13fdb5601..f13fdb5601 100644
--- a/patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/api/0384-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0386-Add-paper-dumplisteners-command.patch b/patches/api/0385-Add-paper-dumplisteners-command.patch
index a5d858851f..a5d858851f 100644
--- a/patches/api/0386-Add-paper-dumplisteners-command.patch
+++ b/patches/api/0385-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0387-ItemStack-damage-API.patch b/patches/api/0386-ItemStack-damage-API.patch
index b7b9d50930..99dcb21b8f 100644
--- a/patches/api/0387-ItemStack-damage-API.patch
+++ b/patches/api/0386-ItemStack-damage-API.patch
@@ -8,10 +8,10 @@ to simulate damage done to an itemstack and all
 the logic associated with damaging them
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 41c5559058df9701e345f39d9d3c23e45b6d49c3..812ae3368f828b388d6fd05a94cd88f2d5db9fac 100644
+index 30e87d632d12326c70507b3ec9f464af1fb05650..4f32d5866b06a78d46db15158598d1e2beb377c1 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1363,4 +1363,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1365,4 +1365,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void knockback(double strength, double directionX, double directionZ);
      // Paper end - knockback API
diff --git a/patches/api/0388-Add-Tick-TemporalUnit.patch b/patches/api/0387-Add-Tick-TemporalUnit.patch
index 562eb00082..562eb00082 100644
--- a/patches/api/0388-Add-Tick-TemporalUnit.patch
+++ b/patches/api/0387-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0389-Friction-API.patch b/patches/api/0388-Friction-API.patch
index 4488bf7b41..fee1e8ce76 100644
--- a/patches/api/0389-Friction-API.patch
+++ b/patches/api/0388-Friction-API.patch
@@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5
      /**
       * Gets the item stack associated with this item drop.
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 812ae3368f828b388d6fd05a94cd88f2d5db9fac..017a743c1445e2c859fef0ef962e656035af12bd 100644
+index 4f32d5866b06a78d46db15158598d1e2beb377c1..951d0960faff8357a42079e10367b2768de835f8 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0390-Player-Entity-Tracking-Events.patch b/patches/api/0389-Player-Entity-Tracking-Events.patch
index 3dfa72c922..3dfa72c922 100644
--- a/patches/api/0390-Player-Entity-Tracking-Events.patch
+++ b/patches/api/0389-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0391-Add-missing-Fluid-type.patch b/patches/api/0390-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0391-Add-missing-Fluid-type.patch
+++ b/patches/api/0390-Add-missing-Fluid-type.patch
diff --git a/patches/api/0392-fix-Instruments.patch b/patches/api/0391-fix-Instruments.patch
index 468dc80a34..468dc80a34 100644
--- a/patches/api/0392-fix-Instruments.patch
+++ b/patches/api/0391-fix-Instruments.patch
diff --git a/patches/api/0393-Add-BlockLockCheckEvent.patch b/patches/api/0392-Add-BlockLockCheckEvent.patch
index c5d560192c..c5d560192c 100644
--- a/patches/api/0393-Add-BlockLockCheckEvent.patch
+++ b/patches/api/0392-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0394-Add-Sneaking-API-for-Entities.patch b/patches/api/0393-Add-Sneaking-API-for-Entities.patch
index 7c75bb16f2..3f8d4c724f 100644
--- a/patches/api/0394-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0393-Add-Sneaking-API-for-Entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8e2fa4dba0337a175acfee24fc59423ab4714977..2d6f7b2bf4cb23ef43a4dcbab2ecd2a7c7c2809c 100644
+index 11885ef53ed97738d0a50e5f459a9f76c975c085..5a80cf6b16c8fb0457421b7b694a06f43e5e902b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -819,6 +819,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -35,10 +35,10 @@ index 8e2fa4dba0337a175acfee24fc59423ab4714977..2d6f7b2bf4cb23ef43a4dcbab2ecd2a7
       * 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 e855cddf37c453ea3f8f0f4fc21dd2358258e28d..6afced1da637e4162972b0ff1f6c9cf42c256a02 100644
+index 537ebbad48191741f666aa2a30c8584562dfcb83..5e798ea4c66e1a7ce6239b972e6a13810850a438 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -417,6 +417,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -461,6 +461,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @return true if player is in sneak mode
       */
@@ -46,7 +46,7 @@ index e855cddf37c453ea3f8f0f4fc21dd2358258e28d..6afced1da637e4162972b0ff1f6c9cf4
      public boolean isSneaking();
  
      /**
-@@ -424,6 +425,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -468,6 +469,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param sneak true if player should appear sneaking
       */
diff --git a/patches/api/0395-Improve-PortalEvents.patch b/patches/api/0394-Improve-PortalEvents.patch
index f7f53b19fc..f7f53b19fc 100644
--- a/patches/api/0395-Improve-PortalEvents.patch
+++ b/patches/api/0394-Improve-PortalEvents.patch
diff --git a/patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0395-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index de7e84ef8b..de7e84ef8b 100644
--- a/patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/api/0395-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/api/0397-Flying-Fall-Damage-API.patch b/patches/api/0396-Flying-Fall-Damage-API.patch
index 69dcbced37..b38eb93f1c 100644
--- a/patches/api/0397-Flying-Fall-Damage-API.patch
+++ b/patches/api/0396-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 6afced1da637e4162972b0ff1f6c9cf42c256a02..6fc27c35f8533b37d82f0db5605d4d06e70af18b 100644
+index 5e798ea4c66e1a7ce6239b972e6a13810850a438..ce5530c27572fefd732301e07393fab0d9c99afb 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1859,6 +1859,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1903,6 +1903,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void setAllowFlight(boolean flight);
  
diff --git a/patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0397-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 3936bb4a92..3936bb4a92 100644
--- a/patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0397-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0399-Win-Screen-API.patch b/patches/api/0398-Win-Screen-API.patch
index 3741437041..05fbb589d3 100644
--- a/patches/api/0399-Win-Screen-API.patch
+++ b/patches/api/0398-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 6fc27c35f8533b37d82f0db5605d4d06e70af18b..0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb 100644
+index ce5530c27572fefd732301e07393fab0d9c99afb..6dc9a93811d143ed266f0f6235358d58b1e00523 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1205,6 +1205,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1249,6 +1249,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/patches/api/0400-Add-Entity-Body-Yaw-API.patch b/patches/api/0399-Add-Entity-Body-Yaw-API.patch
index a34499f0db..b8527349d9 100644
--- a/patches/api/0400-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0399-Add-Entity-Body-Yaw-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 2d6f7b2bf4cb23ef43a4dcbab2ecd2a7c7c2809c..0be4107270fb7fdba5c7d0e6f3964d33337f91f0 100644
+index 5a80cf6b16c8fb0457421b7b694a06f43e5e902b..9e7b6ed599759de451429c99bc6876b878c1cca2 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1026,6 +1026,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1037,6 +1037,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return true if in powdered snow.
       */
      boolean isInPowderedSnow();
@@ -53,10 +53,10 @@ index 2d6f7b2bf4cb23ef43a4dcbab2ecd2a7c7c2809c..0be4107270fb7fdba5c7d0e6f3964d33
  
      // Paper start - Collision API
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 017a743c1445e2c859fef0ef962e656035af12bd..b8a9b56c3071d94371ab69b1a72c2e6c0692ab39 100644
+index 951d0960faff8357a42079e10367b2768de835f8..bc577baad70cdea52aeaaf71d2e110286f9f4265 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1412,4 +1412,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1414,4 +1414,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount);
      // Paper end - ItemStack damage API
diff --git a/patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0400-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index c375206bf7..c375206bf7 100644
--- a/patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0400-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0402-Add-EntityFertilizeEggEvent.patch b/patches/api/0401-Add-EntityFertilizeEggEvent.patch
index 4ae6ff9f0f..4ae6ff9f0f 100644
--- a/patches/api/0402-Add-EntityFertilizeEggEvent.patch
+++ b/patches/api/0401-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0402-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 9dee250212..9dee250212 100644
--- a/patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/api/0402-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0404-Add-Shearable-API.patch b/patches/api/0403-Add-Shearable-API.patch
index 19ef9a4a36..19ef9a4a36 100644
--- a/patches/api/0404-Add-Shearable-API.patch
+++ b/patches/api/0403-Add-Shearable-API.patch
diff --git a/patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0404-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 27abcd1f93..27abcd1f93 100644
--- a/patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/api/0404-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0406-Add-Mob-Experience-reward-API.patch b/patches/api/0405-Add-Mob-Experience-reward-API.patch
index 2e3a09921e..2e3a09921e 100644
--- a/patches/api/0406-Add-Mob-Experience-reward-API.patch
+++ b/patches/api/0405-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0407-Expand-PlayerItemMendEvent.patch b/patches/api/0406-Expand-PlayerItemMendEvent.patch
index 223922e05e..223922e05e 100644
--- a/patches/api/0407-Expand-PlayerItemMendEvent.patch
+++ b/patches/api/0406-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0408-Add-transient-modifier-API.patch b/patches/api/0407-Add-transient-modifier-API.patch
index a32e4c86a9..a32e4c86a9 100644
--- a/patches/api/0408-Add-transient-modifier-API.patch
+++ b/patches/api/0407-Add-transient-modifier-API.patch
diff --git a/patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0408-Properly-remove-the-experimental-smithing-inventory-.patch
index 650b013220..650b013220 100644
--- a/patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/api/0408-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch
index 47a9befa74..71e9937870 100644
--- a/patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index b8a9b56c3071d94371ab69b1a72c2e6c0692ab39..80df95e93b9a919af8c2e98b09b75522ee60eae6 100644
+index bc577baad70cdea52aeaaf71d2e110286f9f4265..4c0c548af4d2eff6fb6b6d11ba94a64db08ccb64 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0411-Folia-scheduler-and-owned-region-API.patch b/patches/api/0410-Folia-scheduler-and-owned-region-API.patch
index 2913858508..05f2626953 100644
--- a/patches/api/0411-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0410-Folia-scheduler-and-owned-region-API.patch
@@ -499,10 +499,10 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a24de4474114af533e1e8b78c4fd0e8c5edd14b8..010d7e8a831b32060a471ef877ac43ce237a7258 100644
+index a2e5e917a7a0f6763f2ac13583dc28d9ea35ca64..e4f3f621c4c6d2653770c149db71587fc04e0991 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2635,6 +2635,141 @@ public final class Bukkit {
+@@ -2658,6 +2658,141 @@ public final class Bukkit {
      }
      // Paper end
  
@@ -645,10 +645,10 @@ index a24de4474114af533e1e8b78c4fd0e8c5edd14b8..010d7e8a831b32060a471ef877ac43ce
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c8704bc90a4f7040e5fa1c0377d5533bd14a4249..627913905269739e91c5007e372856e321cb9312 100644
+index 708ea9556510b2e9de2f7f1c381572e3bde540d1..63cbc38217865be8f79890a0d8d6143461d344f3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2297,4 +2297,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2316,4 +2316,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
@@ -769,10 +769,10 @@ index c8704bc90a4f7040e5fa1c0377d5533bd14a4249..627913905269739e91c5007e372856e3
 +    // Paper end - Folia region threading API
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 0be4107270fb7fdba5c7d0e6f3964d33337f91f0..c01c3f6576d4c0a8a173080ce01509d3eb678611 100644
+index 9e7b6ed599759de451429c99bc6876b878c1cca2..9a0022f9e77b7e532c0cad9f85620901064e436d 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1086,4 +1086,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1097,4 +1097,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
      // Paper end - Collision API
diff --git a/patches/api/0412-Add-event-for-player-editing-sign.patch b/patches/api/0411-Add-event-for-player-editing-sign.patch
index b534aebde9..b534aebde9 100644
--- a/patches/api/0412-Add-event-for-player-editing-sign.patch
+++ b/patches/api/0411-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0413-Add-Sign-getInteractableSideFor.patch b/patches/api/0412-Add-Sign-getInteractableSideFor.patch
index 1e085323ca..1e085323ca 100644
--- a/patches/api/0413-Add-Sign-getInteractableSideFor.patch
+++ b/patches/api/0412-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/api/0414-Fix-BanList-API.patch b/patches/api/0413-Fix-BanList-API.patch
index 1fb6e9abf8..911f301327 100644
--- a/patches/api/0414-Fix-BanList-API.patch
+++ b/patches/api/0413-Fix-BanList-API.patch
@@ -130,10 +130,10 @@ index e805e629cede1c4c0674282c930cb67852718c3e..5248cf08ef83c7304dd76c42a2f646bb
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb..cc84581276a793bb8c4851ab55591f8251b6403b 100644
+index 6dc9a93811d143ed266f0f6235358d58b1e00523..463521dc80254cab673c5203ee263948081219e9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -301,7 +301,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -345,7 +345,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     (updated) previous ban
       */
      @Nullable
@@ -142,7 +142,7 @@ index 0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb..cc84581276a793bb8c4851ab55591f82
  
      /**
       * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
-@@ -317,7 +317,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -361,7 +361,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     (updated) previous ban
       */
      @Nullable
@@ -151,7 +151,7 @@ index 0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb..cc84581276a793bb8c4851ab55591f82
  
      /**
       * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
-@@ -333,7 +333,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -377,7 +377,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     (updated) previous ban
       */
      @Nullable
diff --git a/patches/api/0415-Add-whitelist-events.patch b/patches/api/0414-Add-whitelist-events.patch
index 75458e78df..75458e78df 100644
--- a/patches/api/0415-Add-whitelist-events.patch
+++ b/patches/api/0414-Add-whitelist-events.patch
diff --git a/patches/api/0416-API-for-updating-recipes-on-clients.patch b/patches/api/0415-API-for-updating-recipes-on-clients.patch
index 0ab07c3ae5..60f206a340 100644
--- a/patches/api/0416-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0415-API-for-updating-recipes-on-clients.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 010d7e8a831b32060a471ef877ac43ce237a7258..0865830a8d9f29dee47c34a192e26e4c1304a12c 100644
+index e4f3f621c4c6d2653770c149db71587fc04e0991..b5455d03761ced30c94719deeee6788d7c6a8fb7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -990,6 +990,26 @@ public final class Bukkit {
+@@ -992,6 +992,26 @@ public final class Bukkit {
          server.reloadData();
      }
  
@@ -35,7 +35,7 @@ index 010d7e8a831b32060a471ef877ac43ce237a7258..0865830a8d9f29dee47c34a192e26e4c
      /**
       * Returns the primary logger associated with this server instance.
       *
-@@ -1050,6 +1070,20 @@ public final class Bukkit {
+@@ -1052,6 +1072,20 @@ public final class Bukkit {
          return server.addRecipe(recipe);
      }
  
@@ -56,7 +56,7 @@ index 010d7e8a831b32060a471ef877ac43ce237a7258..0865830a8d9f29dee47c34a192e26e4c
      /**
       * Get a list of all recipes for a given item. The stack size is ignored
       * in comparisons. If the durability is -1, it will match any data value.
-@@ -1241,6 +1275,24 @@ public final class Bukkit {
+@@ -1243,6 +1277,24 @@ public final class Bukkit {
          return server.removeRecipe(key);
      }
  
@@ -82,10 +82,10 @@ index 010d7e8a831b32060a471ef877ac43ce237a7258..0865830a8d9f29dee47c34a192e26e4c
       * Gets a list of command aliases defined in the server properties.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 627913905269739e91c5007e372856e321cb9312..bc55bf7361fb41a91766fcb2f1e4620e3db64781 100644
+index 63cbc38217865be8f79890a0d8d6143461d344f3..c0ebbca69775775af22cf2c31b1516e5bf18df4a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -836,6 +836,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -838,6 +838,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      public void reloadData();
  
@@ -108,7 +108,7 @@ index 627913905269739e91c5007e372856e321cb9312..bc55bf7361fb41a91766fcb2f1e4620e
      /**
       * Returns the primary logger associated with this server instance.
       *
-@@ -877,15 +893,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -879,15 +895,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public boolean dispatchCommand(@NotNull CommandSender sender, @NotNull String commandLine) throws CommandException;
  
      /**
@@ -144,7 +144,7 @@ index 627913905269739e91c5007e372856e321cb9312..bc55bf7361fb41a91766fcb2f1e4620e
      /**
       * Get a list of all recipes for a given item. The stack size is ignored
       * in comparisons. If the durability is -1, it will match any data value.
-@@ -1054,6 +1089,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1056,6 +1091,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      public boolean removeRecipe(@NotNull NamespacedKey key);
  
diff --git a/patches/api/0417-Add-PlayerFailMoveEvent.patch b/patches/api/0416-Add-PlayerFailMoveEvent.patch
index c0687e2ae0..c0687e2ae0 100644
--- a/patches/api/0417-Add-PlayerFailMoveEvent.patch
+++ b/patches/api/0416-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0418-Fix-custom-statistic-criteria-creation.patch b/patches/api/0417-Fix-custom-statistic-criteria-creation.patch
index 1e6de23d5e..1e6de23d5e 100644
--- a/patches/api/0418-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0417-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0419-SculkCatalyst-bloom-API.patch b/patches/api/0418-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0419-SculkCatalyst-bloom-API.patch
+++ b/patches/api/0418-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0419-API-for-an-entity-s-scoreboard-name.patch
index efef8c0b08..9820a1a54f 100644
--- a/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0419-API-for-an-entity-s-scoreboard-name.patch
@@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different
 methods depending on the implementation of Entity you were working with.
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c01c3f6576d4c0a8a173080ce01509d3eb678611..2a30cda9efb24829f9c6a265e8be2dd848fa7c7c 100644
+index 9a0022f9e77b7e532c0cad9f85620901064e436d..8dcb9f17046ac5dc0301b5d4984b016514e19109 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1097,4 +1097,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1108,4 +1108,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler();
      // Paper end - Folia schedulers
diff --git a/patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0420-Deprecate-and-replace-methods-with-old-StructureType.patch
index a32c35bff3..77b0ffe0a4 100644
--- a/patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0420-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0865830a8d9f29dee47c34a192e26e4c1304a12c..8e2942664f73b0f92beb30c7a94b720610a43c15 100644
+index b5455d03761ced30c94719deeee6788d7c6a8fb7..c9fbbf0287cd663080fc09ac83b439780cbfae85 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -935,9 +935,6 @@ public final class Bukkit {
+@@ -937,9 +937,6 @@ public final class Bukkit {
      /**
       * Create a new explorer map targeting the closest nearby structure of a
       * given {@link StructureType}.
@@ -18,7 +18,7 @@ index 0865830a8d9f29dee47c34a192e26e4c1304a12c..8e2942664f73b0f92beb30c7a94b7206
       *
       * @param world the world the map will belong to
       * @param location the origin location to find the nearest structure
-@@ -946,7 +943,9 @@ public final class Bukkit {
+@@ -948,7 +945,9 @@ public final class Bukkit {
       *
       * @see World#locateNearestStructure(org.bukkit.Location,
       *      org.bukkit.StructureType, int, boolean)
@@ -28,7 +28,7 @@ index 0865830a8d9f29dee47c34a192e26e4c1304a12c..8e2942664f73b0f92beb30c7a94b7206
      @NotNull
      public static ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType) {
          return server.createExplorerMap(world, location, structureType);
-@@ -969,11 +968,54 @@ public final class Bukkit {
+@@ -971,11 +970,54 @@ public final class Bukkit {
       *
       * @see World#locateNearestStructure(org.bukkit.Location,
       *      org.bukkit.StructureType, int, boolean)
@@ -84,10 +84,10 @@ index 0865830a8d9f29dee47c34a192e26e4c1304a12c..8e2942664f73b0f92beb30c7a94b7206
      /**
       * Reloads the server, refreshing settings and plugin information.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bc55bf7361fb41a91766fcb2f1e4620e3db64781..78daaaa3b4f1ec1d05652287d9f9b08689bc2cbf 100644
+index c0ebbca69775775af22cf2c31b1516e5bf18df4a..c8395c8707e696f1e6fc8b0fd03f07203e01c157 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -800,16 +800,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -802,16 +802,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @see World#locateNearestStructure(org.bukkit.Location,
       *      org.bukkit.StructureType, int, boolean)
@@ -106,7 +106,7 @@ index bc55bf7361fb41a91766fcb2f1e4620e3db64781..78daaaa3b4f1ec1d05652287d9f9b086
       *
       * @param world the world the map will belong to
       * @param location the origin location to find the nearest structure
-@@ -821,9 +820,50 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -823,9 +822,50 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @see World#locateNearestStructure(org.bukkit.Location,
       *      org.bukkit.StructureType, int, boolean)
diff --git a/patches/api/0422-Add-Listing-API-for-Player.patch b/patches/api/0421-Add-Listing-API-for-Player.patch
index 66d1e974c0..94d5892bd0 100644
--- a/patches/api/0422-Add-Listing-API-for-Player.patch
+++ b/patches/api/0421-Add-Listing-API-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Listing API for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cc84581276a793bb8c4851ab55591f8251b6403b..0d6401cd26424c971b137c968467e29f47c03d8b 100644
+index 463521dc80254cab673c5203ee263948081219e9..5753d6d6ae791e2b086c861ddeb6522e46f2571c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1989,6 +1989,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2033,6 +2033,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public boolean canSee(@NotNull Entity entity);
  
diff --git a/patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0422-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/0422-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0424-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0423-Fix-NPE-on-Boat-getStatus.patch
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0424-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0423-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0425-Expand-Pose-API.patch b/patches/api/0424-Expand-Pose-API.patch
index 42cbaf8eb9..b6d907acb4 100644
--- a/patches/api/0425-Expand-Pose-API.patch
+++ b/patches/api/0424-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 2a30cda9efb24829f9c6a265e8be2dd848fa7c7c..23def071492ccd715693d534cc506936e18f0f46 100644
+index 8dcb9f17046ac5dc0301b5d4984b016514e19109..62e3793903905b94eb1a120345015149abb33713 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -836,6 +836,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0426-MerchantRecipe-add-copy-constructor.patch b/patches/api/0425-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0426-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/api/0425-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0427-More-DragonBattle-API.patch b/patches/api/0426-More-DragonBattle-API.patch
index e25208ec19..e25208ec19 100644
--- a/patches/api/0427-More-DragonBattle-API.patch
+++ b/patches/api/0426-More-DragonBattle-API.patch
diff --git a/patches/api/0428-Add-PlayerPickItemEvent.patch b/patches/api/0427-Add-PlayerPickItemEvent.patch
index 6dd0be80a8..6dd0be80a8 100644
--- a/patches/api/0428-Add-PlayerPickItemEvent.patch
+++ b/patches/api/0427-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0429-Allow-trident-custom-damage.patch b/patches/api/0428-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0429-Allow-trident-custom-damage.patch
+++ b/patches/api/0428-Allow-trident-custom-damage.patch
diff --git a/patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0429-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/api/0429-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0430-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0430-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0432-Add-OfflinePlayer-isConnected.patch b/patches/api/0431-Add-OfflinePlayer-isConnected.patch
index fad59b6a54..fad59b6a54 100644
--- a/patches/api/0432-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0431-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0432-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/api/0432-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0433-Allow-proper-checking-of-empty-item-stacks.patch
index 716a6140d9..716a6140d9 100644
--- a/patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0433-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0434-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/api/0434-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0436-Add-player-idle-duration-API.patch b/patches/api/0435-Add-player-idle-duration-API.patch
index d8f5d40c3c..41b55311ed 100644
--- a/patches/api/0436-Add-player-idle-duration-API.patch
+++ b/patches/api/0435-Add-player-idle-duration-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0d6401cd26424c971b137c968467e29f47c03d8b..0d585390066966f3afd6b88c6d80806292a3cd31 100644
+index 5753d6d6ae791e2b086c861ddeb6522e46f2571c..9261f06e332f8db94b2ef7bc01f5b0e61422bcb2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3645,6 +3645,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3689,6 +3689,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void increaseWardenWarningLevel();
      // Paper end
  
diff --git a/patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0436-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 0481690ad4..0481690ad4 100644
--- a/patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0436-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0437-Add-predicate-for-blocks-when-raytracing.patch
index e03c5e17fa..c212167a42 100644
--- a/patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0437-Add-predicate-for-blocks-when-raytracing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate for blocks when raytracing
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fa81e440ad20ab8740cb073f515d1671dc6ea9a0..377d57b0e603898d309a9384aa8bb9fca97673e3 100644
+index 00fbc02a1751902edda327236e51a6991f5366f8..3abd62dc08e1edaeec6773819c8726671221074a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1703,6 +1703,27 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0438-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/api/0438-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0440-Add-UUID-attribute-modifier-API.patch b/patches/api/0439-Add-UUID-attribute-modifier-API.patch
index 251ae6e425..251ae6e425 100644
--- a/patches/api/0440-Add-UUID-attribute-modifier-API.patch
+++ b/patches/api/0439-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/api/0441-Expand-LingeringPotion-API.patch b/patches/api/0440-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0441-Expand-LingeringPotion-API.patch
+++ b/patches/api/0440-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0441-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 0ac5bf3ef0..0ac5bf3ef0 100644
--- a/patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0441-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0443-Add-Structure-check-API.patch b/patches/api/0442-Add-Structure-check-API.patch
index 00a6416368..4c0756c86e 100644
--- a/patches/api/0443-Add-Structure-check-API.patch
+++ b/patches/api/0442-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 377d57b0e603898d309a9384aa8bb9fca97673e3..35fb5047dd8a8521586a9ca9f8d70881355fb7f5 100644
+index 3abd62dc08e1edaeec6773819c8726671221074a..0e3c7de14be8dc01199fd68b6bf41783c5c43ec3 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -78,6 +78,30 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0444-add-missing-Experimental-annotations.patch b/patches/api/0443-add-missing-Experimental-annotations.patch
index 714fd8e1a3..fb55944d12 100644
--- a/patches/api/0444-add-missing-Experimental-annotations.patch
+++ b/patches/api/0443-add-missing-Experimental-annotations.patch
@@ -28,10 +28,10 @@ index 5269df59f0e8099a72c6b628ac1b8c84a0d1a5d5..775fda4b299e1d6dba9b293b2f98505e
      public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394db7c5c4e 100644
+index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc08bf2a6e5 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -144,54 +144,67 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -145,54 +145,67 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       * BlockData: {@link Slab}
       */
      @MinecraftExperimental
@@ -99,7 +99,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
      CHISELED_TUFF_BRICKS(8601),
      DRIPSTONE_BLOCK(26227),
      /**
-@@ -305,12 +318,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -311,12 +324,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      WEATHERED_COPPER(19699),
      OXIDIZED_COPPER(19490),
      @MinecraftExperimental
@@ -116,7 +116,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
      OXIDIZED_CHISELED_COPPER(27719),
      CUT_COPPER(32519),
      EXPOSED_CUT_COPPER(18000),
-@@ -353,12 +370,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -359,12 +376,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      WAXED_WEATHERED_COPPER(5960),
      WAXED_OXIDIZED_COPPER(25626),
      @MinecraftExperimental
@@ -133,7 +133,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
      WAXED_OXIDIZED_CHISELED_COPPER(7735),
      WAXED_CUT_COPPER(11030),
      WAXED_EXPOSED_CUT_COPPER(30043),
-@@ -2100,41 +2121,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2106,41 +2127,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       * BlockData: {@link Door}
       */
      @MinecraftExperimental
@@ -183,7 +183,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
      WAXED_OXIDIZED_COPPER_DOOR(23888, Door.class),
      /**
       * BlockData: {@link TrapDoor}
-@@ -2188,41 +2217,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2194,41 +2223,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       * BlockData: {@link TrapDoor}
       */
      @MinecraftExperimental
@@ -233,7 +233,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
      WAXED_OXIDIZED_COPPER_TRAPDOOR(21450, TrapDoor.class),
      /**
       * BlockData: {@link Gate}
-@@ -2522,6 +2559,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2530,6 +2567,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      EGG(21603, 16),
      COMPASS(24139),
      RECOVERY_COMPASS(12710),
@@ -242,7 +242,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
      BUNDLE(16835, 1),
      FISHING_ROD(4167, 1, 64),
      CLOCK(14980),
-@@ -2628,6 +2667,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2636,6 +2675,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       * BlockData: {@link Crafter}
       */
      @MinecraftExperimental
@@ -250,15 +250,18 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
      CRAFTER(25243, Crafter.class),
      FILLED_MAP(23504),
      SHEARS(27971, 1, 238),
-@@ -2667,6 +2707,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2676,8 +2716,10 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      BEE_SPAWN_EGG(22924),
      BLAZE_SPAWN_EGG(4759),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     BOGGED_SPAWN_EGG(12042),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      BREEZE_SPAWN_EGG(7580),
      CAT_SPAWN_EGG(29583),
      CAMEL_SPAWN_EGG(14760),
-@@ -3162,88 +3203,106 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -3189,88 +3231,106 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       * BlockData: {@link Waterlogged}
       */
      @MinecraftExperimental
@@ -363,13 +366,13 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      TRIAL_KEY(12725),
-     /**
-      * BlockData: {@link Levelled}
+     @MinecraftExperimental
+     OMINOUS_TRIAL_KEY(4986),
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 0cb15350704955f4a1aeff184a8b60d9a9871ded..594de70f30e292748935f5b1e43a5a7d76bb8ca0 100644
+index 690cf2aedf558396a71b20ba2b8ce737c61dfe43..13fc04abacd36af8755ec0061f4b652f1719d3e5 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -136,12 +136,16 @@ public enum Particle implements Keyed {
+@@ -129,14 +129,19 @@ public enum Particle implements Keyed {
      DUST_PLUME("dust_plume"),
      WHITE_SMOKE("white_smoke"),
      @MinecraftExperimental
@@ -377,20 +380,23 @@ index 0cb15350704955f4a1aeff184a8b60d9a9871ded..594de70f30e292748935f5b1e43a5a7d
      GUST("gust"),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-     GUST_EMITTER("gust_emitter"),
+     SMALL_GUST("small_gust"),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-     GUST_DUST("gust_dust"),
+     GUST_EMITTER_LARGE("gust_emitter_large"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     GUST_EMITTER_SMALL("gust_emitter_small"),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      TRIAL_SPAWNER_DETECTION("trial_spawner_detection"),
-     /**
-      * Uses {@link BlockData} as DataType
+     @MinecraftExperimental
+     TRIAL_SPAWNER_DETECTION_OMINOUS("trial_spawner_detection_ominous"),
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e860921da52589 100644
+index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c942175093134 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
-@@ -215,40 +215,56 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -220,40 +220,56 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
      BLOCK_CONDUIT_DEACTIVATE("block.conduit.deactivate"),
      BLOCK_COPPER_BREAK("block.copper.break"),
      @MinecraftExperimental
@@ -447,7 +453,7 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
      BLOCK_COPPER_TRAPDOOR_OPEN("block.copper_trapdoor.open"),
      BLOCK_CORAL_BLOCK_BREAK("block.coral_block.break"),
      BLOCK_CORAL_BLOCK_FALL("block.coral_block.fall"),
-@@ -531,14 +547,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -546,14 +562,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
      BLOCK_POLISHED_DEEPSLATE_PLACE("block.polished_deepslate.place"),
      BLOCK_POLISHED_DEEPSLATE_STEP("block.polished_deepslate.step"),
      @MinecraftExperimental
@@ -467,17 +473,22 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
      BLOCK_POLISHED_TUFF_STEP("block.polished_tuff.step"),
      BLOCK_PORTAL_AMBIENT("block.portal.ambient"),
      BLOCK_PORTAL_TRAVEL("block.portal.travel"),
-@@ -684,26 +705,37 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
-     BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES("block.sweet_berry_bush.pick_berries"),
-     BLOCK_SWEET_BERRY_BUSH_PLACE("block.sweet_berry_bush.place"),
+@@ -701,34 +722,46 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+     @MinecraftExperimental
+     BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM("block.trial_spawner.about_to_spawn_item"),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      BLOCK_TRIAL_SPAWNER_AMBIENT("block.trial_spawner.ambient"),
      @MinecraftExperimental
+     BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED("block.trial_spawner.ambient_charged"),
+     @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      BLOCK_TRIAL_SPAWNER_BREAK("block.trial_spawner.break"),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     BLOCK_TRIAL_SPAWNER_CHARGE_ACTIVATE("block.trial_spawner.charge_activate"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER("block.trial_spawner.close_shutter"),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
@@ -498,6 +509,10 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      BLOCK_TRIAL_SPAWNER_PLACE("block.trial_spawner.place"),
      @MinecraftExperimental
+     BLOCK_TRIAL_SPAWNER_SPAWN_ITEM("block.trial_spawner.spawn_item"),
+     @MinecraftExperimental
+     BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN("block.trial_spawner.spawn_item_begin"),
+     @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      BLOCK_TRIAL_SPAWNER_SPAWN_MOB("block.trial_spawner.spawn_mob"),
      @MinecraftExperimental
@@ -505,7 +520,7 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
      BLOCK_TRIAL_SPAWNER_STEP("block.trial_spawner.step"),
      BLOCK_TRIPWIRE_ATTACH("block.tripwire.attach"),
      BLOCK_TRIPWIRE_CLICK_OFF("block.tripwire.click_off"),
-@@ -711,14 +743,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -736,14 +769,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
      BLOCK_TRIPWIRE_DETACH("block.tripwire.detach"),
      BLOCK_TUFF_BREAK("block.tuff.break"),
      @MinecraftExperimental
@@ -525,13 +540,33 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
      BLOCK_TUFF_BRICKS_STEP("block.tuff_bricks.step"),
      BLOCK_TUFF_FALL("block.tuff.fall"),
      BLOCK_TUFF_HIT("block.tuff.hit"),
-@@ -809,22 +846,31 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -874,36 +912,51 @@ 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
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     ENTITY_BOGGED_AMBIENT("entity.bogged.ambient"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     ENTITY_BOGGED_DEATH("entity.bogged.death"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     ENTITY_BOGGED_HURT("entity.bogged.hurt"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     ENTITY_BOGGED_SHEAR("entity.bogged.shear"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     ENTITY_BOGGED_STEP("entity.bogged.step"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     ENTITY_BREEZE_CHARGE("entity.breeze.charge"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      ENTITY_BREEZE_DEATH("entity.breeze.death"),
      @MinecraftExperimental
+     ENTITY_BREEZE_DEFLECT("entity.breeze.deflect"),
+     @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      ENTITY_BREEZE_HURT("entity.breeze.hurt"),
      @MinecraftExperimental
@@ -555,25 +590,17 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      ENTITY_BREEZE_SLIDE("entity.breeze.slide"),
-     ENTITY_CAMEL_AMBIENT("entity.camel.ambient"),
-     ENTITY_CAMEL_DASH("entity.camel.dash"),
-@@ -971,6 +1017,7 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
-     ENTITY_GENERIC_SPLASH("entity.generic.splash"),
-     ENTITY_GENERIC_SWIM("entity.generic.swim"),
      @MinecraftExperimental
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-     ENTITY_GENERIC_WIND_BURST("entity.generic.wind_burst"),
-     ENTITY_GHAST_AMBIENT("entity.ghast.ambient"),
-     ENTITY_GHAST_DEATH("entity.ghast.death"),
-@@ -1124,6 +1171,7 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
-     ENTITY_PARROT_HURT("entity.parrot.hurt"),
-     ENTITY_PARROT_IMITATE_BLAZE("entity.parrot.imitate.blaze"),
+     ENTITY_BREEZE_WHIRL("entity.breeze.whirl"),
+@@ -1209,6 +1262,7 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+     @MinecraftExperimental
+     ENTITY_PARROT_IMITATE_BOGGED("entity.parrot.imitate.bogged"),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      ENTITY_PARROT_IMITATE_BREEZE("entity.parrot.imitate.breeze"),
      ENTITY_PARROT_IMITATE_CREEPER("entity.parrot.imitate.creeper"),
      ENTITY_PARROT_IMITATE_DROWNED("entity.parrot.imitate.drowned"),
-@@ -1494,10 +1542,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -1591,10 +1645,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
      ITEM_BUCKET_FILL_POWDER_SNOW("item.bucket.fill_powder_snow"),
      ITEM_BUCKET_FILL_TADPOLE("item.bucket.fill_tadpole"),
      @MinecraftExperimental
@@ -588,27 +615,25 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
      ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"),
      ITEM_CROP_PLANT("item.crop.plant"),
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index dd509bd1f7e80a04a63d2ba6eca1ff845d12fb2d..8ca9c7c8d0d6138c825d765c270c29bce11fe09e 100644
+index cb5890e0e7bccfee2ba32dd4776f1ae1fdd539e8..7f1dc4288c2d324281e11dc582b6f4ef54bde632 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -973,14 +973,17 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -1234,6 +1234,7 @@ public interface Tag<T extends Keyed> extends Keyed {
      /**
-      * Vanilla tag representing entities which deflect arrows.
+      * Vanilla tag representing entities which deflect projectiles.
       */
 +    @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
-     Tag<EntityType> ENTITY_TYPES_DEFLECTS_ARROWS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_arrows"), EntityType.class);
+     Tag<EntityType> ENTITY_TYPES_DEFLECTS_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_projectiles"), EntityType.class);
      /**
-      * Vanilla tag representing entities which deflect tridents.
-      */
-+    @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
-     Tag<EntityType> ENTITY_TYPES_DEFLECTS_TRIDENTS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_tridents"), EntityType.class);
+      * Vanilla tag representing entities which deflect arrows.
+@@ -1244,6 +1245,7 @@ public interface Tag<T extends Keyed> extends Keyed {
      /**
       * Vanilla tag representing entities which can turn in boats.
       */
 +    @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
      Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
- 
-     // Paper start
+     /**
+      * Vanilla tag representing all entities sensitive to illager enchantments.
 diff --git a/src/main/java/org/bukkit/generator/structure/Structure.java b/src/main/java/org/bukkit/generator/structure/Structure.java
 index 65d3d8fd5f00114dc388d65321a9affe1b32ce20..8e39f282c771ddafe5d890dcf065c56f0c633647 100644
 --- a/src/main/java/org/bukkit/generator/structure/Structure.java
@@ -622,10 +647,10 @@ index 65d3d8fd5f00114dc388d65321a9affe1b32ce20..8e39f282c771ddafe5d890dcf065c56f
  
      private static Structure getStructure(String name) {
 diff --git a/src/main/java/org/bukkit/loot/LootTables.java b/src/main/java/org/bukkit/loot/LootTables.java
-index fe1af164da1e27f413a66acf2856d35bd2f72b6c..0cbdeb044beeef59285f5d6ed8782aa8b46e80d9 100644
+index 0a3bce3b9d27e6a978e0c40d9f16afb8b2e14e9b..a29b4e72de9d9d605a227c3cf66fc9f180750d27 100644
 --- a/src/main/java/org/bukkit/loot/LootTables.java
 +++ b/src/main/java/org/bukkit/loot/LootTables.java
-@@ -35,24 +35,34 @@ public enum LootTables implements Keyed {
+@@ -35,38 +35,55 @@ public enum LootTables implements Keyed {
      ANCIENT_CITY_ICE_BOX("chests/ancient_city_ice_box"),
      RUINED_PORTAL("chests/ruined_portal"),
      @MinecraftExperimental
@@ -633,6 +658,27 @@ index fe1af164da1e27f413a66acf2856d35bd2f72b6c..0cbdeb044beeef59285f5d6ed8782aa8
      TRIAL_CHAMBERS_REWARD("chests/trial_chambers/reward"),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     TRIAL_CHAMBERS_REWARD_COMMON("chests/trial_chambers/reward_common"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     TRIAL_CHAMBERS_REWARD_RARE("chests/trial_chambers/reward_rare"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     TRIAL_CHAMBERS_REWARD_UNIQUE("chests/trial_chambers/reward_unique"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     TRIAL_CHAMBERS_REWARD_OMINOUS("chests/trial_chambers/reward_ominous"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     TRIAL_CHAMBERS_REWARD_OMINOUS_COMMON("chests/trial_chambers/reward_ominous_common"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     TRIAL_CHAMBERS_REWARD_OMINOUS_RARE("chests/trial_chambers/reward_ominous_rare"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+     TRIAL_CHAMBERS_REWARD_OMINOUS_UNIQUE("chests/trial_chambers/reward_ominous_unique"),
+     @MinecraftExperimental
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      TRIAL_CHAMBERS_SUPPLY("chests/trial_chambers/supply"),
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
@@ -658,9 +704,9 @@ index fe1af164da1e27f413a66acf2856d35bd2f72b6c..0cbdeb044beeef59285f5d6ed8782aa8
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"),
-     SHIPWRECK_MAP("chests/shipwreck_map"),
-     SHIPWRECK_SUPPLY("chests/shipwreck_supply"),
-@@ -180,8 +190,10 @@ public enum LootTables implements Keyed {
+     @MinecraftExperimental
+     EQUIPMENT_TRIAL_CHAMBER("equipment/trial_chamber"),
+@@ -201,8 +218,10 @@ public enum LootTables implements Keyed {
      PIGLIN_BARTERING("gameplay/piglin_bartering"),
      // Spawners
      @MinecraftExperimental
@@ -669,5 +715,5 @@ index fe1af164da1e27f413a66acf2856d35bd2f72b6c..0cbdeb044beeef59285f5d6ed8782aa8
      @MinecraftExperimental
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"),
-     // Archaeology
-     DESERT_WELL_ARCHAEOLOGY("archaeology/desert_well"),
+     @MinecraftExperimental
+     OMINOUS_TRIAL_CHAMBER_KEY("spawners/ominous/trial_chamber/key"),
diff --git a/patches/api/0445-Add-more-scoreboard-API.patch b/patches/api/0444-Add-more-scoreboard-API.patch
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0445-Add-more-scoreboard-API.patch
+++ b/patches/api/0444-Add-more-scoreboard-API.patch
diff --git a/patches/api/0446-Improve-Registry.patch b/patches/api/0445-Improve-Registry.patch
index 43e30a4477..bb36e1435d 100644
--- a/patches/api/0446-Improve-Registry.patch
+++ b/patches/api/0445-Improve-Registry.patch
@@ -10,7 +10,7 @@ getKey() methods on Keyed objects that have a registry
 are marked as Deprecated or Obsolete.
 
 diff --git a/src/main/java/org/bukkit/MusicInstrument.java b/src/main/java/org/bukkit/MusicInstrument.java
-index ee5368372e136541eafe1d7ffb395de670fe4843..31a81ac909976492f0c6b93ad49008878a3bcae2 100644
+index 62d2b3f950860dee0898d77b0a29635c3f9a7e23..704dba92f9246ef398ed8d162ebee3cf305960e1 100644
 --- a/src/main/java/org/bukkit/MusicInstrument.java
 +++ b/src/main/java/org/bukkit/MusicInstrument.java
 @@ -53,6 +53,16 @@ public abstract class MusicInstrument implements Keyed, net.kyori.adventure.tran
@@ -31,10 +31,10 @@ index ee5368372e136541eafe1d7ffb395de670fe4843..31a81ac909976492f0c6b93ad4900887
      @Override
      public @NotNull String translationKey() {
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index 18c672f3855a329bf8f87a9de81b677e8e360b41..e1fb4d8cca6a9c59047b1396f5c40bea957d777a 100644
+index ff870d18f3870d1432167516b166cece075d77bc..0b578ac7646db0a1afd7a04a77280c977a298826 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -313,6 +313,49 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -328,6 +328,49 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
      @Nullable
      T get(@NotNull NamespacedKey key);
  
@@ -84,7 +84,7 @@ index 18c672f3855a329bf8f87a9de81b677e8e360b41..e1fb4d8cca6a9c59047b1396f5c40bea
      /**
       * Returns a new stream, which contains all registry items, which are registered to the registry.
       *
-@@ -379,5 +422,12 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -394,5 +437,12 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
          public Iterator<T> iterator() {
              return map.values().iterator();
          }
@@ -98,10 +98,10 @@ index 18c672f3855a329bf8f87a9de81b677e8e360b41..e1fb4d8cca6a9c59047b1396f5c40bea
      }
  }
 diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java
-index 1c5c6303de815dd4ffa68f47dd2b6fa187fd4b70..7cdcc70d1bc33c88b217638725713e9cde450bdb 100644
+index 0d250d0c1381aadab031f102f537422a731b88e1..31751aa31ef31142c37ef522a17435f4eeb7231a 100644
 --- a/src/main/java/org/bukkit/block/banner/PatternType.java
 +++ b/src/main/java/org/bukkit/block/banner/PatternType.java
-@@ -67,6 +67,13 @@ public enum PatternType implements Keyed {
+@@ -72,6 +72,13 @@ public enum PatternType implements Keyed {
          this.key = NamespacedKey.minecraft(key);
      }
  
@@ -153,10 +153,10 @@ index 941fac4eee338870d8c30cb1f64cab572cf54548..74816d6da4d7c8d2fa8a7b93fdc4bf29
 +    // Paper end - Registry#getKey
  }
 diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
-index 3fa087d09c7c2d864eea25659951a537359c9589..31554cfa01360b0f92336617a75f313e0175af7a 100644
+index f2242ddc4085f7e7cdd748d860857822e3d9b007..087e99ed281c0b282d91345067bfca80762faa0b 100644
 --- a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
 +++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
-@@ -92,4 +92,14 @@ public interface TrimPattern extends Keyed, Translatable {
+@@ -100,4 +100,14 @@ public interface TrimPattern extends Keyed, Translatable {
      @Deprecated(forRemoval = true)
      @org.jetbrains.annotations.NotNull String getTranslationKey();
      // Paper end - adventure
diff --git a/patches/api/0447-Add-experience-points-API.patch b/patches/api/0446-Add-experience-points-API.patch
index 3dcd7df05d..a0add5e837 100644
--- a/patches/api/0447-Add-experience-points-API.patch
+++ b/patches/api/0446-Add-experience-points-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add experience points API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0d585390066966f3afd6b88c6d80806292a3cd31..c6cb4f17469a8f2e60dd3e28d41402851ce5fb21 100644
+index 9261f06e332f8db94b2ef7bc01f5b0e61422bcb2..f08b1a2ec8815efcaaf1371e20eb1461a5f2d359 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1858,6 +1858,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1902,6 +1902,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param exp New total experience points
       */
      public void setTotalExperience(int exp);
diff --git a/patches/api/0448-Add-missing-InventoryType.patch b/patches/api/0447-Add-missing-InventoryType.patch
index 67b4504ad3..67b4504ad3 100644
--- a/patches/api/0448-Add-missing-InventoryType.patch
+++ b/patches/api/0447-Add-missing-InventoryType.patch
diff --git a/patches/api/0449-Add-drops-to-shear-events.patch b/patches/api/0448-Add-drops-to-shear-events.patch
index c87460e48d..c87460e48d 100644
--- a/patches/api/0449-Add-drops-to-shear-events.patch
+++ b/patches/api/0448-Add-drops-to-shear-events.patch
diff --git a/patches/api/0450-Add-HiddenPotionEffect-API.patch b/patches/api/0449-Add-HiddenPotionEffect-API.patch
index 53d4b040a2..39363e9c3f 100644
--- a/patches/api/0450-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0449-Add-HiddenPotionEffect-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 80df95e93b9a919af8c2e98b09b75522ee60eae6..65112eae8b92344796850b1e4c89e75443eab2fe 100644
+index 4c0c548af4d2eff6fb6b6d11ba94a64db08ccb64..9a5873120e263d77d84183d1909e672f2b303a74 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0451-Add-PlayerShieldDisableEvent.patch b/patches/api/0450-Add-PlayerShieldDisableEvent.patch
index 29c7daa0e3..29c7daa0e3 100644
--- a/patches/api/0451-Add-PlayerShieldDisableEvent.patch
+++ b/patches/api/0450-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0451-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 742314fff8..742314fff8 100644
--- a/patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0451-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0453-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0452-Add-BlockStateMeta-clearBlockState.patch
index 1a81132aa8..1a81132aa8 100644
--- a/patches/api/0453-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/api/0452-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0454-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0453-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0454-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0453-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0455-Add-ShulkerDuplicateEvent.patch b/patches/api/0454-Add-ShulkerDuplicateEvent.patch
index a0a81094ce..a0a81094ce 100644
--- a/patches/api/0455-Add-ShulkerDuplicateEvent.patch
+++ b/patches/api/0454-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0455-Add-api-for-spawn-egg-texture-colors.patch
index 35366bea02..35366bea02 100644
--- a/patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0455-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0457-Add-Lifecycle-Event-system.patch b/patches/api/0456-Add-Lifecycle-Event-system.patch
index f915f892cf..f915f892cf 100644
--- a/patches/api/0457-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0456-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0459-ItemStack-Tooltip-API.patch b/patches/api/0457-ItemStack-Tooltip-API.patch
index 4274a11ce7..4274a11ce7 100644
--- a/patches/api/0459-ItemStack-Tooltip-API.patch
+++ b/patches/api/0457-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0458-Add-getChunkSnapshot-includeLightData-parameter.patch
index 0437924b94..0437924b94 100644
--- a/patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/api/0458-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0458-Conduit-API.patch b/patches/api/0458-Conduit-API.patch
deleted file mode 100644
index 57f43f96a3..0000000000
--- a/patches/api/0458-Conduit-API.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tamion <[email protected]>
-Date: Sat, 27 Jan 2024 20:46:29 +0100
-Subject: [PATCH] Conduit API
-
-
-diff --git a/src/main/java/org/bukkit/block/Conduit.java b/src/main/java/org/bukkit/block/Conduit.java
-index 5543165536e84503c2d1476ee2001468cbb724f9..b3eec2eab586072598a40375a1c3e722ee3fa352 100644
---- a/src/main/java/org/bukkit/block/Conduit.java
-+++ b/src/main/java/org/bukkit/block/Conduit.java
-@@ -3,4 +3,34 @@ package org.bukkit.block;
- /**
-  * Represents a captured state of a conduit.
-  */
--public interface Conduit extends TileState { }
-+public interface Conduit extends TileState {
-+
-+    // Paper start - Conduit API
-+
-+    /**
-+     * Gets if the conduit is currently active.
-+     * <p>
-+     * Requires the conduit to be placed in the world.
-+     *
-+     * @return if the conduit is active
-+     */
-+    boolean isActive();
-+
-+    /**
-+     * Gets the range in which the Conduit Power effect gets added to players.
-+     * <p>
-+     * Requires the conduit to be placed in the world.
-+     *
-+     * @return the range
-+     */
-+    int getRange();
-+
-+    /**
-+     * Gets the current target of the conduit.
-+     *
-+     * @return the current target
-+     */
-+    @org.jetbrains.annotations.Nullable
-+    org.bukkit.entity.LivingEntity getTarget();
-+    // Paper end - Conduit API
-+}
diff --git a/patches/api/0461-Add-FluidState-API.patch b/patches/api/0459-Add-FluidState-API.patch
index 3235c393f5..3235c393f5 100644
--- a/patches/api/0461-Add-FluidState-API.patch
+++ b/patches/api/0459-Add-FluidState-API.patch
diff --git a/patches/api/0462-add-number-format-api.patch b/patches/api/0460-add-number-format-api.patch
index 6d32302ad0..6d32302ad0 100644
--- a/patches/api/0462-add-number-format-api.patch
+++ b/patches/api/0460-add-number-format-api.patch
diff --git a/patches/api/0463-improve-BanList-types.patch b/patches/api/0461-improve-BanList-types.patch
index f1738e1190..2236f8bf3e 100644
--- a/patches/api/0463-improve-BanList-types.patch
+++ b/patches/api/0461-improve-BanList-types.patch
@@ -68,10 +68,10 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..0e0baadde9e34d28db56dc68e66aaf66
          /**
           * Banned player names
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8e2942664f73b0f92beb30c7a94b720610a43c15..9a428153f34291bdc026a71f7e60e285b7794b0c 100644
+index c9fbbf0287cd663080fc09ac83b439780cbfae85..687bd8f54c9bfb5f5ab1f7ad9d232daf2433cc76 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1639,11 +1639,27 @@ public final class Bukkit {
+@@ -1651,11 +1651,27 @@ public final class Bukkit {
       * @param <T> The ban target
       *
       * @return a ban list of the specified type
@@ -100,10 +100,10 @@ index 8e2942664f73b0f92beb30c7a94b720610a43c15..9a428153f34291bdc026a71f7e60e285
      /**
       * Gets a set containing all player operators.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 78daaaa3b4f1ec1d05652287d9f9b08689bc2cbf..4ff1b38eb65f97344257204cf018f176f247ed36 100644
+index c8395c8707e696f1e6fc8b0fd03f07203e01c157..27084402cf0e46dcd171074629b7c4156e48aa44 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1400,10 +1400,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1410,10 +1410,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param <T> The ban target
       *
       * @return a ban list of the specified type
diff --git a/patches/api/0464-Suspicious-Effect-Entry-API.patch b/patches/api/0462-Suspicious-Effect-Entry-API.patch
index 7c9548be79..7c9548be79 100644
--- a/patches/api/0464-Suspicious-Effect-Entry-API.patch
+++ b/patches/api/0462-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0465-Fix-DamageSource-API.patch b/patches/api/0463-Fix-DamageSource-API.patch
index efe4403e2c..efe4403e2c 100644
--- a/patches/api/0465-Fix-DamageSource-API.patch
+++ b/patches/api/0463-Fix-DamageSource-API.patch
diff --git a/patches/api/0466-Expanded-Hopper-API.patch b/patches/api/0464-Expanded-Hopper-API.patch
index 51cb6dfee2..51cb6dfee2 100644
--- a/patches/api/0466-Expanded-Hopper-API.patch
+++ b/patches/api/0464-Expanded-Hopper-API.patch
diff --git a/patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0465-Clone-mutables-to-prevent-unexpected-issues.patch
index e84ea7d3aa..e84ea7d3aa 100644
--- a/patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/patches/api/0465-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0468-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0466-Add-BlockBreakProgressUpdateEvent.patch
index a2b5a83baf..a2b5a83baf 100644
--- a/patches/api/0468-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/api/0466-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0469-Deprecate-ItemStack-setType.patch b/patches/api/0467-Deprecate-ItemStack-setType.patch
index 78e7c70b9f..78e7c70b9f 100644
--- a/patches/api/0469-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0467-Deprecate-ItemStack-setType.patch
diff --git a/patches/api/0470-Item-Mutation-Fixes.patch b/patches/api/0468-Item-Mutation-Fixes.patch
index c1c3508b78..c1c3508b78 100644
--- a/patches/api/0470-Item-Mutation-Fixes.patch
+++ b/patches/api/0468-Item-Mutation-Fixes.patch
diff --git a/patches/api/0471-API-for-checking-sent-chunks.patch b/patches/api/0469-API-for-checking-sent-chunks.patch
index 30170f4dfe..8d97e181b0 100644
--- a/patches/api/0471-API-for-checking-sent-chunks.patch
+++ b/patches/api/0469-API-for-checking-sent-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for checking sent chunks
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c6cb4f17469a8f2e60dd3e28d41402851ce5fb21..d048ae07cc33fd77d128cc1ebf88b0804969fa3c 100644
+index f08b1a2ec8815efcaaf1371e20eb1461a5f2d359..8a1e39474af88188f2e1765731b57d349f0ee645 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3707,6 +3707,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3751,6 +3751,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void resetIdleDuration();
      // Paper end
  
diff --git a/patches/api/0472-Add-CartographyItemEvent.patch b/patches/api/0470-Add-CartographyItemEvent.patch
index 1f19663c9f..1f19663c9f 100644
--- a/patches/api/0472-Add-CartographyItemEvent.patch
+++ b/patches/api/0470-Add-CartographyItemEvent.patch
diff --git a/patches/api/0473-More-Raid-API.patch b/patches/api/0471-More-Raid-API.patch
index 6c0e5da000..921bc9c6fb 100644
--- a/patches/api/0473-More-Raid-API.patch
+++ b/patches/api/0471-More-Raid-API.patch
@@ -39,10 +39,10 @@ index 983a8c20a06d2b509602b27f49c090598b8ecc42..fa98599e3eee37bf68f0e9813497c718
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 35fb5047dd8a8521586a9ca9f8d70881355fb7f5..e6f66d70d024cf4f0536a5bf8e51bf7b306335df 100644
+index 0e3c7de14be8dc01199fd68b6bf41783c5c43ec3..97f97ea5c6aa513c439f86a9c82821e0f7d9cd1e 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4199,6 +4199,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4215,6 +4215,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public Raid locateNearestRaid(@NotNull Location location, int radius);
  
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index 62a6510820..a140c8cb77 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -28,7 +28,7 @@ index 37dab9e868dbfb019c271a547d975a48ad1cb571..3811c0d849a3eb028ed1a6b7a2d4747f
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d0a56f6aa
+index 0000000000000000000000000000000000000000..8116ef8a1d098f0fe4fab661f913132ce3ec4ae9
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,141 @@
@@ -43,13 +43,13 @@ index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d
 +dependencies {
 +    implementation(project(":paper-api"))
 +    implementation("jline:jline:2.12.1")
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") {
++    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") {
 +        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
 +    }
 +    implementation("org.ow2.asm:asm-commons:9.7")
 +    implementation("commons-lang:commons-lang:2.6")
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-+    runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
++    runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
++    runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
 +
 +    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
@@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d
 +    testImplementation("org.ow2.asm:asm-tree:9.7")
 +}
 +
-+val craftbukkitPackageVersion = "1_20_R3" // Paper
++val craftbukkitPackageVersion = "1_20_R4" // Paper
 +tasks.jar {
 +    archiveClassifier.set("dev")
 +
@@ -175,17 +175,17 @@ index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 226b56846562846d1b89c54b67b4ccc235eaf3e9..0000000000000000000000000000000000000000
+index ca5ed64db9554831442170c57e288941454dcbca..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,608 +0,0 @@
+@@ -1,613 +0,0 @@
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 -    <modelVersion>4.0.0</modelVersion>
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.20.4-R0.1-SNAPSHOT</version>
+-    <version>1.20.5-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
@@ -201,9 +201,8 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
 -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -        <api.version>unknown</api.version>
 -        <bt.name>git</bt.name>
--        <minecraft_version>1_20_R3</minecraft_version>
--        <maven.compiler.source>17</maven.compiler.source>
--        <maven.compiler.target>17</maven.compiler.target>
+-        <minecraft_version>1_20_R4</minecraft_version>
+-        <maven.compiler.release>21</maven.compiler.release>
 -    </properties>
 -
 -    <repositories>
@@ -236,7 +235,7 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.logging.log4j</groupId>
 -            <artifactId>log4j-iostreams</artifactId>
--            <version>2.19.0</version>
+-            <version>2.22.1</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -249,13 +248,13 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.github.oshi</groupId>
 -            <artifactId>oshi-core</artifactId>
--            <version>6.4.5</version>
+-            <version>6.4.10</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>authlib</artifactId>
--            <version>5.0.51</version>
+-            <version>6.0.54</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -267,19 +266,19 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>datafixerupper</artifactId>
--            <version>6.0.8</version>
+-            <version>7.0.14</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>logging</artifactId>
--            <version>1.1.1</version>
+-            <version>1.2.7</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>commons-io</groupId>
 -            <artifactId>commons-io</artifactId>
--            <version>2.13.0</version>
+-            <version>2.15.1</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -353,13 +352,13 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>net.java.dev.jna</groupId>
 -            <artifactId>jna</artifactId>
--            <version>5.13.0</version>
+-            <version>5.14.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>net.java.dev.jna</groupId>
 -            <artifactId>jna-platform</artifactId>
--            <version>5.13.0</version>
+-            <version>5.14.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -371,25 +370,31 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.commons</groupId>
 -            <artifactId>commons-lang3</artifactId>
--            <version>3.13.0</version>
+-            <version>3.14.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.logging.log4j</groupId>
 -            <artifactId>log4j-core</artifactId>
--            <version>2.19.0</version>
+-            <version>2.22.1</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.logging.log4j</groupId>
 -            <artifactId>log4j-slf4j2-impl</artifactId>
--            <version>2.19.0</version>
+-            <version>2.22.1</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.slf4j</groupId>
 -            <artifactId>slf4j-api</artifactId>
--            <version>2.0.7</version>
+-            <version>2.0.9</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.lz4</groupId>
+-            <artifactId>lz4-java</artifactId>
+-            <version>1.8.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- deprecated API depend -->
@@ -415,13 +420,13 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.xerial</groupId>
 -            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.42.0.1</version>
+-            <version>3.45.3.0</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mysql</groupId>
 -            <artifactId>mysql-connector-j</artifactId>
--            <version>8.2.0</version>
+-            <version>8.3.0</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- add these back in as they are not exposed by the API -->
@@ -673,7 +678,7 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-compiler-plugin</artifactId>
--                <version>3.11.0</version>
+-                <version>3.13.0</version>
 -                <configuration>
 -                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
 -                    <compilerId>eclipse</compilerId>
@@ -684,7 +689,7 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
 -                    <dependency>
 -                        <groupId>org.codehaus.plexus</groupId>
 -                        <artifactId>plexus-compiler-eclipse</artifactId>
--                        <version>2.13.0</version>
+-                        <version>2.15.0</version>
 -                    </dependency>
 -                </dependencies>
 -            </plugin>
diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch
index 9a1f203f9a..1c0c07fc21 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 17a400bb1710afe0b2c88ba7b0a008d4dbcbfa0c..1a4cab0b9995b733aa84b89129009a99177eee9b 100644
+index f0a764d3e1a756537b8188e9f5361d0dbaca25a9..478d2114fbd5c499a8adbf8b6cefcc8335e830dc 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -289,9 +289,11 @@ public class BlockPos extends Vec3i {
+@@ -311,9 +311,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 17a400bb1710afe0b2c88ba7b0a008d4dbcbfa0c..1a4cab0b9995b733aa84b89129009a99
          return () -> new AbstractIterator<BlockPos>() {
                  private final BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
                  private int currentDepth;
-@@ -305,7 +307,7 @@ public class BlockPos extends Vec3i {
+@@ -327,7 +329,7 @@ public class BlockPos extends Vec3i {
                  protected BlockPos computeNext() {
                      if (this.zMirror) {
                          this.zMirror = false;
@@ -32,7 +32,7 @@ index 17a400bb1710afe0b2c88ba7b0a008d4dbcbfa0c..1a4cab0b9995b733aa84b89129009a99
                          return this.cursor;
                      } else {
                          BlockPos blockPos;
-@@ -331,7 +333,7 @@ public class BlockPos extends Vec3i {
+@@ -353,7 +355,7 @@ public class BlockPos extends Vec3i {
                              int k = this.currentDepth - Math.abs(i) - Math.abs(j);
                              if (k <= rangeZ) {
                                  this.zMirror = k != 0;
@@ -42,10 +42,10 @@ index 17a400bb1710afe0b2c88ba7b0a008d4dbcbfa0c..1a4cab0b9995b733aa84b89129009a99
                          }
  
 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 1915b138ea89790ef8b7456b7fddcbd5d97e5444..ba9f6d288d8773f275e35a9513f7f59ad3f666c0 100644
+index 7344cff32fa6fe3dedb74ed98126072c55b0abd2..d98b28e9488a5a7736719cf656736bb026ec8c7e 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 {
+@@ -169,10 +169,10 @@ public class BehaviorUtils {
  
          return optional.map((uuid) -> {
              return ((ServerLevel) entity.level()).getEntity(uuid);
@@ -53,31 +53,16 @@ index 1915b138ea89790ef8b7456b7fddcbd5d97e5444..ba9f6d288d8773f275e35a9513f7f59a
 +        }).map((entity1) -> { // Paper - remap fix
              LivingEntity entityliving1;
  
--            if (entity instanceof LivingEntity) {
--                LivingEntity entityliving2 = (LivingEntity) entity;
-+            if (entity1 instanceof LivingEntity) { // Paper - remap fix
-+                LivingEntity entityliving2 = (LivingEntity) entity1; // Paper - remap fix
- 
+-            if (entity instanceof LivingEntity entityliving2) {
++            if (entity1 instanceof LivingEntity entityliving2) { // Paper - remap fix
                  entityliving1 = entityliving2;
              } else {
-diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-index 17c42cfcec69385f0b65e2d42d735e8b8f6e7b04..04adc10f24f96804a5cb14e884224bb672360464 100644
---- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-@@ -193,7 +193,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
-         Builder<ResourceLocation, RecipeHolder<?>> builder = ImmutableMap.builder();
- 
-         recipes.forEach((recipeholder) -> {
--            Map<ResourceLocation, RecipeHolder<?>> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes) -> {
-+            Map<ResourceLocation, RecipeHolder<?>> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes_) -> { // Paper - remap fix
-                 return new Object2ObjectLinkedOpenHashMap<>(); // CraftBukkit
-             });
-             ResourceLocation minecraftkey = recipeholder.id();
+                 entityliving1 = null;
 diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-index 95a5ce711150c4c999a9d17f28a497f034638610..214215d203892b8009595539f25ce26e8752debd 100644
+index 61592d57c26c359abda266f4ac8c58419e9beb02..83fce6746aaa3b378da6c5573ec9991d8438b071 100644
 --- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
 +++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-@@ -251,8 +251,8 @@ public class LootTable {
+@@ -255,8 +255,8 @@ public class LootTable {
  
      public static class Builder implements FunctionUserBuilder<LootTable.Builder> {
  
@@ -119,15 +104,15 @@ index b70450722da13bc4d358a70d3d1d2f30a2cca2b9..86d86c292bdeeb7f42685691287c3b4b
      }
  }
 diff --git a/src/test/java/org/bukkit/ParticleTest.java b/src/test/java/org/bukkit/ParticleTest.java
-index 1edc58410316eaf45858db56897179587e8b22ee..cf6f34e506570e7bb9624c5899fbcdd762d8e0c4 100644
+index 9c9f5dd2351b3067b54d6cc5bdb572c46b12aaa8..307e8a3694c6f0b48d2df9792c3e5fdbaae1fd8e 100644
 --- a/src/test/java/org/bukkit/ParticleTest.java
 +++ b/src/test/java/org/bukkit/ParticleTest.java
-@@ -231,7 +231,7 @@ public class ParticleTest extends AbstractTestingBase {
+@@ -250,7 +250,7 @@ public class ParticleTest extends AbstractTestingBase {
                  Check in CraftParticle if the conversion is still correct.
                  """, bukkit.getKey()));
  
--        DataResult<Tag> encoded = assertDoesNotThrow(() -> minecraft.codec().encodeStart(DynamicOpsNBT.INSTANCE, particleParam),
-+        DataResult<Tag> encoded = assertDoesNotThrow(() -> minecraft.codec().encodeStart(NbtOps.INSTANCE, particleParam), // Paper - remap fix
+-        DataResult<Tag> encoded = assertDoesNotThrow(() -> minecraft.codec().codec().encodeStart(DynamicOpsNBT.INSTANCE, particleParam),
++        DataResult<Tag> encoded = assertDoesNotThrow(() -> minecraft.codec().codec().encodeStart(NbtOps.INSTANCE, particleParam), // Paper - remap fix
                  String.format("""
                          Could not encoded particle param for particle %s.
                          This can indicated, that the wrong particle param is created in CraftParticle.
@@ -187,7 +172,7 @@ index 5818bfa69a8573a2a8f350066f829d587cbc546b..8e421a1bee0c526e3024eab9ba4cc0b3
  
              assertNotNull(bukkit, "Bukkit gene null for " + gene);
 diff --git a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
-index 8abeb88d1514d22b5095153f9537317006f39df0..82a1efcb3aaaceaf12ad21559dec6b5112fcb361 100644
+index f3de891458ea190e1d608511b5984ca25b06b74c..1b1e55f70b3c9f922bd1cc63209816f50d7d29d1 100644
 --- a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
 +++ b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
 @@ -28,17 +28,17 @@ public class RegistryConstantsTest extends AbstractTestingBase {
@@ -212,10 +197,10 @@ index 8abeb88d1514d22b5095153f9537317006f39df0..82a1efcb3aaaceaf12ad21559dec6b51
  
          for (Field field : clazz.getFields()) {
 diff --git a/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java b/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java
-index b60b07f15fc61b9a92850b2008e2c928b94dbd04..da3eed6f130903bf27eed7e0bcae672a4f860c17 100644
+index 7d332ecf7905f71de106fe0e5fb4cc3e16bd6035..d7ef3a9a545d5278832b864bca683796b1fd0d42 100644
 --- a/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java
 +++ b/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java
-@@ -22,7 +22,7 @@ public class RegistryLoadOrderTest extends AbstractTestingBase {
+@@ -24,7 +24,7 @@ public class RegistryLoadOrderTest extends AbstractTestingBase {
  
      private static boolean initInterface = false;
      private static boolean initAbstract = false;
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index c935af1a00..51692ff801 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -9,20 +9,20 @@ public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 4e0b810bd0a9991d10e13920f47f0b6d0a56f6aa..50d9182a4845564cd62b026700a7d0517c25e74d 100644
+index 8116ef8a1d098f0fe4fab661f913132ce3ec4ae9..2905c7273ed4d62a7f1bc7eab9ae919ee6c012de 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,9 +9,7 @@ plugins {
  dependencies {
      implementation(project(":paper-api"))
      implementation("jline:jline:2.12.1")
--    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") {
+-    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") {
 -        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
 -    }
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
++    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
      implementation("org.ow2.asm:asm-commons:9.7")
      implementation("commons-lang:commons-lang:2.6")
-     runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
+     runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
 @@ -36,6 +34,7 @@ tasks.jar {
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
@@ -66,10 +66,10 @@ index 4e0b810bd0a9991d10e13920f47f0b6d0a56f6aa..50d9182a4845564cd62b026700a7d051
 +    jvmArgs("-DPaper.pushPaperAssetsRoot=true")
  }
 diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java
-index 0064a1112f392379ff095f95738f1368240ca4cf..aed74e471126a8a66046a181973158d7d288d3f0 100644
+index 0e93817621bad5d69cf0f9f839d033c47c861457..0ad6d9d417193248f6a9df67f1d1a66cef3ff122 100644
 --- a/src/main/java/net/minecraft/resources/ResourceLocation.java
 +++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
-@@ -28,6 +28,7 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
+@@ -32,6 +32,7 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
      public static final char NAMESPACE_SEPARATOR = ':';
      public static final String DEFAULT_NAMESPACE = "minecraft";
      public static final String REALMS_NAMESPACE = "realms";
@@ -78,7 +78,7 @@ index 0064a1112f392379ff095f95738f1368240ca4cf..aed74e471126a8a66046a181973158d7
      private final String path;
  
 diff --git a/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java b/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
-index 6a11d33eb44e0fde731b54a9200eb44b20a73c43..29ab3aae87de2bf14b31268239d935e49cb0fa98 100644
+index 14fc03563daea531314c7ceba56dbb47884010ee..fcf95958ef659c7aa8e28026961fa1d6a5f8b28c 100644
 --- a/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
 +++ b/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
 @@ -138,6 +138,15 @@ public class VanillaPackResourcesBuilder {
@@ -98,10 +98,10 @@ index 6a11d33eb44e0fde731b54a9200eb44b20a73c43..29ab3aae87de2bf14b31268239d935e4
      }
  
 diff --git a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-index dd5e32e7a64eaddab66905dba2595f2220706adb..439b9bc95ae8580fcde89f86565df39ba4040d59 100644
+index a5e8713bc0fefae455b666ebf13c9529e7ba94e6..407254c779c8291543873fe4e94c5f94981a81eb 100644
 --- a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
 +++ b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-@@ -38,7 +38,7 @@ public class ServerPacksSource extends BuiltInPackSource {
+@@ -48,7 +48,7 @@ public class ServerPacksSource extends BuiltInPackSource {
      public static VanillaPackResources createVanillaPackSource() {
          return new VanillaPackResourcesBuilder()
              .setMetadata(BUILT_IN_METADATA)
@@ -109,12 +109,12 @@ index dd5e32e7a64eaddab66905dba2595f2220706adb..439b9bc95ae8580fcde89f86565df39b
 +            .exposeNamespace("minecraft", ResourceLocation.PAPER_NAMESPACE) // Paper
              .applyDevelopmentConfig()
              .pushJarResources()
-             .build();
+             .build(VANILLA_PACK_INFO);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2930f37c663a1824a2d38df8e4b679aa6adbd870..67d347741db1c5a9a6568ee084388a59e35b16ea 100644
+index 5595eb892fa868508c45448942da65d7c11d49fd..4b8602b168f9dd386aa72b4e5d189c441c93542e 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 {
+@@ -210,7 +210,7 @@ public class Main {
                  }
  
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
@@ -122,7 +122,7 @@ index 2930f37c663a1824a2d38df8e4b679aa6adbd870..67d347741db1c5a9a6568ee084388a59
 +                    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, -28);
+                     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
@@ -140,7 +140,7 @@ diff --git a/src/main/resources/data/.paperassetsroot b/src/main/resources/data/
 new file mode 100644
 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
 diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index a1c2c702cc6b5d949df62b5ecf4cc62b8e4e8f77..0619361adf57fdc41c4ecb09d1d6a5c862a85f89 100644
+index 1bdf0b2b8f8e6dace403695fece80ebb3dc9e039..544307fe34cbcfa286a7d7b30900ebea127d189e 100644
 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
 +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
 @@ -43,6 +43,7 @@ public abstract class AbstractTestingBase {
diff --git a/patches/server/0004-Test-changes.patch b/patches/unapplied/server/0004-Test-changes.patch
index 9bb625b711..9bb625b711 100644
--- a/patches/server/0004-Test-changes.patch
+++ b/patches/unapplied/server/0004-Test-changes.patch
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/unapplied/server/0005-Paper-config-files.patch
index ca3d0593c0..ca3d0593c0 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/unapplied/server/0005-Paper-config-files.patch
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/unapplied/server/0006-MC-Dev-fixes.patch
index 671908dd6b..671908dd6b 100644
--- a/patches/server/0006-MC-Dev-fixes.patch
+++ b/patches/unapplied/server/0006-MC-Dev-fixes.patch
diff --git a/patches/server/0007-ConcurrentUtil.patch b/patches/unapplied/server/0007-ConcurrentUtil.patch
index b5d70f9b38..b5d70f9b38 100644
--- a/patches/server/0007-ConcurrentUtil.patch
+++ b/patches/unapplied/server/0007-ConcurrentUtil.patch
diff --git a/patches/server/0008-CB-fixes.patch b/patches/unapplied/server/0008-CB-fixes.patch
index 98a115c15e..5557dcf6f3 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/unapplied/server/0008-CB-fixes.patch
@@ -52,7 +52,7 @@ index b2f37e3caf305f7f2c19c59848717bf73bd2ef5d..87c8460324ff2d2a14e1404fcfa3adb2
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-index 8fa222759b8ada1674a7d3ae1c0cdf91bfd7f915..da919ad85ce06572f8e7e4c121a2c222f975c7f5 100644
+index 3f5bedc49f249888cf435f5511f5ce1da921910b..a63eaec77251a7f6660d17d7210c639b71751c45 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
 @@ -42,7 +42,7 @@ public class StructureCheck {
diff --git a/patches/server/0009-MC-Utils.patch b/patches/unapplied/server/0009-MC-Utils.patch
index 40721b09a9..40721b09a9 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/unapplied/server/0009-MC-Utils.patch
diff --git a/patches/server/0010-Adventure.patch b/patches/unapplied/server/0010-Adventure.patch
index b91e0bfc27..b91e0bfc27 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 7fe615b89f..7fe615b89f 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 3d7bf9785a..3d7bf9785a 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 24c7946f56..3b9673ae92 100644
--- a/patches/server/0013-Paper-Plugins.patch
+++ b/patches/unapplied/server/0013-Paper-Plugins.patch
@@ -7117,7 +7117,7 @@ index f7114d5b8f2f93f62883e24da29afaf9f74ee1a6..8bf0630c0e06950cd99b7ae9898137f7
  
          return foundFrame.orElse(null);
 diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
-index d14613f7d37198276c251e73703b060a971fac28..e741062f0c9c114db47124031c6fa6a6e145a5cd 100644
+index e8afaa3c1fab0435acb068426091bdf776263112..94da73ef6c77308a8bc21db4c0bca22a79376b58 100644
 --- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
 +++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
 @@ -312,7 +312,13 @@ public class BuiltInRegistries {
diff --git a/patches/server/0014-Timings-v2.patch b/patches/unapplied/server/0014-Timings-v2.patch
index b26cda4bf9..b26cda4bf9 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/unapplied/server/0014-Timings-v2.patch
diff --git a/patches/server/0015-Add-TickThread.patch b/patches/unapplied/server/0015-Add-TickThread.patch
index bf8c922243..bf8c922243 100644
--- a/patches/server/0015-Add-TickThread.patch
+++ b/patches/unapplied/server/0015-Add-TickThread.patch
diff --git a/patches/server/0016-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0016-Further-improve-server-tick-loop.patch
index 53f246d057..d4aa75ee92 100644
--- a/patches/server/0016-Further-improve-server-tick-loop.patch
+++ b/patches/unapplied/server/0016-Further-improve-server-tick-loop.patch
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3365d2ec8426888c16873a311226fa69840fa2f0..dd93d4957459556a102b9bf712dd80cb69810cb7 100644
+index 2be50609ccf90d3db6e572377ba63bcbad156382..c1f9acad1e97915dfad5fbc0ba2547853e3b37f1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -283,7 +283,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index aa17ed15b2..aa17ed15b2 100644
--- a/patches/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0018-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0018-Support-components-in-ItemMeta.patch
index 212575286c..212575286c 100644
--- a/patches/server/0018-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/server/0018-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0019-Configurable-cactus-bamboo-and-reed-growth-height.patch b/patches/unapplied/server/0019-Configurable-cactus-bamboo-and-reed-growth-height.patch
index 6f7a9c6719..6f7a9c6719 100644
--- a/patches/server/0019-Configurable-cactus-bamboo-and-reed-growth-height.patch
+++ b/patches/unapplied/server/0019-Configurable-cactus-bamboo-and-reed-growth-height.patch
diff --git a/patches/server/0020-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0020-Configurable-baby-zombie-movement-speed.patch
index 5037cff218..5037cff218 100644
--- a/patches/server/0020-Configurable-baby-zombie-movement-speed.patch
+++ b/patches/unapplied/server/0020-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0021-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0021-Configurable-fishing-time-ranges.patch
index 117f93cdbf..117f93cdbf 100644
--- a/patches/server/0021-Configurable-fishing-time-ranges.patch
+++ b/patches/unapplied/server/0021-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0022-Allow-nerfed-mobs-to-jump.patch b/patches/unapplied/server/0022-Allow-nerfed-mobs-to-jump.patch
index 598cc77be4..598cc77be4 100644
--- a/patches/server/0022-Allow-nerfed-mobs-to-jump.patch
+++ b/patches/unapplied/server/0022-Allow-nerfed-mobs-to-jump.patch
diff --git a/patches/server/0023-Add-configurable-entity-despawn-distances.patch b/patches/unapplied/server/0023-Add-configurable-entity-despawn-distances.patch
index e43e0a2d4c..e43e0a2d4c 100644
--- a/patches/server/0023-Add-configurable-entity-despawn-distances.patch
+++ b/patches/unapplied/server/0023-Add-configurable-entity-despawn-distances.patch
diff --git a/patches/server/0024-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0024-Allow-for-toggling-of-spawn-chunks.patch
index 092af27d5c..092af27d5c 100644
--- a/patches/server/0024-Allow-for-toggling-of-spawn-chunks.patch
+++ b/patches/unapplied/server/0024-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index e81eb5fef1..e81eb5fef1 100644
--- a/patches/server/0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/unapplied/server/0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 9eab4cd8f4..92105de031 100644
--- a/patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/unapplied/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dd93d4957459556a102b9bf712dd80cb69810cb7..b951659a8fae8929123be985d02e08f28bd1e49e 100644
+index c1f9acad1e97915dfad5fbc0ba2547853e3b37f1..01a1d2af6b4cf66cff8eb6d14116343a121deed2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1615,7 +1615,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0027-Implement-Paper-VersionChecker.patch b/patches/unapplied/server/0027-Implement-Paper-VersionChecker.patch
index 5f32648869..5f32648869 100644
--- a/patches/server/0027-Implement-Paper-VersionChecker.patch
+++ b/patches/unapplied/server/0027-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0028-Add-version-history-to-version-command.patch b/patches/unapplied/server/0028-Add-version-history-to-version-command.patch
index 53590f6fd6..53590f6fd6 100644
--- a/patches/server/0028-Add-version-history-to-version-command.patch
+++ b/patches/unapplied/server/0028-Add-version-history-to-version-command.patch
diff --git a/patches/server/0029-Player-affects-spawning-API.patch b/patches/unapplied/server/0029-Player-affects-spawning-API.patch
index 31777af114..31777af114 100644
--- a/patches/server/0029-Player-affects-spawning-API.patch
+++ b/patches/unapplied/server/0029-Player-affects-spawning-API.patch
diff --git a/patches/server/0030-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0030-Only-refresh-abilities-if-needed.patch
index 59271ed1e6..59271ed1e6 100644
--- a/patches/server/0030-Only-refresh-abilities-if-needed.patch
+++ b/patches/unapplied/server/0030-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0031-fix-ItemMeta-removing-CustomModelData.patch b/patches/unapplied/server/0031-fix-ItemMeta-removing-CustomModelData.patch
index e42dfffc09..e42dfffc09 100644
--- a/patches/server/0031-fix-ItemMeta-removing-CustomModelData.patch
+++ b/patches/unapplied/server/0031-fix-ItemMeta-removing-CustomModelData.patch
diff --git a/patches/server/0032-Entity-Origin-API.patch b/patches/unapplied/server/0032-Entity-Origin-API.patch
index 17fa38a37c..17fa38a37c 100644
--- a/patches/server/0032-Entity-Origin-API.patch
+++ b/patches/unapplied/server/0032-Entity-Origin-API.patch
diff --git a/patches/server/0033-Prevent-block-entity-and-entity-crashes.patch b/patches/unapplied/server/0033-Prevent-block-entity-and-entity-crashes.patch
index e2f119f399..e2f119f399 100644
--- a/patches/server/0033-Prevent-block-entity-and-entity-crashes.patch
+++ b/patches/unapplied/server/0033-Prevent-block-entity-and-entity-crashes.patch
diff --git a/patches/server/0034-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0034-Configurable-top-of-nether-void-damage.patch
index 7885dcabd1..7885dcabd1 100644
--- a/patches/server/0034-Configurable-top-of-nether-void-damage.patch
+++ b/patches/unapplied/server/0034-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0035-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0035-Check-online-mode-before-converting-and-renaming-pla.patch
index d6d157d973..d6d157d973 100644
--- a/patches/server/0035-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/unapplied/server/0035-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0036-Add-more-entities-to-activation-range-ignore-list.patch b/patches/unapplied/server/0036-Add-more-entities-to-activation-range-ignore-list.patch
index c402bdafa2..c402bdafa2 100644
--- a/patches/server/0036-Add-more-entities-to-activation-range-ignore-list.patch
+++ b/patches/unapplied/server/0036-Add-more-entities-to-activation-range-ignore-list.patch
diff --git a/patches/server/0037-Configurable-end-credits.patch b/patches/unapplied/server/0037-Configurable-end-credits.patch
index 6c261dacae..6c261dacae 100644
--- a/patches/server/0037-Configurable-end-credits.patch
+++ b/patches/unapplied/server/0037-Configurable-end-credits.patch
diff --git a/patches/server/0038-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0038-Fix-lag-from-explosions-processing-dead-entities.patch
index fb7366543b..fb7366543b 100644
--- a/patches/server/0038-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/unapplied/server/0038-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0039-Optimize-explosions.patch b/patches/unapplied/server/0039-Optimize-explosions.patch
index 2befa1204f..b7e96f9171 100644
--- a/patches/server/0039-Optimize-explosions.patch
+++ b/patches/unapplied/server/0039-Optimize-explosions.patch
@@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b951659a8fae8929123be985d02e08f28bd1e49e..001592ec2ec34a744713d4d6c95a00955889facd 100644
+index 01a1d2af6b4cf66cff8eb6d14116343a121deed2..638ab8ee2a44445baee91ee7e63b96ce6c098ad0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1489,6 +1489,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0040-Disable-explosion-knockback.patch b/patches/unapplied/server/0040-Disable-explosion-knockback.patch
index 880de82afd..880de82afd 100644
--- a/patches/server/0040-Disable-explosion-knockback.patch
+++ b/patches/unapplied/server/0040-Disable-explosion-knockback.patch
diff --git a/patches/server/0041-Disable-thunder.patch b/patches/unapplied/server/0041-Disable-thunder.patch
index b28e50b059..b28e50b059 100644
--- a/patches/server/0041-Disable-thunder.patch
+++ b/patches/unapplied/server/0041-Disable-thunder.patch
diff --git a/patches/server/0042-Disable-ice-and-snow.patch b/patches/unapplied/server/0042-Disable-ice-and-snow.patch
index 10f0de5a2c..10f0de5a2c 100644
--- a/patches/server/0042-Disable-ice-and-snow.patch
+++ b/patches/unapplied/server/0042-Disable-ice-and-snow.patch
diff --git a/patches/server/0043-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0043-Configurable-mob-spawner-tick-rate.patch
index a34fa86ce5..a34fa86ce5 100644
--- a/patches/server/0043-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/unapplied/server/0043-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0044-Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/0044-Implement-PlayerLocaleChangeEvent.patch
index 2db14cb603..2db14cb603 100644
--- a/patches/server/0044-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/unapplied/server/0044-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0045-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0045-Add-BeaconEffectEvent.patch
index 9e5105c14f..9e5105c14f 100644
--- a/patches/server/0045-Add-BeaconEffectEvent.patch
+++ b/patches/unapplied/server/0045-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0046-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0046-Configurable-container-update-tick-rate.patch
index f3cc5d8814..f3cc5d8814 100644
--- a/patches/server/0046-Configurable-container-update-tick-rate.patch
+++ b/patches/unapplied/server/0046-Configurable-container-update-tick-rate.patch
diff --git a/patches/server/0047-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0047-Use-UserCache-for-player-heads.patch
index 48ccece56f..48ccece56f 100644
--- a/patches/server/0047-Use-UserCache-for-player-heads.patch
+++ b/patches/unapplied/server/0047-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0048-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0048-Disable-spigot-tick-limiters.patch
index 57aa7d7317..57aa7d7317 100644
--- a/patches/server/0048-Disable-spigot-tick-limiters.patch
+++ b/patches/unapplied/server/0048-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0049-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0049-Add-PlayerInitialSpawnEvent.patch
index 2ea1d3a2b7..2ea1d3a2b7 100644
--- a/patches/server/0049-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/unapplied/server/0049-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0050-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0050-Configurable-Disabling-Cat-Chest-Detection.patch
index 1ebc3875d7..1ebc3875d7 100644
--- a/patches/server/0050-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/unapplied/server/0050-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0051-Improve-Player-chat-API-handling.patch b/patches/unapplied/server/0051-Improve-Player-chat-API-handling.patch
index 237217ce6f..237217ce6f 100644
--- a/patches/server/0051-Improve-Player-chat-API-handling.patch
+++ b/patches/unapplied/server/0051-Improve-Player-chat-API-handling.patch
diff --git a/patches/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
index a5e068d4c4..a5e068d4c4 100644
--- a/patches/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/unapplied/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0053-Expose-server-CommandMap.patch b/patches/unapplied/server/0053-Expose-server-CommandMap.patch
index 9e0239735d..9e0239735d 100644
--- a/patches/server/0053-Expose-server-CommandMap.patch
+++ b/patches/unapplied/server/0053-Expose-server-CommandMap.patch
diff --git a/patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 619d3c8665..619d3c8665 100644
--- a/patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/unapplied/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0055-Player-Tab-List-and-Title-APIs.patch
index ff7e5579f0..0bfac6bd37 100644
--- a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/unapplied/server/0055-Player-Tab-List-and-Title-APIs.patch
@@ -64,7 +64,7 @@ index 7bb08db97c324d13836303cc8a4623c71d6c8a2c..5e9045f7722481e1f83a3d36d7b3d86e
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6f3c450cd03fa4848175cada63be2dcf5abe45ba..03dad5aa44d4484e9a3064279c867f009104a9b2 100644
+index 1d6176714b097d4ab74af345af319e325735c58f..5cff1571a4eb1af6c961a265051642234bf1b121 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0056-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0056-Add-configurable-portal-search-radius.patch
index df6cdd9f85..df6cdd9f85 100644
--- a/patches/server/0056-Add-configurable-portal-search-radius.patch
+++ b/patches/unapplied/server/0056-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0057-Add-velocity-warnings.patch b/patches/unapplied/server/0057-Add-velocity-warnings.patch
index ad776ec3f5..ad776ec3f5 100644
--- a/patches/server/0057-Add-velocity-warnings.patch
+++ b/patches/unapplied/server/0057-Add-velocity-warnings.patch
diff --git a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0058-Configurable-inter-world-teleportation-safety.patch
index 1b392cb898..1b392cb898 100644
--- a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/unapplied/server/0058-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0059-Add-exception-reporting-event.patch b/patches/unapplied/server/0059-Add-exception-reporting-event.patch
index 76f15e2d28..76f15e2d28 100644
--- a/patches/server/0059-Add-exception-reporting-event.patch
+++ b/patches/unapplied/server/0059-Add-exception-reporting-event.patch
diff --git a/patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0060-Disable-Scoreboards-for-non-players-by-default.patch
index fae95eea55..fae95eea55 100644
--- a/patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/unapplied/server/0060-Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 5fb20edd00..5fb20edd00 100644
--- a/patches/server/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/unapplied/server/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0062-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0062-Chunk-Save-Reattempt.patch
index 2e4356f859..2e4356f859 100644
--- a/patches/server/0062-Chunk-Save-Reattempt.patch
+++ b/patches/unapplied/server/0062-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0063-Complete-resource-pack-API.patch b/patches/unapplied/server/0063-Complete-resource-pack-API.patch
index 22063b0c12..22063b0c12 100644
--- a/patches/server/0063-Complete-resource-pack-API.patch
+++ b/patches/unapplied/server/0063-Complete-resource-pack-API.patch
diff --git a/patches/server/0064-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0064-Default-loading-permissions.yml-before-plugins.patch
index 5cb350113e..5cb350113e 100644
--- a/patches/server/0064-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/unapplied/server/0064-Default-loading-permissions.yml-before-plugins.patch
diff --git a/patches/server/0065-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0065-Allow-Reloading-of-Custom-Permissions.patch
index 78a798eca3..78a798eca3 100644
--- a/patches/server/0065-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/unapplied/server/0065-Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/0066-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0066-Remove-Metadata-on-reload.patch
index 006d87514f..006d87514f 100644
--- a/patches/server/0066-Remove-Metadata-on-reload.patch
+++ b/patches/unapplied/server/0066-Remove-Metadata-on-reload.patch
diff --git a/patches/server/0067-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0067-Handle-Item-Meta-Inconsistencies.patch
index 279fb52e31..279fb52e31 100644
--- a/patches/server/0067-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/unapplied/server/0067-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 8e51094c58..8e51094c58 100644
--- a/patches/server/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/unapplied/server/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0069-Add-World-Util-Methods.patch b/patches/unapplied/server/0069-Add-World-Util-Methods.patch
index 80106855ae..80106855ae 100644
--- a/patches/server/0069-Add-World-Util-Methods.patch
+++ b/patches/unapplied/server/0069-Add-World-Util-Methods.patch
diff --git a/patches/server/0070-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0070-Custom-replacement-for-eaten-items.patch
index fe631ab089..fe631ab089 100644
--- a/patches/server/0070-Custom-replacement-for-eaten-items.patch
+++ b/patches/unapplied/server/0070-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 6aab455065..6aab455065 100644
--- a/patches/server/0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/unapplied/server/0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0072-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0072-Use-a-Shared-Random-for-Entities.patch
index cec2d61d7d..cec2d61d7d 100644
--- a/patches/server/0072-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/unapplied/server/0072-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0073-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0073-Configurable-spawn-chances-for-skeleton-horses.patch
index e950cd8144..e950cd8144 100644
--- a/patches/server/0073-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/unapplied/server/0073-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index d01a3c66bf..9b57bfc36a 100644
--- a/patches/server/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/unapplied/server/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
 Saves on some object allocation and processing when no plugin listens to this
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 001592ec2ec34a744713d4d6c95a00955889facd..72ddebd40c2b29e0c6e069d62ed206c29ad5fa6b 100644
+index 638ab8ee2a44445baee91ee7e63b96ce6c098ad0..cc48cb8c4863db3cb2eb2b4317384fe7e4180ed9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1457,6 +1457,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0075-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0075-Entity-AddTo-RemoveFrom-World-Events.patch
index 5c270f17c5..5c270f17c5 100644
--- a/patches/server/0075-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/unapplied/server/0075-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0076-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0076-Configurable-Chunk-Inhabited-Time.patch
index e803f0aa2e..e803f0aa2e 100644
--- a/patches/server/0076-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/unapplied/server/0076-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0077-EntityPathfindEvent.patch b/patches/unapplied/server/0077-EntityPathfindEvent.patch
index 2fcac51f76..2fcac51f76 100644
--- a/patches/server/0077-EntityPathfindEvent.patch
+++ b/patches/unapplied/server/0077-EntityPathfindEvent.patch
diff --git a/patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch
index 23c86e3bd0..23c86e3bd0 100644
--- a/patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/unapplied/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0079-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0079-Do-not-load-chunks-for-Pathfinding.patch
index 55c9f2fd6e..8ae4aecc56 100644
--- a/patches/server/0079-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/unapplied/server/0079-Do-not-load-chunks-for-Pathfinding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not load chunks for Pathfinding
 
 
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-index 79baaf943a01912c423823e1c153c062d5316232..9e51dcaae00967bcfd30615b1d978c333fafaa8f 100644
+index 13840b12e209b62783206861b817d433eedd6191..b125b9903454891e22a15a0a794d67be67fdb083 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 @@ -469,7 +469,12 @@ public class WalkNodeEvaluator extends NodeEvaluator {
diff --git a/patches/server/0080-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0080-Add-PlayerUseUnknownEntityEvent.patch
index 06d7226a38..17e4ac1435 100644
--- a/patches/server/0080-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/server/0080-Add-PlayerUseUnknownEntityEvent.patch
@@ -28,7 +28,7 @@ index b1bc671490329379e0a61466c13ca88c49259721..3a377e887989f591c671fec312082552
 +    // Paper end - PlayerUseUnknownEntityEvent
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 37cba1e693490e42908f45dc68e60ac3afebbb49..801e1727bd291f647c91e2c325810ead070f3752 100644
+index f7babb4883a45244dd07eab1e87cf5fd4df83d91..19ff229f90d07447947afa8b4794b683feceb574 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2404,7 +2404,26 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0081-Configurable-random-tick-rates-for-blocks.patch b/patches/unapplied/server/0081-Configurable-random-tick-rates-for-blocks.patch
index 1b4e70611e..1b4e70611e 100644
--- a/patches/server/0081-Configurable-random-tick-rates-for-blocks.patch
+++ b/patches/unapplied/server/0081-Configurable-random-tick-rates-for-blocks.patch
diff --git a/patches/server/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 5156c9a9c6..5156c9a9c6 100644
--- a/patches/server/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/unapplied/server/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0083-Optimize-DataBits.patch b/patches/unapplied/server/0083-Optimize-DataBits.patch
index fa5c0b02f0..fa5c0b02f0 100644
--- a/patches/server/0083-Optimize-DataBits.patch
+++ b/patches/unapplied/server/0083-Optimize-DataBits.patch
diff --git a/patches/server/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 38801c08e4..38801c08e4 100644
--- a/patches/server/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/unapplied/server/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0085-Configurable-Player-Collision.patch b/patches/unapplied/server/0085-Configurable-Player-Collision.patch
index d1204a16fd..8f62962182 100644
--- a/patches/server/0085-Configurable-Player-Collision.patch
+++ b/patches/unapplied/server/0085-Configurable-Player-Collision.patch
@@ -18,7 +18,7 @@ index f767bc67fb2b63e0476771b7caabc702ce05c800..0f05f1c2a30fef68ae635f4a2476b8cd
              buf.writeComponent(this.playerPrefix);
              buf.writeComponent(this.playerSuffix);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 72ddebd40c2b29e0c6e069d62ed206c29ad5fa6b..677ce578af9da4b512bad47fe54625305e99c7e4 100644
+index cc48cb8c4863db3cb2eb2b4317384fe7e4180ed9..e6f1a98d4239318944e1ed6128cf8493c795602b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -622,6 +622,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index b368b4d286..b368b4d286 100644
--- a/patches/server/0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/server/0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0087-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0087-Configurable-RCON-IP-address.patch
index 3520bc08a0..3520bc08a0 100644
--- a/patches/server/0087-Configurable-RCON-IP-address.patch
+++ b/patches/unapplied/server/0087-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch
index 332064a55a..332064a55a 100644
--- a/patches/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0089-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0089-Add-ability-to-configure-frosted_ice-properties.patch
index ba6d745387..ba6d745387 100644
--- a/patches/server/0089-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/unapplied/server/0089-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0090-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0090-remove-null-possibility-for-getServer-singleton.patch
index 935454baa7..44c5636e56 100644
--- a/patches/server/0090-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/unapplied/server/0090-remove-null-possibility-for-getServer-singleton.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 677ce578af9da4b512bad47fe54625305e99c7e4..20ee0fd8f5a808436fae60b64fc3e8966146ba71 100644
+index e6f1a98d4239318944e1ed6128cf8493c795602b..7c403b67179fafe2aeb0f622a63c010bfa742781 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -190,6 +190,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/patches/server/0091-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0091-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 5ec276607a..8769633569 100644
--- a/patches/server/0091-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/unapplied/server/0091-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-index 9341349fb16256701450e452270fb85ef213e4d6..df7d9aa45d09e5aaee8c94d48bab99279335fff4 100644
+index 0b45e366b8e37d4d22061b273eec9e8c5376ef06..7eb1c28886741bdfe7985d16b6824f3e85ffae50 100644
 --- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
 +++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
 @@ -144,6 +144,7 @@ public class ScoreboardSaveData extends SavedData {
diff --git a/patches/server/0092-LootTable-API-and-replenishable-lootables.patch b/patches/unapplied/server/0092-LootTable-API-and-replenishable-lootables.patch
index f17c37b15c..f17c37b15c 100644
--- a/patches/server/0092-LootTable-API-and-replenishable-lootables.patch
+++ b/patches/unapplied/server/0092-LootTable-API-and-replenishable-lootables.patch
diff --git a/patches/server/0093-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0093-System-property-for-disabling-watchdoge.patch
index 22e1b2ab7c..22e1b2ab7c 100644
--- a/patches/server/0093-System-property-for-disabling-watchdoge.patch
+++ b/patches/unapplied/server/0093-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0094-Async-GameProfileCache-saving.patch b/patches/unapplied/server/0094-Async-GameProfileCache-saving.patch
index 24ad3a2b3a..8050231d08 100644
--- a/patches/server/0094-Async-GameProfileCache-saving.patch
+++ b/patches/unapplied/server/0094-Async-GameProfileCache-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Async GameProfileCache saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 20ee0fd8f5a808436fae60b64fc3e8966146ba71..b9c006bef0491c401ae3a447a3f67742a75cb74f 100644
+index 7c403b67179fafe2aeb0f622a63c010bfa742781..04cc2b69336ceb463910c081119f3188d8c426d3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -980,7 +980,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0095-Optional-TNT-doesn-t-move-in-water.patch
index 297948a26c..297948a26c 100644
--- a/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/unapplied/server/0095-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
index 09e88a303b..09e88a303b 100644
--- a/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/unapplied/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0097-Add-server-name-parameter.patch b/patches/unapplied/server/0097-Add-server-name-parameter.patch
index 6dfa8a2767..6dfa8a2767 100644
--- a/patches/server/0097-Add-server-name-parameter.patch
+++ b/patches/unapplied/server/0097-Add-server-name-parameter.patch
diff --git a/patches/server/0098-Fix-global-sound-handling.patch b/patches/unapplied/server/0098-Fix-global-sound-handling.patch
index 3832607897..3832607897 100644
--- a/patches/server/0098-Fix-global-sound-handling.patch
+++ b/patches/unapplied/server/0098-Fix-global-sound-handling.patch
diff --git a/patches/server/0099-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0099-Avoid-blocking-on-Network-Manager-creation.patch
index 16784d8691..16784d8691 100644
--- a/patches/server/0099-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/unapplied/server/0099-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index c4975570f8..c4975570f8 100644
--- a/patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/unapplied/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0101-Add-setting-for-proxy-online-mode-status.patch
index 424349ba65..424349ba65 100644
--- a/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/unapplied/server/0101-Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/0102-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0102-Optimise-BlockState-s-hashCode-equals.patch
index 313921f28d..348097f8ce 100644
--- a/patches/server/0102-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/unapplied/server/0102-Optimise-BlockState-s-hashCode-equals.patch
@@ -23,7 +23,7 @@ index ee2f1bff22fed14cda434173dc6286e4d4520822..b63116b333b6e06494091a82588acfb6
              return true;
          } else {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
-index bc7890e8ccfb133992605b06b37114424ccb093d..cd7efe4a09e114ab68a90365a6f5363a5c4c17a2 100644
+index f4d9856420a6e7e857fc9b9cb6182a54fe341568..3097298fe356df98967cf4bdeaaede69dfe8a441 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
 @@ -44,8 +44,7 @@ public class EnumProperty<T extends Enum<T> & StringRepresentable> extends Prope
@@ -51,7 +51,7 @@ index 3c590d400032d8266de63aae301fedbd83d37a1d..3a850321a4bcc68058483b5fd53e829c
              return true;
          } else {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
-index ce06c1702e9ff2e966d94a0d622264e16ded493c..bad6c58b0adc1ca630d3e943a86a2bc66dd94c9f 100644
+index 7cbc5e6e75f389f47ef07045f9876cec192f14e4..9055f15af0cae55effa6942913a9d7edf3857e07 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
 @@ -70,7 +70,7 @@ public abstract class Property<T extends Comparable<T>> {
diff --git a/patches/server/0103-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0103-Configurable-packet-in-spam-threshold.patch
index 45836f3841..b14c58ef25 100644
--- a/patches/server/0103-Configurable-packet-in-spam-threshold.patch
+++ b/patches/unapplied/server/0103-Configurable-packet-in-spam-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 801e1727bd291f647c91e2c325810ead070f3752..b5471f86e4c9b5167ac96eb7a114cde0f6a35a9e 100644
+index 19ff229f90d07447947afa8b4794b683feceb574..6a0e6697331732555f9e4e63e95dce0a2bfc1a85 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1529,13 +1529,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0104-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0104-Configurable-flying-kick-messages.patch
index e0b03a6592..4bc41b33a5 100644
--- a/patches/server/0104-Configurable-flying-kick-messages.patch
+++ b/patches/unapplied/server/0104-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b5471f86e4c9b5167ac96eb7a114cde0f6a35a9e..69e525776d57b2fe80d8bb9e94e981e553f329a3 100644
+index 6a0e6697331732555f9e4e63e95dce0a2bfc1a85..76d3ecbe62775b09aca1306b1adab56a5c730162 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -338,7 +338,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0105-Add-EntityZapEvent.patch b/patches/unapplied/server/0105-Add-EntityZapEvent.patch
index fa810b79bd..fa810b79bd 100644
--- a/patches/server/0105-Add-EntityZapEvent.patch
+++ b/patches/unapplied/server/0105-Add-EntityZapEvent.patch
diff --git a/patches/server/0106-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch b/patches/unapplied/server/0106-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
index 9d998d7123..9d998d7123 100644
--- a/patches/server/0106-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
+++ b/patches/unapplied/server/0106-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0107-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0107-Cache-user-authenticator-threads.patch
index ca76a3254f..ca76a3254f 100644
--- a/patches/server/0107-Cache-user-authenticator-threads.patch
+++ b/patches/unapplied/server/0107-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0108-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0108-Allow-Reloading-of-Command-Aliases.patch
index 139cd4051d..139cd4051d 100644
--- a/patches/server/0108-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/server/0108-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0109-Add-source-to-PlayerExpChangeEvent.patch
index 1899d75ec1..1899d75ec1 100644
--- a/patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/server/0109-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0110-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0110-Add-ProjectileCollideEvent.patch
index ea1d52d913..ea1d52d913 100644
--- a/patches/server/0110-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/server/0110-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0111-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0111-Prevent-Pathfinding-out-of-World-Border.patch
index 6c97c14e17..6c97c14e17 100644
--- a/patches/server/0111-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/unapplied/server/0111-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0112-Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/unapplied/server/0112-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
index 5a64d1f8f3..5a64d1f8f3 100644
--- a/patches/server/0112-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
+++ b/patches/unapplied/server/0112-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
diff --git a/patches/server/0113-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0113-Bound-Treasure-Maps-to-World-Border.patch
index b48b9a0a34..b48b9a0a34 100644
--- a/patches/server/0113-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/unapplied/server/0113-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0114-Configurable-Cartographer-Treasure-Maps.patch
index 7253601c50..7253601c50 100644
--- a/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/unapplied/server/0114-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0115-Add-API-methods-to-control-if-armor-stands-can-move.patch b/patches/unapplied/server/0115-Add-API-methods-to-control-if-armor-stands-can-move.patch
index d1601d12d7..d1601d12d7 100644
--- a/patches/server/0115-Add-API-methods-to-control-if-armor-stands-can-move.patch
+++ b/patches/unapplied/server/0115-Add-API-methods-to-control-if-armor-stands-can-move.patch
diff --git a/patches/server/0116-String-based-Action-Bar-API.patch b/patches/unapplied/server/0116-String-based-Action-Bar-API.patch
index e26a398631..7a1dc79fbe 100644
--- a/patches/server/0116-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/server/0116-String-based-Action-Bar-API.patch
@@ -26,7 +26,7 @@ index cb88a3a4e4c87a6d6c838183c1640b13d82c9344..0b391b0dc6262ef482c4a253a074b593
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b79aea8ae49a4edbb45f0824535fd38d3686e67b..3d3927503dd7f157b59853c570ace002b7e07c25 100644
+index 02cabe9b5e413ce58b82061ea0347fc7a7ce6866..7acea9cd75fcb521ff3997f4fc4cd1d34c788192 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -307,6 +307,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0117-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0117-Properly-fix-item-duplication-bug.patch
index 0d3f7e5666..0d3f7e5666 100644
--- a/patches/server/0117-Properly-fix-item-duplication-bug.patch
+++ b/patches/unapplied/server/0117-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0118-Firework-API-s.patch b/patches/unapplied/server/0118-Firework-API-s.patch
index c562b87811..c562b87811 100644
--- a/patches/server/0118-Firework-API-s.patch
+++ b/patches/unapplied/server/0118-Firework-API-s.patch
diff --git a/patches/server/0119-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0119-PlayerTeleportEndGatewayEvent.patch
index 250433d156..250433d156 100644
--- a/patches/server/0119-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0119-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch
index 980da01921..980da01921 100644
--- a/patches/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0121-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0121-Enforce-Sync-Player-Saves.patch
index 398e56eb2c..398e56eb2c 100644
--- a/patches/server/0121-Enforce-Sync-Player-Saves.patch
+++ b/patches/unapplied/server/0121-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0122-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0122-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 698992e2b7..698992e2b7 100644
--- a/patches/server/0122-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/server/0122-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0123-Cap-Entity-Collisions.patch b/patches/unapplied/server/0123-Cap-Entity-Collisions.patch
index a84c864799..a84c864799 100644
--- a/patches/server/0123-Cap-Entity-Collisions.patch
+++ b/patches/unapplied/server/0123-Cap-Entity-Collisions.patch
diff --git a/patches/server/0124-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0124-Remove-CraftScheduler-Async-Task-Debugger.patch
index 721f748db6..721f748db6 100644
--- a/patches/server/0124-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/unapplied/server/0124-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0125-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0125-Properly-handle-async-calls-to-restart-the-server.patch
index 09c60eff3e..a7eecd2511 100644
--- a/patches/server/0125-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/unapplied/server/0125-Properly-handle-async-calls-to-restart-the-server.patch
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b9c006bef0491c401ae3a447a3f67742a75cb74f..48513e585ce02c301983adbe1224e95ff7f9a345 100644
+index 04cc2b69336ceb463910c081119f3188d8c426d3..fa1a6c2f1c11506243cfc61b519bef578e5627fc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -236,6 +236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0126-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0126-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 458383d6ba..9eb1f8b5f3 100644
--- a/patches/server/0126-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/unapplied/server/0126-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -14,7 +14,7 @@ To be converted into a Paper-API event at some point in the future?
 public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 69e525776d57b2fe80d8bb9e94e981e553f329a3..00870f788b40fc0943ef54da1e84c6e357640a32 100644
+index 76d3ecbe62775b09aca1306b1adab56a5c730162..6162bc5d905505be2a3570cd52c7497c6136136a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2177,6 +2177,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0127-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0127-Add-configuration-option-to-prevent-player-names-fro.patch
index 0c9e8ad802..0c9e8ad802 100644
--- a/patches/server/0127-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/server/0127-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0128-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0128-Use-TerminalConsoleAppender-for-console-improvements.patch
index b6f20d9015..a37c6c49b1 100644
--- a/patches/server/0128-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/unapplied/server/0128-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -206,7 +206,7 @@ index 0000000000000000000000000000000000000000..8f07539a82f449ad217e316a7513a170
 +
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-index 032d23ecda574ed1a3c740c16d13055f399bd6c4..cf5a4c142ed6d9ab4850373a9041bdc6af5a2a71 100644
+index 5bacfadf01777171e51858d450a68135d422bf0f..41a87166d453ea4977ff0c15dab94c93715ade46 100644
 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 @@ -25,6 +25,7 @@ import net.kyori.adventure.text.flattener.ComponentFlattener;
@@ -250,7 +250,7 @@ index 8323f135d6bf2e1f12525e05094ffa3f2420e7e1..a143ea1e58464a3122fbd8ccafe417bd
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 48513e585ce02c301983adbe1224e95ff7f9a345..22b9d4bebee30877225b08b46cec6084b12a9c5a 100644
+index fa1a6c2f1c11506243cfc61b519bef578e5627fc..7e4fd9fa173b24261b88fb5e898c905721e69dca 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -155,7 +155,7 @@ import org.slf4j.Logger;
diff --git a/patches/server/0129-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0129-provide-a-configurable-option-to-disable-creeper-lin.patch
index 98fcd80dba..98fcd80dba 100644
--- a/patches/server/0129-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/unapplied/server/0129-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0130-Item-canEntityPickup.patch b/patches/unapplied/server/0130-Item-canEntityPickup.patch
index 4714e6c080..4714e6c080 100644
--- a/patches/server/0130-Item-canEntityPickup.patch
+++ b/patches/unapplied/server/0130-Item-canEntityPickup.patch
diff --git a/patches/server/0131-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0131-PlayerPickupItemEvent-setFlyAtPlayer.patch
index fc6964aaae..fc6964aaae 100644
--- a/patches/server/0131-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/unapplied/server/0131-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0132-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0132-PlayerAttemptPickupItemEvent.patch
index ccaf080546..ccaf080546 100644
--- a/patches/server/0132-PlayerAttemptPickupItemEvent.patch
+++ b/patches/unapplied/server/0132-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0133-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0133-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 5e3192ef74..44e1a4134d 100644
--- a/patches/server/0133-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/unapplied/server/0133-Do-not-submit-profile-lookups-to-worldgen-threads.patch
@@ -10,7 +10,7 @@ out due to a sync load, as the worldgen threads will be
 stalling on profile lookups.
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 9a12feebbae4a9fdfd24214c2ffa61e717d6e358..1f1422a000eb9a0fb819f26d42b3f39ed683a8da 100644
+index bf17c2005aa71a627c93b3bbaa773a5902b897c1..3db6962b9f6f5da09694d57b7323c39f314b1327 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -91,6 +91,22 @@ public class Util {
diff --git a/patches/server/0134-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0134-Basic-PlayerProfile-API.patch
index 86180d4842..86180d4842 100644
--- a/patches/server/0134-Basic-PlayerProfile-API.patch
+++ b/patches/unapplied/server/0134-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0135-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0135-Add-UnknownCommandEvent.patch
index 032fb0b09f..032fb0b09f 100644
--- a/patches/server/0135-Add-UnknownCommandEvent.patch
+++ b/patches/unapplied/server/0135-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0136-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0136-Shoulder-Entities-Release-API.patch
index 878ba52040..878ba52040 100644
--- a/patches/server/0136-Shoulder-Entities-Release-API.patch
+++ b/patches/unapplied/server/0136-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0137-Profile-Lookup-Events.patch b/patches/unapplied/server/0137-Profile-Lookup-Events.patch
index 8a3c9a944e..8a3c9a944e 100644
--- a/patches/server/0137-Profile-Lookup-Events.patch
+++ b/patches/unapplied/server/0137-Profile-Lookup-Events.patch
diff --git a/patches/server/0138-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0138-Block-player-logins-during-server-shutdown.patch
index 3de7220f12..3de7220f12 100644
--- a/patches/server/0138-Block-player-logins-during-server-shutdown.patch
+++ b/patches/unapplied/server/0138-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0139-Entity-fromMobSpawner.patch b/patches/unapplied/server/0139-Entity-fromMobSpawner.patch
index 71a54b17f9..71a54b17f9 100644
--- a/patches/server/0139-Entity-fromMobSpawner.patch
+++ b/patches/unapplied/server/0139-Entity-fromMobSpawner.patch
diff --git a/patches/server/0140-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0140-Improve-the-Saddle-API-for-Horses.patch
index c529ffab64..c529ffab64 100644
--- a/patches/server/0140-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/unapplied/server/0140-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0141-ensureServerConversions-API.patch b/patches/unapplied/server/0141-ensureServerConversions-API.patch
index d448c021b9..d448c021b9 100644
--- a/patches/server/0141-ensureServerConversions-API.patch
+++ b/patches/unapplied/server/0141-ensureServerConversions-API.patch
diff --git a/patches/server/0142-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0142-Implement-getI18NDisplayName.patch
index 0b1d065a44..0b1d065a44 100644
--- a/patches/server/0142-Implement-getI18NDisplayName.patch
+++ b/patches/unapplied/server/0142-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0143-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0143-ProfileWhitelistVerifyEvent.patch
index 759f285156..759f285156 100644
--- a/patches/server/0143-ProfileWhitelistVerifyEvent.patch
+++ b/patches/unapplied/server/0143-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0144-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0144-Fix-this-stupid-bullshit.patch
index 67c72e7d54..67c72e7d54 100644
--- a/patches/server/0144-Fix-this-stupid-bullshit.patch
+++ b/patches/unapplied/server/0144-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0145-LivingEntity-setKiller.patch b/patches/unapplied/server/0145-LivingEntity-setKiller.patch
index 24334c96fd..24334c96fd 100644
--- a/patches/server/0145-LivingEntity-setKiller.patch
+++ b/patches/unapplied/server/0145-LivingEntity-setKiller.patch
diff --git a/patches/server/0146-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0146-Ocelot-despawns-should-honor-nametags-and-leash.patch
index a72222c640..a72222c640 100644
--- a/patches/server/0146-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/unapplied/server/0146-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0147-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0147-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 8062dad17c..8062dad17c 100644
--- a/patches/server/0147-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/unapplied/server/0147-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0148-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0148-Allow-specifying-a-custom-authentication-servers-dow.patch
index 5548378079..5548378079 100644
--- a/patches/server/0148-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/unapplied/server/0148-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0149-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0149-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 42bd840658..42bd840658 100644
--- a/patches/server/0149-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/unapplied/server/0149-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/0150-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0150-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 06b30f0a00..06b30f0a00 100644
--- a/patches/server/0150-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/unapplied/server/0150-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0151-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0151-Add-PlayerJumpEvent.patch
index cbd161bc48..514f7927f6 100644
--- a/patches/server/0151-Add-PlayerJumpEvent.patch
+++ b/patches/unapplied/server/0151-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 00870f788b40fc0943ef54da1e84c6e357640a32..fa8db93541dc62dc61bccc53c1aaeb3666d80ee1 100644
+index 6162bc5d905505be2a3570cd52c7497c6136136a..ff113cb3c11492ec09e0568f96fff40cbcd53716 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1218,7 +1218,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0152-handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/0152-handle-ServerboundKeepAlivePacket-async.patch
index 0075be7038..0075be7038 100644
--- a/patches/server/0152-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/unapplied/server/0152-handle-ServerboundKeepAlivePacket-async.patch
diff --git a/patches/server/0153-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0153-Expose-client-protocol-version-and-virtual-host.patch
index 349a9ccc59..6dc2f73c03 100644
--- a/patches/server/0153-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/server/0153-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index ce51bde4db395ff30c7d75e3badd68d6395fa40f..3dfec4462d85f3223071b4e78465587d
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3d3927503dd7f157b59853c570ace002b7e07c25..901a1c98024eb81d2fa3e7ca13add63864a9c5ef 100644
+index 7acea9cd75fcb521ff3997f4fc4cd1d34c788192..19ca1d6f6dc01ee56cb52d8d3e2c53c1549cb617 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -253,6 +253,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0154-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0154-revert-serverside-behavior-of-keepalives.patch
index 27c77cb9ee..27c77cb9ee 100644
--- a/patches/server/0154-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/unapplied/server/0154-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0155-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0155-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index ad10a37d50..ad10a37d50 100644
--- a/patches/server/0155-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/unapplied/server/0155-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0156-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0156-Add-PlayerArmorChangeEvent.patch
index e93b77f565..e93b77f565 100644
--- a/patches/server/0156-Add-PlayerArmorChangeEvent.patch
+++ b/patches/unapplied/server/0156-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0157-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0157-Prevent-logins-from-being-processed-when-the-player-.patch
index 28f5efe52b..28f5efe52b 100644
--- a/patches/server/0157-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/unapplied/server/0157-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0158-Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/unapplied/server/0158-Fix-MC-117075-Block-entity-unload-lag-spike.patch
index e5c5e50cd1..e5c5e50cd1 100644
--- a/patches/server/0158-Fix-MC-117075-Block-entity-unload-lag-spike.patch
+++ b/patches/unapplied/server/0158-Fix-MC-117075-Block-entity-unload-lag-spike.patch
diff --git a/patches/server/0159-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0159-use-CB-BlockState-implementations-for-captured-block.patch
index 30982f3423..30982f3423 100644
--- a/patches/server/0159-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/unapplied/server/0159-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0160-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0160-API-to-get-a-BlockState-without-a-snapshot.patch
index 5b11c72288..5b11c72288 100644
--- a/patches/server/0160-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/server/0160-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0161-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0161-AsyncTabCompleteEvent.patch
index 621c5319a5..d3e5b18005 100644
--- a/patches/server/0161-AsyncTabCompleteEvent.patch
+++ b/patches/unapplied/server/0161-AsyncTabCompleteEvent.patch
@@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent
 Co-authored-by: Aikar <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fa8db93541dc62dc61bccc53c1aaeb3666d80ee1..5d4730b9ced378c1e77d7734f2f8aba6d09a19d0 100644
+index ff113cb3c11492ec09e0568f96fff40cbcd53716..8eec3d8b1693d9f9d7d882275e6f00cef4d3520f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -688,21 +688,58 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0162-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0162-PlayerPickupExperienceEvent.patch
index 3b2845e66a..3b2845e66a 100644
--- a/patches/server/0162-PlayerPickupExperienceEvent.patch
+++ b/patches/unapplied/server/0162-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0163-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0163-Ability-to-apply-mending-to-XP-API.patch
index 916e87f7c4..916e87f7c4 100644
--- a/patches/server/0163-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/unapplied/server/0163-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0164-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0164-PlayerNaturallySpawnCreaturesEvent.patch
index b535464839..b535464839 100644
--- a/patches/server/0164-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/unapplied/server/0164-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0165-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0165-Add-setPlayerProfile-API-for-Skulls.patch
index 9a88d6ffaf..9a88d6ffaf 100644
--- a/patches/server/0165-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/unapplied/server/0165-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0166-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0166-PreCreatureSpawnEvent.patch
index 379a3aedda..379a3aedda 100644
--- a/patches/server/0166-PreCreatureSpawnEvent.patch
+++ b/patches/unapplied/server/0166-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0167-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0167-Fill-Profile-Property-Events.patch
index 1b8f42fb8d..1b8f42fb8d 100644
--- a/patches/server/0167-Fill-Profile-Property-Events.patch
+++ b/patches/unapplied/server/0167-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch
index 919a3add63..919a3add63 100644
--- a/patches/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/unapplied/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0169-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0169-Add-ArmorStand-Item-Meta.patch
index b650597d67..b650597d67 100644
--- a/patches/server/0169-Add-ArmorStand-Item-Meta.patch
+++ b/patches/unapplied/server/0169-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0170-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0170-Extend-Player-Interact-cancellation.patch
index f5a0a0c969..f5a0a0c969 100644
--- a/patches/server/0170-Extend-Player-Interact-cancellation.patch
+++ b/patches/unapplied/server/0170-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0171-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0171-Tameable-getOwnerUniqueId-API.patch
index 739f4d8b9c..739f4d8b9c 100644
--- a/patches/server/0171-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/unapplied/server/0171-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0172-Toggleable-player-crits.patch b/patches/unapplied/server/0172-Toggleable-player-crits.patch
index 1acbcc3568..1acbcc3568 100644
--- a/patches/server/0172-Toggleable-player-crits.patch
+++ b/patches/unapplied/server/0172-Toggleable-player-crits.patch
diff --git a/patches/server/0173-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0173-Disable-Explicit-Network-Manager-Flushing.patch
index 47975e8e65..47975e8e65 100644
--- a/patches/server/0173-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/unapplied/server/0173-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0174-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0174-Implement-extended-PaperServerListPingEvent.patch
index 919b4393df..05b4df7406 100644
--- a/patches/server/0174-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/server/0174-Implement-extended-PaperServerListPingEvent.patch
@@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..6b0bdc266109cdfb874f08bf74323603
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 22b9d4bebee30877225b08b46cec6084b12a9c5a..09bd8a6576647c612e9d7f807780b1e20478a534 100644
+index 7e4fd9fa173b24261b88fb5e898c905721e69dca..02df8d59ced48bfebfacbfab669e245539605ede 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,6 +3,9 @@ package net.minecraft.server;
diff --git a/patches/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/unapplied/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch
index 349254d7d8..349254d7d8 100644
--- a/patches/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch
+++ b/patches/unapplied/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch
diff --git a/patches/server/0176-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0176-Player.setPlayerProfile-API.patch
index 084703f4ca..084703f4ca 100644
--- a/patches/server/0176-Player.setPlayerProfile-API.patch
+++ b/patches/unapplied/server/0176-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0177-getPlayerUniqueId-API.patch b/patches/unapplied/server/0177-getPlayerUniqueId-API.patch
index 701b20e981..701b20e981 100644
--- a/patches/server/0177-getPlayerUniqueId-API.patch
+++ b/patches/unapplied/server/0177-getPlayerUniqueId-API.patch
diff --git a/patches/server/0178-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0178-Improved-Async-Task-Scheduler.patch
index 3ce3a754e3..3ce3a754e3 100644
--- a/patches/server/0178-Improved-Async-Task-Scheduler.patch
+++ b/patches/unapplied/server/0178-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0179-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0179-Make-legacy-ping-handler-more-reliable.patch
index e9431bd1eb..e9431bd1eb 100644
--- a/patches/server/0179-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/unapplied/server/0179-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 5265180dd5..5265180dd5 100644
--- a/patches/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/unapplied/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0181-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0181-Flag-to-disable-the-channel-limit.patch
index 11c9e8bf36..11c9e8bf36 100644
--- a/patches/server/0181-Flag-to-disable-the-channel-limit.patch
+++ b/patches/unapplied/server/0181-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0182-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0182-Add-openSign-method-to-HumanEntity.patch
index 1efbc4888d..1efbc4888d 100644
--- a/patches/server/0182-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/unapplied/server/0182-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0183-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0183-Configurable-sprint-interruption-on-attack.patch
index a6eebae304..a6eebae304 100644
--- a/patches/server/0183-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/unapplied/server/0183-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0184-EndermanEscapeEvent.patch b/patches/unapplied/server/0184-EndermanEscapeEvent.patch
index d5911bb2bc..d5911bb2bc 100644
--- a/patches/server/0184-EndermanEscapeEvent.patch
+++ b/patches/unapplied/server/0184-EndermanEscapeEvent.patch
diff --git a/patches/server/0185-Enderman.teleportRandomly.patch b/patches/unapplied/server/0185-Enderman.teleportRandomly.patch
index aeb2e69493..aeb2e69493 100644
--- a/patches/server/0185-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/server/0185-Enderman.teleportRandomly.patch
diff --git a/patches/server/0186-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0186-Block-Enderpearl-Travel-Exploit.patch
index 969fd2b959..969fd2b959 100644
--- a/patches/server/0186-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/unapplied/server/0186-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0187-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0187-Expand-World.spawnParticle-API-and-add-Builder.patch
index 946d5a374a..946d5a374a 100644
--- a/patches/server/0187-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/server/0187-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index d591924a6b..d591924a6b 100644
--- a/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/unapplied/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0189-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0189-EndermanAttackPlayerEvent.patch
index 8504592c00..8504592c00 100644
--- a/patches/server/0189-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/server/0189-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0190-WitchConsumePotionEvent.patch b/patches/unapplied/server/0190-WitchConsumePotionEvent.patch
index 657554b31e..657554b31e 100644
--- a/patches/server/0190-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/server/0190-WitchConsumePotionEvent.patch
diff --git a/patches/server/0191-WitchThrowPotionEvent.patch b/patches/unapplied/server/0191-WitchThrowPotionEvent.patch
index 5f6cac02f4..5f6cac02f4 100644
--- a/patches/server/0191-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/server/0191-WitchThrowPotionEvent.patch
diff --git a/patches/server/0192-WitchReadyPotionEvent.patch b/patches/unapplied/server/0192-WitchReadyPotionEvent.patch
index bbc7fb8788..bbc7fb8788 100644
--- a/patches/server/0192-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/server/0192-WitchReadyPotionEvent.patch
diff --git a/patches/server/0193-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0193-ItemStack-getMaxItemUseDuration.patch
index e66ff94efb..e66ff94efb 100644
--- a/patches/server/0193-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/server/0193-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0194-Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0194-Add-EntityTeleportEndGatewayEvent.patch
index 52e4054b8e..52e4054b8e 100644
--- a/patches/server/0194-Add-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0194-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0195-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0195-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 632fa334b5..632fa334b5 100644
--- a/patches/server/0195-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/unapplied/server/0195-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0196-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0196-Fix-CraftEntity-hashCode.patch
index 1622a61ea9..1622a61ea9 100644
--- a/patches/server/0196-Fix-CraftEntity-hashCode.patch
+++ b/patches/unapplied/server/0196-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0197-Configurable-LootPool-luck-formula.patch b/patches/unapplied/server/0197-Configurable-LootPool-luck-formula.patch
index 5748a6b1d6..5748a6b1d6 100644
--- a/patches/server/0197-Configurable-LootPool-luck-formula.patch
+++ b/patches/unapplied/server/0197-Configurable-LootPool-luck-formula.patch
diff --git a/patches/server/0198-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0198-Print-Error-details-when-failing-to-save-player-data.patch
index 85805baf53..85805baf53 100644
--- a/patches/server/0198-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/unapplied/server/0198-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0199-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0199-Make-shield-blocking-delay-configurable.patch
index cd4b92ec72..cd4b92ec72 100644
--- a/patches/server/0199-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/server/0199-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0200-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0200-Improve-EntityShootBowEvent.patch
index 9f5b75b9ea..9f5b75b9ea 100644
--- a/patches/server/0200-Improve-EntityShootBowEvent.patch
+++ b/patches/unapplied/server/0200-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0201-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0201-PlayerReadyArrowEvent.patch
index 7c34bd8506..7c34bd8506 100644
--- a/patches/server/0201-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/server/0201-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0202-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/unapplied/server/0202-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
index e1c3829623..e1c3829623 100644
--- a/patches/server/0202-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
+++ b/patches/unapplied/server/0202-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
diff --git a/patches/server/0203-Expand-Explosions-API.patch b/patches/unapplied/server/0203-Expand-Explosions-API.patch
index 6fea443e03..6fea443e03 100644
--- a/patches/server/0203-Expand-Explosions-API.patch
+++ b/patches/unapplied/server/0203-Expand-Explosions-API.patch
diff --git a/patches/server/0204-LivingEntity-Active-Item-API.patch b/patches/unapplied/server/0204-LivingEntity-Active-Item-API.patch
index a9e0dd9922..a9e0dd9922 100644
--- a/patches/server/0204-LivingEntity-Active-Item-API.patch
+++ b/patches/unapplied/server/0204-LivingEntity-Active-Item-API.patch
diff --git a/patches/server/0205-RangedEntity-API.patch b/patches/unapplied/server/0205-RangedEntity-API.patch
index 5383dfd935..5383dfd935 100644
--- a/patches/server/0205-RangedEntity-API.patch
+++ b/patches/unapplied/server/0205-RangedEntity-API.patch
diff --git a/patches/server/0206-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0206-Add-config-to-disable-ender-dragon-legacy-check.patch
index 9b0dd03eba..9b0dd03eba 100644
--- a/patches/server/0206-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/unapplied/server/0206-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0207-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0207-Implement-World.getEntity-UUID-API.patch
index 20b2476bf6..20b2476bf6 100644
--- a/patches/server/0207-Implement-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/server/0207-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0208-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0208-InventoryCloseEvent-Reason-API.patch
index 47c2c2a111..47c2c2a111 100644
--- a/patches/server/0208-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/server/0208-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0209-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0209-Vex-get-setSummoner-API.patch
index 9c014ff1fc..9c014ff1fc 100644
--- a/patches/server/0209-Vex-get-setSummoner-API.patch
+++ b/patches/unapplied/server/0209-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index a28ff94015..f74a7d7572 100644
--- a/patches/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/unapplied/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 29ffe034b3b7838e20be4d6a52a82cec004eb2a1..91cc18da4f0beca4cc4a9e13627b87931262efb6 100644
+index 0217a40d7c22d31fa5f5046df6f0c64d8bb44442..de6fff0e915c66123d0691840b180cf60dc8a95a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2421,6 +2421,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0211-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0211-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index d999d8b2ce..d999d8b2ce 100644
--- a/patches/server/0211-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/unapplied/server/0211-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0212-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0212-add-more-information-to-Entity.toString.patch
index beef9001e2..beef9001e2 100644
--- a/patches/server/0212-add-more-information-to-Entity.toString.patch
+++ b/patches/unapplied/server/0212-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0213-EnderDragon-Events.patch b/patches/unapplied/server/0213-EnderDragon-Events.patch
index 5f404a5e08..5f404a5e08 100644
--- a/patches/server/0213-EnderDragon-Events.patch
+++ b/patches/unapplied/server/0213-EnderDragon-Events.patch
diff --git a/patches/server/0214-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0214-PlayerElytraBoostEvent.patch
index 80552e3b6d..b614b1a177 100644
--- a/patches/server/0214-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/server/0214-PlayerElytraBoostEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerElytraBoostEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index 7c627d27300247db9122ab2081049345ef306073..4565cf51ee2f973b368a984436c02220ed9f4a70 100644
+index 3749cfca8f007973d1a2206d8f2ba15283a550e1..a9f82e37c088c6f6ae2a049fcc7acea01b8802cd 100644
 --- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 +++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 @@ -68,12 +68,19 @@ public class FireworkRocketItem extends Item {
diff --git a/patches/server/0215-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0215-PlayerLaunchProjectileEvent.patch
index 6e2265c0d2..b5abc76909 100644
--- a/patches/server/0215-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/server/0215-PlayerLaunchProjectileEvent.patch
@@ -150,7 +150,7 @@ index fe03ef2e400b246f7f3a9333506f22b63ae28690..ad147f392e7ef151d971d462431ab67d
          return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
      }
 diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index eb655eb01e4841ca163666f21dae00f0632a11e5..8a82b8bec014b70d672cfaae84510ed84fd2ea97 100644
+index a9f82e37c088c6f6ae2a049fcc7acea01b8802cd..e1c8b24a92ea63a645406522a3c2fb5efd87f01a 100644
 --- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 +++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 @@ -54,8 +54,12 @@ public class FireworkRocketItem extends Item {
diff --git a/patches/server/0216-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0216-Improve-BlockPosition-inlining.patch
index 52f65f41ad..52f65f41ad 100644
--- a/patches/server/0216-Improve-BlockPosition-inlining.patch
+++ b/patches/unapplied/server/0216-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0217-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0217-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 6824f8274c..6824f8274c 100644
--- a/patches/server/0217-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/unapplied/server/0217-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0218-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0218-Vanished-players-don-t-have-rights.patch
index 52526bd0e1..52526bd0e1 100644
--- a/patches/server/0218-Vanished-players-don-t-have-rights.patch
+++ b/patches/unapplied/server/0218-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0219-Allow-disabling-armor-stand-ticking.patch b/patches/unapplied/server/0219-Allow-disabling-armor-stand-ticking.patch
index 6106bf3ff7..6106bf3ff7 100644
--- a/patches/server/0219-Allow-disabling-armor-stand-ticking.patch
+++ b/patches/unapplied/server/0219-Allow-disabling-armor-stand-ticking.patch
diff --git a/patches/server/0220-SkeletonHorse-Additions.patch b/patches/unapplied/server/0220-SkeletonHorse-Additions.patch
index 201b108f16..bd079ca41a 100644
--- a/patches/server/0220-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/server/0220-SkeletonHorse-Additions.patch
@@ -32,7 +32,7 @@ index 8f20239f3ef7ebe41fac8ee6e024c36dafec33c4..d00fb16ae3b94dfcb10fd1a7c1671595
  
          this.horse.setTrap(false);
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 72b3913d00d6f2ec01a716444debe065c48174f6..c35d5865b77203d0de6467d2793424837704e95a 100644
+index 77ae7882a08441d9a80b50492be5e48487a2fdab..d465fb01af4c8610f83ecb9c68b83127cf7e95ae 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
 @@ -97,6 +97,28 @@ public interface EntityGetter {
diff --git a/patches/server/0221-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0221-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 939529febe..939529febe 100644
--- a/patches/server/0221-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/unapplied/server/0221-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0222-Expand-ArmorStand-API.patch b/patches/unapplied/server/0222-Expand-ArmorStand-API.patch
index 1112902d66..1112902d66 100644
--- a/patches/server/0222-Expand-ArmorStand-API.patch
+++ b/patches/unapplied/server/0222-Expand-ArmorStand-API.patch
diff --git a/patches/server/0223-AnvilDamageEvent.patch b/patches/unapplied/server/0223-AnvilDamageEvent.patch
index fc3492a898..fc3492a898 100644
--- a/patches/server/0223-AnvilDamageEvent.patch
+++ b/patches/unapplied/server/0223-AnvilDamageEvent.patch
diff --git a/patches/server/0224-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0224-Add-TNTPrimeEvent.patch
index acace9251d..acace9251d 100644
--- a/patches/server/0224-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/server/0224-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch
index eef3036873..99d88c7a3a 100644
--- a/patches/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/unapplied/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 91cc18da4f0beca4cc4a9e13627b87931262efb6..a2eb93d47f659eb5b978358ee409bbf5f5d4d35a 100644
+index de6fff0e915c66123d0691840b180cf60dc8a95a..7663110df928ec88fc97e3b7d65671001db2d1bc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -256,6 +256,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0226-Fix-NBT-type-issues.patch b/patches/unapplied/server/0226-Fix-NBT-type-issues.patch
index 6a16b60735..6a16b60735 100644
--- a/patches/server/0226-Fix-NBT-type-issues.patch
+++ b/patches/unapplied/server/0226-Fix-NBT-type-issues.patch
diff --git a/patches/server/0227-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0227-Remove-unnecessary-itemmeta-handling.patch
index 19a56b5c05..19a56b5c05 100644
--- a/patches/server/0227-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/unapplied/server/0227-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 18b6234816..18b6234816 100644
--- a/patches/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/unapplied/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
index 76d44df2fe..2142ed4de7 100644
--- a/patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/unapplied/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 09bd8a6576647c612e9d7f807780b1e20478a534..3e6008d27ed81453f6b4448f0334b8d343f66694 100644
+index 02df8d59ced48bfebfacbfab669e245539605ede..8196ecb2a7280a4f60a5fea18c484d6419953b48 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1092,6 +1092,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0230-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0230-Use-ConcurrentHashMap-in-JsonList.patch
index c49796dc40..c49796dc40 100644
--- a/patches/server/0230-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/unapplied/server/0230-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0231-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0231-Use-a-Queue-for-Queueing-Commands.patch
index 24d08d52b3..24d08d52b3 100644
--- a/patches/server/0231-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/unapplied/server/0231-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0232-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/unapplied/server/0232-Ability-to-get-block-entities-from-a-chunk-without-s.patch
index bc4f825d2a..bc4f825d2a 100644
--- a/patches/server/0232-Ability-to-get-block-entities-from-a-chunk-without-s.patch
+++ b/patches/unapplied/server/0232-Ability-to-get-block-entities-from-a-chunk-without-s.patch
diff --git a/patches/server/0233-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0233-Optimize-BlockPosition-helper-methods.patch
index 876bc9b803..876bc9b803 100644
--- a/patches/server/0233-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/unapplied/server/0233-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0234-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/0234-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index aa9cfcc962..aa9cfcc962 100644
--- a/patches/server/0234-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/unapplied/server/0234-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0235-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0235-Slime-Pathfinder-Events.patch
index 69e65adef2..69e65adef2 100644
--- a/patches/server/0235-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/server/0235-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0236-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0236-Configurable-speed-for-water-flowing-over-lava.patch
index 1ae5655967..1ae5655967 100644
--- a/patches/server/0236-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/unapplied/server/0236-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0237-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0237-Optimize-CraftBlockData-Creation.patch
index 24ea11022c..24ea11022c 100644
--- a/patches/server/0237-Optimize-CraftBlockData-Creation.patch
+++ b/patches/unapplied/server/0237-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0238-Optimize-MappedRegistry.patch b/patches/unapplied/server/0238-Optimize-MappedRegistry.patch
index 6f50c2dc94..6f50c2dc94 100644
--- a/patches/server/0238-Optimize-MappedRegistry.patch
+++ b/patches/unapplied/server/0238-Optimize-MappedRegistry.patch
diff --git a/patches/server/0239-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0239-Add-PhantomPreSpawnEvent.patch
index b8f3ee434f..b8f3ee434f 100644
--- a/patches/server/0239-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/server/0239-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0240-Add-More-Creeper-API.patch b/patches/unapplied/server/0240-Add-More-Creeper-API.patch
index a0cc33b49f..a0cc33b49f 100644
--- a/patches/server/0240-Add-More-Creeper-API.patch
+++ b/patches/unapplied/server/0240-Add-More-Creeper-API.patch
diff --git a/patches/server/0241-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0241-Inventory-removeItemAnySlot.patch
index 1316343a0a..1316343a0a 100644
--- a/patches/server/0241-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/server/0241-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0242-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0242-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 635394d1c0..635394d1c0 100644
--- a/patches/server/0242-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/unapplied/server/0242-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0243-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0243-Add-ray-tracing-methods-to-LivingEntity.patch
index 4279bf5ba5..4279bf5ba5 100644
--- a/patches/server/0243-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/server/0243-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0244-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0244-Expose-attack-cooldown-methods-for-Player.patch
index a6b78911f9..a6b78911f9 100644
--- a/patches/server/0244-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/unapplied/server/0244-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0245-Improve-death-events.patch b/patches/unapplied/server/0245-Improve-death-events.patch
index af42cf617f..af42cf617f 100644
--- a/patches/server/0245-Improve-death-events.patch
+++ b/patches/unapplied/server/0245-Improve-death-events.patch
diff --git a/patches/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch
index ecee8a86b0..ecee8a86b0 100644
--- a/patches/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/unapplied/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0247-Mob-Pathfinding-API.patch b/patches/unapplied/server/0247-Mob-Pathfinding-API.patch
index d48ca68f9b..4074d75813 100644
--- a/patches/server/0247-Mob-Pathfinding-API.patch
+++ b/patches/unapplied/server/0247-Mob-Pathfinding-API.patch
@@ -160,7 +160,7 @@ index 0000000000000000000000000000000000000000..064712e7b27a200b29c72076a82f4f56
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/Path.java b/src/main/java/net/minecraft/world/level/pathfinder/Path.java
-index 339a74782ac4ac5e3cc765c3ee7b8c0c10c9d8c8..3e2b60eaeae6d6ee0d3b06182c6f7cb1eec82b8d 100644
+index f6419f3b345e9e21a05b315aa4669090d7da4194..d9d0fff9962131808d54cca20f209df50b8e4af1 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/Path.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/Path.java
 @@ -18,6 +18,7 @@ public class Path {
diff --git a/patches/server/0248-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/unapplied/server/0248-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index f179b48bd7..f179b48bd7 100644
--- a/patches/server/0248-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/unapplied/server/0248-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/server/0249-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/unapplied/server/0249-Prevent-various-interactions-from-causing-chunk-load.patch
index 0734fec4fb..73f0e12592 100644
--- a/patches/server/0249-Prevent-various-interactions-from-causing-chunk-load.patch
+++ b/patches/unapplied/server/0249-Prevent-various-interactions-from-causing-chunk-load.patch
@@ -64,7 +64,7 @@ index 13ba764d51f941c2b0d1d2af88ffd0c1fc3982c0..9637c26a3c381869f0a4dfe9189c0095
              Vec3 vec3d1 = new Vec3((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D);
              BlockHitResult movingobjectpositionblock = world.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.enderman));
 diff --git a/src/main/java/net/minecraft/world/item/CompassItem.java b/src/main/java/net/minecraft/world/item/CompassItem.java
-index 0f74cdc825c66fac9f085f5d2aa408ba9844b253..a83fc0e62d8f48aaf60d21dca04678e954b6b3c2 100644
+index b8c6ac4c254787e285f97ad15bf10ddfd9cb294f..0f3621483a6ddcaeeb25eac51dbfaad41933579a 100644
 --- a/src/main/java/net/minecraft/world/item/CompassItem.java
 +++ b/src/main/java/net/minecraft/world/item/CompassItem.java
 @@ -77,7 +77,7 @@ public class CompassItem extends Item implements Vanishable {
diff --git a/patches/server/0250-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0250-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 406112a4c1..406112a4c1 100644
--- a/patches/server/0250-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/unapplied/server/0250-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0251-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0251-Implement-furnace-cook-speed-multiplier-API.patch
index b3fe37e706..b3fe37e706 100644
--- a/patches/server/0251-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/unapplied/server/0251-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0252-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0252-Honor-EntityAgeable.ageLock.patch
index 54501c6962..54501c6962 100644
--- a/patches/server/0252-Honor-EntityAgeable.ageLock.patch
+++ b/patches/unapplied/server/0252-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0253-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0253-Configurable-connection-throttle-kick-message.patch
index d14ef13eaa..d14ef13eaa 100644
--- a/patches/server/0253-Configurable-connection-throttle-kick-message.patch
+++ b/patches/unapplied/server/0253-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0254-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0254-Prevent-chunk-loading-from-Fluid-Flowing.patch
index a809dac397..a809dac397 100644
--- a/patches/server/0254-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/unapplied/server/0254-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0255-Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/0255-Hook-into-CB-plugin-rewrites.patch
index b10040abad..b10040abad 100644
--- a/patches/server/0255-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/unapplied/server/0255-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0256-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0256-PreSpawnerSpawnEvent.patch
index 669bde79e7..669bde79e7 100644
--- a/patches/server/0256-PreSpawnerSpawnEvent.patch
+++ b/patches/unapplied/server/0256-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0257-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0257-Add-LivingEntity-getTargetEntity.patch
index 796d844555..796d844555 100644
--- a/patches/server/0257-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/unapplied/server/0257-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0258-Add-sun-related-API.patch b/patches/unapplied/server/0258-Add-sun-related-API.patch
index c0c24f104f..c0c24f104f 100644
--- a/patches/server/0258-Add-sun-related-API.patch
+++ b/patches/unapplied/server/0258-Add-sun-related-API.patch
diff --git a/patches/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch b/patches/unapplied/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch
index 99c5fe4d1e..99c5fe4d1e 100644
--- a/patches/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch
+++ b/patches/unapplied/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch
diff --git a/patches/server/0260-Turtle-API.patch b/patches/unapplied/server/0260-Turtle-API.patch
index c72425f93a..c72425f93a 100644
--- a/patches/server/0260-Turtle-API.patch
+++ b/patches/unapplied/server/0260-Turtle-API.patch
diff --git a/patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0261-Call-player-spectator-target-events-and-improve-impl.patch
index 192951a6e9..192951a6e9 100644
--- a/patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/unapplied/server/0261-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0262-Add-more-Witch-API.patch b/patches/unapplied/server/0262-Add-more-Witch-API.patch
index 2bfa611724..2bfa611724 100644
--- a/patches/server/0262-Add-more-Witch-API.patch
+++ b/patches/unapplied/server/0262-Add-more-Witch-API.patch
diff --git a/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch
index 4f39e06ff4..4f39e06ff4 100644
--- a/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/unapplied/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 69b3eaf3cf..7df1cf3de5 100644
--- a/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/unapplied/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a2eb93d47f659eb5b978358ee409bbf5f5d4d35a..0d9251ceb351b7d763420c49b0bf487907c42c55 100644
+index 7663110df928ec88fc97e3b7d65671001db2d1bc..1de240ecfbe815c12fc35aee1198f8c7a44f3527 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -474,9 +474,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0265-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0265-Reset-players-airTicks-on-respawn.patch
index 86f7de966c..86f7de966c 100644
--- a/patches/server/0265-Reset-players-airTicks-on-respawn.patch
+++ b/patches/unapplied/server/0265-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index d871ee76b6..d871ee76b6 100644
--- a/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/unapplied/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index e696041e24..2b7f60d9b0 100644
--- a/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/unapplied/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..b60f59cf5cc8eb84a6055b7861857dec
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 1f1422a000eb9a0fb819f26d42b3f39ed683a8da..1bab7a03d433d3745cf9e244f5501dd3efedf583 100644
+index 3db6962b9f6f5da09694d57b7323c39f314b1327..722734ce612fb790ddc80488a795a85ebcd4a842 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -88,7 +88,7 @@ public class Util {
@@ -92,7 +92,7 @@ index 1f1422a000eb9a0fb819f26d42b3f39ed683a8da..1bab7a03d433d3745cf9e244f5501dd3
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3e6008d27ed81453f6b4448f0334b8d343f66694..3ccd1178f0db9301fe87afb8a0d996c0acfc1b16 100644
+index 8196ecb2a7280a4f60a5fea18c484d6419953b48..dd2cbb4d3bda6776e94279513b8d58d20661a8aa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0268-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0268-Optimize-World-Time-Updates.patch
index 853bbaef70..7a2a7fb019 100644
--- a/patches/server/0268-Optimize-World-Time-Updates.patch
+++ b/patches/unapplied/server/0268-Optimize-World-Time-Updates.patch
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3ccd1178f0db9301fe87afb8a0d996c0acfc1b16..4cacf5cc0750f017824e9d8737d3c490324b49dd 100644
+index dd2cbb4d3bda6776e94279513b8d58d20661a8aa..01acf93115db41212adf703d44481f50c746a8fa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1478,12 +1478,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0269-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0269-Restore-custom-InventoryHolder-support.patch
index b7d1cce23e..b7d1cce23e 100644
--- a/patches/server/0269-Restore-custom-InventoryHolder-support.patch
+++ b/patches/unapplied/server/0269-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0270-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0270-Fix-SpongeAbsortEvent-handling.patch
index 24104896d1..24104896d1 100644
--- a/patches/server/0270-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/unapplied/server/0270-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch
index 4132fd3278..ad8a5f726f 100644
--- a/patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/unapplied/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index a8d33286832786031ac57e6ce27d5181e1a3d9b1..e8b12b27e5ec74afb940f575e5ce78e5
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0d9251ceb351b7d763420c49b0bf487907c42c55..358b6b493af3fcc52b274ccc43a18187b505e1f0 100644
+index 1de240ecfbe815c12fc35aee1198f8c7a44f3527..f7529016db5d6f933d8f44de07bbdb9e67040cb1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1590,6 +1590,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0272-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0272-Make-the-default-permission-message-configurable.patch
index 0f8d646305..0f8d646305 100644
--- a/patches/server/0272-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/server/0272-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0273-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0273-Handle-Large-Packets-disconnecting-client.patch
index 65d62e20f2..de32fb8f39 100644
--- a/patches/server/0273-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/unapplied/server/0273-Handle-Large-Packets-disconnecting-client.patch
@@ -120,7 +120,7 @@ index 6206d4d71dfe95b454b22f5b3055623638e145c0..6765175c98d52e5cbc191e88e0d545a0
      public void write(FriendlyByteBuf buf) {
          buf.writeByte(this.containerId);
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 0c593b7a4e893568db9c1b0b5dfa7ee4984cd8c9..99fe90094f1cabdaea9db89cfc016a98c1ee8c2d 100644
+index dc657312889da4fc3222a6981223a01406b77deb..a44a82d2d5ed4d675dc1a184d5b6b935fda575dd 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -49,7 +49,7 @@ public class ClientboundLevelChunkPacketData {
diff --git a/patches/server/0274-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0274-force-entity-dismount-during-teleportation.patch
index 0fb457cc12..0fb457cc12 100644
--- a/patches/server/0274-force-entity-dismount-during-teleportation.patch
+++ b/patches/unapplied/server/0274-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0275-Add-more-Zombie-API.patch b/patches/unapplied/server/0275-Add-more-Zombie-API.patch
index 99141e5971..99141e5971 100644
--- a/patches/server/0275-Add-more-Zombie-API.patch
+++ b/patches/unapplied/server/0275-Add-more-Zombie-API.patch
diff --git a/patches/server/0276-Book-Size-Limits.patch b/patches/unapplied/server/0276-Book-Size-Limits.patch
index a25ebb5d5c..d29b1a238b 100644
--- a/patches/server/0276-Book-Size-Limits.patch
+++ b/patches/unapplied/server/0276-Book-Size-Limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 358b6b493af3fcc52b274ccc43a18187b505e1f0..9084109acfa260110c6ccd3c563b8b6688ea7b74 100644
+index f7529016db5d6f933d8f44de07bbdb9e67040cb1..b42b429e318b9ee784847a1824157573df99f683 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1024,6 +1024,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0277-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0277-Add-PlayerConnectionCloseEvent.patch
index 4b002cb923..4b002cb923 100644
--- a/patches/server/0277-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/unapplied/server/0277-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0278-Replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0278-Replace-OfflinePlayer-getLastPlayed.patch
index 4d9db7b485..4d9db7b485 100644
--- a/patches/server/0278-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/unapplied/server/0278-Replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 39521fc7b3..39521fc7b3 100644
--- a/patches/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/unapplied/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/unapplied/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 2a804b56e0..f7d93a4081 100644
--- a/patches/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/unapplied/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4a07e7d3df71f3bfc026e1f1c0abfe25999c6b8e..476b7bc14b4d2e7ed30c23b65dbc7aa0c6679b6b 100644
+index 0e251c385db7969398eca95e3353de4a3de6d189..314e01920fe0302441d2cc08a0098ff8fee263e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -211,8 +211,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0281-BlockDestroyEvent.patch b/patches/unapplied/server/0281-BlockDestroyEvent.patch
index 9d61b5189f..9d61b5189f 100644
--- a/patches/server/0281-BlockDestroyEvent.patch
+++ b/patches/unapplied/server/0281-BlockDestroyEvent.patch
diff --git a/patches/server/0282-Async-command-map-building.patch b/patches/unapplied/server/0282-Async-command-map-building.patch
index 92eb3afb3e..65ec9bb537 100644
--- a/patches/server/0282-Async-command-map-building.patch
+++ b/patches/unapplied/server/0282-Async-command-map-building.patch
@@ -53,7 +53,7 @@ index 15a5059994371da4850adcf726034a715b80efba..af7cb518a32a4d550eae833fdd5bb17f
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4cacf5cc0750f017824e9d8737d3c490324b49dd..fea2863dc00d9765b86ac4cf925ceaf0fbef7da3 100644
+index 01acf93115db41212adf703d44481f50c746a8fa..3d59c9f256f00c213af33c35cd6471a78b97c290 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -916,6 +916,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0283-Brigadier-Mojang-API.patch b/patches/unapplied/server/0283-Brigadier-Mojang-API.patch
index 40e78368b1..0f2bdf9f24 100644
--- a/patches/server/0283-Brigadier-Mojang-API.patch
+++ b/patches/unapplied/server/0283-Brigadier-Mojang-API.patch
@@ -131,7 +131,7 @@ index af7cb518a32a4d550eae833fdd5bb17fd4058717..40ff3090fb17fb0f01a9b52639fb783e
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9084109acfa260110c6ccd3c563b8b6688ea7b74..7fc5078b0fff8746daf6d3ee873e4d85df702cf1 100644
+index b42b429e318b9ee784847a1824157573df99f683..9e7598a0cc3965e382ba13d7fd700585a4884a97 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -746,7 +746,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0284-Improve-exact-choice-recipe-ingredients.patch b/patches/unapplied/server/0284-Improve-exact-choice-recipe-ingredients.patch
index 40cf56721d..40cf56721d 100644
--- a/patches/server/0284-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/unapplied/server/0284-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0285-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0285-Limit-Client-Sign-length-more.patch
index 277c7fcc3e..85eb7ca58c 100644
--- a/patches/server/0285-Limit-Client-Sign-length-more.patch
+++ b/patches/unapplied/server/0285-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7fc5078b0fff8746daf6d3ee873e4d85df702cf1..f78f5be4a1d3e551649090b296881d8dafea1ab9 100644
+index 9e7598a0cc3965e382ba13d7fd700585a4884a97..6d540917d0d4f4787e9abc8c80fd797b2ec1656f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -290,6 +290,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 406e5f78c6..406e5f78c6 100644
--- a/patches/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/unapplied/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0287-Entity-getEntitySpawnReason.patch b/patches/unapplied/server/0287-Entity-getEntitySpawnReason.patch
index aee2a0bbb9..aee2a0bbb9 100644
--- a/patches/server/0287-Entity-getEntitySpawnReason.patch
+++ b/patches/unapplied/server/0287-Entity-getEntitySpawnReason.patch
diff --git a/patches/server/0288-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0288-Fire-event-on-GS4-query.patch
index c43baca1e4..6468ff12c1 100644
--- a/patches/server/0288-Fire-event-on-GS4-query.patch
+++ b/patches/unapplied/server/0288-Fire-event-on-GS4-query.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fire event on GS4 query
 
 
 diff --git a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
-index 7db3cc76543c3e020de799dc844c616e1c027849..41c0eeba9743d7ce141e4e58f96a761948ae33d7 100644
+index f4596e2b82f4bc385b7460f143207c458f1f0162..0e0867d7add9a024bbe9471f8ff92bbb25996a3d 100644
 --- a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
 +++ b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
 @@ -106,13 +106,32 @@ public class QueryThreadGs4 extends GenericThread {
diff --git a/patches/server/0289-Add-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0289-Add-PlayerPostRespawnEvent.patch
index 15c48ae0e1..15c48ae0e1 100644
--- a/patches/server/0289-Add-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/server/0289-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index e83c1e11e6..e83c1e11e6 100644
--- a/patches/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/unapplied/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0291-Server-Tick-Events.patch b/patches/unapplied/server/0291-Server-Tick-Events.patch
index 354c364ca7..8402df699f 100644
--- a/patches/server/0291-Server-Tick-Events.patch
+++ b/patches/unapplied/server/0291-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fea2863dc00d9765b86ac4cf925ceaf0fbef7da3..21baf9139a652f21af81e775c4a0cfd3f2a81923 100644
+index 3d59c9f256f00c213af33c35cd6471a78b97c290..176378ddbf21d758694e8e624cc6c555c78e0fab 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1357,6 +1357,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0292-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0292-PlayerDeathEvent-getItemsToKeep.patch
index dfe9c7f417..dfe9c7f417 100644
--- a/patches/server/0292-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/unapplied/server/0292-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0293-Optimize-Captured-BlockEntity-Lookup.patch b/patches/unapplied/server/0293-Optimize-Captured-BlockEntity-Lookup.patch
index 3070c2b195..3070c2b195 100644
--- a/patches/server/0293-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/unapplied/server/0293-Optimize-Captured-BlockEntity-Lookup.patch
diff --git a/patches/server/0294-Add-Heightmap-API.patch b/patches/unapplied/server/0294-Add-Heightmap-API.patch
index fe436cb894..fe436cb894 100644
--- a/patches/server/0294-Add-Heightmap-API.patch
+++ b/patches/unapplied/server/0294-Add-Heightmap-API.patch
diff --git a/patches/server/0295-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0295-Mob-Spawner-API-Enhancements.patch
index 252fb07567..252fb07567 100644
--- a/patches/server/0295-Mob-Spawner-API-Enhancements.patch
+++ b/patches/unapplied/server/0295-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch
index 1571598444..1571598444 100644
--- a/patches/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/unapplied/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 76b1e55348..76b1e55348 100644
--- a/patches/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/unapplied/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0298-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0298-Implement-CraftBlockSoundGroup.patch
index 9bf16806b3..9bf16806b3 100644
--- a/patches/server/0298-Implement-CraftBlockSoundGroup.patch
+++ b/patches/unapplied/server/0298-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0299-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/0299-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 55a4c16b30..4d9cba2dd0 100644
--- a/patches/server/0299-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/unapplied/server/0299-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 21baf9139a652f21af81e775c4a0cfd3f2a81923..46386befc7c76788bdd136f7d7b4eb8e1e5d19b9 100644
+index 176378ddbf21d758694e8e624cc6c555c78e0fab..6342b7a3c4ccad528f026384da64e973e630f030 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -768,30 +768,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0300-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0300-Expose-the-internal-current-tick.patch
index 21d86ae357..21d86ae357 100644
--- a/patches/server/0300-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/server/0300-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0301-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0301-Show-blockstate-location-if-we-failed-to-read-it.patch
index 2c9fef1cf5..2c9fef1cf5 100644
--- a/patches/server/0301-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/unapplied/server/0301-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0302-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0302-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index a310ad9f1a..a310ad9f1a 100644
--- a/patches/server/0302-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/unapplied/server/0302-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0303-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0303-Configurable-projectile-relative-velocity.patch
index 5c75a20f54..5c75a20f54 100644
--- a/patches/server/0303-Configurable-projectile-relative-velocity.patch
+++ b/patches/unapplied/server/0303-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0304-offset-item-frame-ticking.patch b/patches/unapplied/server/0304-offset-item-frame-ticking.patch
index cb15ef5dd8..cb15ef5dd8 100644
--- a/patches/server/0304-offset-item-frame-ticking.patch
+++ b/patches/unapplied/server/0304-offset-item-frame-ticking.patch
diff --git a/patches/server/0305-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0305-Prevent-consuming-the-wrong-itemstack.patch
index 397c7c692d..397c7c692d 100644
--- a/patches/server/0305-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/unapplied/server/0305-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0306-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0306-Dont-send-unnecessary-sign-update.patch
index 6d4799456e..6d4799456e 100644
--- a/patches/server/0306-Dont-send-unnecessary-sign-update.patch
+++ b/patches/unapplied/server/0306-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0307-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0307-Add-option-to-disable-pillager-patrols.patch
index e648d66623..e648d66623 100644
--- a/patches/server/0307-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/unapplied/server/0307-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0308-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0308-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 82277a287f..82277a287f 100644
--- a/patches/server/0308-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/unapplied/server/0308-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0309-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/0309-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 528cf153ea..528cf153ea 100644
--- a/patches/server/0309-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/unapplied/server/0309-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0310-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0310-Duplicate-UUID-Resolve-Option.patch
index fd0e3d51f3..fd0e3d51f3 100644
--- a/patches/server/0310-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/unapplied/server/0310-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0311-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0311-PlayerDeathEvent-shouldDropExperience.patch
index c7a6d1afba..c7a6d1afba 100644
--- a/patches/server/0311-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/server/0311-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0312-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0312-Prevent-bees-loading-chunks-checking-hive-position.patch
index b0582f28fa..b0582f28fa 100644
--- a/patches/server/0312-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/unapplied/server/0312-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0313-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0313-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 3b189be4e4..3b189be4e4 100644
--- a/patches/server/0313-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/unapplied/server/0313-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0314-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/0314-Optimise-EntityGetter-getPlayerByUUID.patch
index 01113bf72e..01113bf72e 100644
--- a/patches/server/0314-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/unapplied/server/0314-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0315-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0315-Fix-items-not-falling-correctly.patch
index 785cf5a8ff..785cf5a8ff 100644
--- a/patches/server/0315-Fix-items-not-falling-correctly.patch
+++ b/patches/unapplied/server/0315-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0316-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0316-Optimize-call-to-getFluid-for-explosions.patch
index a63134d6ec..a63134d6ec 100644
--- a/patches/server/0316-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/unapplied/server/0316-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0317-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0317-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 9aec8e51d9..9aec8e51d9 100644
--- a/patches/server/0317-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/unapplied/server/0317-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0318-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0318-Guard-against-serializing-mismatching-chunk-coordina.patch
index 4a4b6f7faf..4a4b6f7faf 100644
--- a/patches/server/0318-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/unapplied/server/0318-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0319-Alternative-item-despawn-rate.patch b/patches/unapplied/server/0319-Alternative-item-despawn-rate.patch
index 86340551c0..86340551c0 100644
--- a/patches/server/0319-Alternative-item-despawn-rate.patch
+++ b/patches/unapplied/server/0319-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0320-Tracking-Range-Improvements.patch b/patches/unapplied/server/0320-Tracking-Range-Improvements.patch
index 2daaa84425..2daaa84425 100644
--- a/patches/server/0320-Tracking-Range-Improvements.patch
+++ b/patches/unapplied/server/0320-Tracking-Range-Improvements.patch
diff --git a/patches/server/0321-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0321-Fix-items-vanishing-through-end-portal.patch
index b2763538f5..b2763538f5 100644
--- a/patches/server/0321-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/unapplied/server/0321-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0322-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0322-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 7959db9a16..7959db9a16 100644
--- a/patches/server/0322-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/unapplied/server/0322-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0323-Improve-Block-breakNaturally-API.patch b/patches/unapplied/server/0323-Improve-Block-breakNaturally-API.patch
index 90192e4785..90192e4785 100644
--- a/patches/server/0323-Improve-Block-breakNaturally-API.patch
+++ b/patches/unapplied/server/0323-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0324-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0324-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index bb08aebe5a..bb08aebe5a 100644
--- a/patches/server/0324-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/unapplied/server/0324-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0325-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0325-Add-debug-for-sync-chunk-loads.patch
index 57fda6ab95..57fda6ab95 100644
--- a/patches/server/0325-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/unapplied/server/0325-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0326-Improve-java-version-check.patch b/patches/unapplied/server/0326-Improve-java-version-check.patch
index 4a7b655dd8..4a7b655dd8 100644
--- a/patches/server/0326-Improve-java-version-check.patch
+++ b/patches/unapplied/server/0326-Improve-java-version-check.patch
diff --git a/patches/server/0327-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0327-Add-ThrownEggHatchEvent.patch
index acec0a7669..acec0a7669 100644
--- a/patches/server/0327-Add-ThrownEggHatchEvent.patch
+++ b/patches/unapplied/server/0327-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0328-Entity-Jump-API.patch b/patches/unapplied/server/0328-Entity-Jump-API.patch
index d1a852319f..d1a852319f 100644
--- a/patches/server/0328-Entity-Jump-API.patch
+++ b/patches/unapplied/server/0328-Entity-Jump-API.patch
diff --git a/patches/server/0329-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0329-Add-option-to-nerf-pigmen-from-nether-portals.patch
index d5d6d0d4ca..d5d6d0d4ca 100644
--- a/patches/server/0329-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/unapplied/server/0329-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0330-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0330-Make-the-GUI-graph-fancier.patch
index a997709470..a997709470 100644
--- a/patches/server/0330-Make-the-GUI-graph-fancier.patch
+++ b/patches/unapplied/server/0330-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0331-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0331-add-hand-to-BlockMultiPlaceEvent.patch
index fe9e4dc449..fe9e4dc449 100644
--- a/patches/server/0331-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/unapplied/server/0331-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0332-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0332-Validate-tripwire-hook-placement-before-update.patch
index 67e04f717c..67e04f717c 100644
--- a/patches/server/0332-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/unapplied/server/0332-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0333-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0333-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index a422731e0f..a422731e0f 100644
--- a/patches/server/0333-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/unapplied/server/0333-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0334-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0334-Configurable-chance-of-villager-zombie-infection.patch
index 66e2a4f6d4..66e2a4f6d4 100644
--- a/patches/server/0334-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/unapplied/server/0334-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0335-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0335-Optimise-Chunk-getFluid.patch
index 58ba0e4e5d..58ba0e4e5d 100644
--- a/patches/server/0335-Optimise-Chunk-getFluid.patch
+++ b/patches/unapplied/server/0335-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0336-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0336-Set-spigots-verbose-world-setting-to-false-by-def.patch
index f00c33db91..f00c33db91 100644
--- a/patches/server/0336-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/unapplied/server/0336-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0337-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0337-Add-tick-times-API-and-mspt-command.patch
index 0dd8f2ca3e..0dd8f2ca3e 100644
--- a/patches/server/0337-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/unapplied/server/0337-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0338-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0338-Expose-MinecraftServer-isRunning.patch
index 0c1272197e..0c1272197e 100644
--- a/patches/server/0338-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/server/0338-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0339-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0339-Add-Raw-Byte-ItemStack-Serialization.patch
index 7da0faed6a..7da0faed6a 100644
--- a/patches/server/0339-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/server/0339-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0340-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0340-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 4d9ffc8193..4d9ffc8193 100644
--- a/patches/server/0340-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/unapplied/server/0340-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0341-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0341-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 6a31d5070a..6a31d5070a 100644
--- a/patches/server/0341-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/unapplied/server/0341-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0342-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0342-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 79bb156283..79bb156283 100644
--- a/patches/server/0342-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/unapplied/server/0342-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0343-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0343-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index c5cc3ce8c7..c5cc3ce8c7 100644
--- a/patches/server/0343-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/unapplied/server/0343-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0344-Don-t-tick-dead-players.patch b/patches/unapplied/server/0344-Don-t-tick-dead-players.patch
index ed79ba1216..ed79ba1216 100644
--- a/patches/server/0344-Don-t-tick-dead-players.patch
+++ b/patches/unapplied/server/0344-Don-t-tick-dead-players.patch
diff --git a/patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 78095e6dba..78095e6dba 100644
--- a/patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/unapplied/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0346-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0346-Don-t-move-existing-players-to-world-spawn.patch
index 58204fae45..58204fae45 100644
--- a/patches/server/0346-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/unapplied/server/0346-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0347-Optimize-Pathfinding.patch b/patches/unapplied/server/0347-Optimize-Pathfinding.patch
index c4d6cafff0..c4d6cafff0 100644
--- a/patches/server/0347-Optimize-Pathfinding.patch
+++ b/patches/unapplied/server/0347-Optimize-Pathfinding.patch
diff --git a/patches/server/0348-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0348-Reduce-Either-Optional-allocation.patch
index cafe54198d..cafe54198d 100644
--- a/patches/server/0348-Reduce-Either-Optional-allocation.patch
+++ b/patches/unapplied/server/0348-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0349-Reduce-memory-footprint-of-CompoundTag.patch b/patches/unapplied/server/0349-Reduce-memory-footprint-of-CompoundTag.patch
index 56beb848eb..56beb848eb 100644
--- a/patches/server/0349-Reduce-memory-footprint-of-CompoundTag.patch
+++ b/patches/unapplied/server/0349-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0350-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0350-Prevent-opening-inventories-when-frozen.patch
index f1f9ea6812..f1f9ea6812 100644
--- a/patches/server/0350-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/unapplied/server/0350-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0351-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0351-Don-t-run-entity-collision-code-if-not-needed.patch
index 4fb9ce321f..4fb9ce321f 100644
--- a/patches/server/0351-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/unapplied/server/0351-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0352-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0352-Implement-Player-Client-Options-API.patch
index 7c7cf9b485..7c7cf9b485 100644
--- a/patches/server/0352-Implement-Player-Client-Options-API.patch
+++ b/patches/unapplied/server/0352-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0353-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0353-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 7fee0acf0f..7fee0acf0f 100644
--- a/patches/server/0353-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/unapplied/server/0353-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0354-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/unapplied/server/0354-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index 79298e93c2..79298e93c2 100644
--- a/patches/server/0354-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/unapplied/server/0354-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
diff --git a/patches/server/0355-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0355-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 74931d2851..74931d2851 100644
--- a/patches/server/0355-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/unapplied/server/0355-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0356-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0356-Add-PlayerAttackEntityCooldownResetEvent.patch
index e8b17654bf..e8b17654bf 100644
--- a/patches/server/0356-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/unapplied/server/0356-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0357-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0357-Don-t-fire-BlockFade-on-worldgen-threads.patch
index e5fdaf2d8f..e5fdaf2d8f 100644
--- a/patches/server/0357-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/unapplied/server/0357-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0358-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0358-Add-phantom-creative-and-insomniac-controls.patch
index 83892b75c4..83892b75c4 100644
--- a/patches/server/0358-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/unapplied/server/0358-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0359-Fix-item-duplication-and-teleport-issues.patch b/patches/unapplied/server/0359-Fix-item-duplication-and-teleport-issues.patch
index 7e568e11ce..7e568e11ce 100644
--- a/patches/server/0359-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/unapplied/server/0359-Fix-item-duplication-and-teleport-issues.patch
diff --git a/patches/server/0360-Villager-Restocks-API.patch b/patches/unapplied/server/0360-Villager-Restocks-API.patch
index 75b7928672..75b7928672 100644
--- a/patches/server/0360-Villager-Restocks-API.patch
+++ b/patches/unapplied/server/0360-Villager-Restocks-API.patch
diff --git a/patches/server/0361-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0361-Validate-PickItem-Packet-and-kick-for-invalid.patch
index c1704d1690..d64e44e188 100644
--- a/patches/server/0361-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/unapplied/server/0361-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f78f5be4a1d3e551649090b296881d8dafea1ab9..f0cacf20fbe7dbe11856d89f423c1c74a242853e 100644
+index 6d540917d0d4f4787e9abc8c80fd797b2ec1656f..f1f45ceed8454fc8c144a9abe96a431799d977a0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -867,7 +867,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0362-Expose-game-version.patch b/patches/unapplied/server/0362-Expose-game-version.patch
index 3cbf0b5c30..3cbf0b5c30 100644
--- a/patches/server/0362-Expose-game-version.patch
+++ b/patches/unapplied/server/0362-Expose-game-version.patch
diff --git a/patches/server/0363-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0363-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 890d937ec1..890d937ec1 100644
--- a/patches/server/0363-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/unapplied/server/0363-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0364-misc-debugging-dumps.patch b/patches/unapplied/server/0364-misc-debugging-dumps.patch
index 37d8c2638d..876590f71f 100644
--- a/patches/server/0364-misc-debugging-dumps.patch
+++ b/patches/unapplied/server/0364-misc-debugging-dumps.patch
@@ -42,7 +42,7 @@ index 40ff3090fb17fb0f01a9b52639fb783ea57ce6b6..d39743d9626eb01c942194387dafb110
                  StackTraceElement[] astacktraceelement = exception.getStackTrace();
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1a7dffb3947dab0e334cd5873c69542f383aed61..f4e9929c956585a9305c2b40a995ec4fff08e7e4 100644
+index 746eeb22127d8633f1eeef1bb9c20edb7fd23e5a..4bb7f7ac1e05564ea36a7b0a4e89e6f0feb9c224 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -904,6 +904,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0365-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0365-Prevent-teleporting-dead-entities.patch
index f4f8db3845..ae07c49ccf 100644
--- a/patches/server/0365-Prevent-teleporting-dead-entities.patch
+++ b/patches/unapplied/server/0365-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f0cacf20fbe7dbe11856d89f423c1c74a242853e..c0907af0169862702a4f28985d141c0acb506f51 100644
+index f1f45ceed8454fc8c144a9abe96a431799d977a0..2f3f3dcfc08635435408d54b9ee89fb0584896d0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1545,6 +1545,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0366-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0366-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 09e4a010dd..89b6bb2230 100644
--- a/patches/server/0366-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/unapplied/server/0366-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -483,7 +483,7 @@ index a9a0248b1bd1ac454064e977b61f9b7d80962ff8..6f2452de76e8f5fcc1367066e0e75374
          this.exception = cause;
          this.systemReport.setDetail("CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/CrashReportCategory.java b/src/main/java/net/minecraft/CrashReportCategory.java
-index 91073d755f78bb427cd4b72c21ca0de5d12ec6b1..d0679882606bc84cb2a4abb69022d94caeee86ef 100644
+index f367ba058018074bfe6e4fe88bcc875ea9794d9e..2176171954609fd88f97f93408e14e018c1d6eaa 100644
 --- a/src/main/java/net/minecraft/CrashReportCategory.java
 +++ b/src/main/java/net/minecraft/CrashReportCategory.java
 @@ -110,6 +110,7 @@ public class CrashReportCategory {
diff --git a/patches/server/0367-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0367-Implement-Mob-Goal-API.patch
index 6b2e0d999b..6b2e0d999b 100644
--- a/patches/server/0367-Implement-Mob-Goal-API.patch
+++ b/patches/unapplied/server/0367-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0368-Add-villager-reputation-API.patch b/patches/unapplied/server/0368-Add-villager-reputation-API.patch
index 5043e90bdc..5043e90bdc 100644
--- a/patches/server/0368-Add-villager-reputation-API.patch
+++ b/patches/unapplied/server/0368-Add-villager-reputation-API.patch
diff --git a/patches/server/0369-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0369-Option-for-maximum-exp-value-when-merging-orbs.patch
index 76f5165302..76f5165302 100644
--- a/patches/server/0369-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/unapplied/server/0369-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0370-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0370-ExperienceOrbMergeEvent.patch
index fbe377c669..fbe377c669 100644
--- a/patches/server/0370-ExperienceOrbMergeEvent.patch
+++ b/patches/unapplied/server/0370-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0371-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0371-Fix-PotionEffect-ignores-icon-flag.patch
index 11cb193b27..11cb193b27 100644
--- a/patches/server/0371-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/unapplied/server/0371-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0372-Potential-bed-API.patch b/patches/unapplied/server/0372-Potential-bed-API.patch
index c00100d03d..c00100d03d 100644
--- a/patches/server/0372-Potential-bed-API.patch
+++ b/patches/unapplied/server/0372-Potential-bed-API.patch
diff --git a/patches/server/0373-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0373-Wait-for-Async-Tasks-during-shutdown.patch
index 780d2a450b..732023775f 100644
--- a/patches/server/0373-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/unapplied/server/0373-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f4e9929c956585a9305c2b40a995ec4fff08e7e4..af68110105a9a3ec0ebd31ea9733af8dfed1037b 100644
+index 4bb7f7ac1e05564ea36a7b0a4e89e6f0feb9c224..8922598a66aa184c314595fe9c8ec62797caa052 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -931,6 +931,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0374-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0374-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index 8fe6d83626..8fe6d83626 100644
--- a/patches/server/0374-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/unapplied/server/0374-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0375-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0375-Ensure-safe-gateway-teleport.patch
index 9c45473e39..9c45473e39 100644
--- a/patches/server/0375-Ensure-safe-gateway-teleport.patch
+++ b/patches/unapplied/server/0375-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0376-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0376-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0376-Add-option-for-console-having-all-permissions.patch
+++ b/patches/unapplied/server/0376-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0377-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0377-Fix-villager-trading-demand-MC-163962.patch
index 5396bba5ab..5396bba5ab 100644
--- a/patches/server/0377-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/unapplied/server/0377-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0378-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0378-Maps-shouldn-t-load-chunks.patch
index 4c561b2a04..4c561b2a04 100644
--- a/patches/server/0378-Maps-shouldn-t-load-chunks.patch
+++ b/patches/unapplied/server/0378-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0379-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0379-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index ff8699f85d..ff8699f85d 100644
--- a/patches/server/0379-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/unapplied/server/0379-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0380-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0380-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 4175cae3b0..4175cae3b0 100644
--- a/patches/server/0380-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/unapplied/server/0380-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0381-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0381-Fix-piston-physics-inconsistency-MC-188840.patch
index 9aea09e883..9aea09e883 100644
--- a/patches/server/0381-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/unapplied/server/0381-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch
index 2c28da3a05..2c28da3a05 100644
--- a/patches/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/unapplied/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0383-Prevent-position-desync-causing-tp-exploit.patch b/patches/unapplied/server/0383-Prevent-position-desync-causing-tp-exploit.patch
index 8681f50831..0f094614a6 100644
--- a/patches/server/0383-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/unapplied/server/0383-Prevent-position-desync-causing-tp-exploit.patch
@@ -13,7 +13,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c0907af0169862702a4f28985d141c0acb506f51..2eeeb1f1b07db439a68d70c55192aa9fb54f620c 100644
+index 2f3f3dcfc08635435408d54b9ee89fb0584896d0..e59c54b6bc42d577b81bb1cefffa33c77dd27dbe 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1366,6 +1366,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0384-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0384-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0384-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/unapplied/server/0384-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0385-Add-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0385-Add-PlayerRecipeBookClickEvent.patch
index 2a1e7d648e..29ddcd8ca7 100644
--- a/patches/server/0385-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/unapplied/server/0385-Add-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2eeeb1f1b07db439a68d70c55192aa9fb54f620c..80b6871516c45291f63b1ae521dcdf34199fd9b4 100644
+index e59c54b6bc42d577b81bb1cefffa33c77dd27dbe..e40020e8fbfb2926c61c44f0a184bfc1868bdd0f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2966,16 +2966,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0386-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0386-Hide-sync-chunk-writes-behind-flag.patch
index cf5c2534f0..cf5c2534f0 100644
--- a/patches/server/0386-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/unapplied/server/0386-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0387-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0387-Add-permission-for-command-blocks.patch
index 6134ce4262..8bf915e700 100644
--- a/patches/server/0387-Add-permission-for-command-blocks.patch
+++ b/patches/unapplied/server/0387-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index e8b12b27e5ec74afb940f575e5ce78e5905d55f4..c3eb4b6372eed0b7eb636f495ce494b6
                  return false;
              } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 80b6871516c45291f63b1ae521dcdf34199fd9b4..d78d411879275f11f395b4f9c94b7aab88342236 100644
+index e40020e8fbfb2926c61c44f0a184bfc1868bdd0f..2abd6e356eba3eef021a447d1fc03fcec36846e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -778,7 +778,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/unapplied/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index ca8fc43bc6..ca8fc43bc6 100644
--- a/patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/unapplied/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 8088452701..360338e915 100644
--- a/patches/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/unapplied/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,7 +8,7 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index af68110105a9a3ec0ebd31ea9733af8dfed1037b..0c0356339abbf255a411993b9bd3e09d31cf2636 100644
+index 8922598a66aa184c314595fe9c8ec62797caa052..adc93e0e7a57907e824bdd8bb7b3012f28b515f4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -825,7 +825,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -89,7 +89,7 @@ index b64b20312396638b8fd596bca3794863601d2bb4..8729fb23a7d7700fbccba03d07382091
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d78d411879275f11f395b4f9c94b7aab88342236..67e75982d712fdd2f751f2a0fcafba7aec779d74 100644
+index 2abd6e356eba3eef021a447d1fc03fcec36846e8..782ac9d9284bce9b91e03488756b31a255655edc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3169,7 +3169,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0390-Paper-dumpitem-command.patch b/patches/unapplied/server/0390-Paper-dumpitem-command.patch
index 23f5287194..23f5287194 100644
--- a/patches/server/0390-Paper-dumpitem-command.patch
+++ b/patches/unapplied/server/0390-Paper-dumpitem-command.patch
diff --git a/patches/server/0391-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0391-Improve-Legacy-Component-serialization-size.patch
index 00450d094b..00450d094b 100644
--- a/patches/server/0391-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/unapplied/server/0391-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index d3c6813046..d3c6813046 100644
--- a/patches/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/unapplied/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0393-Add-BlockStateMeta-clearBlockState.patch b/patches/unapplied/server/0393-Add-BlockStateMeta-clearBlockState.patch
index 86efcbf634..86efcbf634 100644
--- a/patches/server/0393-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/unapplied/server/0393-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0394-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0394-Support-old-UUID-format-for-NBT.patch
index c754088358..c754088358 100644
--- a/patches/server/0394-Support-old-UUID-format-for-NBT.patch
+++ b/patches/unapplied/server/0394-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0395-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0395-Convert-legacy-attributes-in-Item-Meta.patch
index 382b69e42d..382b69e42d 100644
--- a/patches/server/0395-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/unapplied/server/0395-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0396-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0396-Do-not-accept-invalid-client-settings.patch
index 95b9f4d59e..a698b1454c 100644
--- a/patches/server/0396-Do-not-accept-invalid-client-settings.patch
+++ b/patches/unapplied/server/0396-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 67e75982d712fdd2f751f2a0fcafba7aec779d74..789576f8b7b3001c243972b320b7dffbbf3baa5f 100644
+index 782ac9d9284bce9b91e03488756b31a255655edc..36ff9acf571d670fda225bce2f4ed16dc1d20fe3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3161,6 +3161,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/unapplied/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0398-Add-entity-liquid-API.patch b/patches/unapplied/server/0398-Add-entity-liquid-API.patch
index bbfe602323..bbfe602323 100644
--- a/patches/server/0398-Add-entity-liquid-API.patch
+++ b/patches/unapplied/server/0398-Add-entity-liquid-API.patch
diff --git a/patches/server/0399-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0399-Update-itemstack-legacy-name-and-lore.patch
index 49a60bd241..49a60bd241 100644
--- a/patches/server/0399-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/unapplied/server/0399-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0400-Add-PrepareResultEvent.patch b/patches/unapplied/server/0400-Add-PrepareResultEvent.patch
index bcd9713cd7..bcd9713cd7 100644
--- a/patches/server/0400-Add-PrepareResultEvent.patch
+++ b/patches/unapplied/server/0400-Add-PrepareResultEvent.patch
diff --git a/patches/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 4f39c3bd5a..4f39c3bd5a 100644
--- a/patches/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/unapplied/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0402-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0402-Fix-arrows-never-despawning-MC-125757.patch
index d3111cf5b4..d3111cf5b4 100644
--- a/patches/server/0402-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/unapplied/server/0402-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch
index d3ee9cbba1..d3ee9cbba1 100644
--- a/patches/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/unapplied/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0404-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0404-Fix-SPIGOT-5989.patch
index fc6ae89551..fc6ae89551 100644
--- a/patches/server/0404-Fix-SPIGOT-5989.patch
+++ b/patches/unapplied/server/0404-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 8c7dd5304b..8c7dd5304b 100644
--- a/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/unapplied/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index fce4bda529..fce4bda529 100644
--- a/patches/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/unapplied/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index be48e82d6e..be48e82d6e 100644
--- a/patches/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/unapplied/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0408-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0408-Optimize-NetworkManager-Exception-Handling.patch
index 320fb48f53..320fb48f53 100644
--- a/patches/server/0408-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/unapplied/server/0408-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0409-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0409-Fix-some-rails-connecting-improperly.patch
index 95fe65653d..95fe65653d 100644
--- a/patches/server/0409-Fix-some-rails-connecting-improperly.patch
+++ b/patches/unapplied/server/0409-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/unapplied/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0411-Brand-support.patch b/patches/unapplied/server/0411-Brand-support.patch
index b81244c027..b81244c027 100644
--- a/patches/server/0411-Brand-support.patch
+++ b/patches/unapplied/server/0411-Brand-support.patch
diff --git a/patches/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch
index bbe6fcba47..bbe6fcba47 100644
--- a/patches/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/unapplied/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0413-Don-t-require-FACING-data.patch b/patches/unapplied/server/0413-Don-t-require-FACING-data.patch
index 98d0ef923f..98d0ef923f 100644
--- a/patches/server/0413-Don-t-require-FACING-data.patch
+++ b/patches/unapplied/server/0413-Don-t-require-FACING-data.patch
diff --git a/patches/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 92a3e10cad..92a3e10cad 100644
--- a/patches/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/unapplied/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0415-Add-moon-phase-API.patch b/patches/unapplied/server/0415-Add-moon-phase-API.patch
index 7a3bfa49f6..7a3bfa49f6 100644
--- a/patches/server/0415-Add-moon-phase-API.patch
+++ b/patches/unapplied/server/0415-Add-moon-phase-API.patch
diff --git a/patches/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 6f37b0bcc0..6f37b0bcc0 100644
--- a/patches/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/unapplied/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0417-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0417-Prevent-headless-pistons-from-being-created.patch
index 2dbb5ee5de..2dbb5ee5de 100644
--- a/patches/server/0417-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/unapplied/server/0417-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0418-Add-BellRingEvent.patch b/patches/unapplied/server/0418-Add-BellRingEvent.patch
index e1dd0b076e..e1dd0b076e 100644
--- a/patches/server/0418-Add-BellRingEvent.patch
+++ b/patches/unapplied/server/0418-Add-BellRingEvent.patch
diff --git a/patches/server/0419-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0419-Add-zombie-targets-turtle-egg-config.patch
index 240bf5e662..240bf5e662 100644
--- a/patches/server/0419-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/unapplied/server/0419-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0420-Buffer-joins-to-world.patch b/patches/unapplied/server/0420-Buffer-joins-to-world.patch
index 35f2604677..35f2604677 100644
--- a/patches/server/0420-Buffer-joins-to-world.patch
+++ b/patches/unapplied/server/0420-Buffer-joins-to-world.patch
diff --git a/patches/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch
index c003ab2626..c003ab2626 100644
--- a/patches/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/unapplied/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch
index 910ff0e5d2..910ff0e5d2 100644
--- a/patches/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/unapplied/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0423-Add-more-Evoker-API.patch b/patches/unapplied/server/0423-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0423-Add-more-Evoker-API.patch
+++ b/patches/unapplied/server/0423-Add-more-Evoker-API.patch
diff --git a/patches/server/0424-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0424-Add-methods-to-get-translation-keys.patch
index 26a527c94e..26a527c94e 100644
--- a/patches/server/0424-Add-methods-to-get-translation-keys.patch
+++ b/patches/unapplied/server/0424-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch
index 9e6e476351..9e6e476351 100644
--- a/patches/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/unapplied/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0426-Cache-block-data-strings.patch b/patches/unapplied/server/0426-Cache-block-data-strings.patch
index 5fc1d46b5b..2594fd72b0 100644
--- a/patches/server/0426-Cache-block-data-strings.patch
+++ b/patches/unapplied/server/0426-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0c0356339abbf255a411993b9bd3e09d31cf2636..d8e528073019514077d36d7395d3056c2d8c1b83 100644
+index adc93e0e7a57907e824bdd8bb7b3012f28b515f4..dd98174480eedfcb348798d9070219581009f16f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2068,6 +2068,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index d00d08bc20..e8f6dba7a8 100644
--- a/patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/unapplied/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 789576f8b7b3001c243972b320b7dffbbf3baa5f..3b73565d295c09a5ab0d610338498f01c7b1520d 100644
+index 36ff9acf571d670fda225bce2f4ed16dc1d20fe3..07c5c01c2f5c18b1d6162275ca091b0ababd72c5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -656,7 +656,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0428-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0428-Add-additional-open-container-api-to-HumanEntity.patch
index a65b493089..a65b493089 100644
--- a/patches/server/0428-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/unapplied/server/0428-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 572dc995c0..572dc995c0 100644
--- a/patches/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/unapplied/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch
index aa2f0131c1..aa2f0131c1 100644
--- a/patches/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/unapplied/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 59a478433f..59a478433f 100644
--- a/patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0432-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0432-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0432-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/unapplied/server/0432-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0433-Entity-isTicking.patch b/patches/unapplied/server/0433-Entity-isTicking.patch
index 1b453a84c9..1b453a84c9 100644
--- a/patches/server/0433-Entity-isTicking.patch
+++ b/patches/unapplied/server/0433-Entity-isTicking.patch
diff --git a/patches/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 404e2050ca..1b9f9b2d28 100644
--- a/patches/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/unapplied/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d8e528073019514077d36d7395d3056c2d8c1b83..99ae9628d96d6d3e42cd038eb4a0d01237cc6b1b 100644
+index dd98174480eedfcb348798d9070219581009f16f..70ae9d44dd860014fd9a599e3a4e4a3fe80068ff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2151,13 +2151,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch
index 43d9b1f7e5..43d9b1f7e5 100644
--- a/patches/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/unapplied/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 3a8fa9719c..3a8fa9719c 100644
--- a/patches/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/unapplied/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0437-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0437-Fix-for-large-move-vectors-crashing-server.patch
index 572b5d2307..7260ba146b 100644
--- a/patches/server/0437-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/unapplied/server/0437-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3b73565d295c09a5ab0d610338498f01c7b1520d..e08c3e0d09896da60cbec7923882bc2263de1bae 100644
+index 07c5c01c2f5c18b1d6162275ca091b0ababd72c5..26c9d483810c8679fb2eff42c9176b8037cd56f8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -472,9 +472,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0438-Optimise-getType-calls.patch b/patches/unapplied/server/0438-Optimise-getType-calls.patch
index 6dd01d7860..6dd01d7860 100644
--- a/patches/server/0438-Optimise-getType-calls.patch
+++ b/patches/unapplied/server/0438-Optimise-getType-calls.patch
diff --git a/patches/server/0439-Villager-resetOffers.patch b/patches/unapplied/server/0439-Villager-resetOffers.patch
index 6068c580b9..6068c580b9 100644
--- a/patches/server/0439-Villager-resetOffers.patch
+++ b/patches/unapplied/server/0439-Villager-resetOffers.patch
diff --git a/patches/server/0440-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0440-Retain-block-place-order-when-capturing-blockstates.patch
index 81ed0ec42c..81ed0ec42c 100644
--- a/patches/server/0440-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/unapplied/server/0440-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch
index 0ead9a9fe2..0ead9a9fe2 100644
--- a/patches/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/unapplied/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0442-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0442-Fix-item-locations-dropped-from-campfires.patch
index d96bf626d4..d96bf626d4 100644
--- a/patches/server/0442-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/unapplied/server/0442-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0443-Fix-bell-block-entity-memory-leak.patch b/patches/unapplied/server/0443-Fix-bell-block-entity-memory-leak.patch
index 91b7136c9d..91b7136c9d 100644
--- a/patches/server/0443-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/unapplied/server/0443-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 741bc6d269..741bc6d269 100644
--- a/patches/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/unapplied/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0445-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0445-Add-getOfflinePlayerIfCached-String.patch
index d72a0cdabe..d72a0cdabe 100644
--- a/patches/server/0445-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/server/0445-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0446-Add-ignore-discounts-API.patch b/patches/unapplied/server/0446-Add-ignore-discounts-API.patch
index a0354c3ea6..a0354c3ea6 100644
--- a/patches/server/0446-Add-ignore-discounts-API.patch
+++ b/patches/unapplied/server/0446-Add-ignore-discounts-API.patch
diff --git a/patches/server/0447-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0447-Toggle-for-removing-existing-dragon.patch
index 410f6cec83..410f6cec83 100644
--- a/patches/server/0447-Toggle-for-removing-existing-dragon.patch
+++ b/patches/unapplied/server/0447-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0448-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0448-Fix-client-lag-on-advancement-loading.patch
index 18483eae32..18483eae32 100644
--- a/patches/server/0448-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/unapplied/server/0448-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0449-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0449-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0449-Item-no-age-no-player-pickup.patch
+++ b/patches/unapplied/server/0449-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0450-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0450-Beacon-API-custom-effect-ranges.patch
index 88e2a56086..88e2a56086 100644
--- a/patches/server/0450-Beacon-API-custom-effect-ranges.patch
+++ b/patches/unapplied/server/0450-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0451-Add-API-for-quit-reason.patch b/patches/unapplied/server/0451-Add-API-for-quit-reason.patch
index a5ab74ddf4..a5ab74ddf4 100644
--- a/patches/server/0451-Add-API-for-quit-reason.patch
+++ b/patches/unapplied/server/0451-Add-API-for-quit-reason.patch
diff --git a/patches/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch
index e14e51ab48..e14e51ab48 100644
--- a/patches/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/unapplied/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0453-Expose-world-spawn-angle.patch b/patches/unapplied/server/0453-Expose-world-spawn-angle.patch
index ccaebc75f6..ccaebc75f6 100644
--- a/patches/server/0453-Expose-world-spawn-angle.patch
+++ b/patches/unapplied/server/0453-Expose-world-spawn-angle.patch
diff --git a/patches/server/0454-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0454-Add-Destroy-Speed-API.patch
index 3b44bc9efc..3b44bc9efc 100644
--- a/patches/server/0454-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/server/0454-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index b11b93ea59..b11b93ea59 100644
--- a/patches/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/unapplied/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0456-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0456-Add-LivingEntity-clearActiveItem.patch
index d6a35cba69..d6a35cba69 100644
--- a/patches/server/0456-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/unapplied/server/0456-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0457-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0457-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0457-Add-PlayerItemCooldownEvent.patch
+++ b/patches/unapplied/server/0457-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0458-Significantly-improve-performance-of-the-end-generat.patch
index ddb86100e5..ddb86100e5 100644
--- a/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/unapplied/server/0458-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0459-More-lightning-API.patch b/patches/unapplied/server/0459-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0459-More-lightning-API.patch
+++ b/patches/unapplied/server/0459-More-lightning-API.patch
diff --git a/patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch
index 290c73d192..290c73d192 100644
--- a/patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/unapplied/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0461-Add-missing-default-perms-for-commands.patch b/patches/unapplied/server/0461-Add-missing-default-perms-for-commands.patch
index c2cc3ce8cc..c2cc3ce8cc 100644
--- a/patches/server/0461-Add-missing-default-perms-for-commands.patch
+++ b/patches/unapplied/server/0461-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0462-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0462-Add-PlayerShearBlockEvent.patch
index a38cf5e637..a38cf5e637 100644
--- a/patches/server/0462-Add-PlayerShearBlockEvent.patch
+++ b/patches/unapplied/server/0462-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0463-Limit-recipe-packets.patch b/patches/unapplied/server/0463-Limit-recipe-packets.patch
index e6120b59a6..759125e140 100644
--- a/patches/server/0463-Limit-recipe-packets.patch
+++ b/patches/unapplied/server/0463-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e08c3e0d09896da60cbec7923882bc2263de1bae..5190939658fce990e166b7c4f5998dd030a156e8 100644
+index 26c9d483810c8679fb2eff42c9176b8037cd56f8..f66c6167f24941b9cfdf4479d6cfbffcc29a7ba6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -257,6 +257,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0464-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0464-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0464-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/unapplied/server/0464-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0465-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0465-Player-Chunk-Load-Unload-Events.patch
index 638b4ea18b..35ae9f9fba 100644
--- a/patches/server/0465-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/server/0465-Player-Chunk-Load-Unload-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
-index 8235d66bb1246f4bb3425d2127b5fe67e4e7eec6..b7778d5296d01870e37560d8f03d48e4a4dd62ae 100644
+index 51bc50111ff30856038245f2614543d84874d930..e890162e1cea3538ed7dea7b78ee2e5346a8ce7b 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
 @@ -44,6 +44,11 @@ public class PlayerChunkSender {
diff --git a/patches/server/0466-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0466-Optimize-Dynamic-get-Missing-Keys.patch
index e58939559a..e58939559a 100644
--- a/patches/server/0466-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/unapplied/server/0466-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0467-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0467-Expose-LivingEntity-hurt-direction.patch
index fa32a9fe84..fa32a9fe84 100644
--- a/patches/server/0467-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/server/0467-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 1c152184b5..1c152184b5 100644
--- a/patches/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/unapplied/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 50044a8342..50044a8342 100644
--- a/patches/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/unapplied/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0470-Add-TargetHitEvent.patch b/patches/unapplied/server/0470-Add-TargetHitEvent.patch
index 2d2b6ef60d..2d2b6ef60d 100644
--- a/patches/server/0470-Add-TargetHitEvent.patch
+++ b/patches/unapplied/server/0470-Add-TargetHitEvent.patch
diff --git a/patches/server/0471-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0471-MC-4-Fix-item-position-desync.patch
index 35ddadadc7..35ddadadc7 100644
--- a/patches/server/0471-MC-4-Fix-item-position-desync.patch
+++ b/patches/unapplied/server/0471-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0472-Additional-Block-Material-API.patch b/patches/unapplied/server/0472-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0472-Additional-Block-Material-API.patch
+++ b/patches/unapplied/server/0472-Additional-Block-Material-API.patch
diff --git a/patches/server/0473-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0473-Fix-harming-potion-dupe.patch
index d7fda01e2c..d7fda01e2c 100644
--- a/patches/server/0473-Fix-harming-potion-dupe.patch
+++ b/patches/unapplied/server/0473-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/unapplied/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/unapplied/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0475-Cache-burn-durations.patch b/patches/unapplied/server/0475-Cache-burn-durations.patch
index 32d702d124..32d702d124 100644
--- a/patches/server/0475-Cache-burn-durations.patch
+++ b/patches/unapplied/server/0475-Cache-burn-durations.patch
diff --git a/patches/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 40171ab920..40171ab920 100644
--- a/patches/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/unapplied/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch
index e434023f48..e434023f48 100644
--- a/patches/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/unapplied/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0478-Add-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0478-Add-PlayerFlowerPotManipulateEvent.patch
index ba8831c6f6..ba8831c6f6 100644
--- a/patches/server/0478-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/server/0478-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0479-Fix-interact-event-not-being-called-sometimes.patch b/patches/unapplied/server/0479-Fix-interact-event-not-being-called-sometimes.patch
index b4f8b3eada..222d664a4e 100644
--- a/patches/server/0479-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/unapplied/server/0479-Fix-interact-event-not-being-called-sometimes.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5190939658fce990e166b7c4f5998dd030a156e8..e5113e86836f9c21570705b1ad312d76e8162e5f 100644
+index f66c6167f24941b9cfdf4479d6cfbffcc29a7ba6..a16751a23eb6aab8c25520127d4dbea0c991c32c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1760,7 +1760,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0480-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0480-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0480-Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/server/0480-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0481-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0481-Fix-nerfed-slime-when-splitting.patch
index 91c9da2246..91c9da2246 100644
--- a/patches/server/0481-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/unapplied/server/0481-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0482-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0482-Add-EntityLoadCrossbowEvent.patch
index ae4000c9dc..ae4000c9dc 100644
--- a/patches/server/0482-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/server/0482-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0483-Add-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0483-Add-WorldGameRuleChangeEvent.patch
index f26393a0b9..f26393a0b9 100644
--- a/patches/server/0483-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/server/0483-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0484-Add-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0484-Add-ServerResourcesReloadedEvent.patch
index 9d87b0e24f..78e525f4d8 100644
--- a/patches/server/0484-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/0484-Add-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 99ae9628d96d6d3e42cd038eb4a0d01237cc6b1b..46cc2649ca482bd2bda37247717d8476dbb76a34 100644
+index 70ae9d44dd860014fd9a599e3a4e4a3fe80068ff..23d68feaa060514e6582a9d47a9ca7db9421c29c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2036,7 +2036,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch
index 4c4ee0656d..4c4ee0656d 100644
--- a/patches/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/unapplied/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0486-Add-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0486-Add-BlockFailedDispenseEvent.patch
index 25dc48423b..25dc48423b 100644
--- a/patches/server/0486-Add-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/server/0486-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0487-Add-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0487-Add-PlayerLecternPageChangeEvent.patch
index 2e62d2becf..2e62d2becf 100644
--- a/patches/server/0487-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/server/0487-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0488-Add-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0488-Add-PlayerLoomPatternSelectEvent.patch
index 382268afcd..382268afcd 100644
--- a/patches/server/0488-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/server/0488-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0489-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0489-Configurable-door-breaking-difficulty.patch
index 18f1e68a47..18f1e68a47 100644
--- a/patches/server/0489-Configurable-door-breaking-difficulty.patch
+++ b/patches/unapplied/server/0489-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0490-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0490-Empty-commands-shall-not-be-dispatched.patch
index 7a48e3018e..7a48e3018e 100644
--- a/patches/server/0490-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/unapplied/server/0490-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0491-Remove-stale-POIs.patch b/patches/unapplied/server/0491-Remove-stale-POIs.patch
index ca376b9ba7..ca376b9ba7 100644
--- a/patches/server/0491-Remove-stale-POIs.patch
+++ b/patches/unapplied/server/0491-Remove-stale-POIs.patch
diff --git a/patches/server/0492-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0492-Fix-villager-boat-exploit.patch
index 1f01745885..1f01745885 100644
--- a/patches/server/0492-Fix-villager-boat-exploit.patch
+++ b/patches/unapplied/server/0492-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0493-Add-sendOpLevel-API.patch b/patches/unapplied/server/0493-Add-sendOpLevel-API.patch
index 7426d0591d..7426d0591d 100644
--- a/patches/server/0493-Add-sendOpLevel-API.patch
+++ b/patches/unapplied/server/0493-Add-sendOpLevel-API.patch
diff --git a/patches/server/0494-TODO-Registry-Modification-API.patch b/patches/unapplied/server/0494-TODO-Registry-Modification-API.patch
index b47ca6aff7..b47ca6aff7 100644
--- a/patches/server/0494-TODO-Registry-Modification-API.patch
+++ b/patches/unapplied/server/0494-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0495-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0495-Add-StructuresLocateEvent.patch
index 5f8804f44d..4cbe5b8bc0 100644
--- a/patches/server/0495-Add-StructuresLocateEvent.patch
+++ b/patches/unapplied/server/0495-Add-StructuresLocateEvent.patch
@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..2667067fd13f61e0464ba88ae4e4a707
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 3e57142dd9cb23d43857d5a4cb30962e4b696b74..a6d5b3fa7e3437e0aec54eec4079e9f3267c64b8 100644
+index 4a731b9170222a5a2b0089ef5e9527dbd46a9ad5..edd968686292237e95afdf99a291f501386144ef 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -121,6 +121,24 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0496-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0496-Collision-option-for-requiring-a-player-participant.patch
index 27be6dda95..27be6dda95 100644
--- a/patches/server/0496-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/unapplied/server/0496-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 95ecd8b67e..95ecd8b67e 100644
--- a/patches/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/unapplied/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch
index ba3a6a7f92..ba3a6a7f92 100644
--- a/patches/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0499-Make-schedule-command-per-world.patch b/patches/unapplied/server/0499-Make-schedule-command-per-world.patch
index f1854ba4c9..f1854ba4c9 100644
--- a/patches/server/0499-Make-schedule-command-per-world.patch
+++ b/patches/unapplied/server/0499-Make-schedule-command-per-world.patch
diff --git a/patches/server/0500-Configurable-max-leash-distance.patch b/patches/unapplied/server/0500-Configurable-max-leash-distance.patch
index 99a4a50ca9..99a4a50ca9 100644
--- a/patches/server/0500-Configurable-max-leash-distance.patch
+++ b/patches/unapplied/server/0500-Configurable-max-leash-distance.patch
diff --git a/patches/server/0501-Add-BlockPreDispenseEvent.patch b/patches/unapplied/server/0501-Add-BlockPreDispenseEvent.patch
index 4d04e2d466..4d04e2d466 100644
--- a/patches/server/0501-Add-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/server/0501-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0502-Add-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0502-Add-PlayerChangeBeaconEffectEvent.patch
index 0187e55e0c..0187e55e0c 100644
--- a/patches/server/0502-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/server/0502-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch
index 7d6769dff8..7d6769dff8 100644
--- a/patches/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/unapplied/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch
index 6aad83c0bc..6aad83c0bc 100644
--- a/patches/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0505-Expand-EntityUnleashEvent.patch b/patches/unapplied/server/0505-Expand-EntityUnleashEvent.patch
index cd50019e1f..cd50019e1f 100644
--- a/patches/server/0505-Expand-EntityUnleashEvent.patch
+++ b/patches/unapplied/server/0505-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0506-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0506-Reset-shield-blocking-on-dimension-change.patch
index e29d07bebd..e29d07bebd 100644
--- a/patches/server/0506-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/unapplied/server/0506-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0507-Add-DragonEggFormEvent.patch b/patches/unapplied/server/0507-Add-DragonEggFormEvent.patch
index b92df234cd..b92df234cd 100644
--- a/patches/server/0507-Add-DragonEggFormEvent.patch
+++ b/patches/unapplied/server/0507-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0508-Add-EntityMoveEvent.patch b/patches/unapplied/server/0508-Add-EntityMoveEvent.patch
index dd7d2720c2..01a71e25e3 100644
--- a/patches/server/0508-Add-EntityMoveEvent.patch
+++ b/patches/unapplied/server/0508-Add-EntityMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 46cc2649ca482bd2bda37247717d8476dbb76a34..4416feb73fd800787db65f5841eb92b1b29cddb0 100644
+index 23d68feaa060514e6582a9d47a9ca7db9421c29c..a596b3e52e902ed01a526aa9961910d8a3cc2e2d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1526,6 +1526,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch
index fbf9bd1483..fbf9bd1483 100644
--- a/patches/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/unapplied/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0510-Inline-shift-direction-fields.patch b/patches/unapplied/server/0510-Inline-shift-direction-fields.patch
index 88027eb7c0..88027eb7c0 100644
--- a/patches/server/0510-Inline-shift-direction-fields.patch
+++ b/patches/unapplied/server/0510-Inline-shift-direction-fields.patch
diff --git a/patches/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch
index b5abbd7988..b5abbd7988 100644
--- a/patches/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 57d54a0434..57d54a0434 100644
--- a/patches/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0513-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0513-living-entity-allow-attribute-registration.patch
index b05d18bed0..b05d18bed0 100644
--- a/patches/server/0513-living-entity-allow-attribute-registration.patch
+++ b/patches/unapplied/server/0513-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0514-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0514-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0514-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/unapplied/server/0514-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/unapplied/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0516-Expose-Tracked-Players.patch b/patches/unapplied/server/0516-Expose-Tracked-Players.patch
index 144143bd1f..144143bd1f 100644
--- a/patches/server/0516-Expose-Tracked-Players.patch
+++ b/patches/unapplied/server/0516-Expose-Tracked-Players.patch
diff --git a/patches/server/0517-Improve-ServerGUI.patch b/patches/unapplied/server/0517-Improve-ServerGUI.patch
index 9aec8b6334..9aec8b6334 100644
--- a/patches/server/0517-Improve-ServerGUI.patch
+++ b/patches/unapplied/server/0517-Improve-ServerGUI.patch
diff --git a/patches/server/0518-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0518-fix-converting-txt-to-json-file.patch
index cd8921cdba..cd8921cdba 100644
--- a/patches/server/0518-fix-converting-txt-to-json-file.patch
+++ b/patches/unapplied/server/0518-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0519-Add-worldborder-events.patch b/patches/unapplied/server/0519-Add-worldborder-events.patch
index f39382cd63..f39382cd63 100644
--- a/patches/server/0519-Add-worldborder-events.patch
+++ b/patches/unapplied/server/0519-Add-worldborder-events.patch
diff --git a/patches/server/0520-Add-PlayerNameEntityEvent.patch b/patches/unapplied/server/0520-Add-PlayerNameEntityEvent.patch
index eec1c1a2eb..eec1c1a2eb 100644
--- a/patches/server/0520-Add-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/server/0520-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0521-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0521-Prevent-grindstones-from-overstacking-items.patch
index d98bb3f1c4..d98bb3f1c4 100644
--- a/patches/server/0521-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/unapplied/server/0521-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0522-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0522-Add-recipe-to-cook-events.patch
index 75eb9efb8b..75eb9efb8b 100644
--- a/patches/server/0522-Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/server/0522-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0523-Add-Block-isValidTool.patch b/patches/unapplied/server/0523-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0523-Add-Block-isValidTool.patch
+++ b/patches/unapplied/server/0523-Add-Block-isValidTool.patch
diff --git a/patches/server/0524-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0524-Allow-using-signs-inside-spawn-protection.patch
index 0eefa73f3f..d32c2c920e 100644
--- a/patches/server/0524-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/unapplied/server/0524-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e5113e86836f9c21570705b1ad312d76e8162e5f..f455c7ab48accf581a8ecdbc78a12b055dbd19fa 100644
+index a16751a23eb6aab8c25520127d4dbea0c991c32c..9f9ac6b67123339b77ff85830f7cf2419b0fc330 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1752,7 +1752,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0525-Expand-world-key-API.patch b/patches/unapplied/server/0525-Expand-world-key-API.patch
index c0e1a1055a..c0e1a1055a 100644
--- a/patches/server/0525-Expand-world-key-API.patch
+++ b/patches/unapplied/server/0525-Expand-world-key-API.patch
diff --git a/patches/server/0526-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0526-Add-fast-alternative-constructor-for-Rotations.patch
index 7c07d6c0ee..7c07d6c0ee 100644
--- a/patches/server/0526-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/unapplied/server/0526-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0527-Item-Rarity-API.patch b/patches/unapplied/server/0527-Item-Rarity-API.patch
index e06ec08950..e06ec08950 100644
--- a/patches/server/0527-Item-Rarity-API.patch
+++ b/patches/unapplied/server/0527-Item-Rarity-API.patch
diff --git a/patches/server/0528-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0528-Drop-carried-item-when-player-has-disconnected.patch
index c5c564c74e..c5c564c74e 100644
--- a/patches/server/0528-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/unapplied/server/0528-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0529-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0529-forced-whitelist-use-configurable-kick-message.patch
index 97e28a74cf..890b503e8f 100644
--- a/patches/server/0529-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/unapplied/server/0529-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4416feb73fd800787db65f5841eb92b1b29cddb0..c9545f96317fd6692889d82851d76084efa6a61d 100644
+index a596b3e52e902ed01a526aa9961910d8a3cc2e2d..d972e82ce41ec0c1ff4f9c55646ed3c21c6381d2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2167,7 +2167,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index ff433de537..c76d4e61a2 100644
--- a/patches/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/unapplied/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f455c7ab48accf581a8ecdbc78a12b055dbd19fa..0ff1e65df2b3c131ed65f8b769bbf369a76aa3d0 100644
+index 9f9ac6b67123339b77ff85830f7cf2419b0fc330..6225499d926c0d83ea1cfd07a0340677a05a64e1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1187,7 +1187,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0531-Expose-protocol-version.patch b/patches/unapplied/server/0531-Expose-protocol-version.patch
index 42ca8eaa45..42ca8eaa45 100644
--- a/patches/server/0531-Expose-protocol-version.patch
+++ b/patches/unapplied/server/0531-Expose-protocol-version.patch
diff --git a/patches/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch
index c1c74a8470..c1c74a8470 100644
--- a/patches/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/unapplied/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index a644ea6fc4..a644ea6fc4 100644
--- a/patches/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/unapplied/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0534-Add-bypass-host-check.patch b/patches/unapplied/server/0534-Add-bypass-host-check.patch
index b53ee2c2d8..b53ee2c2d8 100644
--- a/patches/server/0534-Add-bypass-host-check.patch
+++ b/patches/unapplied/server/0534-Add-bypass-host-check.patch
diff --git a/patches/server/0535-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0535-Set-area-affect-cloud-rotation.patch
index 1904854b96..1904854b96 100644
--- a/patches/server/0535-Set-area-affect-cloud-rotation.patch
+++ b/patches/unapplied/server/0535-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0536-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0536-add-isDeeplySleeping-to-HumanEntity.patch
index b3cc3b4e68..b3cc3b4e68 100644
--- a/patches/server/0536-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/server/0536-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch
index bfdd2e8c45..bfdd2e8c45 100644
--- a/patches/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0539-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0539-fix-PigZombieAngerEvent-cancellation.patch
index 8b29ccdead..8b29ccdead 100644
--- a/patches/server/0539-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/unapplied/server/0539-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch
index 8a5876c2cb..91ef3ef252 100644
--- a/patches/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/unapplied/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0ff1e65df2b3c131ed65f8b769bbf369a76aa3d0..12b81d6dc04586d2491a382b6198f986b2b5bae1 100644
+index 6225499d926c0d83ea1cfd07a0340677a05a64e1..d0409856a3aee811714c9254f4436b7f6bb94bf0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1921,6 +1921,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0541-Add-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0541-Add-PlayerDeepSleepEvent.patch
index 4ae6ac9026..4ae6ac9026 100644
--- a/patches/server/0541-Add-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/0541-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0542-More-World-API.patch b/patches/unapplied/server/0542-More-World-API.patch
index 3090623a76..3090623a76 100644
--- a/patches/server/0542-More-World-API.patch
+++ b/patches/unapplied/server/0542-More-World-API.patch
diff --git a/patches/server/0543-Add-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0543-Add-PlayerBedFailEnterEvent.patch
index 945dacae7c..945dacae7c 100644
--- a/patches/server/0543-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/0543-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0544-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0544-Implement-methods-to-convert-between-Component-and-B.patch
index ebc86dc755..ebc86dc755 100644
--- a/patches/server/0544-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/unapplied/server/0544-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/unapplied/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 95d33b962c..4fa56f22b6 100644
--- a/patches/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/unapplied/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 12b81d6dc04586d2491a382b6198f986b2b5bae1..e12740f601acbe2b344d8e1fffc4bee2c752face 100644
+index d0409856a3aee811714c9254f4436b7f6bb94bf0..872e59c5de3a98bbdf40cf6d2aeb0694f2b88689 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2632,7 +2632,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0546-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0546-Introduce-beacon-activation-deactivation-events.patch
index f793b533a2..f793b533a2 100644
--- a/patches/server/0546-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/server/0546-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0547-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0547-Add-Channel-initialization-listeners.patch
index 51eee16dd9..51eee16dd9 100644
--- a/patches/server/0547-Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/0547-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch
index f385186300..f385186300 100644
--- a/patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/unapplied/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0549-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0549-Add-more-WanderingTrader-API.patch
index 6e3c9d60f5..6e3c9d60f5 100644
--- a/patches/server/0549-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/0549-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0550-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0550-Add-EntityBlockStorage-clearEntities.patch
index 1297267437..1297267437 100644
--- a/patches/server/0550-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/0550-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 4a803357b6..4a803357b6 100644
--- a/patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0552-Add-HiddenPotionEffect-API.patch b/patches/unapplied/server/0552-Add-HiddenPotionEffect-API.patch
index 5f9960d071..5f9960d071 100644
--- a/patches/server/0552-Add-HiddenPotionEffect-API.patch
+++ b/patches/unapplied/server/0552-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0553-Inventory-close.patch b/patches/unapplied/server/0553-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0553-Inventory-close.patch
+++ b/patches/unapplied/server/0553-Inventory-close.patch
diff --git a/patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 1d2850637b..1d2850637b 100644
--- a/patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0555-Add-basic-Datapack-API.patch b/patches/unapplied/server/0555-Add-basic-Datapack-API.patch
index 93aebb5a94..93aebb5a94 100644
--- a/patches/server/0555-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/0555-Add-basic-Datapack-API.patch
diff --git a/patches/server/0556-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0556-Add-environment-variable-to-disable-server-gui.patch
index 787ab50918..787ab50918 100644
--- a/patches/server/0556-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/0556-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0557-Expand-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0557-Expand-PlayerGameModeChangeEvent.patch
index 369bfda4fb..369bfda4fb 100644
--- a/patches/server/0557-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/server/0557-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0558-ItemStack-repair-check-API.patch b/patches/unapplied/server/0558-ItemStack-repair-check-API.patch
index 63cbb56089..63cbb56089 100644
--- a/patches/server/0558-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/server/0558-ItemStack-repair-check-API.patch
diff --git a/patches/server/0559-More-Enchantment-API.patch b/patches/unapplied/server/0559-More-Enchantment-API.patch
index c2c88eec8b..c2c88eec8b 100644
--- a/patches/server/0559-More-Enchantment-API.patch
+++ b/patches/unapplied/server/0559-More-Enchantment-API.patch
diff --git a/patches/server/0560-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0560-Move-range-check-for-block-placing-up.patch
index 6ba529d1a6..96ef06f137 100644
--- a/patches/server/0560-Move-range-check-for-block-placing-up.patch
+++ b/patches/unapplied/server/0560-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c9a8d04d1485a9493f6353beb7998801e286923e..ba7f0f4e2840b88d8f53c5720752cfeed2493c49 100644
+index 77560a31fc90387efb14ae0432b7a6aafb8cab61..ffbd1d99f7f896eb2b0af04e8f344f7fa0dc09d7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1738,6 +1738,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0561-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0561-Add-Mob-lookAt-API.patch
index ddfa31827a..ddfa31827a 100644
--- a/patches/server/0561-Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/server/0561-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/unapplied/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index 5ca75e86a3..5ca75e86a3 100644
--- a/patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/unapplied/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0563-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0563-Add-Unix-domain-socket-support.patch
index 297b991d83..96e615aa5d 100644
--- a/patches/server/0563-Add-Unix-domain-socket-support.patch
+++ b/patches/unapplied/server/0563-Add-Unix-domain-socket-support.patch
@@ -87,7 +87,7 @@ index 25ddfe8e5da65e4ac70be2820ba139e7f3852c0c..87abd6274f9da9367094bad0c28acfa4
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ba7f0f4e2840b88d8f53c5720752cfeed2493c49..a5dd14014fd214ec900e0c49064ee54b2f43ff8e 100644
+index ffbd1d99f7f896eb2b0af04e8f344f7fa0dc09d7..e2fc392afd6fa8fbb9d464262f12bb6a0c81f7f8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2475,6 +2475,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0564-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0564-Add-EntityInsideBlockEvent.patch
index 32ac5315b3..32ac5315b3 100644
--- a/patches/server/0564-Add-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/server/0564-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0565-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0565-Attributes-API-for-item-defaults.patch
index 5dfb74a47a..5dfb74a47a 100644
--- a/patches/server/0565-Attributes-API-for-item-defaults.patch
+++ b/patches/unapplied/server/0565-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch
index c03e550a38..c03e550a38 100644
--- a/patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0567-More-Lidded-Block-API.patch b/patches/unapplied/server/0567-More-Lidded-Block-API.patch
index d36768f000..d36768f000 100644
--- a/patches/server/0567-More-Lidded-Block-API.patch
+++ b/patches/unapplied/server/0567-More-Lidded-Block-API.patch
diff --git a/patches/server/0568-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0568-Limit-item-frame-cursors-on-maps.patch
index 8b38d8900a..8b38d8900a 100644
--- a/patches/server/0568-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/unapplied/server/0568-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0569-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0569-Add-PlayerKickEvent-causes.patch
index e63dc58265..e63dc58265 100644
--- a/patches/server/0569-Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/server/0569-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0570-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0570-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0570-Add-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/server/0570-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 8ac91b4842..8ac91b4842 100644
--- a/patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/unapplied/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 2deed69271..2deed69271 100644
--- a/patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/unapplied/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0573-Add-option-to-fix-items-merging-through-walls.patch
index 718a84a02c..718a84a02c 100644
--- a/patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/unapplied/server/0573-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0574-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0574-Add-BellRevealRaiderEvent.patch
index 58719e8164..58719e8164 100644
--- a/patches/server/0574-Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/server/0574-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0575-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0575-Fix-invulnerable-end-crystals.patch
index 7942af4aa7..7942af4aa7 100644
--- a/patches/server/0575-Fix-invulnerable-end-crystals.patch
+++ b/patches/unapplied/server/0575-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0576-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0576-Add-ElderGuardianAppearanceEvent.patch
index bd92518e4b..bd92518e4b 100644
--- a/patches/server/0576-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/server/0576-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0577-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0577-Fix-dangerous-end-portal-logic.patch
index fc17215428..fc17215428 100644
--- a/patches/server/0577-Fix-dangerous-end-portal-logic.patch
+++ b/patches/unapplied/server/0577-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index efeca7582b..efeca7582b 100644
--- a/patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/unapplied/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0579-Make-item-validations-configurable.patch b/patches/unapplied/server/0579-Make-item-validations-configurable.patch
index e82f39807e..e82f39807e 100644
--- a/patches/server/0579-Make-item-validations-configurable.patch
+++ b/patches/unapplied/server/0579-Make-item-validations-configurable.patch
diff --git a/patches/server/0580-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0580-Line-Of-Sight-Changes.patch
index 0e0c8ce179..0e0c8ce179 100644
--- a/patches/server/0580-Line-Of-Sight-Changes.patch
+++ b/patches/unapplied/server/0580-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0581-add-per-world-spawn-limits.patch b/patches/unapplied/server/0581-add-per-world-spawn-limits.patch
index 667d878d8d..667d878d8d 100644
--- a/patches/server/0581-add-per-world-spawn-limits.patch
+++ b/patches/unapplied/server/0581-add-per-world-spawn-limits.patch
diff --git a/patches/server/0582-Fix-potions-splash-events.patch b/patches/unapplied/server/0582-Fix-potions-splash-events.patch
index ea51de4f20..ea51de4f20 100644
--- a/patches/server/0582-Fix-potions-splash-events.patch
+++ b/patches/unapplied/server/0582-Fix-potions-splash-events.patch
diff --git a/patches/server/0583-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0583-Add-more-LimitedRegion-API.patch
index ff692d5181..ff692d5181 100644
--- a/patches/server/0583-Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/server/0583-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 4f374c8de3..4f374c8de3 100644
--- a/patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/unapplied/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0585-Missing-Entity-API.patch b/patches/unapplied/server/0585-Missing-Entity-API.patch
index 15b6b347f6..578eebacca 100644
--- a/patches/server/0585-Missing-Entity-API.patch
+++ b/patches/unapplied/server/0585-Missing-Entity-API.patch
@@ -113,7 +113,7 @@ index 0000000000000000000000000000000000000000..41bf71d116ffc5431586ce54abba7f8d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
-index eef7d260dcb9a9c8ea6efef3216d33c08e3ea287..79c79f825e4c9b748d54962d06356ef425359101 100644
+index 3982ddbd0fa133fa0ca0241c4fb68ce167ebcbed..59dbb4dd48f81cab5216d5d8edef6ccd6e7efd9e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
 @@ -52,6 +52,7 @@ public abstract class AbstractSchoolingFish extends AbstractFish {
diff --git a/patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 20f139446c..9c10362717 100644
--- a/patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/unapplied/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2e1a0b3d2dee21d6deba62ec710d92efdf33e1a6..75ff85e3710d5e70a32fe39e8469c1f169fd2d46 100644
+index 08f502452dc1c6ee83e04650b08a08e521c64144..37a801668c2fa4e7eaf4839b2f69a92f9f91907f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1096,7 +1096,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/unapplied/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch
index 1778a6a85c..1778a6a85c 100644
--- a/patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/unapplied/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0589-Fix-commands-from-signs-not-firing-command-events.patch
index 67851c6f82..67851c6f82 100644
--- a/patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/unapplied/server/0589-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0590-Add-PlayerArmSwingEvent.patch b/patches/unapplied/server/0590-Add-PlayerArmSwingEvent.patch
index d3f4757d38..0e5d1b0c09 100644
--- a/patches/server/0590-Add-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/server/0590-Add-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75ff85e3710d5e70a32fe39e8469c1f169fd2d46..bce87f55ad85837a17f783b5341ef5b64ab0ede0 100644
+index 37a801668c2fa4e7eaf4839b2f69a92f9f91907f..de6b8af2f586469cd97ad796ee9a841a83f8f068 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2328,7 +2328,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
index c3d3547870..5b12bd148b 100644
--- a/patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/unapplied/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
@@ -50,7 +50,7 @@ index a65a1466dab52fca75cda16a4b22fef03b6207a0..0306771b8f90dcdd77f151c19c6c2d75
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bce87f55ad85837a17f783b5341ef5b64ab0ede0..42c24ed58fab0f7ff9f58b2a65818f45a5b7cc06 100644
+index de6b8af2f586469cd97ad796ee9a841a83f8f068..cb7d038b902c326d2ebec61f1dc40849c3cfbc63 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1882,6 +1882,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0592-Add-config-for-mobs-immune-to-default-effects.patch
index 10ce8bf043..10ce8bf043 100644
--- a/patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/unapplied/server/0592-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0593-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0593-Don-t-apply-cramming-damage-to-players.patch
index b0d6a1ad5d..b0d6a1ad5d 100644
--- a/patches/server/0593-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/unapplied/server/0593-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 2832058fe5..2832058fe5 100644
--- a/patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/unapplied/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0595-Add-missing-forceDrop-toggles.patch b/patches/unapplied/server/0595-Add-missing-forceDrop-toggles.patch
index 7e8de16312..7e8de16312 100644
--- a/patches/server/0595-Add-missing-forceDrop-toggles.patch
+++ b/patches/unapplied/server/0595-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0596-Stinger-API.patch b/patches/unapplied/server/0596-Stinger-API.patch
index 7a81c96422..7a81c96422 100644
--- a/patches/server/0596-Stinger-API.patch
+++ b/patches/unapplied/server/0596-Stinger-API.patch
diff --git a/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 926fba2c7f..926fba2c7f 100644
--- a/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/unapplied/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0598-Add-System.out-err-catcher.patch b/patches/unapplied/server/0598-Add-System.out-err-catcher.patch
index c9b1688452..c9b1688452 100644
--- a/patches/server/0598-Add-System.out-err-catcher.patch
+++ b/patches/unapplied/server/0598-Add-System.out-err-catcher.patch
diff --git a/patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index e3b686c58c..e3b686c58c 100644
--- a/patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
index 8ab33daef9..2ffc213d10 100644
--- a/patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/unapplied/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 42c24ed58fab0f7ff9f58b2a65818f45a5b7cc06..2941445ea453e2fb88ea8de38c24bf755b93936a 100644
+index cb7d038b902c326d2ebec61f1dc40849c3cfbc63..574efd531199332a36fb26c70cc44bd5a05ff37d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -389,7 +389,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch
index 5edf383235..5edf383235 100644
--- a/patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/unapplied/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0602-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0602-Add-PlayerSetSpawnEvent.patch
index f1df5dfc73..f1df5dfc73 100644
--- a/patches/server/0602-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/server/0602-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch
index 0de1d33a58..0de1d33a58 100644
--- a/patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/unapplied/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0604-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0604-Optimize-entity-tracker-passenger-checks.patch
index e1857c2d2c..e1857c2d2c 100644
--- a/patches/server/0604-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/unapplied/server/0604-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0605-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0605-Config-option-for-Piglins-guarding-chests.patch
index 5b025d0fbb..5b025d0fbb 100644
--- a/patches/server/0605-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/unapplied/server/0605-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0606-Add-EntityDamageItemEvent.patch b/patches/unapplied/server/0606-Add-EntityDamageItemEvent.patch
index 99df36aea0..99df36aea0 100644
--- a/patches/server/0606-Add-EntityDamageItemEvent.patch
+++ b/patches/unapplied/server/0606-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0607-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0607-Optimize-indirect-passenger-iteration.patch
index ba1f9b4848..ba1f9b4848 100644
--- a/patches/server/0607-Optimize-indirect-passenger-iteration.patch
+++ b/patches/unapplied/server/0607-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0608-Configurable-item-frame-map-cursor-update-interval.patch
index 18c1f05373..18c1f05373 100644
--- a/patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/unapplied/server/0608-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0609-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0609-Clear-bucket-NBT-after-dispense.patch
index 24eb614ec7..24eb614ec7 100644
--- a/patches/server/0609-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/unapplied/server/0609-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0610-Change-EnderEye-target-without-changing-other-things.patch
index 496056ab98..496056ab98 100644
--- a/patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/server/0610-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0611-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0611-Add-BlockBreakBlockEvent.patch
index 75f265d55f..75f265d55f 100644
--- a/patches/server/0611-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/server/0611-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 32a2c26212..32a2c26212 100644
--- a/patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/unapplied/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0613-More-CommandBlock-API.patch b/patches/unapplied/server/0613-More-CommandBlock-API.patch
index 65a5093980..65a5093980 100644
--- a/patches/server/0613-More-CommandBlock-API.patch
+++ b/patches/unapplied/server/0613-More-CommandBlock-API.patch
diff --git a/patches/server/0614-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0614-Add-missing-team-sidebar-display-slots.patch
index 2a080ce725..2a080ce725 100644
--- a/patches/server/0614-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/server/0614-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0615-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0615-Add-back-EntityPortalExitEvent.patch
index 0f1992b626..0f1992b626 100644
--- a/patches/server/0615-Add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/server/0615-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch
index 5b789cb250..5b789cb250 100644
--- a/patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0617-Get-entity-default-attributes.patch b/patches/unapplied/server/0617-Get-entity-default-attributes.patch
index 1bb8eb30e3..1bb8eb30e3 100644
--- a/patches/server/0617-Get-entity-default-attributes.patch
+++ b/patches/unapplied/server/0617-Get-entity-default-attributes.patch
diff --git a/patches/server/0618-Left-handed-API.patch b/patches/unapplied/server/0618-Left-handed-API.patch
index d59098ccdf..d59098ccdf 100644
--- a/patches/server/0618-Left-handed-API.patch
+++ b/patches/unapplied/server/0618-Left-handed-API.patch
diff --git a/patches/server/0619-Add-more-advancement-API.patch b/patches/unapplied/server/0619-Add-more-advancement-API.patch
index c86f1459b7..c86f1459b7 100644
--- a/patches/server/0619-Add-more-advancement-API.patch
+++ b/patches/unapplied/server/0619-Add-more-advancement-API.patch
diff --git a/patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0620-Add-ItemFactory-getSpawnEgg-API.patch
index c1c7ed6a2c..c1c7ed6a2c 100644
--- a/patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/unapplied/server/0620-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0621-Add-critical-damage-API.patch b/patches/unapplied/server/0621-Add-critical-damage-API.patch
index 7df517266e..7df517266e 100644
--- a/patches/server/0621-Add-critical-damage-API.patch
+++ b/patches/unapplied/server/0621-Add-critical-damage-API.patch
diff --git a/patches/server/0622-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0622-Fix-issues-with-mob-conversion.patch
index af0f87afee..af0f87afee 100644
--- a/patches/server/0622-Fix-issues-with-mob-conversion.patch
+++ b/patches/unapplied/server/0622-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0623-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0623-Add-isCollidable-methods-to-various-places.patch
index 5d9e44b791..5d9e44b791 100644
--- a/patches/server/0623-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/unapplied/server/0623-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0624-Goat-ram-API.patch b/patches/unapplied/server/0624-Goat-ram-API.patch
index 04a1b6c686..04a1b6c686 100644
--- a/patches/server/0624-Goat-ram-API.patch
+++ b/patches/unapplied/server/0624-Goat-ram-API.patch
diff --git a/patches/server/0625-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0625-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0625-Add-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/server/0625-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0626-Add-Raw-Byte-Entity-Serialization.patch
index 2418a2e08d..2418a2e08d 100644
--- a/patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/server/0626-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0627-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0627-Vanilla-command-permission-fixes.patch
index 25c28237d6..25c28237d6 100644
--- a/patches/server/0627-Vanilla-command-permission-fixes.patch
+++ b/patches/unapplied/server/0627-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index abcdf89c61..abcdf89c61 100644
--- a/patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/unapplied/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0629-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0629-Fix-GameProfileCache-concurrency.patch
index 9c0776cd51..9c0776cd51 100644
--- a/patches/server/0629-Fix-GameProfileCache-concurrency.patch
+++ b/patches/unapplied/server/0629-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0630-Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/0630-Improve-and-expand-AsyncCatcher.patch
index b87817eeb4..a57e480c6c 100644
--- a/patches/server/0630-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/unapplied/server/0630-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2941445ea453e2fb88ea8de38c24bf755b93936a..666c6cb6f600973e1d84839aed715606279d4630 100644
+index 574efd531199332a36fb26c70cc44bd5a05ff37d..7efe0cc24590966075ae84d19c3899a43f9adc2a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1570,6 +1570,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 82e949eac0..82e949eac0 100644
--- a/patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/unapplied/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0632-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0632-Sanitize-ResourceLocation-error-logging.patch
index 3c467a8134..3c467a8134 100644
--- a/patches/server/0632-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/unapplied/server/0632-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0633-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0633-Manually-inline-methods-in-BlockPosition.patch
index 870042962d..870042962d 100644
--- a/patches/server/0633-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/unapplied/server/0633-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/unapplied/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index aea03ebfb8..aea03ebfb8 100644
--- a/patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/unapplied/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 538ac56665..538ac56665 100644
--- a/patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/unapplied/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/unapplied/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/unapplied/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0638-Time-scoreboard-search.patch b/patches/unapplied/server/0638-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0638-Time-scoreboard-search.patch
+++ b/patches/unapplied/server/0638-Time-scoreboard-search.patch
diff --git a/patches/server/0639-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0639-Oprimise-map-impl-for-tracked-players.patch
index c8c75040be..c8c75040be 100644
--- a/patches/server/0639-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/unapplied/server/0639-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0640-Add-missing-InventoryType.patch b/patches/unapplied/server/0640-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0640-Add-missing-InventoryType.patch
+++ b/patches/unapplied/server/0640-Add-missing-InventoryType.patch
diff --git a/patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch
index b192406016..b192406016 100644
--- a/patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/unapplied/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 76d51d8295..76d51d8295 100644
--- a/patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/unapplied/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0643-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/unapplied/server/0643-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index d80840a79c..579dc34726 100644
--- a/patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/unapplied/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 666c6cb6f600973e1d84839aed715606279d4630..ace2cab310aa7d89e1b76bf5fdc9fd64f56b6cc7 100644
+index 7efe0cc24590966075ae84d19c3899a43f9adc2a..8fcb241e8d161c9fb024a2a0488f8c29784a74f1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -725,6 +725,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0645-Add-packet-limiter-config.patch b/patches/unapplied/server/0645-Add-packet-limiter-config.patch
index dd045eca75..dd045eca75 100644
--- a/patches/server/0645-Add-packet-limiter-config.patch
+++ b/patches/unapplied/server/0645-Add-packet-limiter-config.patch
diff --git a/patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 341421e59d..341421e59d 100644
--- a/patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/unapplied/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0647-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0647-Ensure-valid-vehicle-status.patch
index 35c8b1e952..35c8b1e952 100644
--- a/patches/server/0647-Ensure-valid-vehicle-status.patch
+++ b/patches/unapplied/server/0647-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0648-Prevent-softlocked-end-exit-portal-generation.patch
index 67312cbfe5..67312cbfe5 100644
--- a/patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/unapplied/server/0648-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index db1f49cd0a..db1f49cd0a 100644
--- a/patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/unapplied/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0650-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0650-Don-t-log-debug-logging-being-disabled.patch
index 8daedd938d..8daedd938d 100644
--- a/patches/server/0650-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/unapplied/server/0650-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0651-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0651-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0651-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/unapplied/server/0651-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0652-Preserve-overstacked-loot.patch b/patches/unapplied/server/0652-Preserve-overstacked-loot.patch
index 004c7c6f77..004c7c6f77 100644
--- a/patches/server/0652-Preserve-overstacked-loot.patch
+++ b/patches/unapplied/server/0652-Preserve-overstacked-loot.patch
diff --git a/patches/server/0653-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0653-Update-head-rotation-in-missing-places.patch
index abf2879a6e..abf2879a6e 100644
--- a/patches/server/0653-Update-head-rotation-in-missing-places.patch
+++ b/patches/unapplied/server/0653-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0654-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0654-prevent-unintended-light-block-manipulation.patch
index 9371202698..9371202698 100644
--- a/patches/server/0654-prevent-unintended-light-block-manipulation.patch
+++ b/patches/unapplied/server/0654-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0655-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0655-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0655-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/unapplied/server/0655-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0656-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0656-Fix-upstreams-block-state-factories.patch
index b930948485..b930948485 100644
--- a/patches/server/0656-Fix-upstreams-block-state-factories.patch
+++ b/patches/unapplied/server/0656-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0657-Configurable-feature-seeds.patch b/patches/unapplied/server/0657-Configurable-feature-seeds.patch
index 0cfc074f8f..bebeb4fc60 100644
--- a/patches/server/0657-Configurable-feature-seeds.patch
+++ b/patches/unapplied/server/0657-Configurable-feature-seeds.patch
@@ -19,7 +19,7 @@ index 49028463ba47e760281545c2f7597e3db8d6c453..7620c72a4c243cbeea245203ce03a97c
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index a6d5b3fa7e3437e0aec54eec4079e9f3267c64b8..567103d635087bf894a8c0473baf03bdb5ff052f 100644
+index edd968686292237e95afdf99a291f501386144ef..d09d5192f0a571e9758e95dd5e1392a9caa88bde 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -431,7 +431,14 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0658-Add-root-admin-user-detection.patch b/patches/unapplied/server/0658-Add-root-admin-user-detection.patch
index 74f125cf61..74f125cf61 100644
--- a/patches/server/0658-Add-root-admin-user-detection.patch
+++ b/patches/unapplied/server/0658-Add-root-admin-user-detection.patch
diff --git a/patches/server/0659-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0659-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0659-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/unapplied/server/0659-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0660-don-t-attempt-to-teleport-dead-entities.patch
index 46478011d3..46478011d3 100644
--- a/patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/unapplied/server/0660-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch
index f3ea39fcf2..f3ea39fcf2 100644
--- a/patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/unapplied/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch
index b7a4fc1608..b7a4fc1608 100644
--- a/patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/unapplied/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0663-Fix-removing-recipes-from-RecipeIterator.patch
index fb78c572eb..fb78c572eb 100644
--- a/patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/unapplied/server/0663-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch
index cd57452be8..cd57452be8 100644
--- a/patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/unapplied/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
index 97005e3398..8f581ab2f3 100644
--- a/patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/unapplied/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index a51564e8dce3c125ed5f05cc23548a05c1e79a95..d2c2075fb0378fd7ec148281d37d886c
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ace2cab310aa7d89e1b76bf5fdc9fd64f56b6cc7..cf173a2315f3a97a89dc2aabe81be285abe73603 100644
+index 8fcb241e8d161c9fb024a2a0488f8c29784a74f1..7127c6f163cc00eb439eb37665df3e1a4bf27cc2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2565,8 +2565,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0666-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0666-Fix-Spigot-growth-modifiers.patch
index 6463677b83..6463677b83 100644
--- a/patches/server/0666-Fix-Spigot-growth-modifiers.patch
+++ b/patches/unapplied/server/0666-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 9dbace63bd..9dbace63bd 100644
--- a/patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/unapplied/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0668-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0668-Add-PlayerItemFrameChangeEvent.patch
index 7dd61945d1..7dd61945d1 100644
--- a/patches/server/0668-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/unapplied/server/0668-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0669-Optimize-HashMapPalette.patch b/patches/unapplied/server/0669-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0669-Optimize-HashMapPalette.patch
+++ b/patches/unapplied/server/0669-Optimize-HashMapPalette.patch
diff --git a/patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch
index 7c8b0a2c4a..7c8b0a2c4a 100644
--- a/patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/unapplied/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index f451e896f8..f451e896f8 100644
--- a/patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/unapplied/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0672-Add-more-Campfire-API.patch b/patches/unapplied/server/0672-Add-more-Campfire-API.patch
index 1133eb93bf..1133eb93bf 100644
--- a/patches/server/0672-Add-more-Campfire-API.patch
+++ b/patches/unapplied/server/0672-Add-more-Campfire-API.patch
diff --git a/patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 4d74f60751..4d74f60751 100644
--- a/patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/unapplied/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0674-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0674-Forward-CraftEntity-in-teleport-command.patch
index d78da2d8e7..d78da2d8e7 100644
--- a/patches/server/0674-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/unapplied/server/0674-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0675-Improve-scoreboard-entries.patch b/patches/unapplied/server/0675-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0675-Improve-scoreboard-entries.patch
+++ b/patches/unapplied/server/0675-Improve-scoreboard-entries.patch
diff --git a/patches/server/0676-Entity-powdered-snow-API.patch b/patches/unapplied/server/0676-Entity-powdered-snow-API.patch
index 449adb8c8d..449adb8c8d 100644
--- a/patches/server/0676-Entity-powdered-snow-API.patch
+++ b/patches/unapplied/server/0676-Entity-powdered-snow-API.patch
diff --git a/patches/server/0677-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0677-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0677-Add-API-for-item-entity-health.patch
+++ b/patches/unapplied/server/0677-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0678-Configurable-max-block-light-for-monster-spawning.patch
index 421d176050..421d176050 100644
--- a/patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/unapplied/server/0678-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 00fea74b71..00fea74b71 100644
--- a/patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/unapplied/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch
index d1a35c86e5..d1a35c86e5 100644
--- a/patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/unapplied/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/unapplied/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0682-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0682-Fix-bees-aging-inside-hives.patch
index 2c8d2209d5..2c8d2209d5 100644
--- a/patches/server/0682-Fix-bees-aging-inside-hives.patch
+++ b/patches/unapplied/server/0682-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0683-Bucketable-API.patch b/patches/unapplied/server/0683-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0683-Bucketable-API.patch
+++ b/patches/unapplied/server/0683-Bucketable-API.patch
diff --git a/patches/server/0684-Validate-usernames.patch b/patches/unapplied/server/0684-Validate-usernames.patch
index a4e02c238d..a4e02c238d 100644
--- a/patches/server/0684-Validate-usernames.patch
+++ b/patches/unapplied/server/0684-Validate-usernames.patch
diff --git a/patches/server/0685-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0685-Make-water-animal-spawn-height-configurable.patch
index 3741f45097..3741f45097 100644
--- a/patches/server/0685-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/unapplied/server/0685-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index d2d9b68707..9a987c53c6 100644
--- a/patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/unapplied/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fdda28bd6aa3a2d3079a383157b82ff825cc992d..82ee16f8efb5d32bf648d416010de557e2b90865 100644
+index 86283e9b7c3ad18e4deb8fcd3de624be92908c55..e367711dc3ef96280fe672f02e2ce99e43a5cd3c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -597,7 +597,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/unapplied/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/unapplied/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/unapplied/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0689-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0689-Multiple-Entries-with-Scoreboards.patch
index a0934c6d89..d59ef12b88 100644
--- a/patches/server/0689-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/unapplied/server/0689-Multiple-Entries-with-Scoreboards.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Multiple Entries with Scoreboards
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
-index e9d03ebfbd02a46b0ba274be107e099cc24b59e3..c52b91f5a001924e7a15f246004b6dd294fa0aae 100644
+index 0f05f1c2a30fef68ae635f4a2476b8cd1b6a127d..3f9712a8da937b03b03f7124e0671eb6905a2b2f 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
 @@ -51,6 +51,12 @@ public class ClientboundSetPlayerTeamPacket implements Packet<ClientGamePacketLi
diff --git a/patches/server/0690-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0690-Reset-placed-block-on-exception.patch
index b6bf08780c..b6bf08780c 100644
--- a/patches/server/0690-Reset-placed-block-on-exception.patch
+++ b/patches/unapplied/server/0690-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0691-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0691-Add-configurable-height-for-slime-spawn.patch
index 08dbacd3f1..08dbacd3f1 100644
--- a/patches/server/0691-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/unapplied/server/0691-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0692-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0692-Fix-xp-reward-for-baby-zombies.patch
index f3c6e8841b..f3c6e8841b 100644
--- a/patches/server/0692-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/unapplied/server/0692-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0693-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0693-Multi-Block-Change-API-Implementation.patch
index e9e18ae9c7..e9e18ae9c7 100644
--- a/patches/server/0693-Multi-Block-Change-API-Implementation.patch
+++ b/patches/unapplied/server/0693-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0694-Fix-NotePlayEvent.patch b/patches/unapplied/server/0694-Fix-NotePlayEvent.patch
index 85437cdf17..85437cdf17 100644
--- a/patches/server/0694-Fix-NotePlayEvent.patch
+++ b/patches/unapplied/server/0694-Fix-NotePlayEvent.patch
diff --git a/patches/server/0695-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0695-Freeze-Tick-Lock-API.patch
index 81d065ccaf..81d065ccaf 100644
--- a/patches/server/0695-Freeze-Tick-Lock-API.patch
+++ b/patches/unapplied/server/0695-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0696-More-PotionEffectType-API.patch b/patches/unapplied/server/0696-More-PotionEffectType-API.patch
index a2ccb85849..a2ccb85849 100644
--- a/patches/server/0696-More-PotionEffectType-API.patch
+++ b/patches/unapplied/server/0696-More-PotionEffectType-API.patch
diff --git a/patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 1b86e32b63..1b86e32b63 100644
--- a/patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/unapplied/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch
index cceecc25ea..cceecc25ea 100644
--- a/patches/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/unapplied/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0699-Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/0699-Add-missing-structure-set-seed-configs.patch
index 5056c05a21..0cc4a490fe 100644
--- a/patches/server/0699-Add-missing-structure-set-seed-configs.patch
+++ b/patches/unapplied/server/0699-Add-missing-structure-set-seed-configs.patch
@@ -20,7 +20,7 @@ seeds/salts to the frequency reducer which has a similar effect.
 Co-authored-by: William Blake Galbreath <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 567103d635087bf894a8c0473baf03bdb5ff052f..f767c822a8e86ce689d40d12c4ef2db3829a97cc 100644
+index d09d5192f0a571e9758e95dd5e1392a9caa88bde..a7ac9a0c4966c2f9d2b325fa59e8792850d376e8 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -568,7 +568,7 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0700-Implement-regenerateChunk.patch b/patches/unapplied/server/0700-Implement-regenerateChunk.patch
index c7c7470081..c7c7470081 100644
--- a/patches/server/0700-Implement-regenerateChunk.patch
+++ b/patches/unapplied/server/0700-Implement-regenerateChunk.patch
diff --git a/patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch
index 80c4ffe9f2..80c4ffe9f2 100644
--- a/patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/unapplied/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 971d368008..971d368008 100644
--- a/patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/unapplied/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0703-Add-GameEvent-tags.patch b/patches/unapplied/server/0703-Add-GameEvent-tags.patch
index 0a4355d93a..0a4355d93a 100644
--- a/patches/server/0703-Add-GameEvent-tags.patch
+++ b/patches/unapplied/server/0703-Add-GameEvent-tags.patch
diff --git a/patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 24d1f7815d..e2539627c2 100644
--- a/patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/unapplied/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 82ee16f8efb5d32bf648d416010de557e2b90865..186bbc60f6e283aeb00e339c98c034e2268f160d 100644
+index e367711dc3ef96280fe672f02e2ce99e43a5cd3c..f32bddb777082e7db307c4691b88e037926174b5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1296,6 +1296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0705-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0705-Furnace-RecipesUsed-API.patch
index 075cd97b56..075cd97b56 100644
--- a/patches/server/0705-Furnace-RecipesUsed-API.patch
+++ b/patches/unapplied/server/0705-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0706-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0706-Configurable-sculk-sensor-listener-range.patch
index bbf1cb0843..bbf1cb0843 100644
--- a/patches/server/0706-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/unapplied/server/0706-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/0707-Add-missing-block-data-mins-and-maxes.patch
index fe8170196d..fe8170196d 100644
--- a/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/unapplied/server/0707-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 060a7d91fb..13f9031599 100644
--- a/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/unapplied/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 186bbc60f6e283aeb00e339c98c034e2268f160d..5b4e4459aa0bcdcf422f4191ebda7b42892d24e4 100644
+index f32bddb777082e7db307c4691b88e037926174b5..3255929982ef8e494d654144753a54d3a76229d9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -617,7 +617,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0709-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0709-Put-world-into-worldlist-before-initing-the-world.patch
index e738059bbd..0b5d3fa617 100644
--- a/patches/server/0709-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/unapplied/server/0709-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5b4e4459aa0bcdcf422f4191ebda7b42892d24e4..6a1102f68b0d9851069e08f67b27ada4f5013b5a 100644
+index 3255929982ef8e494d654144753a54d3a76229d9..041ba5fd85748b3183e12e7a8e10fca77eb35bf5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -629,9 +629,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0710-Fix-Entity-Position-Desync.patch b/patches/unapplied/server/0710-Fix-Entity-Position-Desync.patch
index c12e623f3d..c12e623f3d 100644
--- a/patches/server/0710-Fix-Entity-Position-Desync.patch
+++ b/patches/unapplied/server/0710-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0711-Custom-Potion-Mixes.patch b/patches/unapplied/server/0711-Custom-Potion-Mixes.patch
index e863a0d69c..2bd3d14af3 100644
--- a/patches/server/0711-Custom-Potion-Mixes.patch
+++ b/patches/unapplied/server/0711-Custom-Potion-Mixes.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6a1102f68b0d9851069e08f67b27ada4f5013b5a..03fd35ee321c80ca674cea9eb366cffcc95bc893 100644
+index 041ba5fd85748b3183e12e7a8e10fca77eb35bf5..88821acddee03c30c2630d3d6c39cc93702ed35b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2081,6 +2081,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0712-Force-close-world-loading-screen.patch b/patches/unapplied/server/0712-Force-close-world-loading-screen.patch
index a62795f9be..a62795f9be 100644
--- a/patches/server/0712-Force-close-world-loading-screen.patch
+++ b/patches/unapplied/server/0712-Force-close-world-loading-screen.patch
diff --git a/patches/server/0713-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0713-Fix-falling-block-spawn-methods.patch
index c9e1a31533..c9e1a31533 100644
--- a/patches/server/0713-Fix-falling-block-spawn-methods.patch
+++ b/patches/unapplied/server/0713-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0714-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0714-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0714-Expose-furnace-minecart-push-values.patch
+++ b/patches/unapplied/server/0714-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index d80acbf9d0..d80acbf9d0 100644
--- a/patches/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/unapplied/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0716-More-Projectile-API.patch b/patches/unapplied/server/0716-More-Projectile-API.patch
index abcfbb28e9..abcfbb28e9 100644
--- a/patches/server/0716-More-Projectile-API.patch
+++ b/patches/unapplied/server/0716-More-Projectile-API.patch
diff --git a/patches/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch
index 8a176245ca..8a176245ca 100644
--- a/patches/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/unapplied/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index cf48604618..d4cf7ed2df 100644
--- a/patches/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/unapplied/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cf173a2315f3a97a89dc2aabe81be285abe73603..53a0ad0125e947537ed537b627d1b02c27f0a63d 100644
+index 7127c6f163cc00eb439eb37665df3e1a4bf27cc2..47d47d1979ca543679884e256dc805d2362d619d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -464,6 +464,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0719-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0719-Implement-getComputedBiome-API.patch
index 851c8f573b..851c8f573b 100644
--- a/patches/server/0719-Implement-getComputedBiome-API.patch
+++ b/patches/unapplied/server/0719-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0720-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0720-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0720-Make-some-itemstacks-nonnull.patch
+++ b/patches/unapplied/server/0720-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0721-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0721-Implement-enchantWithLevels-API.patch
index ed80635228..ed80635228 100644
--- a/patches/server/0721-Implement-enchantWithLevels-API.patch
+++ b/patches/unapplied/server/0721-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0722-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0722-Fix-saving-in-unloadWorld.patch
index a844d1cd8e..a844d1cd8e 100644
--- a/patches/server/0722-Fix-saving-in-unloadWorld.patch
+++ b/patches/unapplied/server/0722-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0723-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0723-Buffer-OOB-setBlock-calls.patch
index ae47164389..ae47164389 100644
--- a/patches/server/0723-Buffer-OOB-setBlock-calls.patch
+++ b/patches/unapplied/server/0723-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0724-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0724-Add-TameableDeathMessageEvent.patch
index a3f8770f2a..a3f8770f2a 100644
--- a/patches/server/0724-Add-TameableDeathMessageEvent.patch
+++ b/patches/unapplied/server/0724-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 91ca1e4916..91ca1e4916 100644
--- a/patches/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/unapplied/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 5fc7657405..5fc7657405 100644
--- a/patches/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/unapplied/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 2c800da975..2c800da975 100644
--- a/patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/unapplied/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0728-cache-resource-keys.patch b/patches/unapplied/server/0728-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0728-cache-resource-keys.patch
+++ b/patches/unapplied/server/0728-cache-resource-keys.patch
diff --git a/patches/server/0729-Allow-changing-the-EnderDragon-podium.patch b/patches/unapplied/server/0729-Allow-changing-the-EnderDragon-podium.patch
index a9354ec22b..a9354ec22b 100644
--- a/patches/server/0729-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/unapplied/server/0729-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index aa5772fe8a..aa5772fe8a 100644
--- a/patches/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/unapplied/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0731-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0731-Prevent-tile-entity-copies-loading-chunks.patch
index 209f21dc24..845fc85bb1 100644
--- a/patches/server/0731-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/unapplied/server/0731-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 53a0ad0125e947537ed537b627d1b02c27f0a63d..de2b8ae62bdd9e97aa696768f84543cd4a6522cc 100644
+index 47d47d1979ca543679884e256dc805d2362d619d..19bc63da6bca5b3ff62bb2a148b35e0d3f93bb1d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3111,7 +3111,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch
index ce925b89b7..ce925b89b7 100644
--- a/patches/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/unapplied/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0733-Expand-PlayerItemDamageEvent.patch b/patches/unapplied/server/0733-Expand-PlayerItemDamageEvent.patch
index bb173a36a5..bb173a36a5 100644
--- a/patches/server/0733-Expand-PlayerItemDamageEvent.patch
+++ b/patches/unapplied/server/0733-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0734-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0734-WorldCreator-keepSpawnLoaded.patch
index 97cbe705e8..97cbe705e8 100644
--- a/patches/server/0734-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/unapplied/server/0734-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/unapplied/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/unapplied/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 9606b571be..9606b571be 100644
--- a/patches/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/unapplied/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 758be4b481..758be4b481 100644
--- a/patches/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/unapplied/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch
index 0ad967e4e4..0ad967e4e4 100644
--- a/patches/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/unapplied/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch
index 1d388d0504..1d388d0504 100644
--- a/patches/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/unapplied/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0740-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0740-Add-PlayerStopUsingItemEvent.patch
index c78c171d1e..c78c171d1e 100644
--- a/patches/server/0740-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/unapplied/server/0740-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0741-Don-t-tick-markers.patch b/patches/unapplied/server/0741-Don-t-tick-markers.patch
index f920e6b436..f920e6b436 100644
--- a/patches/server/0741-Don-t-tick-markers.patch
+++ b/patches/unapplied/server/0741-Don-t-tick-markers.patch
diff --git a/patches/server/0742-Expand-FallingBlock-API.patch b/patches/unapplied/server/0742-Expand-FallingBlock-API.patch
index 3f57a2d718..3f57a2d718 100644
--- a/patches/server/0742-Expand-FallingBlock-API.patch
+++ b/patches/unapplied/server/0742-Expand-FallingBlock-API.patch
diff --git a/patches/server/0743-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0743-Add-support-for-Proxy-Protocol.patch
index 1c60d69833..1c60d69833 100644
--- a/patches/server/0743-Add-support-for-Proxy-Protocol.patch
+++ b/patches/unapplied/server/0743-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch
index e67e0fc286..e67e0fc286 100644
--- a/patches/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/unapplied/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index ef7517367b..ef7517367b 100644
--- a/patches/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/unapplied/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0746-properly-read-and-store-sus-effect-duration.patch b/patches/unapplied/server/0746-properly-read-and-store-sus-effect-duration.patch
index 94589408f4..94589408f4 100644
--- a/patches/server/0746-properly-read-and-store-sus-effect-duration.patch
+++ b/patches/unapplied/server/0746-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/0747-Sanitize-sent-BlockEntity-NBT.patch b/patches/unapplied/server/0747-Sanitize-sent-BlockEntity-NBT.patch
index 72cdd70ba1..72cdd70ba1 100644
--- a/patches/server/0747-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/unapplied/server/0747-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0748-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0748-Disable-component-selector-resolving-in-books-by-def.patch
index 97082feba7..97082feba7 100644
--- a/patches/server/0748-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/unapplied/server/0748-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0749-Prevent-entity-loading-causing-async-lookups.patch
index d02ab57220..d02ab57220 100644
--- a/patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/unapplied/server/0749-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0750-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0750-Throw-exception-on-world-create-while-being-ticked.patch
index b8f3f47e4d..42eeeb0a1e 100644
--- a/patches/server/0750-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/unapplied/server/0750-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 03fd35ee321c80ca674cea9eb366cffcc95bc893..c2326a72a038526c850b7820faa59618eba6eb88 100644
+index 88821acddee03c30c2630d3d6c39cc93702ed35b..2a96d128dd42b937b16e25274b39fb66c3d9a097 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -307,6 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0751-Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/0751-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0751-Dont-resent-entity-on-art-update.patch
+++ b/patches/unapplied/server/0751-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0752-Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/0752-Add-WardenAngerChangeEvent.patch
index 7bd9e6cd8e..7bd9e6cd8e 100644
--- a/patches/server/0752-Add-WardenAngerChangeEvent.patch
+++ b/patches/unapplied/server/0752-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0753-Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/0753-Add-option-for-strict-advancement-dimension-checks.patch
index 7d0540d1db..7d0540d1db 100644
--- a/patches/server/0753-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/unapplied/server/0753-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0754-Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/0754-Add-missing-important-BlockStateListPopulator-method.patch
index 5db34c9fe3..5db34c9fe3 100644
--- a/patches/server/0754-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/unapplied/server/0754-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0755-Nameable-Banner-API.patch b/patches/unapplied/server/0755-Nameable-Banner-API.patch
index 351d3597e0..351d3597e0 100644
--- a/patches/server/0755-Nameable-Banner-API.patch
+++ b/patches/unapplied/server/0755-Nameable-Banner-API.patch
diff --git a/patches/server/0756-Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/0756-Don-t-broadcast-messages-to-command-blocks.patch
index fa6488648d..fa6488648d 100644
--- a/patches/server/0756-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/unapplied/server/0756-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0757-Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/0757-Prevent-empty-items-from-being-added-to-world.patch
index c3d0b8413a..c3d0b8413a 100644
--- a/patches/server/0757-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/unapplied/server/0757-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 5816232b91..5816232b91 100644
--- a/patches/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/unapplied/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0759-Add-Player-getFishHook.patch b/patches/unapplied/server/0759-Add-Player-getFishHook.patch
index d5f8b5dc18..d5f8b5dc18 100644
--- a/patches/server/0759-Add-Player-getFishHook.patch
+++ b/patches/unapplied/server/0759-Add-Player-getFishHook.patch
diff --git a/patches/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index b5557f95ef..b5557f95ef 100644
--- a/patches/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/unapplied/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch
index d3b144009b..d3b144009b 100644
--- a/patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/unapplied/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0762-Fix-Bee-flower-NPE.patch b/patches/unapplied/server/0762-Fix-Bee-flower-NPE.patch
index 21a3d68e76..21a3d68e76 100644
--- a/patches/server/0762-Fix-Bee-flower-NPE.patch
+++ b/patches/unapplied/server/0762-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 9c4e396ae4..03696ce783 100644
--- a/patches/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/unapplied/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index de2b8ae62bdd9e97aa696768f84543cd4a6522cc..5775d071f714e7b9d959bfa94510b865f489e68e 100644
+index 19bc63da6bca5b3ff62bb2a148b35e0d3f93bb1d..c26eea3adbe7013ee226f2337e85e423aac11977 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2299,7 +2299,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0764-More-Teleport-API.patch b/patches/unapplied/server/0764-More-Teleport-API.patch
index 3cbd69aa87..3cbd69aa87 100644
--- a/patches/server/0764-More-Teleport-API.patch
+++ b/patches/unapplied/server/0764-More-Teleport-API.patch
diff --git a/patches/server/0765-Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/0765-Add-EntityPortalReadyEvent.patch
index 99fe9a8280..99fe9a8280 100644
--- a/patches/server/0765-Add-EntityPortalReadyEvent.patch
+++ b/patches/unapplied/server/0765-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0766-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0766-Don-t-use-level-random-in-entity-constructors.patch
index ef3475e3a3..ef3475e3a3 100644
--- a/patches/server/0766-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/unapplied/server/0766-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0767-Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/0767-Send-block-entities-after-destroy-prediction.patch
index c1bc860181..a6024df886 100644
--- a/patches/server/0767-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/unapplied/server/0767-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 8f4c9b99b638cfce8cc7c55f6369f62e757f4e48..f3389dc345d8b6e5389ae37848d9b268
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 27eb4bc4d1276ea36b97d0faeed2acee8b7a64cc..b8f1549d1ea98a105577927a735bab331aff3840 100644
+index f2b865d4e28c3d99d50088c61d0b93bf47300a02..faa43550844fd3a3595bd9621b5730c209a54124 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1704,8 +1704,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch
index 2b9d9f5b89..2b9d9f5b89 100644
--- a/patches/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/unapplied/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0769-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/0769-Custom-Chat-Completion-Suggestions-API.patch
index ef47ad0def..ef47ad0def 100644
--- a/patches/server/0769-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/unapplied/server/0769-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0770-Add-and-fix-missing-BlockFadeEvents.patch b/patches/unapplied/server/0770-Add-and-fix-missing-BlockFadeEvents.patch
index d164ac2642..d164ac2642 100644
--- a/patches/server/0770-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/unapplied/server/0770-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0771-Collision-API.patch b/patches/unapplied/server/0771-Collision-API.patch
index 67db25ca90..67db25ca90 100644
--- a/patches/server/0771-Collision-API.patch
+++ b/patches/unapplied/server/0771-Collision-API.patch
diff --git a/patches/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 8645146d61..8645146d61 100644
--- a/patches/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/unapplied/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0773-Block-Ticking-API.patch b/patches/unapplied/server/0773-Block-Ticking-API.patch
index d26cc16750..d26cc16750 100644
--- a/patches/server/0773-Block-Ticking-API.patch
+++ b/patches/unapplied/server/0773-Block-Ticking-API.patch
diff --git a/patches/server/0774-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0774-Add-Velocity-IP-Forwarding-Support.patch
index 64983350da..64983350da 100644
--- a/patches/server/0774-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/unapplied/server/0774-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0775-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/0775-Add-NamespacedKey-biome-methods.patch
index 60b5cb2a50..60b5cb2a50 100644
--- a/patches/server/0775-Add-NamespacedKey-biome-methods.patch
+++ b/patches/unapplied/server/0775-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/0776-Fix-plugin-loggers-on-server-shutdown.patch
index a4e678729b..bb6eb10602 100644
--- a/patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/unapplied/server/0776-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c2326a72a038526c850b7820faa59618eba6eb88..bfee202e1dc8ea875b9d2b4e8c3b0be3f6d94b26 100644
+index 2a96d128dd42b937b16e25274b39fb66c3d9a097..ad2583c581e78e9cf352567b7dbde193319d4301 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1223,6 +1223,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0777-Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/0777-Stop-large-look-changes-from-crashing-the-server.patch
index 3b4d6ca5d3..3b4d6ca5d3 100644
--- a/patches/server/0777-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/unapplied/server/0777-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch
index 87d13244aa..87d13244aa 100644
--- a/patches/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/unapplied/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0779-Missing-eating-regain-reason.patch b/patches/unapplied/server/0779-Missing-eating-regain-reason.patch
index 1a46d0af82..1a46d0af82 100644
--- a/patches/server/0779-Missing-eating-regain-reason.patch
+++ b/patches/unapplied/server/0779-Missing-eating-regain-reason.patch
diff --git a/patches/server/0780-Missing-effect-cause.patch b/patches/unapplied/server/0780-Missing-effect-cause.patch
index 3fcbc0382f..3fcbc0382f 100644
--- a/patches/server/0780-Missing-effect-cause.patch
+++ b/patches/unapplied/server/0780-Missing-effect-cause.patch
diff --git a/patches/server/0781-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/0781-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0781-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/unapplied/server/0781-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 6adc2a884c..6adc2a884c 100644
--- a/patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/unapplied/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0783-Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/0783-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0783-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/unapplied/server/0783-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0784-Configurable-chat-thread-limit.patch b/patches/unapplied/server/0784-Configurable-chat-thread-limit.patch
index b6e534b32f..9f2dcac78f 100644
--- a/patches/server/0784-Configurable-chat-thread-limit.patch
+++ b/patches/unapplied/server/0784-Configurable-chat-thread-limit.patch
@@ -22,7 +22,7 @@ is actually processed, this is honestly really just exposed for the misnomers or
 who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 0aab42ac5d5b0fb8b59eb71d8d3b1ebbc7c76da7..2540b7748e27839552ae88412ecac0aa69485b32 100644
+index a8268886d4a039975b6fed94b8dc325a8270f5fd..0b283171294eca65a898ddd9ab1b7295ad183b0d 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -287,7 +287,18 @@ public class GlobalConfiguration extends ConfigurationPart {
diff --git a/patches/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index ffb644e841..ffb644e841 100644
--- a/patches/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/unapplied/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0786-fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/0786-fix-Jigsaw-block-kicking-user.patch
index 2e5fd7e357..2e5fd7e357 100644
--- a/patches/server/0786-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/unapplied/server/0786-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 2da3483da9..2da3483da9 100644
--- a/patches/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/unapplied/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0788-Add-getDrops-to-BlockState.patch b/patches/unapplied/server/0788-Add-getDrops-to-BlockState.patch
index ba33e973c5..ba33e973c5 100644
--- a/patches/server/0788-Add-getDrops-to-BlockState.patch
+++ b/patches/unapplied/server/0788-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/0789-Fix-a-bunch-of-vanilla-bugs.patch
index 4b96d454ab..4b96d454ab 100644
--- a/patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/unapplied/server/0789-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch
index ea3e8cfcd2..ea3e8cfcd2 100644
--- a/patches/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/unapplied/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0791-Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/0791-Fix-custom-piglin-loved-items.patch
index 6a9dc8a7d4..6a9dc8a7d4 100644
--- a/patches/server/0791-Fix-custom-piglin-loved-items.patch
+++ b/patches/unapplied/server/0791-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0792-EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/0792-EntityPickupItemEvent-fixes.patch
index b378f986f4..b378f986f4 100644
--- a/patches/server/0792-EntityPickupItemEvent-fixes.patch
+++ b/patches/unapplied/server/0792-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch
index f1a45a8700..f1a45a8700 100644
--- a/patches/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/unapplied/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0794-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/0794-Add-PlayerInventorySlotChangeEvent.patch
index 14f1948d31..14f1948d31 100644
--- a/patches/server/0794-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/unapplied/server/0794-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0795-Elder-Guardian-appearance-API.patch b/patches/unapplied/server/0795-Elder-Guardian-appearance-API.patch
index 2611823ca6..2611823ca6 100644
--- a/patches/server/0795-Elder-Guardian-appearance-API.patch
+++ b/patches/unapplied/server/0795-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0796-Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/server/0796-Allow-changing-bed-s-occupied-property.patch
index d8b51d7f0b..d8b51d7f0b 100644
--- a/patches/server/0796-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/unapplied/server/0796-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0797-Add-entity-knockback-API.patch b/patches/unapplied/server/0797-Add-entity-knockback-API.patch
index 8f119833a2..8f119833a2 100644
--- a/patches/server/0797-Add-entity-knockback-API.patch
+++ b/patches/unapplied/server/0797-Add-entity-knockback-API.patch
diff --git a/patches/server/0798-Detect-headless-JREs.patch b/patches/unapplied/server/0798-Detect-headless-JREs.patch
index 9dd8f30c67..9dd8f30c67 100644
--- a/patches/server/0798-Detect-headless-JREs.patch
+++ b/patches/unapplied/server/0798-Detect-headless-JREs.patch
diff --git a/patches/server/0799-fix-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/0799-fix-entity-vehicle-collision-event-not-called.patch
index 9fe5a7cf02..9fe5a7cf02 100644
--- a/patches/server/0799-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/unapplied/server/0799-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0800-Add-EntityToggleSitEvent.patch b/patches/unapplied/server/0800-Add-EntityToggleSitEvent.patch
index 2f61a7420e..2f61a7420e 100644
--- a/patches/server/0800-Add-EntityToggleSitEvent.patch
+++ b/patches/unapplied/server/0800-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0801-Add-fire-tick-delay-option.patch b/patches/unapplied/server/0801-Add-fire-tick-delay-option.patch
index b38e866fe5..b38e866fe5 100644
--- a/patches/server/0801-Add-fire-tick-delay-option.patch
+++ b/patches/unapplied/server/0801-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0802-Add-Moving-Piston-API.patch b/patches/unapplied/server/0802-Add-Moving-Piston-API.patch
index b0b64257f1..b0b64257f1 100644
--- a/patches/server/0802-Add-Moving-Piston-API.patch
+++ b/patches/unapplied/server/0802-Add-Moving-Piston-API.patch
diff --git a/patches/server/0803-Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/0803-Ignore-impossible-spawn-tick.patch
index 116d0fd7f6..116d0fd7f6 100644
--- a/patches/server/0803-Ignore-impossible-spawn-tick.patch
+++ b/patches/unapplied/server/0803-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/unapplied/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch
index b78dda85fc..b78dda85fc 100644
--- a/patches/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/unapplied/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/unapplied/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index 8a2c14c67d..8a2c14c67d 100644
--- a/patches/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/unapplied/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index e1712bed3b..e1712bed3b 100644
--- a/patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/unapplied/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0807-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/0807-Add-PrePlayerAttackEntityEvent.patch
index 7541ba69cb..7541ba69cb 100644
--- a/patches/server/0807-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/unapplied/server/0807-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0808-ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/0808-ensure-reset-EnderDragon-boss-event-name.patch
index 07dc251b4d..07dc251b4d 100644
--- a/patches/server/0808-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/unapplied/server/0808-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/unapplied/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 025e7cbcea..025e7cbcea 100644
--- a/patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/unapplied/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0810-Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/0810-Add-Player-Warden-Warning-API.patch
index 2109390769..2109390769 100644
--- a/patches/server/0810-Add-Player-Warden-Warning-API.patch
+++ b/patches/unapplied/server/0810-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0811-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/0811-More-vanilla-friendly-methods-to-update-trades.patch
index d992c79d48..d992c79d48 100644
--- a/patches/server/0811-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/unapplied/server/0811-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0812-Add-paper-dumplisteners-command.patch b/patches/unapplied/server/0812-Add-paper-dumplisteners-command.patch
index ba293d1dad..ba293d1dad 100644
--- a/patches/server/0812-Add-paper-dumplisteners-command.patch
+++ b/patches/unapplied/server/0812-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0813-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0813-check-global-player-list-where-appropriate.patch
index bf8f80fdbd..bf8f80fdbd 100644
--- a/patches/server/0813-check-global-player-list-where-appropriate.patch
+++ b/patches/unapplied/server/0813-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch
index 63a99ea749..63a99ea749 100644
--- a/patches/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/unapplied/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0815-ItemStack-damage-API.patch b/patches/unapplied/server/0815-ItemStack-damage-API.patch
index 207d179c13..207d179c13 100644
--- a/patches/server/0815-ItemStack-damage-API.patch
+++ b/patches/unapplied/server/0815-ItemStack-damage-API.patch
diff --git a/patches/server/0816-Friction-API.patch b/patches/unapplied/server/0816-Friction-API.patch
index 691571962d..691571962d 100644
--- a/patches/server/0816-Friction-API.patch
+++ b/patches/unapplied/server/0816-Friction-API.patch
diff --git a/patches/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a5a831fc6e..a5a831fc6e 100644
--- a/patches/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/unapplied/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0818-Fix-premature-player-kicks-on-shutdown.patch b/patches/unapplied/server/0818-Fix-premature-player-kicks-on-shutdown.patch
index 983dbfd32a..1c1059d40a 100644
--- a/patches/server/0818-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/unapplied/server/0818-Fix-premature-player-kicks-on-shutdown.patch
@@ -47,7 +47,7 @@ index 22a7f17180b76b6c3548d3b54ae8218a469401a8..c399625a342ffd61102bb96a97ac24b0
                          this.disconnect(Component.translatable("multiplayer.disconnect.server_shutdown"));
                      } catch (ClassCastException classcastexception) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bfee202e1dc8ea875b9d2b4e8c3b0be3f6d94b26..d50d3bc9c0f573cdb43100bce6e3dbfe2102fc53 100644
+index ad2583c581e78e9cf352567b7dbde193319d4301..a540c744ca88884207c4520794091c01c1c9f50e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2013,7 +2013,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0819-Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/0819-Sync-offhand-slot-in-menus.patch
index 5b34f7caeb..5b34f7caeb 100644
--- a/patches/server/0819-Sync-offhand-slot-in-menus.patch
+++ b/patches/unapplied/server/0819-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0820-Player-Entity-Tracking-Events.patch b/patches/unapplied/server/0820-Player-Entity-Tracking-Events.patch
index 7ec91ddd19..7ec91ddd19 100644
--- a/patches/server/0820-Player-Entity-Tracking-Events.patch
+++ b/patches/unapplied/server/0820-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0821-Limit-pet-look-distance.patch b/patches/unapplied/server/0821-Limit-pet-look-distance.patch
index 915187e43e..915187e43e 100644
--- a/patches/server/0821-Limit-pet-look-distance.patch
+++ b/patches/unapplied/server/0821-Limit-pet-look-distance.patch
diff --git a/patches/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/unapplied/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch
index 12f3e570a0..12f3e570a0 100644
--- a/patches/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/unapplied/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0823-fix-Instruments.patch b/patches/unapplied/server/0823-fix-Instruments.patch
index 46c17b097e..46c17b097e 100644
--- a/patches/server/0823-fix-Instruments.patch
+++ b/patches/unapplied/server/0823-fix-Instruments.patch
diff --git a/patches/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/unapplied/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 8b39f81526..8b39f81526 100644
--- a/patches/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/unapplied/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/unapplied/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index afdba86d79..afdba86d79 100644
--- a/patches/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/unapplied/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0826-Add-BlockLockCheckEvent.patch b/patches/unapplied/server/0826-Add-BlockLockCheckEvent.patch
index 3ac83356d3..3ac83356d3 100644
--- a/patches/server/0826-Add-BlockLockCheckEvent.patch
+++ b/patches/unapplied/server/0826-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0827-Add-Sneaking-API-for-Entities.patch b/patches/unapplied/server/0827-Add-Sneaking-API-for-Entities.patch
index 7ab8bbe768..7ab8bbe768 100644
--- a/patches/server/0827-Add-Sneaking-API-for-Entities.patch
+++ b/patches/unapplied/server/0827-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0828-Improve-logging-and-errors.patch b/patches/unapplied/server/0828-Improve-logging-and-errors.patch
index d5774cbd4f..fff7048b9e 100644
--- a/patches/server/0828-Improve-logging-and-errors.patch
+++ b/patches/unapplied/server/0828-Improve-logging-and-errors.patch
@@ -52,7 +52,7 @@ index 5675931fe3ea896027a510944fc484f41f5ef555..1b38d267daa7902bcb7d2a71d28b3f39
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b8f1549d1ea98a105577927a735bab331aff3840..45a68beff0c97ead5e9f1201b5fb9ef80c08b92b 100644
+index faa43550844fd3a3595bd9621b5730c209a54124..dd7f0aed33183dd51e3378d2430df4f7c96ae730 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3309,7 +3309,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0829-Improve-PortalEvents.patch b/patches/unapplied/server/0829-Improve-PortalEvents.patch
index eb9278ff7b..eb9278ff7b 100644
--- a/patches/server/0829-Improve-PortalEvents.patch
+++ b/patches/unapplied/server/0829-Improve-PortalEvents.patch
diff --git a/patches/server/0830-Add-config-option-for-spider-worldborder-climbing.patch b/patches/unapplied/server/0830-Add-config-option-for-spider-worldborder-climbing.patch
index c4325b822a..c4325b822a 100644
--- a/patches/server/0830-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/unapplied/server/0830-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0831-Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/0831-Add-missing-SpigotConfig-logCommands-check.patch
index a6135e7f58..940b244dc2 100644
--- a/patches/server/0831-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/unapplied/server/0831-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 45a68beff0c97ead5e9f1201b5fb9ef80c08b92b..994787f52ce9eb0b77889ed9bc8021183fa0cb7c 100644
+index dd7f0aed33183dd51e3378d2430df4f7c96ae730..5f1c31323d58cdc4419cf5f8870a8acf121c7669 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2060,7 +2060,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/unapplied/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/unapplied/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0833-Flying-Fall-Damage.patch b/patches/unapplied/server/0833-Flying-Fall-Damage.patch
index 0bdc65209b..0bdc65209b 100644
--- a/patches/server/0833-Flying-Fall-Damage.patch
+++ b/patches/unapplied/server/0833-Flying-Fall-Damage.patch
diff --git a/patches/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/unapplied/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index 09acddcf7f..09acddcf7f 100644
--- a/patches/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/unapplied/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 1cb4410623..1cb4410623 100644
--- a/patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/unapplied/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0836-config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/0836-config-for-disabling-entity-tag-tags.patch
index 822a325fe5..822a325fe5 100644
--- a/patches/server/0836-config-for-disabling-entity-tag-tags.patch
+++ b/patches/unapplied/server/0836-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0837-Use-single-player-info-update-packet-on-join.patch b/patches/unapplied/server/0837-Use-single-player-info-update-packet-on-join.patch
index ff64d83371..64b13bd01b 100644
--- a/patches/server/0837-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/unapplied/server/0837-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 994787f52ce9eb0b77889ed9bc8021183fa0cb7c..a1196f79968c950fd9d92123bb4018f8d29c3a82 100644
+index 5f1c31323d58cdc4419cf5f8870a8acf121c7669..0c87fff227448f7f88e3377989b1091e4badcc53 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3339,7 +3339,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 54b162da71..54b162da71 100644
--- a/patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/unapplied/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0839-Win-Screen-API.patch b/patches/unapplied/server/0839-Win-Screen-API.patch
index d42c24f3b8..d42c24f3b8 100644
--- a/patches/server/0839-Win-Screen-API.patch
+++ b/patches/unapplied/server/0839-Win-Screen-API.patch
diff --git a/patches/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch
index 0e54130972..0e54130972 100644
--- a/patches/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/unapplied/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0841-Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/0841-Fix-force-opening-enchantment-tables.patch
index 57955b6cc3..57955b6cc3 100644
--- a/patches/server/0841-Fix-force-opening-enchantment-tables.patch
+++ b/patches/unapplied/server/0841-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0842-Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/0842-Add-Entity-Body-Yaw-API.patch
index d8eb3655e9..d8eb3655e9 100644
--- a/patches/server/0842-Add-Entity-Body-Yaw-API.patch
+++ b/patches/unapplied/server/0842-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/unapplied/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 8bd2fa8c91..355a9ece0e 100644
--- a/patches/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/unapplied/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
@@ -10,7 +10,7 @@ https://bugs.mojang.com/browse/MC-157464
 https://github.com/PaperMC/Paper/issues/8569
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
-index 28b255b425d2ac4d13b85a7fce67406ea3b6fdae..458cfece2c0ce94f0017aa94ed6f1a356861ec31 100644
+index 5feef31a37aa30a0fdabd14396f5cdb05ad63030..d2917f9b215919890f28b513601863ccaced17c7 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
 @@ -35,7 +35,7 @@ public class VillagerGoalPackages {
diff --git a/patches/server/0844-Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/0844-Add-EntityFertilizeEggEvent.patch
index 975cf31634..975cf31634 100644
--- a/patches/server/0844-Add-EntityFertilizeEggEvent.patch
+++ b/patches/unapplied/server/0844-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0845-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/unapplied/server/0845-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index d7bf05c02c..d7bf05c02c 100644
--- a/patches/server/0845-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/unapplied/server/0845-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0846-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/0846-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index a1fa4eea77..a1fa4eea77 100644
--- a/patches/server/0846-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/unapplied/server/0846-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0847-Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/0847-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0847-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/unapplied/server/0847-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0848-Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/0848-Fix-advancement-triggers-for-entity-damage.patch
index e5b6bd4878..e5b6bd4878 100644
--- a/patches/server/0848-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/unapplied/server/0848-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0849-Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/0849-Fix-text-display-error-on-spawn.patch
index 5ee377452f..5ee377452f 100644
--- a/patches/server/0849-Fix-text-display-error-on-spawn.patch
+++ b/patches/unapplied/server/0849-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0850-Fix-inventories-returning-null-Locations.patch b/patches/unapplied/server/0850-Fix-inventories-returning-null-Locations.patch
index 763bde3953..763bde3953 100644
--- a/patches/server/0850-Fix-inventories-returning-null-Locations.patch
+++ b/patches/unapplied/server/0850-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0851-Add-Shearable-API.patch b/patches/unapplied/server/0851-Add-Shearable-API.patch
index f97657b8e1..f97657b8e1 100644
--- a/patches/server/0851-Add-Shearable-API.patch
+++ b/patches/unapplied/server/0851-Add-Shearable-API.patch
diff --git a/patches/server/0852-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/server/0852-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 682696f502..682696f502 100644
--- a/patches/server/0852-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/unapplied/server/0852-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0853-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/unapplied/server/0853-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 576441539c..576441539c 100644
--- a/patches/server/0853-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/unapplied/server/0853-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0854-Treat-sequence-violations-like-they-should-be.patch b/patches/unapplied/server/0854-Treat-sequence-violations-like-they-should-be.patch
index d67cd31a14..10cef59fcf 100644
--- a/patches/server/0854-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/unapplied/server/0854-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a1196f79968c950fd9d92123bb4018f8d29c3a82..c9dab47fe3db73b31b40e071d37f1be63401c19d 100644
+index 0c87fff227448f7f88e3377989b1091e4badcc53..f2b6c74317dbedaa983bb5d821255dc40e1c81e4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1964,6 +1964,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0855-remove-duplicate-animate-packet-for-records.patch b/patches/unapplied/server/0855-remove-duplicate-animate-packet-for-records.patch
index 9254f5b8cf..9254f5b8cf 100644
--- a/patches/server/0855-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/unapplied/server/0855-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0856-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/unapplied/server/0856-Prevent-causing-expired-keys-from-impacting-new-join.patch
index c23be58240..e66fad7ec2 100644
--- a/patches/server/0856-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/unapplied/server/0856-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -26,7 +26,7 @@ index e4f0949b6538734ff25daf68a428262481feeb81..754a2a5e958a04b3f8bf216b6022f547
          UPDATE_GAME_MODE((serialized, buf) -> serialized.gameMode = GameType.byId(buf.readVarInt()), (buf, entry) -> buf.writeVarInt(entry.gameMode().getId())),
          UPDATE_LISTED((serialized, buf) -> serialized.listed = buf.readBoolean(), (buf, entry) -> buf.writeBoolean(entry.listed())),
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c9dab47fe3db73b31b40e071d37f1be63401c19d..69118af2a873f23f6543676db39263bfeb81b4f1 100644
+index f2b6c74317dbedaa983bb5d821255dc40e1c81e4..1de8ee39347a6f4c56c2d3aa0e32887b57b80524 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -286,6 +286,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0857-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/unapplied/server/0857-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index b0714f833f..b0714f833f 100644
--- a/patches/server/0857-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/unapplied/server/0857-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0858-Use-array-for-gamerule-storage.patch b/patches/unapplied/server/0858-Use-array-for-gamerule-storage.patch
index 1a7c2006a5..1a7c2006a5 100644
--- a/patches/server/0858-Use-array-for-gamerule-storage.patch
+++ b/patches/unapplied/server/0858-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0859-Fix-a-couple-of-upstream-bed-issues.patch b/patches/unapplied/server/0859-Fix-a-couple-of-upstream-bed-issues.patch
index 6740daf4d1..6740daf4d1 100644
--- a/patches/server/0859-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/unapplied/server/0859-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0860-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/0860-Fix-demo-flag-not-enabling-demo-mode.patch
index af05cbe092..af05cbe092 100644
--- a/patches/server/0860-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/unapplied/server/0860-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0861-Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/0861-Add-Mob-Experience-reward-API.patch
index 874d481524..874d481524 100644
--- a/patches/server/0861-Add-Mob-Experience-reward-API.patch
+++ b/patches/unapplied/server/0861-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0862-Break-redstone-on-top-of-trap-doors-early.patch b/patches/unapplied/server/0862-Break-redstone-on-top-of-trap-doors-early.patch
index fd04a38431..fd04a38431 100644
--- a/patches/server/0862-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/unapplied/server/0862-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 112f2214ae..ac37b3fe84 100644
--- a/patches/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/unapplied/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch
@@ -7,7 +7,7 @@ This patch is meant to get rid of any instances of lazy initialization that Mine
 This has the possibility to create race condition issues, and generally don't make sense to be lazily done anyways.
 
 diff --git a/src/main/java/com/mojang/math/OctahedralGroup.java b/src/main/java/com/mojang/math/OctahedralGroup.java
-index 8af12b383bb80d1c0a12e1151030ab6e21c27e79..d2efe5e4f767f8316bc3915573bd1efcbcf20968 100644
+index 05d28a08c1fdf75221f5d774fe49d905840ae472..207f424b2bf5e0c48f33e4553c7c6019ef2dd009 100644
 --- a/src/main/java/com/mojang/math/OctahedralGroup.java
 +++ b/src/main/java/com/mojang/math/OctahedralGroup.java
 @@ -110,6 +110,7 @@ public enum OctahedralGroup implements StringRepresentable {
diff --git a/patches/server/0864-More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/0864-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0864-More-accurate-isInOpenWater-impl.patch
+++ b/patches/unapplied/server/0864-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/unapplied/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 54ad4f456c..0731970718 100644
--- a/patches/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/unapplied/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
@@ -11,7 +11,7 @@ more than one Netty IO thread.
 Fixes https://github.com/PaperMC/Folia/issues/11
 
 diff --git a/src/main/java/net/minecraft/resources/RegistryOps.java b/src/main/java/net/minecraft/resources/RegistryOps.java
-index 3dc8333a5c17926679c79d5294a0e72199801c34..fafecd2f5aefd5e6fdc2b0c3674378f03f4dc4f2 100644
+index 0272fe45449785e8589b6e42fa454f2abfcc0476..dd8a6bd463e5c8fe69271663cb46b45b201ba59c 100644
 --- a/src/main/java/net/minecraft/resources/RegistryOps.java
 +++ b/src/main/java/net/minecraft/resources/RegistryOps.java
 @@ -19,7 +19,10 @@ public class RegistryOps<T> extends DelegatingOps<T> {
diff --git a/patches/server/0866-Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/0866-Expand-PlayerItemMendEvent.patch
index 8faaf4a00b..8faaf4a00b 100644
--- a/patches/server/0866-Expand-PlayerItemMendEvent.patch
+++ b/patches/unapplied/server/0866-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0867-Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/0867-Refresh-ProjectileSource-for-projectiles.patch
index 2041ea7689..2041ea7689 100644
--- a/patches/server/0867-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/unapplied/server/0867-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0868-Add-transient-modifier-API.patch b/patches/unapplied/server/0868-Add-transient-modifier-API.patch
index 8144e5dc44..8144e5dc44 100644
--- a/patches/server/0868-Add-transient-modifier-API.patch
+++ b/patches/unapplied/server/0868-Add-transient-modifier-API.patch
diff --git a/patches/server/0869-Fix-block-place-logic.patch b/patches/unapplied/server/0869-Fix-block-place-logic.patch
index 16fd6d2e89..16fd6d2e89 100644
--- a/patches/server/0869-Fix-block-place-logic.patch
+++ b/patches/unapplied/server/0869-Fix-block-place-logic.patch
diff --git a/patches/server/0870-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/unapplied/server/0870-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 288b2c3711..288b2c3711 100644
--- a/patches/server/0870-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/unapplied/server/0870-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0871-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/unapplied/server/0871-Call-BlockGrowEvent-for-missing-blocks.patch
index 4938d57d18..4938d57d18 100644
--- a/patches/server/0871-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/unapplied/server/0871-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0872-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/unapplied/server/0872-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 954f7480a5..954f7480a5 100644
--- a/patches/server/0872-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/unapplied/server/0872-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0873-fix-MapLike-spam-for-missing-key-selector.patch b/patches/unapplied/server/0873-fix-MapLike-spam-for-missing-key-selector.patch
index 2fee78531f..2fee78531f 100644
--- a/patches/server/0873-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/unapplied/server/0873-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0874-Fix-sniffer-removeExploredLocation.patch b/patches/unapplied/server/0874-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0874-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/unapplied/server/0874-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0875-Add-method-to-remove-all-active-potion-effects.patch b/patches/unapplied/server/0875-Add-method-to-remove-all-active-potion-effects.patch
index 1461dfa249..1461dfa249 100644
--- a/patches/server/0875-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/unapplied/server/0875-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0876-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/unapplied/server/0876-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index 6436cefd47..6436cefd47 100644
--- a/patches/server/0876-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/unapplied/server/0876-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0877-Add-event-for-player-editing-sign.patch b/patches/unapplied/server/0877-Add-event-for-player-editing-sign.patch
index 321cccc3d6..321cccc3d6 100644
--- a/patches/server/0877-Add-event-for-player-editing-sign.patch
+++ b/patches/unapplied/server/0877-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0878-Only-tick-item-frames-if-players-can-see-it.patch b/patches/unapplied/server/0878-Only-tick-item-frames-if-players-can-see-it.patch
index 2ae56c0857..2ae56c0857 100644
--- a/patches/server/0878-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/unapplied/server/0878-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0879-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/unapplied/server/0879-Fix-cmd-permission-levels-for-command-blocks.patch
index 8bc99edf2c..8bc99edf2c 100644
--- a/patches/server/0879-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/unapplied/server/0879-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0880-Add-option-to-disable-block-updates.patch b/patches/unapplied/server/0880-Add-option-to-disable-block-updates.patch
index 817a831971..817a831971 100644
--- a/patches/server/0880-Add-option-to-disable-block-updates.patch
+++ b/patches/unapplied/server/0880-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0881-Call-missing-BlockDispenseEvent.patch b/patches/unapplied/server/0881-Call-missing-BlockDispenseEvent.patch
index bd92362781..bd92362781 100644
--- a/patches/server/0881-Call-missing-BlockDispenseEvent.patch
+++ b/patches/unapplied/server/0881-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0882-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/unapplied/server/0882-Don-t-load-chunks-for-supporting-block-checks.patch
index 2e07b71256..2e07b71256 100644
--- a/patches/server/0882-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/unapplied/server/0882-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0883-Optimize-player-lookups-for-beacons.patch b/patches/unapplied/server/0883-Optimize-player-lookups-for-beacons.patch
index 3b3d11c547..3b3d11c547 100644
--- a/patches/server/0883-Optimize-player-lookups-for-beacons.patch
+++ b/patches/unapplied/server/0883-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0884-Add-Sign-getInteractableSideFor.patch b/patches/unapplied/server/0884-Add-Sign-getInteractableSideFor.patch
index c5009d0b42..c5009d0b42 100644
--- a/patches/server/0884-Add-Sign-getInteractableSideFor.patch
+++ b/patches/unapplied/server/0884-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0885-Array-backed-synched-entity-data.patch b/patches/unapplied/server/0885-Array-backed-synched-entity-data.patch
index 2345458940..2345458940 100644
--- a/patches/server/0885-Array-backed-synched-entity-data.patch
+++ b/patches/unapplied/server/0885-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0886-fix-item-meta-for-tadpole-buckets.patch b/patches/unapplied/server/0886-fix-item-meta-for-tadpole-buckets.patch
index 7ee950152d..7ee950152d 100644
--- a/patches/server/0886-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/unapplied/server/0886-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0887-Fix-BanList-API.patch b/patches/unapplied/server/0887-Fix-BanList-API.patch
index 5c2d7a655d..5c2d7a655d 100644
--- a/patches/server/0887-Fix-BanList-API.patch
+++ b/patches/unapplied/server/0887-Fix-BanList-API.patch
diff --git a/patches/server/0888-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/unapplied/server/0888-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0888-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/unapplied/server/0888-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0889-Fix-possible-NPE-on-painting-creation.patch b/patches/unapplied/server/0889-Fix-possible-NPE-on-painting-creation.patch
index a503b8ac40..a503b8ac40 100644
--- a/patches/server/0889-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/unapplied/server/0889-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0890-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0890-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 54c442e544..54c442e544 100644
--- a/patches/server/0890-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/unapplied/server/0890-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0891-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/unapplied/server/0891-ExperienceOrb-should-call-EntitySpawnEvent.patch
index d365559159..d365559159 100644
--- a/patches/server/0891-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/unapplied/server/0891-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0892-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/unapplied/server/0892-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 96b4aa8c41..96b4aa8c41 100644
--- a/patches/server/0892-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/unapplied/server/0892-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0893-Add-whitelist-events.patch b/patches/unapplied/server/0893-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0893-Add-whitelist-events.patch
+++ b/patches/unapplied/server/0893-Add-whitelist-events.patch
diff --git a/patches/server/0894-Implement-PlayerFailMoveEvent.patch b/patches/unapplied/server/0894-Implement-PlayerFailMoveEvent.patch
index 67cf55983c..3d263f8ee9 100644
--- a/patches/server/0894-Implement-PlayerFailMoveEvent.patch
+++ b/patches/unapplied/server/0894-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 69118af2a873f23f6543676db39263bfeb81b4f1..93f5ec2c48bf4bdd4afc1e07ffcf1a34387ce6ac 100644
+index 1de8ee39347a6f4c56c2d3aa0e32887b57b80524..91e9e8a62ae25360ad82ab12ef07f8a51a2665ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1279,8 +1279,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0895-Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/server/0895-Folia-scheduler-and-owned-region-API.patch
index ab7ab5a341..e7344d7653 100644
--- a/patches/server/0895-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/unapplied/server/0895-Folia-scheduler-and-owned-region-API.patch
@@ -1148,7 +1148,7 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bfee202e1dc8ea875b9d2b4e8c3b0be3f6d94b26..28645a835a169029b734262a9f42751caa52c4c9 100644
+index a540c744ca88884207c4520794091c01c1c9f50e..882b6effa39b62172914b41af54e54c2890480fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1497,6 +1497,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0896-Only-erase-allay-memory-on-non-item-targets.patch b/patches/unapplied/server/0896-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0896-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/unapplied/server/0896-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0897-API-for-updating-recipes-on-clients.patch b/patches/unapplied/server/0897-API-for-updating-recipes-on-clients.patch
index 7fbba42341..7fbba42341 100644
--- a/patches/server/0897-API-for-updating-recipes-on-clients.patch
+++ b/patches/unapplied/server/0897-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0898-Fix-rotation-when-spawning-display-entities.patch b/patches/unapplied/server/0898-Fix-rotation-when-spawning-display-entities.patch
index afe854d47e..afe854d47e 100644
--- a/patches/server/0898-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/unapplied/server/0898-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0899-Only-capture-actual-tree-growth.patch b/patches/unapplied/server/0899-Only-capture-actual-tree-growth.patch
index 683dad5511..683dad5511 100644
--- a/patches/server/0899-Only-capture-actual-tree-growth.patch
+++ b/patches/unapplied/server/0899-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0900-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/unapplied/server/0900-Use-correct-source-for-mushroom-block-spread-event.patch
index ef72acd36e..ef72acd36e 100644
--- a/patches/server/0900-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/unapplied/server/0900-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0901-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/unapplied/server/0901-Respect-randomizeData-on-more-entities-when-spawning.patch
index 0b50ce9b7b..0b50ce9b7b 100644
--- a/patches/server/0901-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/unapplied/server/0901-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0902-Use-correct-seed-on-api-world-load.patch b/patches/unapplied/server/0902-Use-correct-seed-on-api-world-load.patch
index a39775a339..a39775a339 100644
--- a/patches/server/0902-Use-correct-seed-on-api-world-load.patch
+++ b/patches/unapplied/server/0902-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0903-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/unapplied/server/0903-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 930a90563b..930a90563b 100644
--- a/patches/server/0903-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/unapplied/server/0903-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0904-Cache-map-ids-on-item-frames.patch b/patches/unapplied/server/0904-Cache-map-ids-on-item-frames.patch
index 19972857b6..19972857b6 100644
--- a/patches/server/0904-Cache-map-ids-on-item-frames.patch
+++ b/patches/unapplied/server/0904-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0905-Fix-custom-statistic-criteria-creation.patch b/patches/unapplied/server/0905-Fix-custom-statistic-criteria-creation.patch
index 9137af35a3..9137af35a3 100644
--- a/patches/server/0905-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/unapplied/server/0905-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0906-Bandaid-fix-for-Effect.patch b/patches/unapplied/server/0906-Bandaid-fix-for-Effect.patch
index 8b1e531d37..8b1e531d37 100644
--- a/patches/server/0906-Bandaid-fix-for-Effect.patch
+++ b/patches/unapplied/server/0906-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0907-SculkCatalyst-bloom-API.patch b/patches/unapplied/server/0907-SculkCatalyst-bloom-API.patch
index 77742addde..77742addde 100644
--- a/patches/server/0907-SculkCatalyst-bloom-API.patch
+++ b/patches/unapplied/server/0907-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0908-API-for-an-entity-s-scoreboard-name.patch b/patches/unapplied/server/0908-API-for-an-entity-s-scoreboard-name.patch
index c85896cb5a..c85896cb5a 100644
--- a/patches/server/0908-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/unapplied/server/0908-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0909-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/unapplied/server/0909-Deprecate-and-replace-methods-with-old-StructureType.patch
index ff4c42a8ca..ff4c42a8ca 100644
--- a/patches/server/0909-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/unapplied/server/0909-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0910-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/unapplied/server/0910-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index e3fb817061..329a372192 100644
--- a/patches/server/0910-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/unapplied/server/0910-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 93f5ec2c48bf4bdd4afc1e07ffcf1a34387ce6ac..81bc1e1cf5cd77f09560dbd0c277f77670d6cc56 100644
+index 91e9e8a62ae25360ad82ab12ef07f8a51a2665ca..a580b36ae2dafc1b178fd2333afcc23e0691e5f2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -792,6 +792,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0911-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/unapplied/server/0911-Properly-handle-BlockBreakEvent-isDropItems.patch
index 025a223021..025a223021 100644
--- a/patches/server/0911-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/unapplied/server/0911-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0912-Fire-entity-death-event-for-ender-dragon.patch b/patches/unapplied/server/0912-Fire-entity-death-event-for-ender-dragon.patch
index 46c12c1b61..46c12c1b61 100644
--- a/patches/server/0912-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/unapplied/server/0912-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0913-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/unapplied/server/0913-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 81dacf5aab..81dacf5aab 100644
--- a/patches/server/0913-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/unapplied/server/0913-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0914-Add-Listing-API-for-Player.patch b/patches/unapplied/server/0914-Add-Listing-API-for-Player.patch
index 8d97e7bc60..8d97e7bc60 100644
--- a/patches/server/0914-Add-Listing-API-for-Player.patch
+++ b/patches/unapplied/server/0914-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0915-Configurable-Region-Compression-Format.patch b/patches/unapplied/server/0915-Configurable-Region-Compression-Format.patch
index 315bfdce09..315bfdce09 100644
--- a/patches/server/0915-Configurable-Region-Compression-Format.patch
+++ b/patches/unapplied/server/0915-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0916-Add-BlockFace-to-BlockDamageEvent.patch b/patches/unapplied/server/0916-Add-BlockFace-to-BlockDamageEvent.patch
index d17954042f..d17954042f 100644
--- a/patches/server/0916-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/unapplied/server/0916-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0917-Fix-NPE-on-Boat-getStatus.patch b/patches/unapplied/server/0917-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0917-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/unapplied/server/0917-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0918-Expand-Pose-API.patch b/patches/unapplied/server/0918-Expand-Pose-API.patch
index 8704e4d4d2..8704e4d4d2 100644
--- a/patches/server/0918-Expand-Pose-API.patch
+++ b/patches/unapplied/server/0918-Expand-Pose-API.patch
diff --git a/patches/server/0919-More-DragonBattle-API.patch b/patches/unapplied/server/0919-More-DragonBattle-API.patch
index 1ff4688b56..1ff4688b56 100644
--- a/patches/server/0919-More-DragonBattle-API.patch
+++ b/patches/unapplied/server/0919-More-DragonBattle-API.patch
diff --git a/patches/server/0920-Deep-clone-unhandled-nbt-tags.patch b/patches/unapplied/server/0920-Deep-clone-unhandled-nbt-tags.patch
index 0f522edd88..0f522edd88 100644
--- a/patches/server/0920-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/unapplied/server/0920-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0921-Add-PlayerPickItemEvent.patch b/patches/unapplied/server/0921-Add-PlayerPickItemEvent.patch
index 5ddf5f6a12..6bda428232 100644
--- a/patches/server/0921-Add-PlayerPickItemEvent.patch
+++ b/patches/unapplied/server/0921-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 81bc1e1cf5cd77f09560dbd0c277f77670d6cc56..270a76e932b76105a8a986b71ac8da8096368c73 100644
+index a580b36ae2dafc1b178fd2333afcc23e0691e5f2..6349ac2f093c067311efac06dd84c92996b1c64a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -907,8 +907,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0922-Allow-trident-custom-damage.patch b/patches/unapplied/server/0922-Allow-trident-custom-damage.patch
index fb6397821e..fb6397821e 100644
--- a/patches/server/0922-Allow-trident-custom-damage.patch
+++ b/patches/unapplied/server/0922-Allow-trident-custom-damage.patch
diff --git a/patches/server/0923-Expose-hand-in-BlockCanBuildEvent.patch b/patches/unapplied/server/0923-Expose-hand-in-BlockCanBuildEvent.patch
index ab17992d38..ab17992d38 100644
--- a/patches/server/0923-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/unapplied/server/0923-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0924-Optimize-nearest-structure-border-iteration.patch b/patches/unapplied/server/0924-Optimize-nearest-structure-border-iteration.patch
index e073d7a1df..0cad8d11fb 100644
--- a/patches/server/0924-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/unapplied/server/0924-Optimize-nearest-structure-border-iteration.patch
@@ -14,7 +14,7 @@ ensure that the returned found structure (which may for example be a buried
 treasure that will be marked on a treasure map) is the same as in vanilla.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index f767c822a8e86ce689d40d12c4ef2db3829a97cc..b26a4eb4951e87f891b59028d98b8ffba8e103a8 100644
+index a7ac9a0c4966c2f9d2b325fa59e8792850d376e8..84a2a5384a8a31eff5363e6391c9a5187212ff36 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -260,12 +260,15 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0925-Implement-OfflinePlayer-isConnected.patch b/patches/unapplied/server/0925-Implement-OfflinePlayer-isConnected.patch
index 50c30ac481..37cdf1cbc4 100644
--- a/patches/server/0925-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/unapplied/server/0925-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 96408d505ce80799868ff84554a3b0b25adabb22..4a875bce9563f3b9351ebecde9b0eb12
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 458c7039bddf63a0affbf14c24ba73d66cc13fac..5b5167947c82ca66a89aab456a2eb5b523887d33 100644
+index 2c7c39eab2bdbedf4aea903ba76f3289285bd7e7..3cbebe9a08a6f37c8716a71db9c34454025b458a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -243,6 +243,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0926-Fix-inventory-desync.patch b/patches/unapplied/server/0926-Fix-inventory-desync.patch
index f69c4d7ee9..f69c4d7ee9 100644
--- a/patches/server/0926-Fix-inventory-desync.patch
+++ b/patches/unapplied/server/0926-Fix-inventory-desync.patch
diff --git a/patches/server/0927-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/unapplied/server/0927-Add-titleOverride-to-InventoryOpenEvent.patch
index 76cb094c35..76cb094c35 100644
--- a/patches/server/0927-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/unapplied/server/0927-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0928-Configure-sniffer-egg-hatch-time.patch b/patches/unapplied/server/0928-Configure-sniffer-egg-hatch-time.patch
index 702bef1759..702bef1759 100644
--- a/patches/server/0928-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/unapplied/server/0928-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0929-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/unapplied/server/0929-Do-crystal-portal-proximity-check-before-entity-look.patch
index 43740a74f0..43740a74f0 100644
--- a/patches/server/0929-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/unapplied/server/0929-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0930-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/unapplied/server/0930-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0930-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/unapplied/server/0930-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0931-Add-slot-sanity-checks-in-container-clicks.patch b/patches/unapplied/server/0931-Add-slot-sanity-checks-in-container-clicks.patch
index 269657c258..dc29fcbded 100644
--- a/patches/server/0931-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/unapplied/server/0931-Add-slot-sanity-checks-in-container-clicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 270a76e932b76105a8a986b71ac8da8096368c73..e7f51d24868038179b0882c0e2cd4ce1f4fb56b7 100644
+index 6349ac2f093c067311efac06dd84c92996b1c64a..33560f75dd76f946203faa34ca5d10f213cd62c9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2892,6 +2892,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0932-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/unapplied/server/0932-Call-BlockRedstoneEvents-for-lecterns.patch
index c5d3495f31..c5d3495f31 100644
--- a/patches/server/0932-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/unapplied/server/0932-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0933-Allow-proper-checking-of-empty-item-stacks.patch b/patches/unapplied/server/0933-Allow-proper-checking-of-empty-item-stacks.patch
index 1ffc2241c3..1ffc2241c3 100644
--- a/patches/server/0933-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/unapplied/server/0933-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0934-Fix-silent-equipment-change-for-mobs.patch b/patches/unapplied/server/0934-Fix-silent-equipment-change-for-mobs.patch
index f9d34b89ae..46482b386e 100644
--- a/patches/server/0934-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/unapplied/server/0934-Fix-silent-equipment-change-for-mobs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix silent equipment change for mobs
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index d1833dcc92b1570e62a1941bbea6d66ff0b2ee5f..4e8aee81cb9e9fe4a4e5df4e228c0314b3af486b 100644
+index 5da7ffee71bf6d82a53b3c2f99e2bd898d0b1799..a59ee9d9b93404060e7a4702497071859daec6df 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1047,13 +1047,20 @@ public abstract class Mob extends LivingEntity implements Targeting {
diff --git a/patches/server/0935-Fix-spigot-s-Forced-Stats.patch b/patches/unapplied/server/0935-Fix-spigot-s-Forced-Stats.patch
index a138a58b79..a138a58b79 100644
--- a/patches/server/0935-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/unapplied/server/0935-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0936-Add-missing-InventoryHolders-to-inventories.patch b/patches/unapplied/server/0936-Add-missing-InventoryHolders-to-inventories.patch
index e6954fc31c..e6954fc31c 100644
--- a/patches/server/0936-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/unapplied/server/0936-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0937-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/unapplied/server/0937-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index a5090d6c00..a5090d6c00 100644
--- a/patches/server/0937-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/unapplied/server/0937-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0938-Add-missing-logs-for-log-ips-config-option.patch b/patches/unapplied/server/0938-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0938-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/unapplied/server/0938-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0939-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/unapplied/server/0939-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e547ae2524..e547ae2524 100644
--- a/patches/server/0939-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/unapplied/server/0939-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0940-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/unapplied/server/0940-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0940-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/unapplied/server/0940-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0941-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/unapplied/server/0941-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0941-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/unapplied/server/0941-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0942-Fix-missing-map-initialize-event-call.patch b/patches/unapplied/server/0942-Fix-missing-map-initialize-event-call.patch
index 20b3a50d58..20b3a50d58 100644
--- a/patches/server/0942-Fix-missing-map-initialize-event-call.patch
+++ b/patches/unapplied/server/0942-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0943-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/unapplied/server/0943-Update-entity-data-when-attaching-firework-to-entity.patch
index 8cbc0f974a..8cbc0f974a 100644
--- a/patches/server/0943-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/unapplied/server/0943-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0944-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/unapplied/server/0944-Use-correct-variable-for-initializing-CraftLootTable.patch
index ab46cdf78a..ab46cdf78a 100644
--- a/patches/server/0944-Use-correct-variable-for-initializing-CraftLootTable.patch
+++ b/patches/unapplied/server/0944-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/0945-Fix-UnsafeValues-loadAdvancement.patch b/patches/unapplied/server/0945-Fix-UnsafeValues-loadAdvancement.patch
index 60d7a4d75a..60d7a4d75a 100644
--- a/patches/server/0945-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/unapplied/server/0945-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0946-Add-player-idle-duration-API.patch b/patches/unapplied/server/0946-Add-player-idle-duration-API.patch
index a702fe4314..a702fe4314 100644
--- a/patches/server/0946-Add-player-idle-duration-API.patch
+++ b/patches/unapplied/server/0946-Add-player-idle-duration-API.patch
diff --git a/patches/server/0947-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/unapplied/server/0947-Don-t-check-if-we-can-see-non-visible-entities.patch
index 1c1aa40a97..1c1aa40a97 100644
--- a/patches/server/0947-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/unapplied/server/0947-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0948-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/unapplied/server/0948-Fix-NPE-in-SculkBloomEvent-world-access.patch
index b66e61a522..b66e61a522 100644
--- a/patches/server/0948-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/unapplied/server/0948-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0949-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/unapplied/server/0949-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 6f15e00d6a..6f15e00d6a 100644
--- a/patches/server/0949-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/unapplied/server/0949-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0950-Optimize-VarInts.patch b/patches/unapplied/server/0950-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0950-Optimize-VarInts.patch
+++ b/patches/unapplied/server/0950-Optimize-VarInts.patch
diff --git a/patches/server/0951-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/unapplied/server/0951-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 9794102b95..9794102b95 100644
--- a/patches/server/0951-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/unapplied/server/0951-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0952-Add-predicate-for-blocks-when-raytracing.patch b/patches/unapplied/server/0952-Add-predicate-for-blocks-when-raytracing.patch
index efe5b6e6bc..efe5b6e6bc 100644
--- a/patches/server/0952-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/unapplied/server/0952-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0953-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/unapplied/server/0953-Broadcast-take-item-packets-with-collector-as-source.patch
index 762ec4c8fd..762ec4c8fd 100644
--- a/patches/server/0953-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/unapplied/server/0953-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0954-Expand-LingeringPotion-API.patch b/patches/unapplied/server/0954-Expand-LingeringPotion-API.patch
index abc4c72435..abc4c72435 100644
--- a/patches/server/0954-Expand-LingeringPotion-API.patch
+++ b/patches/unapplied/server/0954-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0955-Add-MaterialTagsTest.patch b/patches/unapplied/server/0955-Add-MaterialTagsTest.patch
index 34233ba1ca..34233ba1ca 100644
--- a/patches/server/0955-Add-MaterialTagsTest.patch
+++ b/patches/unapplied/server/0955-Add-MaterialTagsTest.patch
diff --git a/patches/server/0956-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/unapplied/server/0956-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index a6ef0b68f1..a6ef0b68f1 100644
--- a/patches/server/0956-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/unapplied/server/0956-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0957-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/unapplied/server/0957-Add-hand-to-fish-event-for-all-player-interactions.patch
index 39764d836e..39764d836e 100644
--- a/patches/server/0957-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/unapplied/server/0957-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0958-Fix-several-issues-with-EntityBreedEvent.patch b/patches/unapplied/server/0958-Fix-several-issues-with-EntityBreedEvent.patch
index e7f91ee16c..e7f91ee16c 100644
--- a/patches/server/0958-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/unapplied/server/0958-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0959-Add-UUID-attribute-modifier-API.patch b/patches/unapplied/server/0959-Add-UUID-attribute-modifier-API.patch
index 37efcab4b6..37efcab4b6 100644
--- a/patches/server/0959-Add-UUID-attribute-modifier-API.patch
+++ b/patches/unapplied/server/0959-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0960-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/unapplied/server/0960-Fix-missing-event-call-for-entity-teleport-API.patch
index 77319ed2b1..77319ed2b1 100644
--- a/patches/server/0960-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/unapplied/server/0960-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0961-Lazily-create-LootContext-for-criterions.patch b/patches/unapplied/server/0961-Lazily-create-LootContext-for-criterions.patch
index f0786c2018..d1033bf7e7 100644
--- a/patches/server/0961-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/unapplied/server/0961-Lazily-create-LootContext-for-criterions.patch
@@ -8,7 +8,7 @@ For each player on each tick, enter block triggers are invoked, and these create
 To avoid this, we now lazily create the LootContext if the criterion passes the predicate AND if any of the listener triggers require a loot context instance
 
 diff --git a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
-index 795d1f3e6065baee4cadf71ae0eeabfa5522199b..557de599b3496105b572bebb86313e3441947bae 100644
+index f43053ba082f9772b6ec02828fa2d6f387c32d26..35772110e9318df46a2729dbc0b5879b290011b7 100644
 --- a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
 +++ b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
 @@ -42,14 +42,14 @@ public abstract class SimpleCriterionTrigger<T extends SimpleCriterionTrigger.Si
diff --git a/patches/server/0962-Don-t-fire-sync-events-during-worldgen.patch b/patches/unapplied/server/0962-Don-t-fire-sync-events-during-worldgen.patch
index 086273d9ca..086273d9ca 100644
--- a/patches/server/0962-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/unapplied/server/0962-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0963-Add-Structure-check-API.patch b/patches/unapplied/server/0963-Add-Structure-check-API.patch
index 551c80ce78..551c80ce78 100644
--- a/patches/server/0963-Add-Structure-check-API.patch
+++ b/patches/unapplied/server/0963-Add-Structure-check-API.patch
diff --git a/patches/server/0964-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/unapplied/server/0964-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index bbc3e41f85..bbc3e41f85 100644
--- a/patches/server/0964-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/unapplied/server/0964-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0965-Restore-vanilla-entity-drops-behavior.patch b/patches/unapplied/server/0965-Restore-vanilla-entity-drops-behavior.patch
index 531ac1d639..531ac1d639 100644
--- a/patches/server/0965-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/unapplied/server/0965-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0966-Dont-resend-blocks-on-interactions.patch b/patches/unapplied/server/0966-Dont-resend-blocks-on-interactions.patch
index 8a8a5bb4ed..8a8a5bb4ed 100644
--- a/patches/server/0966-Dont-resend-blocks-on-interactions.patch
+++ b/patches/unapplied/server/0966-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0967-add-more-scoreboard-API.patch b/patches/unapplied/server/0967-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0967-add-more-scoreboard-API.patch
+++ b/patches/unapplied/server/0967-add-more-scoreboard-API.patch
diff --git a/patches/server/0968-Improve-Registry.patch b/patches/unapplied/server/0968-Improve-Registry.patch
index aed822acfc..aed822acfc 100644
--- a/patches/server/0968-Improve-Registry.patch
+++ b/patches/unapplied/server/0968-Improve-Registry.patch
diff --git a/patches/server/0969-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/unapplied/server/0969-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index b554986b74..b554986b74 100644
--- a/patches/server/0969-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/unapplied/server/0969-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0970-Add-experience-points-API.patch b/patches/unapplied/server/0970-Add-experience-points-API.patch
index 114c8103e5..114c8103e5 100644
--- a/patches/server/0970-Add-experience-points-API.patch
+++ b/patches/unapplied/server/0970-Add-experience-points-API.patch
diff --git a/patches/server/0971-Add-drops-to-shear-events.patch b/patches/unapplied/server/0971-Add-drops-to-shear-events.patch
index a249a70023..a249a70023 100644
--- a/patches/server/0971-Add-drops-to-shear-events.patch
+++ b/patches/unapplied/server/0971-Add-drops-to-shear-events.patch
diff --git a/patches/server/0972-Add-PlayerShieldDisableEvent.patch b/patches/unapplied/server/0972-Add-PlayerShieldDisableEvent.patch
index 196eafaea2..196eafaea2 100644
--- a/patches/server/0972-Add-PlayerShieldDisableEvent.patch
+++ b/patches/unapplied/server/0972-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0973-Validate-ResourceLocation-in-NBT-reading.patch b/patches/unapplied/server/0973-Validate-ResourceLocation-in-NBT-reading.patch
index b913537457..147ec449fe 100644
--- a/patches/server/0973-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/unapplied/server/0973-Validate-ResourceLocation-in-NBT-reading.patch
@@ -72,7 +72,7 @@ index bb52d084637c97d9cc1ebaeec28358a0ddb3952b..40e21effc948b02874a6ed1d1c340c4d
  
          if (nbt.contains("Brain", 10)) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 544e22f569d7ddeb1ba46a9ef7f4d4d6ca37c431..d2f5d959d3b67f7c20d0c0de462a18d667f3a84b 100644
+index f7818fd5e59784554732c39ef5c56461ea0d62c4..11c933a662c2275e2ef239cb0b5dd2480cc55490 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -608,7 +608,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
diff --git a/patches/server/0974-Properly-handle-experience-dropping-on-block-break.patch b/patches/unapplied/server/0974-Properly-handle-experience-dropping-on-block-break.patch
index 57e56e24ab..57e56e24ab 100644
--- a/patches/server/0974-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/unapplied/server/0974-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0975-Fixup-NamespacedKey-handling.patch b/patches/unapplied/server/0975-Fixup-NamespacedKey-handling.patch
index 14ddcf111d..14ddcf111d 100644
--- a/patches/server/0975-Fixup-NamespacedKey-handling.patch
+++ b/patches/unapplied/server/0975-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0976-Expose-LootTable-of-DecoratedPot.patch b/patches/unapplied/server/0976-Expose-LootTable-of-DecoratedPot.patch
index 6d5e2738de..6d5e2738de 100644
--- a/patches/server/0976-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/unapplied/server/0976-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0977-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0977-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index b1345b9284..1239f9241c 100644
--- a/patches/server/0977-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/unapplied/server/0977-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce allocation of Vec3D by entity tracker
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
-index baacaa8fcefdee3c7eeebae1d3a365553e2dbac6..0d079f33c5cbc063081d5722c0823e332b448ea2 100644
+index a3d247c93ac1a2d872ff0e3841efc3d7b84fcbc1..23fe7c4c1844d321efed6b7b886c422761ad6594 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
 @@ -5,7 +5,7 @@ import org.jetbrains.annotations.VisibleForTesting;
diff --git a/patches/server/0978-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0978-Rewrite-dataconverter-system.patch
index 971d840785..ba142f5a86 100644
--- a/patches/server/0978-Rewrite-dataconverter-system.patch
+++ b/patches/unapplied/server/0978-Rewrite-dataconverter-system.patch
@@ -24837,7 +24837,7 @@ index 6743dca44e6552ad39aca757a24f3c4df400d83d..eebaf98bc0fa4696af59b2a79563beb7
              NbtUtils.addCurrentDataVersion(nbttagcompound);
          }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-index 01e54bd6c8157bc5c20375180a29c62599d72a3b..0eaecd48f763d60e3bfe684fae1700c2ced78cc2 100644
+index dd5adf1833ec64f183505c6d8c165a129ed4ed36..3b842297774472af5999438e883c1cd262f3c286 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 @@ -115,7 +115,7 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
diff --git a/patches/server/0979-Starlight.patch b/patches/unapplied/server/0979-Starlight.patch
index 598933220f..598933220f 100644
--- a/patches/server/0979-Starlight.patch
+++ b/patches/unapplied/server/0979-Starlight.patch
diff --git a/patches/server/0980-Rewrite-chunk-system.patch b/patches/unapplied/server/0980-Rewrite-chunk-system.patch
index e013a3c5f4..541f2b8723 100644
--- a/patches/server/0980-Rewrite-chunk-system.patch
+++ b/patches/unapplied/server/0980-Rewrite-chunk-system.patch
@@ -19951,7 +19951,7 @@ index ced67cf88c91c5270a0060a7307f36739237cbb2..dab86988686cf7c926b7432b8a4afffd
      @Nullable default ChunkAccess getChunkIfLoadedImmediately(BlockPos pos) { return this.getChunkIfLoadedImmediately(pos.getX() >> 4, pos.getZ() >> 4);}
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index b26a4eb4951e87f891b59028d98b8ffba8e103a8..b8b78494449c0cd638f9706a803dc54e184d981f 100644
+index 84a2a5384a8a31eff5363e6391c9a5187212ff36..4c03297fb523ef59cd9d11edbed437398e562a00 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -114,7 +114,7 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0981-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0981-incremental-chunk-and-player-saving.patch
index ee962a9466..33d6eb0a5f 100644
--- a/patches/server/0981-incremental-chunk-and-player-saving.patch
+++ b/patches/unapplied/server/0981-incremental-chunk-and-player-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] incremental chunk and player saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 56d579e64b367dd21b2909eb0dbc1d7686d0c3d0..c8a2686f1e60a8c1fb56ce7b5d3e2ba62ec3a987 100644
+index 03d566c3e6d7541487ea79ed868aa7334793df3b..54d6e197bd6357bf2d31d8d5d1cb3707d22ef03e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -908,7 +908,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0982-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0982-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index bb73216915..bb73216915 100644
--- a/patches/server/0982-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/unapplied/server/0982-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0983-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0983-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 811439226f..811439226f 100644
--- a/patches/server/0983-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/unapplied/server/0983-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0984-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/unapplied/server/0984-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 46e1b7e745..46e1b7e745 100644
--- a/patches/server/0984-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/unapplied/server/0984-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0985-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0985-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 2e8076eb2e..2e8076eb2e 100644
--- a/patches/server/0985-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/unapplied/server/0985-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0986-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0986-Allow-Saving-of-Oversized-Chunks.patch
index f6a81ca166..f6a81ca166 100644
--- a/patches/server/0986-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/unapplied/server/0986-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0987-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/0987-Fix-World-isChunkGenerated-calls.patch
index f6df1f113b..f6df1f113b 100644
--- a/patches/server/0987-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/unapplied/server/0987-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0988-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/0988-Flat-bedrock-generator-settings.patch
index d1bbbdf7ef..d1bbbdf7ef 100644
--- a/patches/server/0988-Flat-bedrock-generator-settings.patch
+++ b/patches/unapplied/server/0988-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0989-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0989-Entity-Activation-Range-2.0.patch
index b497ed2a71..82e80d8998 100644
--- a/patches/server/0989-Entity-Activation-Range-2.0.patch
+++ b/patches/unapplied/server/0989-Entity-Activation-Range-2.0.patch
@@ -147,7 +147,7 @@ index b108f779abe3d9798c0bcbc983f41d48b33aa153..a66fe080ee73171090abec48352ad0bd
              movement = this.maybeBackOffFromEdge(movement, movementType);
              Vec3 vec3d1 = this.collide(movement);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index d2f5d959d3b67f7c20d0c0de462a18d667f3a84b..2439f8d48daca7329049436414f06a36b4b79029 100644
+index 11c933a662c2275e2ef239cb0b5dd2480cc55490..d2c92df28475f0a32a0134324eb0a5609a9afb99 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -222,6 +222,19 @@ public abstract class Mob extends LivingEntity implements Targeting {
diff --git a/patches/server/0990-Optional-per-player-mob-spawns.patch b/patches/unapplied/server/0990-Optional-per-player-mob-spawns.patch
index dc4d88d053..dc4d88d053 100644
--- a/patches/server/0990-Optional-per-player-mob-spawns.patch
+++ b/patches/unapplied/server/0990-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0991-Anti-Xray.patch b/patches/unapplied/server/0991-Anti-Xray.patch
index 0e19dabd18..0e19dabd18 100644
--- a/patches/server/0991-Anti-Xray.patch
+++ b/patches/unapplied/server/0991-Anti-Xray.patch
diff --git a/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/unapplied/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 05c9814be3..05c9814be3 100644
--- a/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/unapplied/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0993-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0993-Optimize-Collision-to-not-load-chunks.patch
index dd6fd94feb..dd6fd94feb 100644
--- a/patches/server/0993-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/unapplied/server/0993-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0994-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0994-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index dcbd7aff42..dcbd7aff42 100644
--- a/patches/server/0994-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/unapplied/server/0994-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0995-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0995-Entity-load-save-limit-per-chunk.patch
index 85299c2e1e..85299c2e1e 100644
--- a/patches/server/0995-Entity-load-save-limit-per-chunk.patch
+++ b/patches/unapplied/server/0995-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0996-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0996-Fix-and-optimise-world-force-upgrading.patch
index 6c12518ffe..828506da0e 100644
--- a/patches/server/0996-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/unapplied/server/0996-Fix-and-optimise-world-force-upgrading.patch
@@ -267,7 +267,7 @@ index 329471af4f40e0a74612707cce96bb00819e6cf2..bc391d27399d8c22e78735ca39aa8ab4
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dimensionOptionsRegistry, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c8a2686f1e60a8c1fb56ce7b5d3e2ba62ec3a987..2c381ae8a604b9aee4613614593809f634aaa89d 100644
+index 54d6e197bd6357bf2d31d8d5d1cb3707d22ef03e..884c0e4f58f0e374c910bc0d8b5d3ab1b8ade226 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -584,11 +584,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0997-Improved-Watchdog-Support.patch b/patches/unapplied/server/0997-Improved-Watchdog-Support.patch
index 720936ff38..cff6443130 100644
--- a/patches/server/0997-Improved-Watchdog-Support.patch
+++ b/patches/unapplied/server/0997-Improved-Watchdog-Support.patch
@@ -71,7 +71,7 @@ index 6f2452de76e8f5fcc1367066e0e753740764eb98..e047dee632022abfe05865d1e71838be
              cause = cause.getCause();
          }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2c381ae8a604b9aee4613614593809f634aaa89d..6454e139cc6322b23b9810cbd450aac5d7b3d942 100644
+index 884c0e4f58f0e374c910bc0d8b5d3ab1b8ade226..9d3cf1a14259397f806c57baa223faa7ee9eaf6b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -296,7 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0998-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0998-Optimize-Voxel-Shape-Merging.patch
index 4ec779560c..4ec779560c 100644
--- a/patches/server/0998-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/unapplied/server/0998-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0999-Write-SavedData-IO-async.patch b/patches/unapplied/server/0999-Write-SavedData-IO-async.patch
index fc9b211347..fc9b211347 100644
--- a/patches/server/0999-Write-SavedData-IO-async.patch
+++ b/patches/unapplied/server/0999-Write-SavedData-IO-async.patch
diff --git a/patches/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 8702845583..8702845583 100644
--- a/patches/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/unapplied/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/1001-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/1001-Use-distance-map-to-optimise-entity-tracker.patch
index 8cf1aa5a19..f8878d5e7d 100644
--- a/patches/server/1001-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/unapplied/server/1001-Use-distance-map-to-optimise-entity-tracker.patch
@@ -236,7 +236,7 @@ index ac1a4ff5f83e53fa2983ff6e834775e51fba715e..284f9548d62f9230c668bb1adb8cb808
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5cc7043d2783d38f9d3a28d0cb62f8834e971e1e..eb269e90c62544d6e56ac8e6e81d0e5d4bc1f7e9 100644
+index d4c8f2cb1e3adf45863226ae9ad31968bc3445c9..ab8a736bd8da140c48e6bd66449d7aa3b4f29a16 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/1002-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/1002-Optimize-Bit-Operations-by-inlining.patch
index 5823fb0d37..5823fb0d37 100644
--- a/patches/server/1002-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/unapplied/server/1002-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1003-Remove-streams-from-hot-code.patch b/patches/unapplied/server/1003-Remove-streams-from-hot-code.patch
index 8e8133d2b2..8e8133d2b2 100644
--- a/patches/server/1003-Remove-streams-from-hot-code.patch
+++ b/patches/unapplied/server/1003-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1004-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/1004-Eigencraft-redstone-implementation.patch
index 1c66b34a01..1c66b34a01 100644
--- a/patches/server/1004-Eigencraft-redstone-implementation.patch
+++ b/patches/unapplied/server/1004-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 76d173106a..76d173106a 100644
--- a/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/unapplied/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1006-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/1006-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index de82ef89da..de82ef89da 100644
--- a/patches/server/1006-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/unapplied/server/1006-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/1007-Improve-boat-collision-performance.patch b/patches/unapplied/server/1007-Improve-boat-collision-performance.patch
index d32dfc35cc..d32dfc35cc 100644
--- a/patches/server/1007-Improve-boat-collision-performance.patch
+++ b/patches/unapplied/server/1007-Improve-boat-collision-performance.patch
diff --git a/patches/server/1008-Optimise-general-POI-access.patch b/patches/unapplied/server/1008-Optimise-general-POI-access.patch
index 715dea7d5c..715dea7d5c 100644
--- a/patches/server/1008-Optimise-general-POI-access.patch
+++ b/patches/unapplied/server/1008-Optimise-general-POI-access.patch
diff --git a/patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
index 9c4e3867d5..9c4e3867d5 100644
--- a/patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/unapplied/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1010-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/1010-Execute-chunk-tasks-mid-tick.patch
index b41e463698..3a02d6108e 100644
--- a/patches/server/1010-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/unapplied/server/1010-Execute-chunk-tasks-mid-tick.patch
@@ -19,7 +19,7 @@ index 6b3cde6d4d1e63bec01f502f2027ee9fddac08aa..46449728f69ee7d4f78470f8da23c055
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6454e139cc6322b23b9810cbd450aac5d7b3d942..55204f27d3633d0aef01ac2469925d02865ab2fe 100644
+index 9d3cf1a14259397f806c57baa223faa7ee9eaf6b..636ad032f9b6b20557327e7d0b0aefff7780d1f3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1357,8 +1357,79 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1011-Optimise-random-block-ticking.patch b/patches/unapplied/server/1011-Optimise-random-block-ticking.patch
index 7bda9d54c9..bd41ca541a 100644
--- a/patches/server/1011-Optimise-random-block-ticking.patch
+++ b/patches/unapplied/server/1011-Optimise-random-block-ticking.patch
@@ -258,7 +258,7 @@ index 68648c5a5e3ff079f832092af0f2f801c42d1ede..8bafd5fd7499ba4a04bf706cfd1e1560
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/util/SimpleBitStorage.java b/src/main/java/net/minecraft/util/SimpleBitStorage.java
-index 236ce41328758cb173a239133073944adb484dd1..abef177f074706f13ae6acbcfe036fcaecf00cd6 100644
+index 9f438d9c6eb05e43d24e4af68188a3d4c46a938c..8d7d763bf51cac556057645e6169c9447993189b 100644
 --- a/src/main/java/net/minecraft/util/SimpleBitStorage.java
 +++ b/src/main/java/net/minecraft/util/SimpleBitStorage.java
 @@ -315,6 +315,28 @@ public class SimpleBitStorage implements BitStorage {
diff --git a/patches/server/1012-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/1012-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index e0ffe43767..e0ffe43767 100644
--- a/patches/server/1012-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/unapplied/server/1012-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1013-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/1013-Use-Velocity-compression-and-cipher-natives.patch
index 8ba0372a99..8ba0372a99 100644
--- a/patches/server/1013-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/unapplied/server/1013-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1014-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/1014-Detail-more-information-in-watchdog-dumps.patch
index e403a57375..c18d6158f6 100644
--- a/patches/server/1014-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/unapplied/server/1014-Detail-more-information-in-watchdog-dumps.patch
@@ -122,7 +122,7 @@ index 9d18da228c6709e7665ba8babb6ee6d0b36b5dc5..af9f58328c09dddb2875f79128f906b8
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb269e90c62544d6e56ac8e6e81d0e5d4bc1f7e9..865c5ee8a8a14ef1a7d71dcab3e324932d065d5f 100644
+index ab8a736bd8da140c48e6bd66449d7aa3b4f29a16..9a01eff5a93c68edd45f98e9a6f8d24656650fb6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1063,8 +1063,43 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1015-Collision-optimisations.patch b/patches/unapplied/server/1015-Collision-optimisations.patch
index e527784429..e527784429 100644
--- a/patches/server/1015-Collision-optimisations.patch
+++ b/patches/unapplied/server/1015-Collision-optimisations.patch
diff --git a/patches/server/1016-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/1016-Optimise-collision-checking-in-player-move-packet-ha.patch
index 76b0962ce2..1aef4ea053 100644
--- a/patches/server/1016-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/unapplied/server/1016-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e7f51d24868038179b0882c0e2cd4ce1f4fb56b7..a5bee627cd01d42c01751fef79d90062cc0c1603 100644
+index 33560f75dd76f946203faa34ca5d10f213cd62c9..d0ae2c485b0e37406633c79043bd833a8a6b3e2d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -552,7 +552,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1017-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/unapplied/server/1017-Fix-tripwire-disarming-not-working-as-intended.patch
index 46a8a52189..46a8a52189 100644
--- a/patches/server/1017-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/unapplied/server/1017-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1018-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/1018-Fix-entity-type-tags-suggestions-in-selectors.patch
index 854bb2d342..854bb2d342 100644
--- a/patches/server/1018-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/unapplied/server/1018-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1019-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/1019-Add-Alternate-Current-redstone-implementation.patch
index 66ad39643d..66ad39643d 100644
--- a/patches/server/1019-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/unapplied/server/1019-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1020-optimize-dirt-and-snow-spreading.patch b/patches/unapplied/server/1020-optimize-dirt-and-snow-spreading.patch
index 223dbd9a3e..223dbd9a3e 100644
--- a/patches/server/1020-optimize-dirt-and-snow-spreading.patch
+++ b/patches/unapplied/server/1020-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1021-Properly-resend-entities.patch b/patches/unapplied/server/1021-Properly-resend-entities.patch
index 113d66e3b4..3165a6aa39 100644
--- a/patches/server/1021-Properly-resend-entities.patch
+++ b/patches/unapplied/server/1021-Properly-resend-entities.patch
@@ -116,7 +116,7 @@ index 692a01b52a71e26887ee42cbd5fd64b0a81bfc99..ef3048a4748113538a0ee0af5b526b2c
          return enuminteractionresult;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a5bee627cd01d42c01751fef79d90062cc0c1603..98496bcc7ab9adde3fdc8b2cd9eaeceee99e28b4 100644
+index d0ae2c485b0e37406633c79043bd833a8a6b3e2d..b8db3c3a5870e9d7dbba38caf7c9e1c1f3849bde 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1990,6 +1990,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1022-Optimize-Hoppers.patch b/patches/unapplied/server/1022-Optimize-Hoppers.patch
index fc971c77c0..f39b27cb4a 100644
--- a/patches/server/1022-Optimize-Hoppers.patch
+++ b/patches/unapplied/server/1022-Optimize-Hoppers.patch
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..5c42823726e70ce6c9d0121d07431548
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 55204f27d3633d0aef01ac2469925d02865ab2fe..0b1ed3a19ce11faf5650c7c2f7a150a2b10bab48 100644
+index 636ad032f9b6b20557327e7d0b0aefff7780d1f3..2f263ef5120982b3167ab008a0e22b8cbc9b9fdd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1692,6 +1692,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1023-Improve-performance-of-mass-crafts.patch b/patches/unapplied/server/1023-Improve-performance-of-mass-crafts.patch
index 3f69ae35b9..3f69ae35b9 100644
--- a/patches/server/1023-Improve-performance-of-mass-crafts.patch
+++ b/patches/unapplied/server/1023-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1024-Actually-optimise-explosions.patch b/patches/unapplied/server/1024-Actually-optimise-explosions.patch
index 7a35803ac0..7a35803ac0 100644
--- a/patches/server/1024-Actually-optimise-explosions.patch
+++ b/patches/unapplied/server/1024-Actually-optimise-explosions.patch
diff --git a/patches/server/1025-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/1025-Optimise-chunk-tick-iteration.patch
index da9130527c..da9130527c 100644
--- a/patches/server/1025-Optimise-chunk-tick-iteration.patch
+++ b/patches/unapplied/server/1025-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1026-Lag-compensation-ticks.patch b/patches/unapplied/server/1026-Lag-compensation-ticks.patch
index ffb279c55f..40fbaa1e15 100644
--- a/patches/server/1026-Lag-compensation-ticks.patch
+++ b/patches/unapplied/server/1026-Lag-compensation-ticks.patch
@@ -8,7 +8,7 @@ Areas affected by lag comepnsation:
  - Eating food items
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0b1ed3a19ce11faf5650c7c2f7a150a2b10bab48..5934d8fc3d0a96f72f41193102ac58bd87f82b57 100644
+index 2f263ef5120982b3167ab008a0e22b8cbc9b9fdd..f03f6922d15541c5491e5b37a3efa7ef0abef211 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -311,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1027-Optimise-nearby-player-retrieval.patch b/patches/unapplied/server/1027-Optimise-nearby-player-retrieval.patch
index 06b8d42fec..06b8d42fec 100644
--- a/patches/server/1027-Optimise-nearby-player-retrieval.patch
+++ b/patches/unapplied/server/1027-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1028-Distance-manager-tick-timings.patch b/patches/unapplied/server/1028-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/server/1028-Distance-manager-tick-timings.patch
+++ b/patches/unapplied/server/1028-Distance-manager-tick-timings.patch
diff --git a/patches/server/1029-Handle-Oversized-block-entities-in-chunks.patch b/patches/unapplied/server/1029-Handle-Oversized-block-entities-in-chunks.patch
index 3705e1d295..27d881a58e 100644
--- a/patches/server/1029-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/unapplied/server/1029-Handle-Oversized-block-entities-in-chunks.patch
@@ -9,7 +9,7 @@ creating too large of a packet to sed.
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 9c51c4d12bac588002f530f484ee89b094269349..761a8d4fb47f9bffdf9ca76fbae1003e8ae46a02 100644
+index 454bec4f8843e7e4e42cd8a8132b557ead292dcc..76bde683d193b37e563a67c1c7b9bdcf17d64524 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -24,6 +24,14 @@ public class ClientboundLevelChunkPacketData {
diff --git a/patches/server/1030-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/1030-Send-full-pos-packets-for-hard-colliding-entities.patch
index 45738a19b2..45738a19b2 100644
--- a/patches/server/1030-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/unapplied/server/1030-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1031-Add-ShulkerDuplicateEvent.patch b/patches/unapplied/server/1031-Add-ShulkerDuplicateEvent.patch
index 91ff8b7326..91ff8b7326 100644
--- a/patches/server/1031-Add-ShulkerDuplicateEvent.patch
+++ b/patches/unapplied/server/1031-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/1032-Add-api-for-spawn-egg-texture-colors.patch b/patches/unapplied/server/1032-Add-api-for-spawn-egg-texture-colors.patch
index 57f59afe69..57f59afe69 100644
--- a/patches/server/1032-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/unapplied/server/1032-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/1033-Disable-memory-reserve-allocating.patch b/patches/unapplied/server/1033-Disable-memory-reserve-allocating.patch
index bd18c240f0..bd18c240f0 100644
--- a/patches/server/1033-Disable-memory-reserve-allocating.patch
+++ b/patches/unapplied/server/1033-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/1034-Improve-tag-parser-handling.patch b/patches/unapplied/server/1034-Improve-tag-parser-handling.patch
index 30bd53f874..78cf8189d3 100644
--- a/patches/server/1034-Improve-tag-parser-handling.patch
+++ b/patches/unapplied/server/1034-Improve-tag-parser-handling.patch
@@ -169,7 +169,7 @@ index a5e438a834826161c52ca9db57d234d9ff80a591..4766994cce060564370b0d24836a7da8
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 98496bcc7ab9adde3fdc8b2cd9eaeceee99e28b4..860d33ac56680babd87358b1d7d2216dac3f7865 100644
+index b8db3c3a5870e9d7dbba38caf7c9e1c1f3849bde..2ad17823bf442ce0455227b64e5d3bb10d0ee2c1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -777,6 +777,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1035-Add-Lifecycle-Event-system.patch b/patches/unapplied/server/1035-Add-Lifecycle-Event-system.patch
index 76dfc6a17f..76dfc6a17f 100644
--- a/patches/server/1035-Add-Lifecycle-Event-system.patch
+++ b/patches/unapplied/server/1035-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/1036-Conduit-API.patch b/patches/unapplied/server/1036-Conduit-API.patch
index 9df9ff716b..9df9ff716b 100644
--- a/patches/server/1036-Conduit-API.patch
+++ b/patches/unapplied/server/1036-Conduit-API.patch
diff --git a/patches/server/1037-ItemStack-Tooltip-API.patch b/patches/unapplied/server/1037-ItemStack-Tooltip-API.patch
index 9a3075e565..9a3075e565 100644
--- a/patches/server/1037-ItemStack-Tooltip-API.patch
+++ b/patches/unapplied/server/1037-ItemStack-Tooltip-API.patch
diff --git a/patches/server/1038-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/unapplied/server/1038-Fix-possible-StackOverflowError-for-some-dispenses.patch
index c9638c6967..c9638c6967 100644
--- a/patches/server/1038-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/unapplied/server/1038-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/1039-Properly-track-the-changed-item-from-dispense-events.patch b/patches/unapplied/server/1039-Properly-track-the-changed-item-from-dispense-events.patch
index f01bec2a48..f01bec2a48 100644
--- a/patches/server/1039-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/unapplied/server/1039-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/1040-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/unapplied/server/1040-Add-getChunkSnapshot-includeLightData-parameter.patch
index bb830096ec..bb830096ec 100644
--- a/patches/server/1040-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/unapplied/server/1040-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/1041-Add-FluidState-API.patch b/patches/unapplied/server/1041-Add-FluidState-API.patch
index 153752df1d..153752df1d 100644
--- a/patches/server/1041-Add-FluidState-API.patch
+++ b/patches/unapplied/server/1041-Add-FluidState-API.patch
diff --git a/patches/server/1042-add-number-format-api.patch b/patches/unapplied/server/1042-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/1042-add-number-format-api.patch
+++ b/patches/unapplied/server/1042-add-number-format-api.patch
diff --git a/patches/server/1043-check-if-itemstack-is-stackable-first.patch b/patches/unapplied/server/1043-check-if-itemstack-is-stackable-first.patch
index 3655bb3a13..3655bb3a13 100644
--- a/patches/server/1043-check-if-itemstack-is-stackable-first.patch
+++ b/patches/unapplied/server/1043-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/1044-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/unapplied/server/1044-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 69eea7f52e..69eea7f52e 100644
--- a/patches/server/1044-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/unapplied/server/1044-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/1045-improve-BanList-types.patch b/patches/unapplied/server/1045-improve-BanList-types.patch
index ad92622c45..ad92622c45 100644
--- a/patches/server/1045-improve-BanList-types.patch
+++ b/patches/unapplied/server/1045-improve-BanList-types.patch
diff --git a/patches/server/1046-Configurable-max-block-fluid-ticks.patch b/patches/unapplied/server/1046-Configurable-max-block-fluid-ticks.patch
index c1d19d41e3..c1d19d41e3 100644
--- a/patches/server/1046-Configurable-max-block-fluid-ticks.patch
+++ b/patches/unapplied/server/1046-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/1047-disable-forced-empty-world-ticks.patch b/patches/unapplied/server/1047-disable-forced-empty-world-ticks.patch
index 6f3fb1c6f0..6f3fb1c6f0 100644
--- a/patches/server/1047-disable-forced-empty-world-ticks.patch
+++ b/patches/unapplied/server/1047-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/1048-Suspicious-Effect-Entry-API.patch b/patches/unapplied/server/1048-Suspicious-Effect-Entry-API.patch
index 31c7a46ac6..31c7a46ac6 100644
--- a/patches/server/1048-Suspicious-Effect-Entry-API.patch
+++ b/patches/unapplied/server/1048-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/1049-Per-world-ticks-per-spawn-settings.patch b/patches/unapplied/server/1049-Per-world-ticks-per-spawn-settings.patch
index cc4a0e5292..cc4a0e5292 100644
--- a/patches/server/1049-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/unapplied/server/1049-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/1050-Add-onboarding-message-for-initial-server-start.patch b/patches/unapplied/server/1050-Add-onboarding-message-for-initial-server-start.patch
index 7769ecafe8..6210b12485 100644
--- a/patches/server/1050-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/unapplied/server/1050-Add-onboarding-message-for-initial-server-start.patch
@@ -17,7 +17,7 @@ index c01b4393439838976965823298f12e4762e72eff..218bf89fd7583d6db9f64754c4db8fcc
              node = loader.load();
              this.verifyGlobalConfigVersion(node);
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index d00fc39b19c02895553f40bf5f62daa1dd50d59c..0cc2307636279915c1f8529e62174cc696e185ee 100644
+index 31f34ac1c70df3ef6eb6f6dfd0f870b1b275adfa..30fe1c0645a07d663b08c0f988a1ab3a750bf7c4 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -25,6 +25,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -29,7 +29,7 @@ index d00fc39b19c02895553f40bf5f62daa1dd50d59c..0cc2307636279915c1f8529e62174cc6
          return instance;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5934d8fc3d0a96f72f41193102ac58bd87f82b57..c8772c773f9933ed1d1debfe707af4373c458152 100644
+index f03f6922d15541c5491e5b37a3efa7ef0abef211..2dc07e5ef249636e85ad9c78e3729e9e066a8fe8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1155,6 +1155,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1051-Fix-DamageSource-API.patch b/patches/unapplied/server/1051-Fix-DamageSource-API.patch
index 7d2ad02099..e6ce72b632 100644
--- a/patches/server/1051-Fix-DamageSource-API.patch
+++ b/patches/unapplied/server/1051-Fix-DamageSource-API.patch
@@ -44,7 +44,7 @@ index 1561b85a45f52a8162f43553f8485bfe084b8f1f..b26e4d58ea1898a5e4b31c3d6ab33f38
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8c2c877a26af90dae6d083e12a51384755c7a1de..6407496ccd993839e4fda1858e2daa6e735511a8 100644
+index 7992375dc55492aeb6defb204b28dd267be4a6e7..637478fd8a284e6833cf8f5fa17ccf9d73d1dd3f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3462,7 +3462,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1052-Expanded-Hopper-API.patch b/patches/unapplied/server/1052-Expanded-Hopper-API.patch
index 67efc0d7a2..67efc0d7a2 100644
--- a/patches/server/1052-Expanded-Hopper-API.patch
+++ b/patches/unapplied/server/1052-Expanded-Hopper-API.patch
diff --git a/patches/server/1053-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/unapplied/server/1053-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index 5f6f4e6b9c..5f6f4e6b9c 100644
--- a/patches/server/1053-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/unapplied/server/1053-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/1054-Add-BlockBreakProgressUpdateEvent.patch b/patches/unapplied/server/1054-Add-BlockBreakProgressUpdateEvent.patch
index 382b360aff..382b360aff 100644
--- a/patches/server/1054-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/unapplied/server/1054-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/1055-Deprecate-ItemStack-setType.patch b/patches/unapplied/server/1055-Deprecate-ItemStack-setType.patch
index 72d51180a3..72d51180a3 100644
--- a/patches/server/1055-Deprecate-ItemStack-setType.patch
+++ b/patches/unapplied/server/1055-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/1056-Item-Mutation-Fixes.patch b/patches/unapplied/server/1056-Item-Mutation-Fixes.patch
index 4fc0800e22..4fc0800e22 100644
--- a/patches/server/1056-Item-Mutation-Fixes.patch
+++ b/patches/unapplied/server/1056-Item-Mutation-Fixes.patch
diff --git a/patches/server/1057-API-for-checking-sent-chunks.patch b/patches/unapplied/server/1057-API-for-checking-sent-chunks.patch
index b418da022b..b418da022b 100644
--- a/patches/server/1057-API-for-checking-sent-chunks.patch
+++ b/patches/unapplied/server/1057-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1058-Add-CartographyItemEvent.patch b/patches/unapplied/server/1058-Add-CartographyItemEvent.patch
index 6cf27afb8b..6cf27afb8b 100644
--- a/patches/server/1058-Add-CartographyItemEvent.patch
+++ b/patches/unapplied/server/1058-Add-CartographyItemEvent.patch
diff --git a/patches/server/1059-More-Raid-API.patch b/patches/unapplied/server/1059-More-Raid-API.patch
index b6ad0cb22a..b6ad0cb22a 100644
--- a/patches/server/1059-More-Raid-API.patch
+++ b/patches/unapplied/server/1059-More-Raid-API.patch
diff --git a/work/BuildData b/work/BuildData
-Subproject 58819a3c2a15e6e47ad89d32fb60d44c253491f
+Subproject 2e2c7cd23daeeddf71226b4e604f8603d71cfca
diff --git a/work/Bukkit b/work/Bukkit
-Subproject f02baa38696abb62cc2588af8aaed4c9e0e1b30
+Subproject 664548f4eca483e1b9722c5252e322205ba6e20
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject dfaa89bbe33da3db95b8cc61f9897845076ba75
+Subproject 8d3e67d8653ffb29b0fd00adaffd3f166aa10e7
diff --git a/work/Spigot b/work/Spigot
-Subproject e9ec54852f825ba470576cd1b5a33b0d76091fb
+Subproject b698b49caf14f97a717afd67e13fd7ac59f5108