Updated Upstream (Bukkit/CraftBukkit) (#10034)

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

Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries

CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion

Spigot Changes:
06d602e7 Rebuild patches

967 files changed, 1078 insertions, 1282 deletions

diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 562225e974..2214037ae9 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -27,7 +27,7 @@ index 5dd700a956e915c00b25d91dea8d6f285ddab72b..97e78e27ee0eea2c8b24886eeb19164d
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..41e77b687df6480adf8f5e21daad105dab208df2
+index 0000000000000000000000000000000000000000..fd076ab0df328818873028d333b0716d5b3796a9
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,91 @@
@@ -52,9 +52,9 @@ index 0000000000000000000000000000000000000000..41e77b687df6480adf8f5e21daad105d
 +    api("org.yaml:snakeyaml:2.2")
 +    api("org.joml:joml:1.10.5")
 +
-+    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
++    compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
++    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
++    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
 +
 +    val annotations = "org.jetbrains:annotations-java5:$annotationsVersion"
 +    compileOnly(annotations)
@@ -124,10 +124,10 @@ index 0000000000000000000000000000000000000000..41e77b687df6480adf8f5e21daad105d
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 6a2befb4a0172e2208775887a7ebe25ed8ba5e4c..0000000000000000000000000000000000000000
+index 900855ebbf1332010d4351e0775670d1b0ff091f..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,278 +0,0 @@
+@@ -1,277 +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">
@@ -199,19 +199,19 @@ index 6a2befb4a0172e2208775887a7ebe25ed8ba5e4c..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.maven</groupId>
 -            <artifactId>maven-resolver-provider</artifactId>
--            <version>3.8.5</version>
+-            <version>3.9.6</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.7.3</version>
+-            <version>1.9.18</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.7.3</version>
+-            <version>1.9.18</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- annotations -->
@@ -370,7 +370,6 @@ index 6a2befb4a0172e2208775887a7ebe25ed8ba5e4c..00000000000000000000000000000000
 -                        </executions>
 -                        <configuration>
 -                            <configLocation>checkstyle.xml</configLocation>
--                            <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
 -                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
 -                        </configuration>
 -                        <dependencies>
diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index d86679e18d..181ce6e8d4 100644
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 41e77b687df6480adf8f5e21daad105dab208df2..cc586ca58c9ef852d7154f29c2dc187047f2c64a 100644
+index fd076ab0df328818873028d333b0716d5b3796a9..4a62bb7c89c25e11e7f514fbcbc35a408ed83856 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,15 +18,26 @@ dependencies {
@@ -18,9 +18,9 @@ index 41e77b687df6480adf8f5e21daad105dab208df2..cc586ca58c9ef852d7154f29c2dc1870
 +    }
 +    // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
  
 -    val annotations = "org.jetbrains:annotations-java5:$annotationsVersion"
 +    val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
diff --git a/patches/api/0005-Add-FastUtil-to-Bukkit.patch b/patches/api/0005-Add-FastUtil-to-Bukkit.patch
index 750fc86a9e..b84756a5d7 100644
--- a/patches/api/0005-Add-FastUtil-to-Bukkit.patch
+++ b/patches/api/0005-Add-FastUtil-to-Bukkit.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 87e4ee95a8da287b02c13fac5f24f66902bc84c9..2b91ac7b5bc9fa7fb2ab64a80fd2707cb8d3f01d 100644
+index b9bf992867115fe6e84091a1a0b1f220de751699..cc8f297a71eb75b3388ff1cb21a297e268894aac 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -23,6 +23,7 @@ dependencies {
@@ -16,4 +16,4 @@ index 87e4ee95a8da287b02c13fac5f24f66902bc84c9..2b91ac7b5bc9fa7fb2ab64a80fd2707c
 +    api("it.unimi.dsi:fastutil:8.5.6")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
index 0eda4c69b1..ea91e54303 100644
--- a/patches/api/0006-Adventure.patch
+++ b/patches/api/0006-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 41871b8a25798a98b856f1b0034016666216e28f..8324fa4b96ee6cf338e22d525f0d236df3a9addf 100644
+index cc8f297a71eb75b3388ff1cb21a297e268894aac..cbe75dc937409af36528e4eef6f257f323cd4d12 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,12 +11,28 @@ java {
@@ -53,7 +53,7 @@ index 41871b8a25798a98b856f1b0034016666216e28f..8324fa4b96ee6cf338e22d525f0d236d
 +    apiAndDocs("net.kyori:adventure-text-logger-slf4j")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 @@ -99,14 +122,30 @@ tasks.withType<Javadoc> {
          "https://guava.dev/releases/32.1.2-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
@@ -767,10 +767,10 @@ index 0000000000000000000000000000000000000000..6e94562d79206d88b74b53814f9423f1
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965e928ebc0 100644
+index 5680a77cc98cdb4b4c002d1366e775acaf747e51..a0fce496d2b90f484d2723c4ea4099ad29dc438f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -390,7 +390,9 @@ public final class Bukkit {
+@@ -400,7 +400,9 @@ public final class Bukkit {
       *
       * @param message the message
       * @return the number of players
@@ -780,7 +780,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      public static int broadcastMessage(@NotNull String message) {
          return server.broadcastMessage(message);
      }
-@@ -1181,6 +1183,19 @@ public final class Bukkit {
+@@ -1191,6 +1193,19 @@ public final class Bukkit {
          server.shutdown();
      }
  
@@ -800,7 +800,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      /**
       * Broadcasts the specified message to every user with the given
       * permission name.
-@@ -1190,6 +1205,21 @@ public final class Bukkit {
+@@ -1200,6 +1215,21 @@ public final class Bukkit {
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
       */
@@ -822,7 +822,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      public static int broadcast(@NotNull String message, @NotNull String permission) {
          return server.broadcast(message, permission);
      }
-@@ -1451,6 +1481,7 @@ public final class Bukkit {
+@@ -1461,6 +1491,7 @@ public final class Bukkit {
          return server.createInventory(owner, type);
      }
  
@@ -830,7 +830,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      /**
       * 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;
-@@ -1476,6 +1507,38 @@ public final class Bukkit {
+@@ -1486,6 +1517,38 @@ public final class Bukkit {
       * @see InventoryType#isCreatable()
       */
      @NotNull
@@ -869,7 +869,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
          return server.createInventory(owner, type, title);
      }
-@@ -1494,6 +1557,7 @@ public final class Bukkit {
+@@ -1504,6 +1567,7 @@ public final class Bukkit {
          return server.createInventory(owner, size);
      }
  
@@ -877,7 +877,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1506,10 +1570,30 @@ public final class Bukkit {
+@@ -1516,10 +1580,30 @@ public final class Bukkit {
       * @throws IllegalArgumentException if the size is not a multiple of 9
       */
      @NotNull
@@ -908,7 +908,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      /**
       * Creates an empty merchant.
       *
-@@ -1517,7 +1601,20 @@ public final class Bukkit {
+@@ -1527,7 +1611,20 @@ public final class Bukkit {
       * when the merchant inventory is viewed
       * @return a new merchant
       */
@@ -929,7 +929,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      public static Merchant createMerchant(@Nullable String title) {
          return server.createMerchant(title);
      }
-@@ -1634,12 +1731,43 @@ public final class Bukkit {
+@@ -1644,12 +1741,43 @@ public final class Bukkit {
          return server.isPrimaryThread();
      }
  
@@ -973,7 +973,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      public static String getMotd() {
          return server.getMotd();
      }
-@@ -1648,7 +1776,9 @@ public final class Bukkit {
+@@ -1658,7 +1786,9 @@ public final class Bukkit {
       * Set the message that is displayed on the server list.
       *
       * @param motd The message to be displayed
@@ -983,7 +983,7 @@ index ea881e5b8fcde8768bd884fde737d38f6ee07a5f..0272b699bd2351511856fe116162a965
      public static void setMotd(@NotNull String motd) {
          server.setMotd(motd);
      }
-@@ -1657,8 +1787,10 @@ public final class Bukkit {
+@@ -1667,8 +1797,10 @@ public final class Bukkit {
       * Gets the default message that is displayed when the server is stopped.
       *
       * @return the shutdown message
@@ -1165,7 +1165,7 @@ index ae7b51341fb66c41b8a7c4604fd273d876e311be..4034fcb9abc39b12f0de47c4b679f2ef
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b0422a947 100644
+index c394954cab8213bd1073356524cdd5705ef54d12..83ae1490f6c48d931541e13f76950fcdc62a5c01 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -62,13 +62,13 @@ import org.jetbrains.annotations.Nullable;
@@ -1193,7 +1193,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b
       */
      public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
  
-@@ -329,7 +329,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -337,7 +337,9 @@ public interface Server extends PluginMessageRecipient {
       *
       * @param message the message
       * @return the number of players
@@ -1203,7 +1203,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b
      public int broadcastMessage(@NotNull String message);
  
      /**
-@@ -1015,8 +1017,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -1023,8 +1025,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
@@ -1237,7 +1237,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b
  
      /**
       * Gets the player by the given name, regardless if they are offline or
-@@ -1233,6 +1260,35 @@ public interface Server extends PluginMessageRecipient {
+@@ -1241,6 +1268,35 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
  
@@ -1273,7 +1273,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b
      /**
       * 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;
-@@ -1254,9 +1310,11 @@ public interface Server extends PluginMessageRecipient {
+@@ -1262,9 +1318,11 @@ public interface Server extends PluginMessageRecipient {
       * @return The new inventory.
       * @throws IllegalArgumentException if the {@link InventoryType} cannot be
       * viewed.
@@ -1285,7 +1285,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
  
-@@ -1272,6 +1330,22 @@ public interface Server extends PluginMessageRecipient {
+@@ -1280,6 +1338,22 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
  
@@ -1308,7 +1308,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1282,18 +1356,32 @@ public interface Server extends PluginMessageRecipient {
+@@ -1290,18 +1364,32 @@ public interface Server extends PluginMessageRecipient {
       *     viewed
       * @return a new inventory
       * @throws IllegalArgumentException if the size is not a multiple of 9
@@ -1341,7 +1341,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b
      Merchant createMerchant(@Nullable String title);
  
      /**
-@@ -1389,27 +1477,56 @@ public interface Server extends PluginMessageRecipient {
+@@ -1397,27 +1485,56 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean isPrimaryThread();
  
@@ -1398,7 +1398,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b
      String getShutdownMessage();
  
      /**
-@@ -1791,7 +1908,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1799,7 +1916,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends the component to the player
           *
           * @param component the components to send
@@ -1408,7 +1408,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b
          public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1800,7 +1919,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1808,7 +1927,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends an array of components as a single message to the player
           *
           * @param components the components to send
@@ -2138,7 +2138,7 @@ index 8532b8484d5a493c1c37ad7508597f624f1831c8..978431fd88cfb7d42fcdea8c904633df
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e8027201b8e7 100644
+index a5046b416fa26d51974de0866d3af190ee197c3a..6b93a62ca4e25a4b3dfcf95e29a8cfac5ba5e564 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -52,7 +52,41 @@ import org.jetbrains.annotations.Nullable;
@@ -2497,7 +2497,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
      public void setResourcePack(@NotNull String url, @Nullable byte[] hash);
  
      /**
-@@ -1420,6 +1633,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1419,6 +1632,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -2505,7 +2505,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
       * @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.
-@@ -1433,8 +1647,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1432,8 +1646,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2560,7 +2560,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1464,6 +1724,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1462,6 +1722,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -2568,7 +2568,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
       * @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.
-@@ -1524,8 +1785,56 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1521,8 +1782,56 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2625,7 +2625,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1570,9 +1879,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1566,9 +1875,57 @@ 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.
@@ -2681,9 +2681,9 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
 +    // Paper end
 +
      /**
-      * Gets the Scoreboard displayed to this player
-      *
-@@ -1707,7 +2064,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * Request that the player's client remove a resource pack sent by the
+      * server.
+@@ -1718,7 +2075,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param title Title text
       * @param subtitle Subtitle text
@@ -2692,7 +2692,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
       */
      @Deprecated
      public void sendTitle(@Nullable String title, @Nullable String subtitle);
-@@ -1726,7 +2083,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1737,7 +2094,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.
@@ -2702,7 +2702,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
      public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
  
      /**
-@@ -1953,6 +2312,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1964,6 +2323,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public int getClientViewDistance();
  
@@ -2717,7 +2717,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
      /**
       * Gets the player's estimated ping in milliseconds.
       *
-@@ -1978,8 +2345,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1989,8 +2356,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * they wish.
       *
       * @return the player's locale
@@ -2728,7 +2728,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
      public String getLocale();
  
      /**
-@@ -2031,6 +2400,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2042,6 +2411,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public boolean isAllowingServerListings();
  
@@ -2743,7 +2743,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
      // Spigot start
      public class Spigot extends Entity.Spigot {
  
-@@ -2062,11 +2439,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2073,11 +2450,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2757,7 +2757,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
          @Override
          public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
-@@ -2077,7 +2456,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2088,7 +2467,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param component the components to send
@@ -2767,7 +2767,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
          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.");
          }
-@@ -2087,7 +2468,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2098,7 +2479,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param components the components to send
@@ -2777,7 +2777,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
          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.");
          }
-@@ -2098,7 +2481,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2109,7 +2492,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
@@ -2787,7 +2787,7 @@ index 8aee70e27688ff85367b3534c6ccb64aeba95d74..7a6be9c1d74fca1b03bf4c6ef804e802
          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.");
          }
-@@ -2109,7 +2494,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2120,7 +2505,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           * @param position the screen position
           * @param sender the sender of the message
           * @param components the components to send
diff --git a/patches/api/0008-Use-ASM-for-event-executors.patch b/patches/api/0008-Use-ASM-for-event-executors.patch
index 9757b37c01..2029015467 100644
--- a/patches/api/0008-Use-ASM-for-event-executors.patch
+++ b/patches/api/0008-Use-ASM-for-event-executors.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8324fa4b96ee6cf338e22d525f0d236df3a9addf..801a31ca6812bd24aca1b7d2761b3f8cbc917b67 100644
+index cbe75dc937409af36528e4eef6f257f323cd4d12..7fbb782ccf17e581a759429ffac6db608c08e3cf 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -47,6 +47,9 @@ dependencies {
@@ -18,7 +18,7 @@ index 8324fa4b96ee6cf338e22d525f0d236df3a9addf..801a31ca6812bd24aca1b7d2761b3f8c
 +    implementation("org.ow2.asm:asm-commons:9.5")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..5b28e9b1daba7834af67dbc193dd656bedd9a994
diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch
index b41b887d46..9dfd0a6a1b 100644
--- a/patches/api/0009-Paper-Plugins.patch
+++ b/patches/api/0009-Paper-Plugins.patch
@@ -5,17 +5,17 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 801a31ca6812bd24aca1b7d2761b3f8cbc917b67..c8e4f4613cd2af0c650a079ec5ed520254ce5816 100644
+index 7fbb782ccf17e581a759429ffac6db608c08e3cf..1f4053ce50673585c27494a3c23f6acd119875db 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -52,7 +52,7 @@ dependencies {
      implementation("org.ow2.asm:asm-commons:9.5")
      // Paper end
  
--    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-+    api("org.apache.maven:maven-resolver-provider:3.8.5")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+-    compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
++    api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
+     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
  
 @@ -138,6 +138,7 @@ tasks.withType<Javadoc> {
          "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
diff --git a/patches/api/0011-Timings-v2.patch b/patches/api/0011-Timings-v2.patch
index 393424308e..87af8a2471 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 0272b699bd2351511856fe116162a965e928ebc0..7300bba67cfd4d312c59b0f81f597ea0f8a54fcd 100644
+index a0fce496d2b90f484d2723c4ea4099ad29dc438f..f9360200c3f96018b3bd1d73b5336a78486cfaea 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -834,7 +834,6 @@ public final class Bukkit {
+@@ -844,7 +844,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2866,10 +2866,10 @@ index 0272b699bd2351511856fe116162a965e928ebc0..7300bba67cfd4d312c59b0f81f597ea0
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index be29b60651f0ab9cae4e0a3ff1df4e8b0422a947..31227e818b624d641bb7562ac3de8a821815d33a 100644
+index 83ae1490f6c48d931541e13f76950fcdc62a5c01..f6fbf2ae2bb48a9edbb199b9a421fa388b2b99a6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1904,6 +1904,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1912,6 +1912,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -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 7a6be9c1d74fca1b03bf4c6ef804e8027201b8e7..d642ead25eae4ba106bcfe21ff2579f58ea5135d 100644
+index 6b93a62ca4e25a4b3dfcf95e29a8cfac5ba5e564..1a55f1b296d606179ee7ecbe4b482acc2d877fc1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2499,7 +2499,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2510,7 +2510,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.");
diff --git a/patches/api/0013-Player-affects-spawning-API.patch b/patches/api/0013-Player-affects-spawning-API.patch
index 8dc8e93bdc..18af00d5ec 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 d642ead25eae4ba106bcfe21ff2579f58ea5135d..642a29e3a01bacfc5a36b89eb01387d768b8d5ac 100644
+index 1a55f1b296d606179ee7ecbe4b482acc2d877fc1..8f6c133ff7ce78de8f0ac17eb45aced699548431 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2351,6 +2351,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2362,6 +2362,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 0630abf659..19d33368c1 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 3a8b07a870d334296e3865598741dc3e6fcf9b62..43f4ec39a610119d6285884aa323d9f46e22f073 100644
+index f9545a52bc822af03182f8d18231e02b7348c90f..cb6433792786540e7bf667e466d6642e73ca8df0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2040,6 +2040,17 @@ public final class Bukkit {
+@@ -2050,6 +2050,17 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -27,10 +27,10 @@ index 3a8b07a870d334296e3865598741dc3e6fcf9b62..43f4ec39a610119d6285884aa323d9f4
       * 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 d3917c514f0e1d4343aed0738bea1625f63fcb92..a8a932e308b4d7b1e9cacb53f78b1cdd0c6d4063 100644
+index 9b887115c90ed80b391f414b1b9db85b2b9e85ee..b8871820aab10f5d8d167e661e73b671204e9b4f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1741,6 +1741,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1749,6 +1749,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  
diff --git a/patches/api/0018-Add-view-distance-API.patch b/patches/api/0018-Add-view-distance-API.patch
index 45e9c0d53f..8f034212bf 100644
--- a/patches/api/0018-Add-view-distance-API.patch
+++ b/patches/api/0018-Add-view-distance-API.patch
@@ -75,10 +75,10 @@ index 30dc2f85b60877930cab68230d3259ce92c08618..2867faf0acbbbb2e99c5b503f0c6bc83
      public class Spigot {
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 642a29e3a01bacfc5a36b89eb01387d768b8d5ac..7931b05ecbe2580fa9222a57792232711f3e835e 100644
+index 8f6c133ff7ce78de8f0ac17eb45aced699548431..934a347fc7be511cc125e1c2c175bcb2bf91c41a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2365,6 +2365,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2376,6 +2376,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);
diff --git a/patches/api/0021-Expose-server-CommandMap.patch b/patches/api/0021-Expose-server-CommandMap.patch
index 1c6a682aa6..4f48f57826 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 43f4ec39a610119d6285884aa323d9f46e22f073..4c5671cf75143e741d945834a2a8b56cb52f20dd 100644
+index cb6433792786540e7bf667e466d6642e73ca8df0..6c5ded00ddf2c5e991baac73f63d5fd6444ccbda 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2241,6 +2241,19 @@ public final class Bukkit {
+@@ -2251,6 +2251,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index 43f4ec39a610119d6285884aa323d9f46e22f073..4c5671cf75143e741d945834a2a8b56c
      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 a8a932e308b4d7b1e9cacb53f78b1cdd0c6d4063..7ee7fdc8379078456492da00bb213a0738cc6f08 100644
+index b8871820aab10f5d8d167e661e73b671204e9b4f..f95fbfa29f3926847c78b218037cac601c7d9419 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1751,6 +1751,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1759,6 +1759,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 e665574f51..88fba21261 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 4c5671cf75143e741d945834a2a8b56cb52f20dd..3118da2ad367b5bd547769214112ea5299c95866 100644
+index 6c5ded00ddf2c5e991baac73f63d5fd6444ccbda..5c6d52f707905f9c60dd2a5097084e97a31806f4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -411,6 +411,30 @@ public final class Bukkit {
+@@ -421,6 +421,30 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -41,10 +41,10 @@ index 4c5671cf75143e741d945834a2a8b56cb52f20dd..3118da2ad367b5bd547769214112ea52
       * 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 7ee7fdc8379078456492da00bb213a0738cc6f08..d94483d1481f233897faf378e6b34b6b97f02caf 100644
+index f95fbfa29f3926847c78b218037cac601c7d9419..979028265db05a8a97c2dc10138075eaa15b2472 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -346,6 +346,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -354,6 +354,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Deprecated // Paper
      public int broadcastMessage(@NotNull String message);
  
@@ -76,7 +76,7 @@ index 7ee7fdc8379078456492da00bb213a0738cc6f08..d94483d1481f233897faf378e6b34b6b
       * 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 17c3fcaca46e1e8f4c14026ee7a6a2d7a472b90c..602d8b81135eba0481280c887f44f1c1855044e1 100644
+index 934a347fc7be511cc125e1c2c175bcb2bf91c41a..512b57c8d2dca32460253798c46f2b42997e66b5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1103,6 +1103,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0028-Complete-resource-pack-API.patch b/patches/api/0028-Complete-resource-pack-API.patch
index 2420640cb7..89072c80cb 100644
--- a/patches/api/0028-Complete-resource-pack-API.patch
+++ b/patches/api/0028-Complete-resource-pack-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index dd3d0cfae07acbd6d3325d0244581e5cb2c1ee9b..36cb91ee7076f011e0e2558f858a5f9bb1281b44 100644
+index fd557f0ee33748362ee97e24822509a6020a2c33..2995dd0ec8f6e49f850865bbc9fc7e0f0e66f121 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1717,7 +1717,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -18,7 +18,7 @@ index dd3d0cfae07acbd6d3325d0244581e5cb2c1ee9b..36cb91ee7076f011e0e2558f858a5f9b
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -2091,6 +2093,165 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2087,6 +2089,165 @@ 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
  
@@ -182,8 +182,8 @@ index dd3d0cfae07acbd6d3325d0244581e5cb2c1ee9b..36cb91ee7076f011e0e2558f858a5f9b
 +    // Paper end - more resource pack API
 +
      /**
-      * Gets the Scoreboard displayed to this player
-      *
+      * Request that the player's client remove a resource pack sent by the
+      * server.
 diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 index e2c4f9a0456cef345772d57b4d9c6e7d9598dd53..e4c32b21ab013703a6a1b07a1ad564d914ebe83f 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
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 78fada6408..e9b686dec3 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 3118da2ad367b5bd547769214112ea5299c95866..7b467aedbcf3a6174bfb12ded3b27775a7eaf45c 100644
+index 5c6d52f707905f9c60dd2a5097084e97a31806f4..ba2bdb4dda26370aa1ad2425cc2d9e4e05344650 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2276,6 +2276,13 @@ public final class Bukkit {
+@@ -2286,6 +2286,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 3118da2ad367b5bd547769214112ea5299c95866..7b467aedbcf3a6174bfb12ded3b27775
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d94483d1481f233897faf378e6b34b6b97f02caf..c5591e82e14e299facfc767a20f2eed77354caac 100644
+index 979028265db05a8a97c2dc10138075eaa15b2472..c061146ac6c6bee2b865e32580e577168d61ea87 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2012,4 +2012,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2020,4 +2020,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 5fad0aed7c..22196422e5 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 7b467aedbcf3a6174bfb12ded3b27775a7eaf45c..27f076ed2bb30bc27564db61e165cff4172f9df0 100644
+index ba2bdb4dda26370aa1ad2425cc2d9e4e05344650..b89c38ca48df446ea97217e5031d1c70dd01d8d9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2283,6 +2283,15 @@ public final class Bukkit {
+@@ -2293,6 +2293,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 7b467aedbcf3a6174bfb12ded3b27775a7eaf45c..27f076ed2bb30bc27564db61e165cff4
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c5591e82e14e299facfc767a20f2eed77354caac..d80f41e7f4466eae8101b5ee7136918e6de93324 100644
+index c061146ac6c6bee2b865e32580e577168d61ea87..f13e254395c942082dc426615e215e3f3eb0b1c5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2014,4 +2014,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2022,4 +2022,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Spigot end
  
      void reloadPermissions(); // Paper
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 bf9b28356d..7532ee5c32 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 27f076ed2bb30bc27564db61e165cff4172f9df0..0ec7937572a28964123322f0cd2c060d4d69e42e 100644
+index b89c38ca48df446ea97217e5031d1c70dd01d8d9..ff83383c3fcbf4de3e6be0a0a950f132b6c47807 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2292,6 +2292,16 @@ public final class Bukkit {
+@@ -2302,6 +2302,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index 27f076ed2bb30bc27564db61e165cff4172f9df0..0ec7937572a28964123322f0cd2c060d
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d80f41e7f4466eae8101b5ee7136918e6de93324..581955462495d63d07f2f461f45b1353e5b89c5b 100644
+index f13e254395c942082dc426615e215e3f3eb0b1c5..1c088886add66f1e99bee42f70e5bc742c912e88 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2016,4 +2016,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2024,4 +2024,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch
index fc72038894..70870f7b78 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 0ec7937572a28964123322f0cd2c060d4d69e42e..a1c8cb4d89147311539a70901c74eae4020c022f 100644
+index ff83383c3fcbf4de3e6be0a0a950f132b6c47807..22d63e82c3c7d54e90c5cd7adef09882f01c7da2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1464,6 +1464,8 @@ public final class Bukkit {
+@@ -1474,6 +1474,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 581955462495d63d07f2f461f45b1353e5b89c5b..95d1e6c57c3331ce3badfb5269531dce490d4079 100644
+index 1c088886add66f1e99bee42f70e5bc742c912e88..5a8f15195b0a87bb7a49983e5ee0dee6d2ce242c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -544,13 +544,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -552,13 +552,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 581955462495d63d07f2f461f45b1353e5b89c5b..95d1e6c57c3331ce3badfb5269531dce
       */
      public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
  
-@@ -1250,6 +1247,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1258,6 +1255,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
      /**
       * Gets every player that has ever played on this server.
@@ -216,10 +216,10 @@ index f8e12868f2e629cdf4784f0157fdb2f8e7b01f99..870ad6cd930653e6248abcc0fce94ffa
       * @return Temperature of this block
       */
 diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
-index 2e2232956f626669005cfdfd6550aa8ee29fc1ab..869fa47a13fbcb128228963bf53cc72da4499a01 100644
+index dff615d7cc190e11b31cd76167327d2eb4580593..b70176b9ca3c3fb7d68aa7bc92b7ca6329255bd7 100644
 --- a/src/main/java/org/bukkit/block/data/BlockData.java
 +++ b/src/main/java/org/bukkit/block/data/BlockData.java
-@@ -215,7 +215,7 @@ public interface BlockData extends Cloneable {
+@@ -224,7 +224,7 @@ public interface BlockData extends Cloneable {
       * {@link Material#REDSTONE_WIRE} -> {@link Material#REDSTONE}
       * {@link Material#CARROTS} -> {@link Material#CARROT}
       * </pre>
@@ -386,7 +386,7 @@ index ae9eaaa8e38e1d9dfc459926c7fc51ddb89de84a..b2ec535bb1b0ce0c114ddd7638b90218
      @Override
      public int getConversionTime();
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 680d8fddb6150a33f3012c348376101607ee2cb2..0b1ad0e33dd4a2b05a0c668562ed59cbf4d6a442 100644
+index 938780fb04751ceba4b871cd386f7ece5d6def37..d8e0fe5ed16e99192e8bd0431219c4bb5649b436 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -432,15 +432,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -475,46 +475,6 @@ index 680d8fddb6150a33f3012c348376101607ee2cb2..0b1ad0e33dd4a2b05a0c668562ed59cb
       * <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.
-@@ -1823,9 +1814,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!
--     * <li>There is no concept of resetting resource packs back to default
--     *     within Minecraft, so players will have to relog to do so or you
--     *     have to send an empty pack.
-      * <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.
-@@ -1914,9 +1902,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!
--     * <li>There is no concept of resetting resource packs back to default
--     *     within Minecraft, so players will have to relog to do so or you
--     *     have to send an empty pack.
-      * <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.
-@@ -1960,9 +1945,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!
--     * <li>There is no concept of resetting resource packs back to default
--     *     within Minecraft, so players will have to relog to do so or you
--     *     have to send an empty pack.
-      * <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.
-@@ -2054,9 +2036,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!
--     * <li>There is no concept of resetting resource packs back to default
--     *     within Minecraft, so players will have to relog to do so or you
--     *     have to send an empty pack.
-      * <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.
 diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
 index a5ad3250cebfeb302c58e0bfd6db1295913c927e..bfac874840cf1f36afba16ae4d176c5821a68cfb 100644
 --- a/src/main/java/org/bukkit/entity/Slime.java
diff --git a/patches/api/0060-Basic-PlayerProfile-API.patch b/patches/api/0060-Basic-PlayerProfile-API.patch
index 1fd339cefa..05b288bad7 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 a1c8cb4d89147311539a70901c74eae4020c022f..8f1f432c9d6c68ac142401626adaf1dc212181f2 100644
+index 22d63e82c3c7d54e90c5cd7adef09882f01c7da2..cf00ff0c0332b31167f8f1b7b386674458cdf15a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2304,6 +2304,83 @@ public final class Bukkit {
+@@ -2314,6 +2314,83 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -409,10 +409,10 @@ index a1c8cb4d89147311539a70901c74eae4020c022f..8f1f432c9d6c68ac142401626adaf1dc
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 95d1e6c57c3331ce3badfb5269531dce490d4079..aad8b2fbdbb03fbf32f99b3a533716eca9d42219 100644
+index 5a8f15195b0a87bb7a49983e5ee0dee6d2ce242c..4016129ead172c5f5b550482f523921d39df046f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2024,5 +2024,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2032,5 +2032,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/0092-Player.setPlayerProfile-API.patch b/patches/api/0092-Player.setPlayerProfile-API.patch
index 289ae2ac92..2352ce0757 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 8f1f432c9d6c68ac142401626adaf1dc212181f2..8c430623204d419a93ccc67a0214942952f4a33c 100644
+index cf00ff0c0332b31167f8f1b7b386674458cdf15a..11288c4e1cb6a1f8322c6cbacb3750e6b08dad5e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1306,8 +1306,10 @@ public final class Bukkit {
+@@ -1316,8 +1316,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 8f1f432c9d6c68ac142401626adaf1dc212181f2..8c430623204d419a93ccc67a02149429
      public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
          return server.createPlayerProfile(uniqueId, name);
      }
-@@ -1318,8 +1320,10 @@ public final class Bukkit {
+@@ -1328,8 +1330,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 8f1f432c9d6c68ac142401626adaf1dc212181f2..8c430623204d419a93ccc67a02149429
      public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
          return server.createPlayerProfile(uniqueId);
      }
-@@ -1331,8 +1335,10 @@ public final class Bukkit {
+@@ -1341,8 +1345,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 bec480aff819e09220b52175cab0cb6d68ae68c6..12349910297a75c00e64f6ccc7981aee
      /**
       * 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 aad8b2fbdbb03fbf32f99b3a533716eca9d42219..405b6a388c3593a83985f766e79b92951006563e 100644
+index 4016129ead172c5f5b550482f523921d39df046f..4d500904b28375f8517aa05075667da22f23f754 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1119,8 +1119,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1127,8 +1127,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 aad8b2fbdbb03fbf32f99b3a533716eca9d42219..405b6a388c3593a83985f766e79b9295
      PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
  
      /**
-@@ -1129,8 +1131,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1137,8 +1139,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 aad8b2fbdbb03fbf32f99b3a533716eca9d42219..405b6a388c3593a83985f766e79b9295
      PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
  
      /**
-@@ -1140,8 +1144,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1148,8 +1152,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 aad8b2fbdbb03fbf32f99b3a533716eca9d42219..405b6a388c3593a83985f766e79b9295
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2787f205b08b9c0dc97c6a49ade01b319ef23630..985185802e0ad5d063e83ad22a1bcc735d722f04 100644
+index 267d7ac323e5bde343ea4b4caa6ec2fc837e1a6d..03f86dbb176428380465a9163b9c0789454a49c3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2853,6 +2853,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2876,6 +2876,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 12a448bd00..9b6ebd8464 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 8c430623204d419a93ccc67a0214942952f4a33c..9f52c092d906622e2eade3bc9d8baac6816f9f3a 100644
+index 11288c4e1cb6a1f8322c6cbacb3750e6b08dad5e..579b002425024a942091c95880366ba8f1761e1c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -689,6 +689,20 @@ public final class Bukkit {
+@@ -699,6 +699,20 @@ public final class Bukkit {
          return server.getPlayer(id);
      }
  
@@ -34,10 +34,10 @@ index 8c430623204d419a93ccc67a0214942952f4a33c..9f52c092d906622e2eade3bc9d8baac6
       * 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 405b6a388c3593a83985f766e79b92951006563e..aace34252f65dd54868b521288f68c641b7ed71e 100644
+index 4d500904b28375f8517aa05075667da22f23f754..4c16d026c6850f38295e71f4f4299e81f3e4c856 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -593,6 +593,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -601,6 +601,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 9ece271165..82e4ab0c66 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 abdca9fe5acc90f167219eb769ece66c35682bb1..b3aa3dc6aa5afbc36cc86741b4cba56f
      /**
       * 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 985185802e0ad5d063e83ad22a1bcc735d722f04..ab7df32513667f9c73540c2d74e438daed1381b0 100644
+index 03f86dbb176428380465a9163b9c0789454a49c3..c74be483d11c7b2ab6d462af55495af8ccc7d0da 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2814,10 +2814,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2837,10 +2837,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Open a Sign for editing by the Player.
       *
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 eacc09cd2e..e3e2cafc30 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 7899925a60e81e0d58a288f033d3c5d2789485ed..5466b250db43bd92137f46d249a0dd8558491567 100644
+index 529e423889607b6128c7851c87480eb94125c1e8..bfed5759b4f4613e5143da41f5e82a37ab4f10a8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3031,6 +3031,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3054,6 +3054,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/0161-Make-the-default-permission-message-configurable.patch b/patches/api/0161-Make-the-default-permission-message-configurable.patch
index 621961541e..67be23ffad 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 869d57b429fbe2694d1444db56c56619abfae920..5bb11c5ebd02cf4e4c6c9b859cd7987abd2093d6 100644
+index 378a457dee428238eb2c4827e9c1d2cc57d0f544..a06e6f51606612f5b9a69ce2d46be84231c08177 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2344,6 +2344,28 @@ public final class Bukkit {
+@@ -2354,6 +2354,28 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -38,10 +38,10 @@ index 869d57b429fbe2694d1444db56c56619abfae920..5bb11c5ebd02cf4e4c6c9b859cd7987a
       * 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 aace34252f65dd54868b521288f68c641b7ed71e..e1f36d4f35cb53e28f4b64ddd730634b0fa9eb14 100644
+index 4c16d026c6850f38295e71f4f4299e81f3e4c856..904502029842e8c3be700be33b156f11db4724af 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2043,6 +2043,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2051,6 +2051,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
index c86fa5a295..40738d23c0 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 5bb11c5ebd02cf4e4c6c9b859cd7987abd2093d6..87d2348f39e2e43c782c1b7bf73ec38c52e67f95 100644
+index a06e6f51606612f5b9a69ce2d46be84231c08177..3e072efdb4f552a0d010fe4c8efe523f59cdccd0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -838,9 +838,8 @@ public final class Bukkit {
+@@ -848,9 +848,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 5bb11c5ebd02cf4e4c6c9b859cd7987abd2093d6..87d2348f39e2e43c782c1b7bf73ec38c
      @Nullable
      public static MapView getMap(int id) {
          return server.getMap(id);
-@@ -1307,10 +1306,8 @@ public final class Bukkit {
+@@ -1317,10 +1316,8 @@ public final class Bukkit {
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -66,7 +66,7 @@ index 5bb11c5ebd02cf4e4c6c9b859cd7987abd2093d6..87d2348f39e2e43c782c1b7bf73ec38c
      @NotNull
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
-@@ -1901,7 +1898,7 @@ public final class Bukkit {
+@@ -1911,7 +1908,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -521,10 +521,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 e1f36d4f35cb53e28f4b64ddd730634b0fa9eb14..3cf66dde58cbe92cf9273c482af378058708b15b 100644
+index 904502029842e8c3be700be33b156f11db4724af..b9c7ff1dcbc09980faf26ce3319f7ee09bafc6df 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -704,9 +704,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -712,9 +712,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
@@ -535,7 +535,7 @@ index e1f36d4f35cb53e28f4b64ddd730634b0fa9eb14..3cf66dde58cbe92cf9273c482af37805
      @Nullable
      public MapView getMap(int id);
  
-@@ -1103,10 +1102,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1111,10 +1110,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)
@@ -547,7 +547,7 @@ index e1f36d4f35cb53e28f4b64ddd730634b0fa9eb14..3cf66dde58cbe92cf9273c482af37805
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
-@@ -1606,7 +1603,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1614,7 +1611,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -895,7 +895,7 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fe06d06cf97b1b020c771fb455f644d68097f1ef..1afa65152f56e42793cb53a049e06b16eabe2ce4 100644
+index bfed5759b4f4613e5143da41f5e82a37ab4f10a8..5e7fec90713e580801c1e98bccf4adc5e16b9c71 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1498,11 +1498,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0181-Expose-the-internal-current-tick.patch b/patches/api/0181-Expose-the-internal-current-tick.patch
index 254a32eb8f..cab5b202d7 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 87d2348f39e2e43c782c1b7bf73ec38c52e67f95..f11c8e344694610b4a3f5ce945afb5ba876de33d 100644
+index 3e072efdb4f552a0d010fe4c8efe523f59cdccd0..bff6eb5114e44bf04eb793ad78752dabee471543 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2439,6 +2439,10 @@ public final class Bukkit {
+@@ -2449,6 +2449,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 87d2348f39e2e43c782c1b7bf73ec38c52e67f95..f11c8e344694610b4a3f5ce945afb5ba
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3cf66dde58cbe92cf9273c482af378058708b15b..54400edeb6a2245bed7824db2a5c9b7a1ba76eda 100644
+index b9c7ff1dcbc09980faf26ce3319f7ee09bafc6df..9cb3ab0ecfdab51e8dd1c397eb58bcdcde7a6a1a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2125,5 +2125,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2133,5 +2133,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/0187-Add-tick-times-API.patch b/patches/api/0187-Add-tick-times-API.patch
index a0b2f514c5..6bc3b548d3 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 f11c8e344694610b4a3f5ce945afb5ba876de33d..1a66d6314765840f529900a850265ed20173fd9b 100644
+index bff6eb5114e44bf04eb793ad78752dabee471543..36af91308b498b72639bef62aaf82a1ea26ec91c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2111,6 +2111,25 @@ public final class Bukkit {
+@@ -2121,6 +2121,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
@@ -35,10 +35,10 @@ index f11c8e344694610b4a3f5ce945afb5ba876de33d..1a66d6314765840f529900a850265ed2
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 54400edeb6a2245bed7824db2a5c9b7a1ba76eda..88bb506880fa019881e95a2cc07915841c2028e7 100644
+index 9cb3ab0ecfdab51e8dd1c397eb58bcdcde7a6a1a..037fab9568abda1ae2a54d3759ba74ec4fc09ff9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1787,6 +1787,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1795,6 +1795,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 48d9214f84..2297138cfa 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 1a66d6314765840f529900a850265ed20173fd9b..4e8383432a3a8a07dbc31f77986b0f4790779f7d 100644
+index 36af91308b498b72639bef62aaf82a1ea26ec91c..27e62bd04426295e23134e2e601550a995ea7059 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2462,6 +2462,15 @@ public final class Bukkit {
+@@ -2472,6 +2472,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
@@ -26,10 +26,10 @@ index 1a66d6314765840f529900a850265ed20173fd9b..4e8383432a3a8a07dbc31f77986b0f47
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 88bb506880fa019881e95a2cc07915841c2028e7..37caeff1416cf0e3c63260ba7ad82a92e95a5399 100644
+index 037fab9568abda1ae2a54d3759ba74ec4fc09ff9..7a292b24d90b36278321200e13fa12d7d46225da 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2147,5 +2147,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2155,5 +2155,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 3f4764cbba..c48c5e3075 100644
--- a/patches/api/0190-Add-Player-Client-Options-API.patch
+++ b/patches/api/0190-Add-Player-Client-Options-API.patch
@@ -229,10 +229,10 @@ index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f52
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 716b2023ee3e03a70f0afc0c26558fc0a2ee356b..1e52cc88dc47f2494af505d92ebe56f79780a099 100644
+index 5e7fec90713e580801c1e98bccf4adc5e16b9c71..25b86021224e53f5ff10ca21f19cce85e4073c4c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3050,6 +3050,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3073,6 +3073,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void resetCooldown();
      // Paper end - attack cooldown API
  
diff --git a/patches/api/0196-Add-Mob-Goal-API.patch b/patches/api/0196-Add-Mob-Goal-API.patch
index 4075fcbaec..83b5c476fa 100644
--- a/patches/api/0196-Add-Mob-Goal-API.patch
+++ b/patches/api/0196-Add-Mob-Goal-API.patch
@@ -535,10 +535,10 @@ index 0000000000000000000000000000000000000000..39fca3674f32c7bbb2797bf6c3e22270
 +    @Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21") GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 29cf7359334144d6e718fed560771be35f580b16..5c508045a53d9f6efe6358648daa47c0096ad55e 100644
+index 2a6ecd328c913cb493716c878f3474345148bb8e..1f63a4f8ffd11fe04f8dc807ad993e4b59172fea 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2483,6 +2483,16 @@ public final class Bukkit {
+@@ -2493,6 +2493,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
@@ -556,10 +556,10 @@ index 29cf7359334144d6e718fed560771be35f580b16..5c508045a53d9f6efe6358648daa47c0
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d97200a8816dbbbce07734b5547a942f8f3f0fdc..aec7814485efb0b827ccfde92372a436d47ed2f5 100644
+index b7c731b006e1bff630f12ff0c790a34c257adf3a..1e88ad22e98cbbde118e6208b3502aee7391bac8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2164,5 +2164,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2172,5 +2172,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/0208-Brand-support.patch b/patches/api/0208-Brand-support.patch
index 2d4f207294..45cc967c93 100644
--- a/patches/api/0208-Brand-support.patch
+++ b/patches/api/0208-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 1e52cc88dc47f2494af505d92ebe56f79780a099..b128d2e9a2bc1629dbe650ba7d7e3a19a502de7b 100644
+index 25b86021224e53f5ff10ca21f19cce85e4073c4c..76b9a7735b7f9860f051eaf205f711f594dbe966 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3163,6 +3163,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3186,6 +3186,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          // Paper end
      }
  
diff --git a/patches/api/0218-Player-elytra-boost-API.patch b/patches/api/0218-Player-elytra-boost-API.patch
index 0c4a7066a4..32e50e738d 100644
--- a/patches/api/0218-Player-elytra-boost-API.patch
+++ b/patches/api/0218-Player-elytra-boost-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b128d2e9a2bc1629dbe650ba7d7e3a19a502de7b..f086585e03b6b782431abd69f163e648bc1c22b4 100644
+index 76b9a7735b7f9860f051eaf205f711f594dbe966..e78cc9a7908c857272d931726dc6b217e98ce14d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3057,6 +3057,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3080,6 +3080,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/0219-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch
index bd98e0d3f2..bfbdc483f7 100644
--- a/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0219-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 5c508045a53d9f6efe6358648daa47c0096ad55e..c9f4ec3ff1aaca2f75fe0a7f0c85d63f3dfd97f8 100644
+index 1f63a4f8ffd11fe04f8dc807ad993e4b59172fea..dfe5055cefe6a110732e0fcc936dddb866cbd9e3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1325,6 +1325,27 @@ public final class Bukkit {
+@@ -1335,6 +1335,27 @@ public final class Bukkit {
          return server.getOfflinePlayer(name);
      }
  
@@ -37,10 +37,10 @@ index 5c508045a53d9f6efe6358648daa47c0096ad55e..c9f4ec3ff1aaca2f75fe0a7f0c85d63f
       * 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 aec7814485efb0b827ccfde92372a436d47ed2f5..578a516d568dcc9fbdd67529bf986817adb480bc 100644
+index 1e88ad22e98cbbde118e6208b3502aee7391bac8..7986d51083c2c27709032b06731621d2e89bec57 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1117,6 +1117,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1125,6 +1125,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
diff --git a/patches/api/0224-Add-Destroy-Speed-API.patch b/patches/api/0224-Add-Destroy-Speed-API.patch
index 84faaef8ce..409762c945 100644
--- a/patches/api/0224-Add-Destroy-Speed-API.patch
+++ b/patches/api/0224-Add-Destroy-Speed-API.patch
@@ -42,10 +42,10 @@ index 4dcfff9aa28eec3467d49d6fcc00f22943fd9c92..137a40c708bb67de4608447975867a07
 +    // Paper end - destroy speed API
  }
 diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
-index 869fa47a13fbcb128228963bf53cc72da4499a01..1f475424cc04d90f437cf0e38e07f5ae4020fb54 100644
+index b70176b9ca3c3fb7d68aa7bc92b7ca6329255bd7..81351a057fc2647dfd53a95ed78077d74204086b 100644
 --- a/src/main/java/org/bukkit/block/data/BlockData.java
 +++ b/src/main/java/org/bukkit/block/data/BlockData.java
-@@ -247,4 +247,29 @@ public interface BlockData extends Cloneable {
+@@ -256,4 +256,29 @@ public interface BlockData extends Cloneable {
      @NotNull
      @ApiStatus.Experimental
      BlockState createBlockState();
diff --git a/patches/api/0245-Add-sendOpLevel-API.patch b/patches/api/0245-Add-sendOpLevel-API.patch
index f2dca3ee6d..ab9da2429d 100644
--- a/patches/api/0245-Add-sendOpLevel-API.patch
+++ b/patches/api/0245-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f086585e03b6b782431abd69f163e648bc1c22b4..b848ef1c207797b352c2ca97c574c4cd3fe6e43a 100644
+index e78cc9a7908c857272d931726dc6b217e98ce14d..f9f33c83adcfe04fcc0937e3279ac1b77eb6774d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3076,6 +3076,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3099,6 +3099,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      }
      // Paper end - elytra boost API
  
diff --git a/patches/api/0265-Expand-world-key-API.patch b/patches/api/0265-Expand-world-key-API.patch
index cc4843e552..761d7d83f5 100644
--- a/patches/api/0265-Expand-world-key-API.patch
+++ b/patches/api/0265-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 c9f4ec3ff1aaca2f75fe0a7f0c85d63f3dfd97f8..1e6307106391056af17add97080cd1f1908114e7 100644
+index dfe5055cefe6a110732e0fcc936dddb866cbd9e3..c4a4a0b1295739070017e7d09dd5e04a798494e3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -832,6 +832,18 @@ public final class Bukkit {
+@@ -842,6 +842,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 578a516d568dcc9fbdd67529bf986817adb480bc..91535f211ba7352c22c8cc30e340ed93b3ace21d 100644
+index 7986d51083c2c27709032b06731621d2e89bec57..0e3e654fb0551c6f862ce14b75cf1186392b023f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -696,6 +696,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -704,6 +704,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      public World getWorld(@NotNull UUID uid);
  
diff --git a/patches/api/0283-Add-basic-Datapack-API.patch b/patches/api/0283-Add-basic-Datapack-API.patch
index 2416c29b0e..497ce52ec6 100644
--- a/patches/api/0283-Add-basic-Datapack-API.patch
+++ b/patches/api/0283-Add-basic-Datapack-API.patch
@@ -70,7 +70,7 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 1e6307106391056af17add97080cd1f1908114e7..ff5c49c0a3a730ae6cf7a2547f63fcdb0a6e69f8 100644
+index c4a4a0b1295739070017e7d09dd5e04a798494e3..2e29da775e60c149d2c251d78ee7c60b494215a4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -318,9 +318,11 @@ public final class Bukkit {
@@ -85,7 +85,7 @@ index 1e6307106391056af17add97080cd1f1908114e7..ff5c49c0a3a730ae6cf7a2547f63fcdb
      public static DataPackManager getDataPackManager() {
          return server.getDataPackManager();
      }
-@@ -2526,6 +2528,14 @@ public final class Bukkit {
+@@ -2536,6 +2538,14 @@ public final class Bukkit {
      public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return server.getMobGoals();
      }
@@ -101,7 +101,7 @@ index 1e6307106391056af17add97080cd1f1908114e7..ff5c49c0a3a730ae6cf7a2547f63fcdb
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 91535f211ba7352c22c8cc30e340ed93b3ace21d..4a461c02b62ce782c69801b1b076e5383a79b7c6 100644
+index 0e3e654fb0551c6f862ce14b75cf1186392b023f..61701b6e8291cb5816b0a7eb511152eed3db43e8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -256,9 +256,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -116,7 +116,7 @@ index 91535f211ba7352c22c8cc30e340ed93b3ace21d..4a461c02b62ce782c69801b1b076e538
      public DataPackManager getDataPackManager();
  
      /**
-@@ -2202,5 +2204,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2210,5 +2212,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
diff --git a/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch
index d981c912fc..9382ddd92c 100644
--- a/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0327-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 ff5c49c0a3a730ae6cf7a2547f63fcdb0a6e69f8..6d09d22a2d488e3fdd0584a4361210f0060114e8 100644
+index 2e29da775e60c149d2c251d78ee7c60b494215a4..c5ac78c4a4711e9c44d5eb7f66b28f448bcda63a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2046,6 +2046,24 @@ public final class Bukkit {
+@@ -2056,6 +2056,24 @@ public final class Bukkit {
          return server.createChunkData(world);
      }
  
@@ -34,10 +34,10 @@ index ff5c49c0a3a730ae6cf7a2547f63fcdb0a6e69f8..6d09d22a2d488e3fdd0584a4361210f0
       * 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 4a461c02b62ce782c69801b1b076e5383a79b7c6..cea13dcd6b9e6cbc5af42f38296c9ab8db7e7855 100644
+index 61701b6e8291cb5816b0a7eb511152eed3db43e8..d2c4887184661b68726ff8539d022b8dee8313fa 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1730,6 +1730,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1738,6 +1738,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
  
diff --git a/patches/api/0345-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0345-API-for-creating-command-sender-which-forwards-feedb.patch
index 3d2b9aaa96..328823c103 100644
--- a/patches/api/0345-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0345-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 6d09d22a2d488e3fdd0584a4361210f0060114e8..5e8518372a30595f5f8f254e31a130645e75772e 100644
+index c5ac78c4a4711e9c44d5eb7f66b28f448bcda63a..d7a9b5f9aeececb4070264bba6d2240628cdca12 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1535,6 +1535,20 @@ public final class Bukkit {
+@@ -1545,6 +1545,20 @@ public final class Bukkit {
          return server.getConsoleSender();
      }
  
@@ -30,10 +30,10 @@ index 6d09d22a2d488e3fdd0584a4361210f0060114e8..5e8518372a30595f5f8f254e31a13064
       * 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 cea13dcd6b9e6cbc5af42f38296c9ab8db7e7855..204e68a63cf32d3b58a9fadabde5780608f47421 100644
+index d2c4887184661b68726ff8539d022b8dee8313fa..1fbd8ce1b9fa60ba06512dfcbd025212bc6dedfc 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1294,6 +1294,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1302,6 +1302,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ConsoleCommandSender getConsoleSender();
  
diff --git a/patches/api/0351-Custom-Potion-Mixes.patch b/patches/api/0351-Custom-Potion-Mixes.patch
index 0562b91cb0..57bce6f5d1 100644
--- a/patches/api/0351-Custom-Potion-Mixes.patch
+++ b/patches/api/0351-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 5e8518372a30595f5f8f254e31a130645e75772e..011d4e3c6fe3ffb0636506f5447c0097b297a957 100644
+index d7a9b5f9aeececb4070264bba6d2240628cdca12..50d336fda7f549e50dc127767ca35107c99a3483 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2568,6 +2568,15 @@ public final class Bukkit {
+@@ -2578,6 +2578,15 @@ public final class Bukkit {
      public static io.papermc.paper.datapack.DatapackManager getDatapackManager() {
          return server.getDatapackManager();
      }
@@ -175,10 +175,10 @@ index 5e8518372a30595f5f8f254e31a130645e75772e..011d4e3c6fe3ffb0636506f5447c0097
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 204e68a63cf32d3b58a9fadabde5780608f47421..5e5b5aedeaaca24aebe59ec2cfd0adde2ca4a7f5 100644
+index 1fbd8ce1b9fa60ba06512dfcbd025212bc6dedfc..eca2b37d2841f3d64b9c3134c6b40264ee49d255 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2238,5 +2238,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2246,5 +2246,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      io.papermc.paper.datapack.DatapackManager getDatapackManager();
diff --git a/patches/api/0364-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0364-Add-method-isTickingWorlds-to-Bukkit.patch
index 3a69d67dec..f25774fe60 100644
--- a/patches/api/0364-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0364-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 011d4e3c6fe3ffb0636506f5447c0097b297a957..458d98cc385718a86e0ef0eb90ff9ce64d77066a 100644
+index 50d336fda7f549e50dc127767ca35107c99a3483..d71b30d574e5cf7273ff831edb7f3ef2359bbadc 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -776,12 +776,26 @@ public final class Bukkit {
+@@ -786,12 +786,26 @@ public final class Bukkit {
          return server.getWorlds();
      }
  
@@ -35,7 +35,7 @@ index 011d4e3c6fe3ffb0636506f5447c0097b297a957..458d98cc385718a86e0ef0eb90ff9ce6
       *
       * @param creator the options to use when creating the world
       * @return newly created or loaded world
-@@ -793,6 +807,9 @@ public final class Bukkit {
+@@ -803,6 +817,9 @@ public final class Bukkit {
  
      /**
       * Unloads a world with the given name.
@@ -45,7 +45,7 @@ index 011d4e3c6fe3ffb0636506f5447c0097b297a957..458d98cc385718a86e0ef0eb90ff9ce6
       *
       * @param name Name of the world to unload
       * @param save whether to save the chunks before unloading
-@@ -804,6 +821,9 @@ public final class Bukkit {
+@@ -814,6 +831,9 @@ public final class Bukkit {
  
      /**
       * Unloads the given world.
@@ -56,10 +56,10 @@ index 011d4e3c6fe3ffb0636506f5447c0097b297a957..458d98cc385718a86e0ef0eb90ff9ce6
       * @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 5e5b5aedeaaca24aebe59ec2cfd0adde2ca4a7f5..383f1fcddaa50a8c94282c7a828912d73accfb62 100644
+index eca2b37d2841f3d64b9c3134c6b40264ee49d255..75f2b46c4fc1e12d1d02cd60865a5b76b1c2de49 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -649,34 +649,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -657,34 +657,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public List<World> getWorlds();
  
diff --git a/patches/api/0368-More-Teleport-API.patch b/patches/api/0368-More-Teleport-API.patch
index fb5c155fe4..8538f9dd8a 100644
--- a/patches/api/0368-More-Teleport-API.patch
+++ b/patches/api/0368-More-Teleport-API.patch
@@ -158,10 +158,10 @@ index 953bb49b7079647450d3453356d1c8a91be94c01..2ea66188468cf32bcaedc5167d4b9b0c
       * 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 2ded556b2adca7cf8d6f6cd0c19a618f5d3ffaaf..17f78126ba815fd2c1a88e12047d5187285ada8f 100644
+index 2ee4844870e00b3971d92f49f7b5607435053f7f..d7da0e2abd953805a076a4b5c48678ca27ed7759 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3236,6 +3236,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3259,6 +3259,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  
diff --git a/patches/api/0370-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0370-Custom-Chat-Completion-Suggestions-API.patch
index f123c89635..d47ccd756e 100644
--- a/patches/api/0370-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0370-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 17f78126ba815fd2c1a88e12047d5187285ada8f..d5ee046a5d410c9805924ae9d9ca3cbc1239b826 100644
+index d7da0e2abd953805a076a4b5c48678ca27ed7759..db22831f7f444e5cee27c2cd8f5e17fecbfb5c65 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3120,6 +3120,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3143,6 +3143,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void sendOpLevel(byte level);
      // Paper end - sendOpLevel API
  
diff --git a/patches/api/0372-Block-Ticking-API.patch b/patches/api/0372-Block-Ticking-API.patch
index 122cb9dd52..8944708dd4 100644
--- a/patches/api/0372-Block-Ticking-API.patch
+++ b/patches/api/0372-Block-Ticking-API.patch
@@ -31,10 +31,10 @@ index 732e8ea9e1bdcbc8f9a0888e07940fe21617b490..49974558799830d827f9ccd65a8bafee
  
      /**
 diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
-index 1f475424cc04d90f437cf0e38e07f5ae4020fb54..31111cea5ffd018c3c011c1f3b8befbbd33db5e5 100644
+index 81351a057fc2647dfd53a95ed78077d74204086b..d30ac3edc475796cf7f1d7ea04f665eef4ce755f 100644
 --- a/src/main/java/org/bukkit/block/data/BlockData.java
 +++ b/src/main/java/org/bukkit/block/data/BlockData.java
-@@ -272,4 +272,14 @@ public interface BlockData extends Cloneable {
+@@ -281,4 +281,14 @@ public interface BlockData extends Cloneable {
       */
      float getDestroySpeed(@NotNull ItemStack itemStack, boolean considerEnchants);
      // Paper end - destroy speed API
diff --git a/patches/api/0380-Elder-Guardian-appearance-API.patch b/patches/api/0380-Elder-Guardian-appearance-API.patch
index c130d36150..5f1e4866bd 100644
--- a/patches/api/0380-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0380-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 d5ee046a5d410c9805924ae9d9ca3cbc1239b826..2fe7a0afa581c5f8ab2f7b1ab5703cc5976b89f4 100644
+index db22831f7f444e5cee27c2cd8f5e17fecbfb5c65..374e7f82033ef964a5e4c8b10099e330e716d56d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3300,6 +3300,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3323,6 +3323,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/0388-Add-Player-Warden-Warning-API.patch b/patches/api/0388-Add-Player-Warden-Warning-API.patch
index 8b0e99a0a0..d109a16a5c 100644
--- a/patches/api/0388-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0388-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 2fe7a0afa581c5f8ab2f7b1ab5703cc5976b89f4..24d23796558dd2ff3a942b4d0ccf46c3bc7ed2bf 100644
+index 374e7f82033ef964a5e4c8b10099e330e716d56d..f008f3c9137e4c0662b53efab476c83a49494d22 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3316,6 +3316,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3339,6 +3339,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/0416-Folia-scheduler-and-owned-region-API.patch b/patches/api/0416-Folia-scheduler-and-owned-region-API.patch
index 1673b4500f..624a3fde44 100644
--- a/patches/api/0416-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0416-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 458d98cc385718a86e0ef0eb90ff9ce64d77066a..2bafcb26c144a84d1b955c8cdf122cca6628afc4 100644
+index d71b30d574e5cf7273ff831edb7f3ef2359bbadc..f98c8c41ad9685af327db9c44db5fc9e37e00590 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2599,6 +2599,141 @@ public final class Bukkit {
+@@ -2609,6 +2609,141 @@ public final class Bukkit {
      }
      // Paper end
  
@@ -645,10 +645,10 @@ index 458d98cc385718a86e0ef0eb90ff9ce64d77066a..2bafcb26c144a84d1b955c8cdf122cca
      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 383f1fcddaa50a8c94282c7a828912d73accfb62..cd1df326ef937863e427f47e1c8ac8720c01f75d 100644
+index 75f2b46c4fc1e12d1d02cd60865a5b76b1c2de49..f8f0a2b7fdd51c739c3f55801037a417872ce7d5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2267,4 +2267,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2275,4 +2275,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
diff --git a/patches/api/0421-API-for-updating-recipes-on-clients.patch b/patches/api/0421-API-for-updating-recipes-on-clients.patch
index 1091394bc9..266d6a480d 100644
--- a/patches/api/0421-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0421-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 2bafcb26c144a84d1b955c8cdf122cca6628afc4..07e6e66c73827afbbaf3bff35474c98ffb1f4393 100644
+index f98c8c41ad9685af327db9c44db5fc9e37e00590..adfaf27b872aa5614a31ff5f32cf9336c6f2ee49 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -960,6 +960,26 @@ public final class Bukkit {
+@@ -970,6 +970,26 @@ public final class Bukkit {
          server.reloadData();
      }
  
@@ -35,7 +35,7 @@ index 2bafcb26c144a84d1b955c8cdf122cca6628afc4..07e6e66c73827afbbaf3bff35474c98f
      /**
       * Returns the primary logger associated with this server instance.
       *
-@@ -1014,6 +1034,20 @@ public final class Bukkit {
+@@ -1024,6 +1044,20 @@ public final class Bukkit {
          return server.addRecipe(recipe);
      }
  
@@ -56,7 +56,7 @@ index 2bafcb26c144a84d1b955c8cdf122cca6628afc4..07e6e66c73827afbbaf3bff35474c98f
      /**
       * 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.
-@@ -1205,6 +1239,24 @@ public final class Bukkit {
+@@ -1215,6 +1249,24 @@ public final class Bukkit {
          return server.removeRecipe(key);
      }
  
@@ -82,10 +82,10 @@ index 2bafcb26c144a84d1b955c8cdf122cca6628afc4..07e6e66c73827afbbaf3bff35474c98f
       * 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 cd1df326ef937863e427f47e1c8ac8720c01f75d..7142f0f4105ccbc594e5d120b2270fd5e8bb5470 100644
+index f8f0a2b7fdd51c739c3f55801037a417872ce7d5..36a21c39f834faa6fec29a319588ddc58715a747 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -812,6 +812,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -820,6 +820,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      public void reloadData();
  
@@ -108,7 +108,7 @@ index cd1df326ef937863e427f47e1c8ac8720c01f75d..7142f0f4105ccbc594e5d120b2270fd5
      /**
       * Returns the primary logger associated with this server instance.
       *
-@@ -847,15 +863,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -855,15 +871,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 cd1df326ef937863e427f47e1c8ac8720c01f75d..7142f0f4105ccbc594e5d120b2270fd5
      /**
       * 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.
-@@ -1024,6 +1059,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1032,6 +1067,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      public boolean removeRecipe(@NotNull NamespacedKey key);
  
diff --git a/patches/api/0426-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0426-Deprecate-and-replace-methods-with-old-StructureType.patch
index e3794f28ac..2e0d35f597 100644
--- a/patches/api/0426-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0426-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 07e6e66c73827afbbaf3bff35474c98ffb1f4393..4863d9f21f0a0f11974be85360edc587ffd7eab3 100644
+index adfaf27b872aa5614a31ff5f32cf9336c6f2ee49..48fab492609e0bae459d20cc2eae78b87e37ab75 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -916,7 +916,9 @@ public final class Bukkit {
+@@ -926,7 +926,9 @@ public final class Bukkit {
       *
       * @see World#locateNearestStructure(org.bukkit.Location,
       *      org.bukkit.StructureType, int, boolean)
@@ -18,7 +18,7 @@ index 07e6e66c73827afbbaf3bff35474c98ffb1f4393..4863d9f21f0a0f11974be85360edc587
      @NotNull
      public static ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType) {
          return server.createExplorerMap(world, location, structureType);
-@@ -925,9 +927,6 @@ public final class Bukkit {
+@@ -935,9 +937,6 @@ public final class Bukkit {
      /**
       * Create a new explorer map targeting the closest nearby structure of a
       * given {@link StructureType}.
@@ -28,7 +28,7 @@ index 07e6e66c73827afbbaf3bff35474c98ffb1f4393..4863d9f21f0a0f11974be85360edc587
       *
       * @param world the world the map will belong to
       * @param location the origin location to find the nearest structure
-@@ -939,11 +938,54 @@ public final class Bukkit {
+@@ -949,11 +948,54 @@ public final class Bukkit {
       *
       * @see World#locateNearestStructure(org.bukkit.Location,
       *      org.bukkit.StructureType, int, boolean)
@@ -84,10 +84,10 @@ index 07e6e66c73827afbbaf3bff35474c98ffb1f4393..4863d9f21f0a0f11974be85360edc587
      /**
       * 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 7142f0f4105ccbc594e5d120b2270fd5e8bb5470..f1fa97d12f97baf97beb92ca0719cf3cf906b225 100644
+index 36a21c39f834faa6fec29a319588ddc58715a747..9af4bc16da09e59009c47911219e99450cdf2aa5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -776,16 +776,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -784,16 +784,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 7142f0f4105ccbc594e5d120b2270fd5e8bb5470..f1fa97d12f97baf97beb92ca0719cf3c
       *
       * @param world the world the map will belong to
       * @param location the origin location to find the nearest structure
-@@ -797,9 +796,50 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -805,9 +804,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/0441-Add-player-idle-duration-API.patch b/patches/api/0441-Add-player-idle-duration-API.patch
index b728ffc4ca..62875ac3a6 100644
--- a/patches/api/0441-Add-player-idle-duration-API.patch
+++ b/patches/api/0441-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 bab78593de3b8cbf939f423334ba3cfc67aea9dc..a8d3451ccfcd21a9e80adc2feab8fc9c2926c753 100644
+index d74c12d8b2c9b813f13591bd552c67c857657d08..ec937534f049ba25fb359c3e022ebe52ead6abef 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3457,6 +3457,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3480,6 +3480,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void increaseWardenWarningLevel();
      // Paper end
  
diff --git a/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 8c93339e29..9528da025b 100644
--- a/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add API to get the collision shape of a block before it's
 
 
 diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
-index 31111cea5ffd018c3c011c1f3b8befbbd33db5e5..66903e0fa65052ede789a163dad723ba05a2cc8c 100644
+index d30ac3edc475796cf7f1d7ea04f665eef4ce755f..647536e1f1a323447dc510b2406bb39c22083945 100644
 --- a/src/main/java/org/bukkit/block/data/BlockData.java
 +++ b/src/main/java/org/bukkit/block/data/BlockData.java
-@@ -204,6 +204,19 @@ public interface BlockData extends Cloneable {
+@@ -205,6 +205,19 @@ public interface BlockData extends Cloneable {
       */
      boolean isFaceSturdy(@NotNull BlockFace face, @NotNull BlockSupport support);
  
@@ -27,5 +27,5 @@ index 31111cea5ffd018c3c011c1f3b8befbbd33db5e5..66903e0fa65052ede789a163dad723ba
 +    // Paper end
 +
      /**
-      * Gets the material that a player would use to place this block.
-      * <p>
+      * Gets the color this block should appear as when rendered on a map.
+      *
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index da7bebccdf..a7d8619191 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..126d8c232de267d6d5639647fcda3b3416deb7e4
+index 0000000000000000000000000000000000000000..700ec4dda905cee41ae3fe2a420d8c6db64a13e8
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,140 @@
@@ -49,11 +49,11 @@ index 0000000000000000000000000000000000000000..126d8c232de267d6d5639647fcda3b34
 +    implementation("org.ow2.asm:asm:9.5")
 +    implementation("commons-lang:commons-lang:2.6")
 +    runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-+    runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
++    runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
 +
-+    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
++    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
 +
 +    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
 +    testImplementation("org.hamcrest:hamcrest:2.2")
@@ -174,7 +174,7 @@ index 0000000000000000000000000000000000000000..126d8c232de267d6d5639647fcda3b34
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index bd92ee304f9ab0fcc80d4456ca34a3e026e1b97f..0000000000000000000000000000000000000000
+index 123a4526359c53823898b743d9233c22ce6a8989..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,602 +0,0 @@
@@ -420,26 +420,26 @@ index bd92ee304f9ab0fcc80d4456ca34a3e026e1b97f..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.mysql</groupId>
 -            <artifactId>mysql-connector-j</artifactId>
--            <version>8.1.0</version>
+-            <version>8.2.0</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- add these back in as they are not exposed by the API -->
 -        <dependency>
 -            <groupId>org.apache.maven</groupId>
 -            <artifactId>maven-resolver-provider</artifactId>
--            <version>3.8.5</version>
+-            <version>3.9.6</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.7.3</version>
+-            <version>1.9.18</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.7.3</version>
+-            <version>1.9.18</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- annotations -->
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index 98f91f5342..87bae9ad99 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -9,7 +9,7 @@ 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 126d8c232de267d6d5639647fcda3b3416deb7e4..f83cda5b820ebb3dcbc3a39059579ba9487586e8 100644
+index 700ec4dda905cee41ae3fe2a420d8c6db64a13e8..14eae4cf079a384691c72c2f70ba627bddb0b2b1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,10 +9,9 @@ plugins {
@@ -24,7 +24,7 @@ index 126d8c232de267d6d5639647fcda3b3416deb7e4..f83cda5b820ebb3dcbc3a39059579ba9
 +    implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
+     runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
 @@ -35,6 +34,7 @@ tasks.jar {
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
@@ -137,7 +137,7 @@ index a2a8bce29ec5540de89095574dfdc0ca9b17bbd3..d92cd89373f8373c367ce422328b9836
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d837882f91dcc684873010ba2d93ffe035d89c57..16cee5f32f980d91a6a616a2cd47016b80f2146e 100644
+index 4fad736163683f49502ccd2d3122a4eef0a4a20e..a7921cde2b6275d730879b2814cc5f430520b051 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 {
@@ -148,7 +148,7 @@ index d837882f91dcc684873010ba2d93ffe035d89c57..16cee5f32f980d91a6a616a2cd47016b
 +                    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, -3);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index 41f119bb82..845a260a25 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -15,7 +15,7 @@ public net.minecraft.server.dedicated.DedicatedServerProperties reload(Lnet/mine
 public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ef91080dc7123677190839b057c3458c4d5b9f32..6f442d70a963dfc65a1b5b9494f850456c31cde3 100644
+index 6049006d0676838a3330903e587c35643caa7caf..89064b339ce27a09ad546c62a36459534d138c29 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,7 @@ dependencies {
@@ -25,7 +25,7 @@ index ef91080dc7123677190839b057c3458c4d5b9f32..6f442d70a963dfc65a1b5b9494f85045
 +    implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
+     runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..ef41cf3a7d1e6f2bfe81e0fb865d2f969bbc77c1
@@ -4916,7 +4916,7 @@ index 37ab411817008d4e6194e177d88d50931e53b42e..ca23639f15107ccd43b874ae38fa3727
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b091aa07aac623cf87847184444430331445ef16..482ae4d9699891af2ea04a34c979a944d7d29a2c 100644
+index ecc61c7b1b4eb887795ffd39578b70b4e77f5213..92cb1c23f2ef95f9be6c688146ee81aae5ac101c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -236,7 +236,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -4957,10 +4957,10 @@ index cff78fc8d073be7541628bb40670f82d1e9917cd..50ea733f42d0f06a62b55e61b0c73995
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 95a547c980c7199aa53736c9362b7e5b35497136..3a0f31f25f4956248b708ae736b6604d0b957647 100644
+index 0656c3f599bd92f8e5ba13495c46614a2eab6c73..468f4bb6d65a1608782e11fd91462ac50778ae3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -914,6 +914,7 @@ public final class CraftServer implements Server {
+@@ -915,6 +915,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
@@ -4969,7 +4969,7 @@ index 95a547c980c7199aa53736c9362b7e5b35497136..3a0f31f25f4956248b708ae736b6604d
              world.serverLevelData.setDifficulty(config.difficulty);
              world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 16cee5f32f980d91a6a616a2cd47016b80f2146e..098b5d68cd910ae95a3512c8921b9465d9446d3b 100644
+index a7921cde2b6275d730879b2814cc5f430520b051..686d6376322dab126393198da87e02827ec0fda2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -141,6 +141,19 @@ public class Main {
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch
index a9f780a71c..c4892651d5 100644
--- a/patches/server/0006-MC-Dev-fixes.patch
+++ b/patches/server/0006-MC-Dev-fixes.patch
@@ -193,40 +193,6 @@ index 04adc10f24f96804a5cb14e884224bb672360464..4259181bab2dc4f2d0409b56fdf81d96
          }));
          this.byName = Maps.newHashMap(builder.build()); // CraftBukkit
          RecipeManager.LOGGER.info("Loaded {} recipes", map1.size());
-diff --git a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java
-index db56047f8047ad0e139a45fa9d2294d464eb305b..cee371fde78e7e95e166b138d9437e5e8087f7c7 100644
---- a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java
-@@ -63,8 +63,10 @@ public class CeilingHangingSignBlock extends SignBlock {
-     public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-         BlockEntity itemStack = world.getBlockEntity(pos);
-         if (itemStack instanceof SignBlockEntity signBlockEntity) {
--            ItemStack itemStack = player.getItemInHand(hand);
--            if (this.shouldTryToChainAnotherHangingSign(player, hit, signBlockEntity, itemStack)) {
-+            // Paper start - decompile fixes
-+            ItemStack itemStack0 = player.getItemInHand(hand);
-+            if (this.shouldTryToChainAnotherHangingSign(player, hit, signBlockEntity, itemStack0)) {
-+            // Paper end - decompile fixes
-                 return InteractionResult.PASS;
-             }
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java
-index f83b7524dd9957fdda185a1211ee3dcfc2b7b5ec..32a463104593ecf00d44c449edda24a13ac8224e 100644
---- a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java
-@@ -62,8 +62,10 @@ public class WallHangingSignBlock extends SignBlock {
-     public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-         BlockEntity itemStack = world.getBlockEntity(pos);
-         if (itemStack instanceof SignBlockEntity signBlockEntity) {
--            ItemStack itemStack = player.getItemInHand(hand);
--            if (this.shouldTryToChainAnotherHangingSign(state, player, hit, signBlockEntity, itemStack)) {
-+            // Paper start - decompile fixes
-+            ItemStack itemStack0 = player.getItemInHand(hand);
-+            if (this.shouldTryToChainAnotherHangingSign(state, player, hit, signBlockEntity, itemStack0)) {
-+            // Paper end
-                 return InteractionResult.PASS;
-             }
-         }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 index 9fbe8ef3fea77ecbbc8689cc6472d0d5f30b7166..b8fb6d1d85e07f5165bfaf7d80807e069b595851 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch
index 4cfdc12018..fc96fcbefb 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/server/0008-CB-fixes.patch
@@ -17,7 +17,7 @@ Subject: [PATCH] CB fixes
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 482ae4d9699891af2ea04a34c979a944d7d29a2c..2b94db53d9046299d1d4b39bce06002039a1800f 100644
+index 92cb1c23f2ef95f9be6c688146ee81aae5ac101c..9cf839be15126444d4d2ffdb7faa637859941d6b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -296,7 +296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -68,10 +68,10 @@ index 161ad6ab1443b2ce33a2d7d91d189c855db0453b..15a9736a870055d639d03063c7cf67fd
          this.registryAccess = registryManager;
          this.structureTemplateManager = structureTemplateManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
-index 6ab2fd523b7f4e5cacef4ebb95f6812f391985d1..85133c388eff009ea1ffa391824b6556f7bf2014 100644
+index 809fdf2da78293391aa5c60c04f4ad652b152eec..955b0abd4019fc45df84719eee6bf413e59d941a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
-@@ -174,4 +174,11 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
+@@ -172,4 +172,11 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
          org.bukkit.loot.LootTable table = (org.bukkit.loot.LootTable) obj;
          return table.getKey().equals(this.getKey());
      }
@@ -84,10 +84,10 @@ index 6ab2fd523b7f4e5cacef4ebb95f6812f391985d1..85133c388eff009ea1ffa391824b6556
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3a0f31f25f4956248b708ae736b6604d0b957647..ead95ec10f93918215ea88d43aa5ad9e451ec3db 100644
+index 468f4bb6d65a1608782e11fd91462ac50778ae3f..0a39f95c77f0a2015200bb95b17eee9cbe95c416 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2454,7 +2454,13 @@ public final class CraftServer implements Server {
+@@ -2455,7 +2455,13 @@ public final class CraftServer implements Server {
          Preconditions.checkArgument(key != null, "NamespacedKey key cannot be null");
  
          LootDataManager registry = this.getServer().getLootData();
@@ -103,7 +103,7 @@ index 3a0f31f25f4956248b708ae736b6604d0b957647..ead95ec10f93918215ea88d43aa5ad9e
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 098b5d68cd910ae95a3512c8921b9465d9446d3b..fc9406f5f85c1f6180dbb666129a264b2baa55a3 100644
+index 686d6376322dab126393198da87e02827ec0fda2..5edad60f75a14b63ad704a68a3920f180ae82c40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -122,6 +122,7 @@ public class Main {
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index 0749b27267..e98ce154f1 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -7912,10 +7912,10 @@ index c0c0e704f67124b333e54ac72444d6265d1fbafb..c4936130274d5e4512decea691e151db
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index f86da2cfe050ea60d17310c4feebc63c4bf4465f..19e2f524bdc8a705bab29a4d3b2abb3707accb4b 100644
+index 0b369866a31efa8bd86a6927e83cfec06fcbedcc..c65f9f63f7eff2c3acb3339a75da58b7b1550682 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1246,4 +1246,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -897,4 +897,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 294a57f61f..02c5efa456 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -3198,7 +3198,7 @@ index 4c62df5a3781ec9df4a5c5f1b528649e6e8a62d1..affd1b8c7589ba59330dc0b6fc803cce
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 5ab86ca12d7a7da5d6c9221a39ebd1c6907472f5..0b5d988c6372ee5b7c2edd56f87ef604e76a2a5b 100644
+index fe31cd2698077c7d75fbd411a59947268100823c..4642113daf986c16d1390c53fbbb50e1e3067738 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -209,22 +209,22 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
@@ -3251,10 +3251,10 @@ index 23bdb77690ba15bcbbfb0c70af23336d08ac7752..8f144a357174bbe096ac9b38a5e67a61
                  }
                  collection = icons;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ead95ec10f93918215ea88d43aa5ad9e451ec3db..0fb29151929ce124e9a69f117d00959c27b38c84 100644
+index 0a39f95c77f0a2015200bb95b17eee9cbe95c416..67e90e18793852baf6dbd1aa41351a6943ef3d07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -612,8 +612,10 @@ public final class CraftServer implements Server {
+@@ -608,8 +608,10 @@ public final class CraftServer implements Server {
      }
  
      @Override
@@ -3265,7 +3265,7 @@ index ead95ec10f93918215ea88d43aa5ad9e451ec3db..0fb29151929ce124e9a69f117d00959c
      }
  
      @Override
-@@ -1568,7 +1570,15 @@ public final class CraftServer implements Server {
+@@ -1569,7 +1571,15 @@ public final class CraftServer implements Server {
          return this.configuration.getInt("settings.spawn-radius", -1);
      }
  
@@ -3281,7 +3281,7 @@ index ead95ec10f93918215ea88d43aa5ad9e451ec3db..0fb29151929ce124e9a69f117d00959c
      public String getShutdownMessage() {
          return this.configuration.getString("settings.shutdown-message");
      }
-@@ -1736,7 +1746,20 @@ public final class CraftServer implements Server {
+@@ -1737,7 +1747,20 @@ public final class CraftServer implements Server {
      }
  
      @Override
@@ -3302,7 +3302,7 @@ index ead95ec10f93918215ea88d43aa5ad9e451ec3db..0fb29151929ce124e9a69f117d00959c
          Set<CommandSender> recipients = new HashSet<>();
          for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
              if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
-@@ -1744,14 +1767,14 @@ public final class CraftServer implements Server {
+@@ -1745,14 +1768,14 @@ public final class CraftServer implements Server {
              }
          }
  
@@ -3319,7 +3319,7 @@ index ead95ec10f93918215ea88d43aa5ad9e451ec3db..0fb29151929ce124e9a69f117d00959c
  
          for (CommandSender recipient : recipients) {
              recipient.sendMessage(message);
-@@ -2014,6 +2037,14 @@ public final class CraftServer implements Server {
+@@ -2015,6 +2038,14 @@ public final class CraftServer implements Server {
          return CraftInventoryCreator.INSTANCE.createInventory(owner, type);
      }
  
@@ -3334,7 +3334,7 @@ index ead95ec10f93918215ea88d43aa5ad9e451ec3db..0fb29151929ce124e9a69f117d00959c
      @Override
      public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
          Preconditions.checkArgument(type != null, "InventoryType cannot be null");
-@@ -2028,13 +2059,28 @@ public final class CraftServer implements Server {
+@@ -2029,13 +2060,28 @@ public final class CraftServer implements Server {
          return CraftInventoryCreator.INSTANCE.createInventory(owner, size);
      }
  
@@ -3363,7 +3363,7 @@ index ead95ec10f93918215ea88d43aa5ad9e451ec3db..0fb29151929ce124e9a69f117d00959c
      public Merchant createMerchant(String title) {
          return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
      }
-@@ -2099,6 +2145,17 @@ public final class CraftServer implements Server {
+@@ -2100,6 +2146,17 @@ public final class CraftServer implements Server {
          return Thread.currentThread().equals(this.console.serverThread) || this.console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog)
      }
  
@@ -3381,7 +3381,7 @@ index ead95ec10f93918215ea88d43aa5ad9e451ec3db..0fb29151929ce124e9a69f117d00959c
      @Override
      public String getMotd() {
          return this.console.getMotd();
-@@ -2533,4 +2590,53 @@ public final class CraftServer implements Server {
+@@ -2534,4 +2591,53 @@ public final class CraftServer implements Server {
          return this.spigot;
      }
      // Spigot end
@@ -3507,7 +3507,7 @@ index c4936130274d5e4512decea691e151dbc2c9ff54..bb60804a77ecda3c86ccf54e028e634f
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index fc9406f5f85c1f6180dbb666129a264b2baa55a3..328118a19ce409ad9a15e75d54d70eb3be65ea6a 100644
+index 5edad60f75a14b63ad704a68a3920f180ae82c40..ff503ab0ef9f3245d8ead4519507936f1c2288cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -20,6 +20,12 @@ public class Main {
@@ -3912,10 +3912,10 @@ index 6f95a6bf27af151aec38bb2bd6fa657acc1c62e9..b54bd4e85042955448a2e76b379d370e
      @Override
      public boolean equals(Object other) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 19e2f524bdc8a705bab29a4d3b2abb3707accb4b..9efb4615d6d196a658940a2211c73af46e1c54b5 100644
+index c65f9f63f7eff2c3acb3339a75da58b7b1550682..fa66a1c6c26f8952478edcf6d7d0598d64d9111c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -211,6 +211,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -66,6 +66,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      private final EntityType entityType;
      private EntityDamageEvent lastDamageEvent;
      private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftEntity.DATA_TYPE_REGISTRY);
@@ -3923,7 +3923,7 @@ index 19e2f524bdc8a705bab29a4d3b2abb3707accb4b..9efb4615d6d196a658940a2211c73af4
  
      public CraftEntity(final CraftServer server, final Entity entity) {
          this.server = server;
-@@ -871,6 +872,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -522,6 +523,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.getHandle().getVehicle().getBukkitEntity();
      }
  
@@ -3956,7 +3956,7 @@ index 19e2f524bdc8a705bab29a4d3b2abb3707accb4b..9efb4615d6d196a658940a2211c73af4
      @Override
      public void setCustomName(String name) {
          // sane limit for name length
-@@ -967,6 +994,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -618,6 +645,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public String getName() {
          return CraftChatMessage.fromComponent(this.getHandle().getName());
      }
@@ -3975,10 +3975,10 @@ index 19e2f524bdc8a705bab29a4d3b2abb3707accb4b..9efb4615d6d196a658940a2211c73af4
      @Override
      public boolean isPermissionSet(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index c5525266f25e9ba910424370b0588ae5bb6a6f13..c27dfd3e8f3c287e74887a76b479c75563b7f280 100644
+index a93534f9e855df5ee10b90fb2126870a30f23421..233dd760713a48770178c5fb532f86aee52ad0aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -321,9 +321,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -320,9 +320,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          container = CraftEventFactory.callInventoryOpenEvent(player, container);
          if (container == null) return;
  
@@ -3993,7 +3993,7 @@ index c5525266f25e9ba910424370b0588ae5bb6a6f13..c27dfd3e8f3c287e74887a76b479c755
          player.containerMenu = container;
          player.initMenu(container);
      }
-@@ -392,8 +395,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -391,8 +394,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
  
          // Now open the window
          MenuType<?> windowType = CraftContainer.getNotchInventoryType(inventory.getTopInventory());
@@ -4027,10 +4027,10 @@ index 61759e8179d0f6342abf0c0294e5a024928db8d9..92e21126a9347f1ee2279ab09bb6abf2
      public boolean isOp() {
          return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcdff684332 100644
+index 429bbe15f8b04a57108f311a9cc198ed5c5a45c5..098e85980670723cffd751f6d5b67bb66e209e9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -303,14 +303,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -300,14 +300,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getDisplayName() {
@@ -4070,7 +4070,7 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
      @Override
      public String getPlayerListName() {
          return this.getHandle().listName == null ? this.getName() : CraftChatMessage.fromComponent(this.getHandle().listName);
-@@ -329,42 +354,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -326,42 +351,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -4122,7 +4122,7 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
          this.getHandle().connection.send(packet);
      }
  
-@@ -396,6 +421,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -393,6 +418,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.disconnect(message == null ? "" : message);
      }
  
@@ -4146,7 +4146,7 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
      @Override
      public void setCompassTarget(Location loc) {
          Preconditions.checkArgument(loc != null, "Location cannot be null");
-@@ -692,6 +734,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -689,6 +731,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
@@ -4171,7 +4171,7 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
      @Override
      public void sendSignChange(Location loc, String[] lines) {
          this.sendSignChange(loc, lines, DyeColor.BLACK);
-@@ -715,6 +775,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -712,6 +772,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (this.getHandle().connection == null) return;
  
          Component[] components = CraftSign.sanitizeLines(lines);
@@ -4183,7 +4183,7 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
          SignBlockEntity sign = new SignBlockEntity(CraftLocation.toBlockPosition(loc), Blocks.OAK_SIGN.defaultBlockState());
          SignText text = sign.getFrontText();
          text = text.setColor(net.minecraft.world.item.DyeColor.byId(dyeColor.getWoolData()));
-@@ -724,7 +789,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -721,7 +786,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          sign.setText(text, true);
  
@@ -4193,7 +4193,7 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
      }
  
      @Override
-@@ -1693,7 +1759,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1690,7 +1756,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url) {
@@ -4202,7 +4202,7 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
      }
  
      @Override
-@@ -1708,7 +1774,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1705,7 +1771,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url, byte[] hash, boolean force) {
@@ -4211,7 +4211,7 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
      }
  
      @Override
-@@ -1731,6 +1797,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1728,6 +1794,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -4227,15 +4227,15 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
 +        } else {
 +            hash = "";
 +        }
-+        this.getHandle().connection.send(new net.minecraft.network.protocol.common.ClientboundResourcePackPopPacket(Optional.empty()));
++        this.getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.empty()));
 +        this.getHandle().connection.send(new ClientboundResourcePackPushPacket(uuid, url, hash, force, io.papermc.paper.adventure.PaperAdventure.asVanilla(prompt)));
 +    }
 +    // Paper end - adventure
 +
-     public void addChannel(String channel) {
-         Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
-         channel = StandardMessenger.validateAndCorrectChannel(channel);
-@@ -2126,6 +2209,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+     @Override
+     public void removeResourcePack(UUID id) {
+         Preconditions.checkArgument(id != null, "Resource pack id cannot be null");
+@@ -2136,6 +2219,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (this.getHandle().requestedViewDistance() == 0) ? Bukkit.getViewDistance() : this.getHandle().requestedViewDistance();
      }
  
@@ -4248,7 +4248,7 @@ index 3777442efd8e7d599a4f3191d85cb1be6871ad3b..f8fc314a0c6960125e51e6d6ed11afcd
      @Override
      public int getPing() {
          return this.getHandle().connection.latency();
-@@ -2176,6 +2265,252 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2186,6 +2275,252 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  
@@ -4524,10 +4524,10 @@ index 5725b0281ac53a2354b233223259d6784353bc6e..9ef939b76d06874b856e0c850addb364
      @Override
      public int getLineWidth() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index fd5f77433aee8640b83738ed868a6f00ba1d2a6a..c6f5d282b35a40756f920906e39a4f71d277ada3 100644
+index 97cb754bcac8b1c511c59f9cd1c007749d8b7965..54c4a45d5f67c7ed6ce751b4985d9e920cf62008 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -907,9 +907,9 @@ public class CraftEventFactory {
+@@ -904,9 +904,9 @@ public class CraftEventFactory {
          return event;
      }
  
@@ -4539,7 +4539,7 @@ index fd5f77433aee8640b83738ed868a6f00ba1d2a6a..c6f5d282b35a40756f920906e39a4f71
          event.setKeepInventory(keepInventory);
          event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
          org.bukkit.World world = entity.getWorld();
-@@ -934,7 +934,7 @@ public class CraftEventFactory {
+@@ -931,7 +931,7 @@ public class CraftEventFactory {
       * Server methods
       */
      public static ServerListPingEvent callServerListPingEvent(SocketAddress address, String motd, int numPlayers, int maxPlayers) {
@@ -4949,10 +4949,10 @@ index cc588fb207062829637adad79129ca91950496cb..8b27ca7606869798486c3afd03e86205
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 302218333ef18350535642317d6360079416c285..0874c65c15fa66f61dfe8c440921b45e00b2f8b3 100644
+index 8aa5a8404dcbb83f88ef60c74c4aeb339231adc8..9d779d899eaed1122b70a2aa40eb7950d26b45de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -751,6 +751,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -750,6 +750,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return !(this.hasDisplayName() || this.hasLocalizedName() || this.hasEnchants() || (this.lore != null) || this.hasCustomModelData() || this.hasBlockData() || this.hasRepairCost() || !this.unhandledTags.isEmpty() || !this.persistentDataContainer.isEmpty() || this.hideFlag != 0 || this.isUnbreakable() || this.hasDamage() || this.hasAttributeModifiers());
      }
  
@@ -4971,7 +4971,7 @@ index 302218333ef18350535642317d6360079416c285..0874c65c15fa66f61dfe8c440921b45e
      @Override
      public String getDisplayName() {
          return CraftChatMessage.fromJSONComponent(this.displayName);
-@@ -786,6 +798,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -785,6 +797,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return this.lore != null && !this.lore.isEmpty();
      }
  
@@ -5063,10 +5063,10 @@ index ec8ef47ed7cc627fef2c71b2b281119245e88b97..53cbc743b1e722d029021f9d63ffbf7d
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
-index 9dc36e89bcfe9f982f32642b28bd083ad34cf5a2..7db801cc18945ce203d7ea30dc517dd65183f6d6 100644
+index 1b301c45a9b6f2ba7bd9d51ad93800497b7f0fec..3aecc929c0a9ea6a770326304dacd51fc08ac894 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
-@@ -32,6 +32,18 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -31,6 +31,18 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
          return this.getInventory(this.getTileEntity());
      }
  
@@ -5085,7 +5085,7 @@ index 9dc36e89bcfe9f982f32642b28bd083ad34cf5a2..7db801cc18945ce203d7ea30dc517dd6
      @Override
      public Inventory createInventory(InventoryHolder holder, InventoryType type, String title) {
          Container te = this.getTileEntity();
-@@ -54,6 +66,15 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -53,6 +65,15 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
              return furnace;
          }
  
@@ -5101,7 +5101,7 @@ index 9dc36e89bcfe9f982f32642b28bd083ad34cf5a2..7db801cc18945ce203d7ea30dc517dd6
          @Override
          public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
              Container tileEntity = this.getTileEntity();
-@@ -74,6 +95,18 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -73,6 +94,18 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
              return new BrewingStandBlockEntity(BlockPos.ZERO, Blocks.BREWING_STAND.defaultBlockState());
          }
  
@@ -5160,7 +5160,7 @@ index 5c987c7d9e43bb481800935cbc918a43a3656524..da1e4496d78a2c1b258ff8bb316414cb
      public String getDisplayName() {
          this.checkState();
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-index eabe3879175c29007e59d191608023f74de47781..7791fb5b39702798fc0006fcff9c6041980eb191 100644
+index d9f8a0c894a2a70b3dc2cef4feb87363627ec73a..5681630159bb52628e6cc391db324bbafe333414 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 @@ -29,6 +29,33 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
diff --git a/patches/server/0011-Paper-command.patch b/patches/server/0011-Paper-command.patch
index 3c0e69e2ba..7d030d45dc 100644
--- a/patches/server/0011-Paper-command.patch
+++ b/patches/server/0011-Paper-command.patch
@@ -617,10 +617,10 @@ index 458c04786f7b56f3c006e1e717c0ac709fddb1a0..6c83df6290e4ec59c596f1b9e2f10f0a
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0fb29151929ce124e9a69f117d00959c27b38c84..9fb7b743c7d8a7051fa145594bc6dd357b55a1cb 100644
+index 67e90e18793852baf6dbd1aa41351a6943ef3d07..5f03d77a64e5ba2e86343599e0faafecbda316b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -938,6 +938,7 @@ public final class CraftServer implements Server {
+@@ -939,6 +939,7 @@ public final class CraftServer implements Server {
          this.commandMap.clearCommands();
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@@ -628,7 +628,7 @@ index 0fb29151929ce124e9a69f117d00959c27b38c84..9fb7b743c7d8a7051fa145594bc6dd35
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2630,6 +2631,34 @@ public final class CraftServer implements Server {
+@@ -2631,6 +2632,34 @@ public final class CraftServer implements Server {
      // Paper end
  
      // Paper start
diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/server/0013-Paper-Plugins.patch
index 5c74fb1c18..0fe1ef7114 100644
--- a/patches/server/0013-Paper-Plugins.patch
+++ b/patches/server/0013-Paper-Plugins.patch
@@ -7097,10 +7097,10 @@ index f3130afbfd70e39a8000b0471854f8ef892bbbf5..884731fa4ebbbdc7c06ff670941f36ef
              Bootstrap.validate();
              Util.startTimerHackThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9fb7b743c7d8a7051fa145594bc6dd357b55a1cb..6a8b3ad8848119e3c448ff976c60bfc6eda22e59 100644
+index 5f03d77a64e5ba2e86343599e0faafecbda316b1..04880123cde240f2d02936ecdefa9731db743b8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -276,7 +276,8 @@ public final class CraftServer implements Server {
+@@ -270,7 +270,8 @@ public final class CraftServer implements Server {
      private final CraftCommandMap commandMap = new CraftCommandMap(this);
      private final SimpleHelpMap helpMap = new SimpleHelpMap(this);
      private final StandardMessenger messenger = new StandardMessenger();
@@ -7110,7 +7110,7 @@ index 9fb7b743c7d8a7051fa145594bc6dd357b55a1cb..6a8b3ad8848119e3c448ff976c60bfc6
      private final StructureManager structureManager;
      protected final DedicatedServer console;
      protected final DedicatedPlayerList playerList;
-@@ -422,24 +423,7 @@ public final class CraftServer implements Server {
+@@ -418,24 +419,7 @@ public final class CraftServer implements Server {
      }
  
      public void loadPlugins() {
@@ -7136,7 +7136,7 @@ index 9fb7b743c7d8a7051fa145594bc6dd357b55a1cb..6a8b3ad8848119e3c448ff976c60bfc6
      }
  
      public void enablePlugins(PluginLoadOrder type) {
-@@ -528,15 +512,17 @@ public final class CraftServer implements Server {
+@@ -524,15 +508,17 @@ public final class CraftServer implements Server {
      private void enablePlugin(Plugin plugin) {
          try {
              List<Permission> perms = plugin.getDescription().getPermissions();
@@ -7160,7 +7160,7 @@ index 9fb7b743c7d8a7051fa145594bc6dd357b55a1cb..6a8b3ad8848119e3c448ff976c60bfc6
  
              this.pluginManager.enablePlugin(plugin);
          } catch (Throwable ex) {
-@@ -962,6 +948,7 @@ public final class CraftServer implements Server {
+@@ -963,6 +949,7 @@ public final class CraftServer implements Server {
                  "This plugin is not properly shutting down its async tasks when it is being reloaded.  This may cause conflicts with the newly loaded version of the plugin"
              ));
          }
diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch
index a38625f584..2bf60bfc38 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/server/0014-Timings-v2.patch
@@ -1603,10 +1603,10 @@ index 0eb09ce5c850d85ffd7229d27cf06b3e0edda11b..cc1d7626a82881c4410d65c6a33dadae
          };
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6a8b3ad8848119e3c448ff976c60bfc6eda22e59..0f3659d2d60426275869dec76412aecb8e407442 100644
+index 04880123cde240f2d02936ecdefa9731db743b8f..836a388dbbc1987272aba6604a5b61acabe441b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -372,7 +372,7 @@ public final class CraftServer implements Server {
+@@ -368,7 +368,7 @@ public final class CraftServer implements Server {
          this.saveCommandsConfig();
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -1615,7 +1615,7 @@ index 6a8b3ad8848119e3c448ff976c60bfc6eda22e59..0f3659d2d60426275869dec76412aecb
          this.overrideSpawnLimits();
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
          this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
-@@ -2547,12 +2547,31 @@ public final class CraftServer implements Server {
+@@ -2548,12 +2548,31 @@ public final class CraftServer implements Server {
      private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
      {
  
@@ -1817,10 +1817,10 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f8fc314a0c6960125e51e6d6ed11afcdff684332..4a7199edc2c7597cba956b2427a17efa08eb8d82 100644
+index 098e85980670723cffd751f6d5b67bb66e209e9a..2f05361e8c086e07de2ff18bc5136fb9e8d62399 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2586,6 +2586,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2596,6 +2596,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
              CraftPlayer.this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(components, position == net.md_5.bungee.api.ChatMessageType.ACTION_BAR));
          }
diff --git a/patches/server/0018-Rewrite-chunk-system.patch b/patches/server/0018-Rewrite-chunk-system.patch
index 9fd95dd03e..3f90c6b20a 100644
--- a/patches/server/0018-Rewrite-chunk-system.patch
+++ b/patches/server/0018-Rewrite-chunk-system.patch
@@ -22661,10 +22661,10 @@ index b1aeb021e53a233bfb0439d38f1a889ed6fc301d..7687a81bfa420e8377308fea3d673814
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0f3659d2d60426275869dec76412aecb8e407442..e411d9e821604f07e744f2457654f6ac4bb34db7 100644
+index 836a388dbbc1987272aba6604a5b61acabe441b5..cf05dd46b17e69e09b97d955e9c2198e78ba7f1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1194,7 +1194,7 @@ public final class CraftServer implements Server {
+@@ -1195,7 +1195,7 @@ public final class CraftServer implements Server {
          this.console.addLevel(internal);
  
          this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal);
@@ -22673,7 +22673,7 @@ index 0f3659d2d60426275869dec76412aecb8e407442..e411d9e821604f07e744f2457654f6ac
  
          this.pluginManager.callEvent(new WorldLoadEvent(internal.getWorld()));
          return internal.getWorld();
-@@ -1238,7 +1238,7 @@ public final class CraftServer implements Server {
+@@ -1239,7 +1239,7 @@ public final class CraftServer implements Server {
              }
  
              handle.getChunkSource().close(save);
@@ -22682,7 +22682,7 @@ index 0f3659d2d60426275869dec76412aecb8e407442..e411d9e821604f07e744f2457654f6ac
              handle.convertable.close();
          } catch (Exception ex) {
              this.getLogger().log(Level.SEVERE, null, ex);
-@@ -2130,7 +2130,7 @@ public final class CraftServer implements Server {
+@@ -2131,7 +2131,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -22811,10 +22811,10 @@ index bb60804a77ecda3c86ccf54e028e634f8d7f141d..1f160036b433c5d1fb8ed1f94adefcca
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4a7199edc2c7597cba956b2427a17efa08eb8d82..41a4f6126f24848a26ff0f928a23b5be13783c90 100644
+index 2f05361e8c086e07de2ff18bc5136fb9e8d62399..2dbc49b944ce318ec5081e3ec421efa1ff24c615 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -198,6 +198,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -195,6 +195,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = System.currentTimeMillis();
      }
  
@@ -22864,10 +22864,10 @@ index 4a7199edc2c7597cba956b2427a17efa08eb8d82..41a4f6126f24848a26ff0f928a23b5be
          return this.getHandle().getGameProfile();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 20592dc147f4f0b84928dabcfa349622f1de691c..d46ccc3b3aaacf937631a44a7e0f91b793a83c86 100644
+index f6d003ea707f43287e52f8ffad24be35eeefec69..c6e5d3b7ef3886d0ffa9302d1270c048eaaeb671 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-@@ -265,7 +265,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator {
+@@ -264,7 +264,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator {
              return ichunkaccess1;
          };
  
diff --git a/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 198ccd4791..66ff9dd820 100644
--- a/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/server/0019-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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e411d9e821604f07e744f2457654f6ac4bb34db7..012634a64a39cbcbb49d2c8948fac92eca15cebe 100644
+index cf05dd46b17e69e09b97d955e9c2198e78ba7f1f..668263f6b58e04461564687f75ae75504beb1996 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -426,6 +426,35 @@ public final class CraftServer implements Server {
+@@ -422,6 +422,35 @@ public final class CraftServer implements Server {
          io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler.INSTANCE.enter(io.papermc.paper.plugin.entrypoint.Entrypoint.PLUGIN); // Paper - replace implementation
      }
  
@@ -47,7 +47,7 @@ index e411d9e821604f07e744f2457654f6ac4bb34db7..012634a64a39cbcbb49d2c8948fac92e
          if (type == PluginLoadOrder.STARTUP) {
              this.helpMap.clear();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 328118a19ce409ad9a15e75d54d70eb3be65ea6a..7285510dc618327b578b179165023414d595a354 100644
+index ff503ab0ef9f3245d8ead4519507936f1c2288cf..3436351140383f53404d37b8f974181724d13627 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -160,6 +160,12 @@ public class Main {
diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 110c2b8d4b..797efac184 100644
--- a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -19,10 +19,10 @@ index b608788552d380328b729ce6164e0fc60cf3fefd..457b0f1f469436f6caa7473d91f906f1
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 012634a64a39cbcbb49d2c8948fac92eca15cebe..d89f832288e197e6c7cf3a0eaab699b3ce1a2c0c 100644
+index 668263f6b58e04461564687f75ae75504beb1996..1c8363ea23c76633b69e4b98b35ea4feb6c1d2ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -267,7 +267,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+@@ -261,7 +261,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
  public final class CraftServer implements Server {
@@ -32,11 +32,11 @@ index 012634a64a39cbcbb49d2c8948fac92eca15cebe..d89f832288e197e6c7cf3a0eaab699b3
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 7285510dc618327b578b179165023414d595a354..176ffe9f5007bf4bb83bfc0d1186116c98481f45 100644
+index 3436351140383f53404d37b8f974181724d13627..bf6ee9f7613e76daba9db4089d13a1f189d093b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -241,12 +241,25 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
                      if (buildDate.before(deadline.getTime())) {
                          System.err.println("*** Error, this build is outdated ***");
 -                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/server/0030-Player-affects-spawning-API.patch
index b8e5ed0b8b..c62c34ae82 100644
--- a/patches/server/0030-Player-affects-spawning-API.patch
+++ b/patches/server/0030-Player-affects-spawning-API.patch
@@ -137,10 +137,10 @@ index 2ec2b1d9d987c7f31c685aec3d3c87f42758c94b..36d793b492d9776ee36f8285b5bab09e
          for(Player player : this.players()) {
              if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 41a4f6126f24848a26ff0f928a23b5be13783c90..4bdcff78393b618b2201753bbffbd9001d5ad2d1 100644
+index 2dbc49b944ce318ec5081e3ec421efa1ff24c615..879bbc36e8390945276414a18a4fe4a9903e3999 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2267,6 +2267,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2277,6 +2277,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().language;
      }
  
diff --git a/patches/server/0031-Further-improve-server-tick-loop.patch b/patches/server/0031-Further-improve-server-tick-loop.patch
index 71da80e81d..c63df8e085 100644
--- a/patches/server/0031-Further-improve-server-tick-loop.patch
+++ b/patches/server/0031-Further-improve-server-tick-loop.patch
@@ -141,10 +141,10 @@ index 457b0f1f469436f6caa7473d91f906f1a61d6c74..2f04f10f5819be04b98ac0b52a2d7f4d
                  this.startMetricsRecordingTick();
                  this.profiler.push("tick");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d89f832288e197e6c7cf3a0eaab699b3ce1a2c0c..7102165a09afdf6f33257f9fcd6c2c96aefd566a 100644
+index 1c8363ea23c76633b69e4b98b35ea4feb6c1d2ff..d491b3e7a6ec5ef2e2d7bf3fa014a4f501bff124 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2572,6 +2572,17 @@ public final class CraftServer implements Server {
+@@ -2573,6 +2573,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
diff --git a/patches/server/0032-Only-refresh-abilities-if-needed.patch b/patches/server/0032-Only-refresh-abilities-if-needed.patch
index 3ec75f6e69..74f0b81537 100644
--- a/patches/server/0032-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0032-Only-refresh-abilities-if-needed.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4bdcff78393b618b2201753bbffbd9001d5ad2d1..188daf2ff7766d39b62b763bab7e4ad79f85449f 100644
+index 879bbc36e8390945276414a18a4fe4a9903e3999..e80d2d6568a4fa2b877add86e2a2b974d9d87c03 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1938,12 +1938,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1948,12 +1948,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
diff --git a/patches/server/0033-Entity-Origin-API.patch b/patches/server/0033-Entity-Origin-API.patch
index fa02bcb7cc..2be24f301f 100644
--- a/patches/server/0033-Entity-Origin-API.patch
+++ b/patches/server/0033-Entity-Origin-API.patch
@@ -132,10 +132,10 @@ index f08c021f867c00611139a17db48352944eb2aa99..5c3b86e2301079e775971aa4da6a8f2d
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9efb4615d6d196a658940a2211c73af46e1c54b5..beae7b8cf726f61b25c5afb553da8c34dce1dd37 100644
+index fa66a1c6c26f8952478edcf6d7d0598d64d9111c..acfe67911d052933bbf62e5c68181f4472b6e4c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1316,5 +1316,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -967,5 +967,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
  
          return ret;
      }
diff --git a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
index 4e3884a480..39b615d753 100644
--- a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
@@ -39,10 +39,10 @@ index bf89ea0f7506434848cb9c1cbfb3fe6dd2eb3212..686b42a9b4475fe3d530a9b950c1cc8f
          // CraftBukkit end
          this.language = clientOptions.language();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 188daf2ff7766d39b62b763bab7e4ad79f85449f..6cf9ca72f042b1b936f8ba04e9582cf4da4bcb6a 100644
+index e80d2d6568a4fa2b877add86e2a2b974d9d87c03..fc6557ad318209a3f1f617cec162740a1d26b051 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2265,7 +2265,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2275,7 +2275,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
diff --git a/patches/server/0052-Improve-Player-chat-API-handling.patch b/patches/server/0052-Improve-Player-chat-API-handling.patch
index 467b022b11..fc6af15fe7 100644
--- a/patches/server/0052-Improve-Player-chat-API-handling.patch
+++ b/patches/server/0052-Improve-Player-chat-API-handling.patch
@@ -40,10 +40,10 @@ index b41351783ea9795afaddce453c82ab32cb8134a1..870a1d6679fa062d90bcfa1a21a8af0c
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7102165a09afdf6f33257f9fcd6c2c96aefd566a..21f7a4d8ad251468b78399df04587991e3df3a65 100644
+index d491b3e7a6ec5ef2e2d7bf3fa014a4f501bff124..638d978d86ee324e2eddfebda02ae54572982935 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -884,7 +884,7 @@ public final class CraftServer implements Server {
+@@ -885,7 +885,7 @@ public final class CraftServer implements Server {
      public boolean dispatchCommand(CommandSender sender, String commandLine) {
          Preconditions.checkArgument(sender != null, "sender cannot be null");
          Preconditions.checkArgument(commandLine != null, "commandLine cannot be null");
@@ -53,10 +53,10 @@ index 7102165a09afdf6f33257f9fcd6c2c96aefd566a..21f7a4d8ad251468b78399df04587991
          if (this.commandMap.dispatch(sender, commandLine)) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1e395d14382c79231dc81d6cf7ea864e45906add..445e1349256a788a59831893ba7238ae95ae6bef 100644
+index fc6557ad318209a3f1f617cec162740a1d26b051..4585c67495ffda7f149c4dbcf379839f40cf6bac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -501,7 +501,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -498,7 +498,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0054-Expose-server-CommandMap.patch b/patches/server/0054-Expose-server-CommandMap.patch
index c86e610c28..2bb0b0faac 100644
--- a/patches/server/0054-Expose-server-CommandMap.patch
+++ b/patches/server/0054-Expose-server-CommandMap.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 21f7a4d8ad251468b78399df04587991e3df3a65..0ef715796926076042705d48a20b80c4b4b29466 100644
+index 638d978d86ee324e2eddfebda02ae54572982935..236bbec16b90a71d42d7b55fb5fedbf1a8b350dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2112,6 +2112,7 @@ public final class CraftServer implements Server {
+@@ -2113,6 +2113,7 @@ public final class CraftServer implements Server {
          return this.helpMap;
      }
  
diff --git a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 2b2011aa32..c7e83e469b 100644
--- a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0ecfcf1b3a7a7ccdbb0d55f1b1e57feee4e724c3..bde3486b5eb89f8e35778eb59a44c7208ae38743 100644
+index ffaab4f83e416503206fef34cc69dc14b1295884..f4e70fa2f74d15bdc7669d0ce0b2dc2c824fffb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -103,7 +103,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -102,7 +102,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      @Override
      public void setHealth(double health) {
          health = (float) health;
diff --git a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
index 43fd846000..398970d6b5 100644
--- a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0056-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 7b0e382d1c31ee63cd1b1ccbf7f2fc7dda78fe9c..268e524550f76b77b12c808c682d5416f802d98e 100644
+index 4585c67495ffda7f149c4dbcf379839f40cf6bac..1cb9dbb01a320081188320048d36f61434efa109 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 @@
@@ -74,7 +74,7 @@ index 7b0e382d1c31ee63cd1b1ccbf7f2fc7dda78fe9c..268e524550f76b77b12c808c682d5416
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -343,6 +344,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -340,6 +341,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/patches/server/0058-Add-velocity-warnings.patch b/patches/server/0058-Add-velocity-warnings.patch
index 06978832ed..92bc6070df 100644
--- a/patches/server/0058-Add-velocity-warnings.patch
+++ b/patches/server/0058-Add-velocity-warnings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0ef715796926076042705d48a20b80c4b4b29466..8fbd8d021fe638505dc70188779f6b92ef2696cf 100644
+index 236bbec16b90a71d42d7b55fb5fedbf1a8b350dc..95e864de78b7e1825c4899295ee7c1970f888b14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -303,6 +303,7 @@ public final class CraftServer implements Server {
+@@ -298,6 +298,7 @@ public final class CraftServer implements Server {
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
      public int reloadCount;
@@ -17,10 +17,10 @@ index 0ef715796926076042705d48a20b80c4b4b29466..8fbd8d021fe638505dc70188779f6b92
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index beae7b8cf726f61b25c5afb553da8c34dce1dd37..6100b2e718954b40f63ed30ab32e1dea4edba9a6 100644
+index acfe67911d052933bbf62e5c68181f4472b6e4c9..9ff8190002d25a13e6166e076b54a006cff0b47d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -477,10 +477,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -128,10 +128,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public void setVelocity(Vector velocity) {
          Preconditions.checkArgument(velocity != null, "velocity");
          velocity.checkFinite();
diff --git a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
index caf6a2581b..d2b98f50be 100644
--- a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
@@ -16,10 +16,10 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 136dd30ae472a58845a2d8f399d2040faed09345..a58b0d10d73310587a05e40e072029ee258063e1 100644
+index 1cb9dbb01a320081188320048d36f61434efa109..73b6740cf50d878b98438f58c2291c0d13f412b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1171,7 +1171,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1168,7 +1168,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entity.connection.teleport(to);
          } else {
              // The respawn reason should never be used if the passed location is non null.
diff --git a/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 30e1c1215c..81e23560bd 100644
--- a/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -7,10 +7,10 @@ Upstream added methods for this, original methods are now
 deprecated
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index bde3486b5eb89f8e35778eb59a44c7208ae38743..afbf6af7198bc69053882ac200892b5b695a4d36 100644
+index f4e70fa2f74d15bdc7669d0ce0b2dc2c824fffb7..a51a3aed4a55e251da04544a4a59059d73b615d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -268,9 +268,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -267,9 +267,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      }
  
      @Override
@@ -27,7 +27,7 @@ index bde3486b5eb89f8e35778eb59a44c7208ae38743..afbf6af7198bc69053882ac200892b5b
      }
  
      @Override
-@@ -788,4 +794,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -787,4 +793,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.getHandle().persistentInvisibility = invisible;
          this.getHandle().setSharedFlag(5, invisible);
      }
diff --git a/patches/server/0064-Complete-resource-pack-API.patch b/patches/server/0064-Complete-resource-pack-API.patch
index 21dfe4be10..61ce1b2d83 100644
--- a/patches/server/0064-Complete-resource-pack-API.patch
+++ b/patches/server/0064-Complete-resource-pack-API.patch
@@ -22,10 +22,10 @@ index 56f6f65ceb1271e9273b1ee6658773eb3445beed..771db61f81d7a3cd763efb5febf6008f
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b64d3ad29235c8483bbb4ae108821137cbe13e3f..e48bd008d641852b88ca2df649965d8264f2ddbe 100644
+index 73b6740cf50d878b98438f58c2291c0d13f412b7..5107128b0868d46b1672df8c8f98018de87c9eff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -192,6 +192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -189,6 +189,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private double healthScale = 20;
      private CraftWorldBorder clientWorldBorder = null;
      private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
@@ -33,7 +33,7 @@ index b64d3ad29235c8483bbb4ae108821137cbe13e3f..e48bd008d641852b88ca2df649965d82
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -1964,6 +1965,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1961,6 +1962,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end - adventure
  
@@ -46,7 +46,7 @@ index b64d3ad29235c8483bbb4ae108821137cbe13e3f..e48bd008d641852b88ca2df649965d82
 +        final net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ?
 +            io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) :
 +            null;
-+        this.getHandle().connection.send(new net.minecraft.network.protocol.common.ClientboundResourcePackPopPacket(Optional.empty()));
++        this.getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.empty()));
 +        this.getHandle().connection.send(new ClientboundResourcePackPushPacket(uuid, url, hash, required, promptComponent));
 +    }
 +
@@ -56,6 +56,6 @@ index b64d3ad29235c8483bbb4ae108821137cbe13e3f..e48bd008d641852b88ca2df649965d82
 +    }
 +    // Paper end - more resource pack API
 +
-     public void addChannel(String channel) {
-         Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
-         channel = StandardMessenger.validateAndCorrectChannel(channel);
+     @Override
+     public void removeResourcePack(UUID id) {
+         Preconditions.checkArgument(id != null, "Resource pack id cannot be null");
diff --git a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch
index f98bfaec16..fdc1648dbe 100644
--- a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8fbd8d021fe638505dc70188779f6b92ef2696cf..4b10f55ffe8a63de437ff821970f8924c13f6f24 100644
+index 95e864de78b7e1825c4899295ee7c1970f888b14..fb2b1c13538ed7123beb3d1bc9169a2b313e87ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -460,6 +460,7 @@ public final class CraftServer implements Server {
+@@ -456,6 +456,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              this.helpMap.clear();
              this.helpMap.initializeGeneralTopics();
@@ -27,7 +27,7 @@ index 8fbd8d021fe638505dc70188779f6b92ef2696cf..4b10f55ffe8a63de437ff821970f8924
          }
  
          Plugin[] plugins = this.pluginManager.getPlugins();
-@@ -479,7 +480,7 @@ public final class CraftServer implements Server {
+@@ -475,7 +476,7 @@ public final class CraftServer implements Server {
              this.commandMap.registerServerAliases();
              DefaultPermissions.registerCorePermissions();
              CraftDefaultPermissions.registerCorePermissions();
diff --git a/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch
index cc1fdb0ed3..36fa504007 100644
--- a/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4b10f55ffe8a63de437ff821970f8924c13f6f24..bf194d40a3078c0dda6da2d80d8dbd220f6af749 100644
+index fb2b1c13538ed7123beb3d1bc9169a2b313e87ea..4eb1a2bbdb03973e38ec7cdc93601ddab3e44f8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2716,5 +2716,23 @@ public final class CraftServer implements Server {
+@@ -2717,5 +2717,23 @@ public final class CraftServer implements Server {
          }
          return this.adventure$audiences;
      }
diff --git a/patches/server/0067-Remove-Metadata-on-reload.patch b/patches/server/0067-Remove-Metadata-on-reload.patch
index 02bbdce1a3..1ae8646f4e 100644
--- a/patches/server/0067-Remove-Metadata-on-reload.patch
+++ b/patches/server/0067-Remove-Metadata-on-reload.patch
@@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bf194d40a3078c0dda6da2d80d8dbd220f6af749..e85017f62eb90efda8d4f3910fe543c9a4a2243a 100644
+index 4eb1a2bbdb03973e38ec7cdc93601ddab3e44f8e..1d08a65fa782d8150bc6253d11f0a9ffa25ea325 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -951,8 +951,16 @@ public final class CraftServer implements Server {
+@@ -952,8 +952,16 @@ public final class CraftServer implements Server {
              world.spigotConfig.init(); // Spigot
          }
  
diff --git a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
index 03cc3fe460..fa53958ae4 100644
--- a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
@@ -168,7 +168,7 @@ index 7278ac809eff364e8b838d63a2ec1291493869f8..7dd0c000fa7f363997178ffa6de7d39e
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.world.item.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 0874c65c15fa66f61dfe8c440921b45e00b2f8b3..cd0c885ed63a3c43b915da239a8dddfee2622c76 100644
+index 9d779d899eaed1122b70a2aa40eb7950d26b45de..78762a410ece8bca16382975222d026ad010bca2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList;
@@ -195,7 +195,7 @@ index 0874c65c15fa66f61dfe8c440921b45e00b2f8b3..cd0c885ed63a3c43b915da239a8dddfe
  import java.util.logging.Level;
  import java.util.logging.Logger;
  import javax.annotation.Nonnull;
-@@ -277,7 +280,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -276,7 +279,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      private List<String> lore; // null and empty are two different states internally
      private Integer customModelData;
      private CompoundTag blockData;
@@ -204,7 +204,7 @@ index 0874c65c15fa66f61dfe8c440921b45e00b2f8b3..cd0c885ed63a3c43b915da239a8dddfe
      private Multimap<Attribute, AttributeModifier> attributeModifiers;
      private int repairCost;
      private int hideFlag;
-@@ -288,7 +291,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -287,7 +290,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
  
      private CompoundTag internalTag;
@@ -213,7 +213,7 @@ index 0874c65c15fa66f61dfe8c440921b45e00b2f8b3..cd0c885ed63a3c43b915da239a8dddfe
      private CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftMetaItem.DATA_TYPE_REGISTRY);
  
      private int version = CraftMagicNumbers.INSTANCE.getDataVersion(); // Internal use only
-@@ -309,7 +312,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -308,7 +311,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          this.blockData = meta.blockData;
  
          if (meta.enchantments != null) { // Spigot
@@ -222,7 +222,7 @@ index 0874c65c15fa66f61dfe8c440921b45e00b2f8b3..cd0c885ed63a3c43b915da239a8dddfe
          }
  
          if (meta.hasAttributeModifiers()) {
-@@ -392,13 +395,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -391,13 +394,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -238,7 +238,7 @@ index 0874c65c15fa66f61dfe8c440921b45e00b2f8b3..cd0c885ed63a3c43b915da239a8dddfe
  
          for (int i = 0; i < ench.size(); i++) {
              String id = ((CompoundTag) ench.get(i)).getString(CraftMetaItem.ENCHANTMENTS_ID.NBT);
-@@ -551,13 +554,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -550,13 +553,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -254,7 +254,7 @@ index 0874c65c15fa66f61dfe8c440921b45e00b2f8b3..cd0c885ed63a3c43b915da239a8dddfe
          for (Map.Entry<?, ?> entry : ench.entrySet()) {
              // Doctor older enchants
              String enchantKey = entry.getKey().toString();
-@@ -833,14 +836,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -832,14 +835,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
      @Override
      public Map<Enchantment, Integer> getEnchants() {
@@ -271,7 +271,7 @@ index 0874c65c15fa66f61dfe8c440921b45e00b2f8b3..cd0c885ed63a3c43b915da239a8dddfe
          }
  
          if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) {
-@@ -1229,7 +1232,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1228,7 +1231,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              clone.customModelData = this.customModelData;
              clone.blockData = this.blockData;
              if (this.enchantments != null) {
@@ -280,7 +280,7 @@ index 0874c65c15fa66f61dfe8c440921b45e00b2f8b3..cd0c885ed63a3c43b915da239a8dddfe
              }
              if (this.hasAttributeModifiers()) {
                  clone.attributeModifiers = LinkedHashMultimap.create(this.attributeModifiers);
-@@ -1471,4 +1474,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1470,4 +1473,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              return CraftMetaItem.HANDLED_TAGS;
          }
      }
diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index f4c25dcca2..d6b9582de3 100644
--- a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -44,10 +44,10 @@ index b76ac10fe0d4b860a4b30fae365cf38400afb456..1e2d3040bb3e8b1901fbc933caa5ad3b
  
      protected void internalSetAbsorptionAmount(float absorptionAmount) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5d624f73a5b47efc3b117023a58176fe35454a84..77d836f33db291eeb214a833169da9cd1f22e4bb 100644
+index 5107128b0868d46b1672df8c8f98018de87c9eff..3fe9b9a28829f6796a23fe337df3a677d2e8d19b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2199,6 +2199,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2209,6 +2209,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
diff --git a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
index 7dab2ffd58..4121d026a4 100644
--- a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
@@ -43,10 +43,10 @@ index 78b11d6fd74fb0714a8013fdc78d096643c4f83c..6a64c58fff9bbed542bf29a029531996
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e85017f62eb90efda8d4f3910fe543c9a4a2243a..9c971f28483661fbdbee07b8091669071f0088a8 100644
+index 1d08a65fa782d8150bc6253d11f0a9ffa25ea325..a7c5f9b5c734243c81894e6b073e9ccef191f296 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1821,7 +1821,7 @@ public final class CraftServer implements Server {
+@@ -1822,7 +1822,7 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch
index 673a6e5ec7..93b813b3f6 100644
--- a/patches/server/0109-Add-EntityZapEvent.patch
+++ b/patches/server/0109-Add-EntityZapEvent.patch
@@ -28,10 +28,10 @@ index 22f7318711041bfc2847d519933c46b9fd523d01..505e0031f2783192f1146b1b00249e78
                  entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
                  entitywitch.setNoAi(this.isNoAi());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c6f5d282b35a40756f920906e39a4f71d277ada3..be2722c95fad0b78b27a97e64692dfe686a1f03f 100644
+index 54c4a45d5f67c7ed6ce751b4985d9e920cf62008..6436da99daa22ace3cdee794d0dab09894c1d92c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1268,6 +1268,14 @@ public class CraftEventFactory {
+@@ -1265,6 +1265,14 @@ public class CraftEventFactory {
          return !event.isCancelled();
      }
  
diff --git a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
index 506659df89..ece1b73341 100644
--- a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/server/0112-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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9c971f28483661fbdbee07b8091669071f0088a8..cfa9f0336494de42a34ea14d9453e083574f5945 100644
+index a7c5f9b5c734243c81894e6b073e9ccef191f296..4cc530605843faf8ce296ed34314592250fa9f9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2742,5 +2742,24 @@ public final class CraftServer implements Server {
+@@ -2743,5 +2743,24 @@ public final class CraftServer implements Server {
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();
      }
diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
index f01d4d9dd9..9dc1202d54 100644
--- a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
@@ -18,10 +18,10 @@ index 79943167c7e16111a81ff608fd9ed6c06bcb9468..59bad6c92cc421dd05c7315e2ab694a6
  
                  --this.count;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index be2722c95fad0b78b27a97e64692dfe686a1f03f..1008cd5a10d6587f7df66e6235bee5fe5c3f2eca 100644
+index 6436da99daa22ace3cdee794d0dab09894c1d92c..f6691073be08db9ea960b1298369687782ba9624 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1221,6 +1221,17 @@ public class CraftEventFactory {
+@@ -1218,6 +1218,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0114-Add-ProjectileCollideEvent.patch
index fec8266420..969c65511c 100644
--- a/patches/server/0114-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0114-Add-ProjectileCollideEvent.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add ProjectileCollideEvent
 Deprecated now and replaced with ProjectileHitEvent
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1008cd5a10d6587f7df66e6235bee5fe5c3f2eca..3b267a9a22a735af6f12427136816578c4a1e681 100644
+index f6691073be08db9ea960b1298369687782ba9624..42c4423979cb007f9e9270ee319d765f208dc61b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1365,6 +1365,17 @@ public class CraftEventFactory {
+@@ -1362,6 +1362,17 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
@@ -27,7 +27,7 @@ index 1008cd5a10d6587f7df66e6235bee5fe5c3f2eca..3b267a9a22a735af6f12427136816578
      public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) {
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
-@@ -1389,8 +1400,15 @@ public class CraftEventFactory {
+@@ -1386,8 +1397,15 @@ public class CraftEventFactory {
          if (position.getType() == HitResult.Type.ENTITY) {
              hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity();
          }
diff --git a/patches/server/0120-String-based-Action-Bar-API.patch b/patches/server/0120-String-based-Action-Bar-API.patch
index 5da48b5804..c45927d5f6 100644
--- a/patches/server/0120-String-based-Action-Bar-API.patch
+++ b/patches/server/0120-String-based-Action-Bar-API.patch
@@ -26,10 +26,10 @@ 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 77d836f33db291eeb214a833169da9cd1f22e4bb..6c46977874eac7d88ad87f655c0f6ad5159ce98c 100644
+index 3fe9b9a28829f6796a23fe337df3a677d2e8d19b..ba93b5d9b6ee5f4da150248a850970e8ecfb4d2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -346,6 +346,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -343,6 +343,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start
diff --git a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 0052d4d7af..5cd2e63537 100644
--- a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -323,19 +323,19 @@ index e72ed2ed8664cbc408cbe1e38f1f0acacc3841dd..2f628f36c32752d1bac910e180b90639
      }
  
      @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 0f1644d3ba208a1dc9bf584640fc7c36bc57ce0c..4ce013d8715d2090420a369678f698a9ce1983cb 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -977,7 +977,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-         } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
-             entity = new PrimedTnt(world, x, y, z, null);
-         } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
--            entity = new net.minecraft.world.entity.ExperienceOrb(world, x, y, z, 0);
-+            entity = new net.minecraft.world.entity.ExperienceOrb(world, x, y, z, 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null); // Paper
-         } else if (LightningStrike.class.isAssignableFrom(clazz)) {
-             entity = net.minecraft.world.entity.EntityType.LIGHTNING_BOLT.create(world);
-             entity.moveTo(location.getX(), location.getY(), location.getZ());
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+index f07cff6e72094c5f7c6248b4f738d3c26ea35160..4e7c37c384116ddb9525994428e1bfac35b4a85e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+@@ -363,7 +363,7 @@ public final class CraftEntityTypes {
+             return item;
+         }));
+         register(new EntityTypeData<>(EntityType.EXPERIENCE_ORB, ExperienceOrb.class, CraftExperienceOrb::new,
+-                spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0)
++                spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null) // Paper
+         ));
+         register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, spawnData -> new net.minecraft.world.entity.AreaEffectCloud(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z())));
+         register(new EntityTypeData<>(EntityType.EGG, Egg.class, CraftEgg::new, spawnData -> new ThrownEgg(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z())));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 index 9231511af4cba747594000364f0b8fceeeab4819..5a7d314ec0562e472f5dc45924a7b24841cff126 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
diff --git a/patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch
index 08368048be..2070657485 100644
--- a/patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0131-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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cfa9f0336494de42a34ea14d9453e083574f5945..31c8013369feb57defe3f530c003eafb9468890f 100644
+index 4cc530605843faf8ce296ed34314592250fa9f9f..3be38200f46973dfaa0371337d5ed9544aa0aeaa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2761,5 +2761,10 @@ public final class CraftServer implements Server {
+@@ -2762,5 +2762,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
diff --git a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
index a245574757..a56f469625 100644
--- a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -25,7 +25,7 @@ Other changes:
 Co-Authored-By: Emilia Kond <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6f442d70a963dfc65a1b5b9494f850456c31cde3..0bfa5a3fe47d96f159f0093c046de3f2d8a0211c 100644
+index 89064b339ce27a09ad546c62a36459534d138c29..63ed761efdb11533905a8a44a7564d86c7e0bc90 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -6,9 +6,30 @@ plugins {
@@ -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 1fb9b0ea9f2dbff12d8d2fbc2ad2f4d88ca9f7ad..66ff48a12c8322cfbfd17c470d03dad1f912d123 100644
+index c10c0ffa29332d73328f088935a0b914260d4c50..99871023c54e387c6ef72a4307d945047aee87fe 100644
 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 @@ -22,6 +22,7 @@ import net.kyori.adventure.text.TranslatableComponent;
@@ -387,10 +387,10 @@ index 8550245a088be78359b55fa0cc582df35dbbebed..ea7effdb4274c7e2c19d737a74b1fc58
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 31c8013369feb57defe3f530c003eafb9468890f..f2c8a7fe1a029166701bcacbd3faa750cfe38ae4 100644
+index 3be38200f46973dfaa0371337d5ed9544aa0aeaa..68d9ba337885ef9158d5f42154526596d8fefe07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -44,7 +44,7 @@ import java.util.logging.Level;
+@@ -42,7 +42,7 @@ import java.util.logging.Level;
  import java.util.logging.Logger;
  import java.util.stream.Collectors;
  import javax.imageio.ImageIO;
@@ -399,7 +399,7 @@ index 31c8013369feb57defe3f530c003eafb9468890f..f2c8a7fe1a029166701bcacbd3faa750
  import net.minecraft.advancements.AdvancementHolder;
  import net.minecraft.commands.CommandSourceStack;
  import net.minecraft.commands.Commands;
-@@ -1328,9 +1328,13 @@ public final class CraftServer implements Server {
+@@ -1329,9 +1329,13 @@ public final class CraftServer implements Server {
          return this.logger;
      }
  
@@ -414,7 +414,7 @@ index 31c8013369feb57defe3f530c003eafb9468890f..f2c8a7fe1a029166701bcacbd3faa750
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3eca99ab31f257423ca4d1d2cdcfc19a16758e6d..de7f0db02cdc730ccc89111396c031a267198f04 100644
+index d843307a2de71537a5a17c42f9fab4fc0328dc43..9c24fdab1744a5af71d8dfb63736483272476f40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -13,7 +13,6 @@ import java.util.logging.Logger;
diff --git a/patches/server/0138-Basic-PlayerProfile-API.patch b/patches/server/0138-Basic-PlayerProfile-API.patch
index 792819662c..05a9807eb6 100644
--- a/patches/server/0138-Basic-PlayerProfile-API.patch
+++ b/patches/server/0138-Basic-PlayerProfile-API.patch
@@ -612,10 +612,10 @@ index fdf3194499512614355b02aa11e34574cdd89c59..4dc08b0abf0a1edb51cc586d1a89444b
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f2c8a7fe1a029166701bcacbd3faa750cfe38ae4..7c85ef9eebdfb977c4975998311e0ff356430b1a 100644
+index 68d9ba337885ef9158d5f42154526596d8fefe07..a4426373070ca065884ae80e6aa9215df89c741d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -266,6 +266,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+@@ -260,6 +260,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
  
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
@@ -625,7 +625,7 @@ index f2c8a7fe1a029166701bcacbd3faa750cfe38ae4..7c85ef9eebdfb977c4975998311e0ff3
  public final class CraftServer implements Server {
      private final String serverName = "Paper"; // Paper
      private final String serverVersion;
-@@ -308,6 +311,7 @@ public final class CraftServer implements Server {
+@@ -303,6 +306,7 @@ public final class CraftServer implements Server {
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
          ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
@@ -633,7 +633,7 @@ index f2c8a7fe1a029166701bcacbd3faa750cfe38ae4..7c85ef9eebdfb977c4975998311e0ff3
          CraftItemFactory.instance();
      }
  
-@@ -2770,5 +2774,42 @@ public final class CraftServer implements Server {
+@@ -2771,5 +2775,42 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return io.papermc.paper.configuration.GlobalConfiguration.get().commands.suggestPlayerNamesWhenNullTabCompletions;
      }
diff --git a/patches/server/0139-Add-UnknownCommandEvent.patch b/patches/server/0139-Add-UnknownCommandEvent.patch
index 508b9b113a..79dd3b5bba 100644
--- a/patches/server/0139-Add-UnknownCommandEvent.patch
+++ b/patches/server/0139-Add-UnknownCommandEvent.patch
@@ -108,10 +108,10 @@ index 495a7b713a7ab9c19aad34512b76523bad43b89d..5a1accff1a7dc2ab40224ec0952a287c
  
              return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7c85ef9eebdfb977c4975998311e0ff356430b1a..4c3d6286a0718694df2bebb94f42082bb96dc4f0 100644
+index a4426373070ca065884ae80e6aa9215df89c741d..a41b39a7b8f6011327584d5556ddb304a6e32e4b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -531,6 +531,7 @@ public final class CraftServer implements Server {
+@@ -527,6 +527,7 @@ public final class CraftServer implements Server {
                      }
                      node = clone;
                  }
@@ -119,7 +119,7 @@ index 7c85ef9eebdfb977c4975998311e0ff356430b1a..4c3d6286a0718694df2bebb94f42082b
  
                  dispatcher.getDispatcher().getRoot().addChild(node);
              } else {
-@@ -898,7 +899,13 @@ public final class CraftServer implements Server {
+@@ -899,7 +900,13 @@ public final class CraftServer implements Server {
  
          // Spigot start
          if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
diff --git a/patches/server/0140-Shoulder-Entities-Release-API.patch b/patches/server/0140-Shoulder-Entities-Release-API.patch
index ccbafb9afe..5ad94990b1 100644
--- a/patches/server/0140-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0140-Shoulder-Entities-Release-API.patch
@@ -59,10 +59,10 @@ index 09d5561deb40549ce6a7661ebfd9b9db24db0d12..9db07751cf1321c7fd15b2345729deaa
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index c27dfd3e8f3c287e74887a76b479c75563b7f280..a472bd00afb1ef4ee3043e8c8e2098014f67a888 100644
+index 233dd760713a48770178c5fb532f86aee52ad0aa..b143c417b70bbc4d5fdbe1b31f3a86594ea82ae9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -517,6 +517,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -516,6 +516,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          this.getHandle().getCooldowns().addCooldown(CraftMagicNumbers.getItem(material), ticks);
      }
  
diff --git a/patches/server/0143-Entity-fromMobSpawner.patch b/patches/server/0143-Entity-fromMobSpawner.patch
index 98dbdfb6f9..a19919f3e5 100644
--- a/patches/server/0143-Entity-fromMobSpawner.patch
+++ b/patches/server/0143-Entity-fromMobSpawner.patch
@@ -49,10 +49,10 @@ index bd48f49d50709354abc5bcff155b5abb9ab20191..1a5fb001e28997a113ad8133e9dc9462
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
                              continue;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6100b2e718954b40f63ed30ab32e1dea4edba9a6..09cae000b1ff23ab3a0f2a43d83bc7ec05b5623f 100644
+index 9ff8190002d25a13e6166e076b54a006cff0b47d..b96f65776155f57d599a0a0d06456c95088d38fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1361,5 +1361,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1012,5 +1012,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          //noinspection ConstantConditions
          return originVector.toLocation(world);
      }
diff --git a/patches/server/0148-Fix-this-stupid-bullshit.patch b/patches/server/0148-Fix-this-stupid-bullshit.patch
index 3686090d91..b3fb127176 100644
--- a/patches/server/0148-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0148-Fix-this-stupid-bullshit.patch
@@ -31,12 +31,12 @@ index 8ff786c366332588a2df053438f23cc9fb7e2b84..c887d34171f89c731d76c4ca92c70be2
              Bootstrap.isBootstrapped = true;
              Instant instant = Instant.now();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index de7f0db02cdc730ccc89111396c031a267198f04..bb2ed43dccac698ea7265739bc1ed253f345d314 100644
+index 9c24fdab1744a5af71d8dfb63736483272476f40..ebfebbb9b7de93dd43ee6d0531832a71f8556d33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -258,10 +258,12 @@ public class Main {
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
                      if (buildDate.before(deadline.getTime())) {
 -                        System.err.println("*** Error, this build is outdated ***");
 +                        // Paper start - This is some stupid bullshit
diff --git a/patches/server/0149-LivingEntity-setKiller.patch b/patches/server/0149-LivingEntity-setKiller.patch
index 9411e6e937..ecbc4d4730 100644
--- a/patches/server/0149-LivingEntity-setKiller.patch
+++ b/patches/server/0149-LivingEntity-setKiller.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] LivingEntity#setKiller
 public net.minecraft.world.entity.LivingEntity lastHurtByPlayerTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index afbf6af7198bc69053882ac200892b5b695a4d36..1d5b84449fb91dba87de040c1c37ad77e0741320 100644
+index a51a3aed4a55e251da04544a4a59059d73b615d8..7c0fe4772d171575be820ee66bb7facf1c3465f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -366,6 +366,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -365,6 +365,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().lastHurtByPlayer == null ? null : (Player) this.getHandle().lastHurtByPlayer.getBukkitEntity();
      }
  
diff --git a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
index 0befb524ec..7defeb27e0 100644
--- a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,10 +90,10 @@ index 0d9658b1c6b5912a34058c0ce53b8e7f8c28afac..203fc53142bb0c9b6e2d1876fe8dfbe3
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6c46977874eac7d88ad87f655c0f6ad5159ce98c..31e107a0641276b2f00fd219f2095e15e0544285 100644
+index ba93b5d9b6ee5f4da150248a850970e8ecfb4d2e..809ad04237c85f41bdf3bd772deb67d203b4a4b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -292,6 +292,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -289,6 +289,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/patches/server/0165-AsyncTabCompleteEvent.patch b/patches/server/0165-AsyncTabCompleteEvent.patch
index 110bde7b7e..6e0a03b699 100644
--- a/patches/server/0165-AsyncTabCompleteEvent.patch
+++ b/patches/server/0165-AsyncTabCompleteEvent.patch
@@ -91,10 +91,10 @@ index 6b1885cd2dd03772e2a8f3ea2b58ce68e70e97e7..9aa8c643d0a338afefeb8ff6a1f016cc
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4c3d6286a0718694df2bebb94f42082bb96dc4f0..781922298273c77ef92cf683034d4239deb02599 100644
+index a41b39a7b8f6011327584d5556ddb304a6e32e4b..dbbb697a91f137c32be663bb8c0a263158723a94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2227,7 +2227,7 @@ public final class CraftServer implements Server {
+@@ -2228,7 +2228,7 @@ public final class CraftServer implements Server {
              offers = this.tabCompleteChat(player, message);
          }
  
diff --git a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
index 0b914ae992..1487a51ace 100644
--- a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
@@ -14,10 +14,10 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 31e107a0641276b2f00fd219f2095e15e0544285..9255edcd67e2cdd2fab31ae881ca88b6a5beb8e3 100644
+index 809ad04237c85f41bdf3bd772deb67d203b4a4b6..7021921980b20a8c61016a021b281af58ed72b51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1546,7 +1546,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1543,7 +1543,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0173-Add-ArmorStand-Item-Meta.patch b/patches/server/0173-Add-ArmorStand-Item-Meta.patch
index 7f2bdd0c95..12eb0d514a 100644
--- a/patches/server/0173-Add-ArmorStand-Item-Meta.patch
+++ b/patches/server/0173-Add-ArmorStand-Item-Meta.patch
@@ -255,10 +255,10 @@ index b77f5832265be5aaf96d95fcac4737919720fa6e..e15723080445b09852512132039ca2cd
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index cd0c885ed63a3c43b915da239a8dddfee2622c76..4c66a0357c06e0b286e38624c874e33e45933fc9 100644
+index 78762a410ece8bca16382975222d026ad010bca2..be9acd6f975718c1ef254391e8ef9129558c86a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -1464,6 +1464,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1463,6 +1463,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                          CraftMetaCrossbow.CHARGED.NBT,
                          CraftMetaCrossbow.CHARGED_PROJECTILES.NBT,
                          CraftMetaSuspiciousStew.EFFECTS.NBT,
diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/server/0180-Player.setPlayerProfile-API.patch
index 96ec2274b8..c4a8f2025f 100644
--- a/patches/server/0180-Player.setPlayerProfile-API.patch
+++ b/patches/server/0180-Player.setPlayerProfile-API.patch
@@ -55,10 +55,10 @@ index 477d3245facb5ae59c786d4f696f64226cb540a6..e8490a58dd4d9bc39a5bb2f9fc109526
  
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9255edcd67e2cdd2fab31ae881ca88b6a5beb8e3..a343157512ca145b3e5ab1a0fcaeae0ae7aeb2e0 100644
+index 7021921980b20a8c61016a021b281af58ed72b51..44b98fc01ce1879f08987c6544b77b442e7bfad6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -275,11 +275,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -272,11 +272,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.server.getPlayer(this.getUniqueId()) != null;
      }
  
@@ -70,7 +70,7 @@ index 9255edcd67e2cdd2fab31ae881ca88b6a5beb8e3..a343157512ca145b3e5ab1a0fcaeae0a
      @Override
      public InetSocketAddress getAddress() {
          if (this.getHandle().connection == null) return null;
-@@ -1696,8 +1691,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1693,8 +1688,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      private void untrackAndHideEntity(org.bukkit.entity.Entity entity) {
          // Remove this entity from the hidden player's EntityTrackerEntry
@@ -87,7 +87,7 @@ index 9255edcd67e2cdd2fab31ae881ca88b6a5beb8e3..a343157512ca145b3e5ab1a0fcaeae0a
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
          if (entry != null) {
              entry.removePlayer(this.getHandle());
-@@ -1710,8 +1712,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1707,8 +1709,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.getHandle().connection.send(new ClientboundPlayerInfoRemovePacket(List.of(otherPlayer.getUUID())));
              }
          }
@@ -96,7 +96,7 @@ index 9255edcd67e2cdd2fab31ae881ca88b6a5beb8e3..a343157512ca145b3e5ab1a0fcaeae0a
      }
  
      void resetAndHideEntity(org.bukkit.entity.Entity entity) {
-@@ -1776,12 +1776,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1773,12 +1773,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      private void trackAndShowEntity(org.bukkit.entity.Entity entity) {
@@ -122,7 +122,7 @@ index 9255edcd67e2cdd2fab31ae881ca88b6a5beb8e3..a343157512ca145b3e5ab1a0fcaeae0a
          }
  
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
-@@ -1791,6 +1804,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1788,6 +1801,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          this.server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
      }
@@ -162,7 +162,7 @@ index 9255edcd67e2cdd2fab31ae881ca88b6a5beb8e3..a343157512ca145b3e5ab1a0fcaeae0a
  
      void resetAndShowEntity(org.bukkit.entity.Entity entity) {
          // SPIGOT-7312: Can't show/hide self
-@@ -1802,6 +1848,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1799,6 +1845,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              this.trackAndShowEntity(entity);
          }
      }
diff --git a/patches/server/0181-getPlayerUniqueId-API.patch b/patches/server/0181-getPlayerUniqueId-API.patch
index f3873faf75..da4573f45a 100644
--- a/patches/server/0181-getPlayerUniqueId-API.patch
+++ b/patches/server/0181-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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 781922298273c77ef92cf683034d4239deb02599..91598abecda54206f177976d4c7eed99bd949993 100644
+index dbbb697a91f137c32be663bb8c0a263158723a94..146b21e3d3b1432d7b14cda4a9462d77b30e5fe2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1825,6 +1825,25 @@ public final class CraftServer implements Server {
+@@ -1826,6 +1826,25 @@ public final class CraftServer implements Server {
          return recipients.size();
      }
  
diff --git a/patches/server/0185-Flag-to-disable-the-channel-limit.patch b/patches/server/0185-Flag-to-disable-the-channel-limit.patch
index ad0d8dbe43..b8b4bb0e0a 100644
--- a/patches/server/0185-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0185-Flag-to-disable-the-channel-limit.patch
@@ -9,10 +9,10 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a343157512ca145b3e5ab1a0fcaeae0ae7aeb2e0..a5b82436d929c17007cf55d12686ecdd948bdee3 100644
+index 44b98fc01ce1879f08987c6544b77b442e7bfad6..cb6cad55f02feaacfb1a194b63fa75c3b7e267be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -193,6 +193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -190,6 +190,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private CraftWorldBorder clientWorldBorder = null;
      private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
      public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus; // Paper - more resource pack API
@@ -20,8 +20,8 @@ index a343157512ca145b3e5ab1a0fcaeae0ae7aeb2e0..a5b82436d929c17007cf55d12686ecdd
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2128,7 +2129,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     // Paper end - more resource pack API
+@@ -2138,7 +2139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+     }
  
      public void addChannel(String channel) {
 -        Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
diff --git a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch b/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
index a03b4bae39..1cf74ce84b 100644
--- a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add openSign method to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index a472bd00afb1ef4ee3043e8c8e2098014f67a888..7d6301ae9ee2added007b0c68ffabe5d79f7be62 100644
+index b143c417b70bbc4d5fdbe1b31f3a86594ea82ae9..f0194d4431821638e43a0f1b12b39f668ad147d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -627,6 +627,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -626,6 +626,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          }
      }
  
diff --git a/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch
deleted file mode 100644
index 2ce4e6559b..0000000000
--- a/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Mon, 4 Jun 2018 20:39:20 -0400
-Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
-
-This API has more capabilities than .dropItem with the Consumer function
-
-Item can be set inside of the Consumer pre spawn function.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 4ce013d8715d2090420a369678f698a9ce1983cb..53385eb0fb6c79052f508f8feeff7cbd8559c19f 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -623,6 +623,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-                 entity = net.minecraft.world.entity.EntityType.BOAT.create(world);
-             }
-             entity.moveTo(x, y, z, yaw, pitch);
-+            // Paper start
-+        } else if (org.bukkit.entity.Item.class.isAssignableFrom(clazz)) {
-+            entity = new net.minecraft.world.entity.item.ItemEntity(world, x, y, z, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.DIRT));
-+            // Paper end
-         } else if (FallingBlock.class.isAssignableFrom(clazz)) {
-             BlockPos pos = BlockPos.containing(x, y, z);
-             entity = FallingBlockEntity.fall(world, pos, this.getHandle().getBlockState(pos));
diff --git a/patches/server/0198-WitchReadyPotionEvent.patch b/patches/server/0197-WitchReadyPotionEvent.patch
index d22f2f2885..d22f2f2885 100644
--- a/patches/server/0198-WitchReadyPotionEvent.patch
+++ b/patches/server/0197-WitchReadyPotionEvent.patch
diff --git a/patches/server/0199-ItemStack-getMaxItemUseDuration.patch b/patches/server/0198-ItemStack-getMaxItemUseDuration.patch
index e81a524d20..e81a524d20 100644
--- a/patches/server/0199-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/server/0198-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0199-Implement-EntityTeleportEndGatewayEvent.patch
index 99c2c303c4..99c2c303c4 100644
--- a/patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/server/0199-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index ca3c8f8d69..ca3c8f8d69 100644
--- a/patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0202-Fix-CraftEntity-hashCode.patch b/patches/server/0201-Fix-CraftEntity-hashCode.patch
index 1feb378bf8..cb48492e74 100644
--- a/patches/server/0202-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0201-Fix-CraftEntity-hashCode.patch
@@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 09cae000b1ff23ab3a0f2a43d83bc7ec05b5623f..93363aabee8bafeb1bc1d0d5a94e80b647175509 100644
+index b96f65776155f57d599a0a0d06456c95088d38fb..594eeb83425787e160f8051f15c7cdf61a7bb090 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -848,14 +848,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -499,14 +499,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return false;
          }
          final CraftEntity other = (CraftEntity) obj;
diff --git a/patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0202-Configurable-Alternative-LootPool-Luck-Formula.patch
index 20b7414cd7..20b7414cd7 100644
--- a/patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/server/0202-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch
index 46002fb1e9..46002fb1e9 100644
--- a/patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0205-Make-shield-blocking-delay-configurable.patch b/patches/server/0204-Make-shield-blocking-delay-configurable.patch
index 06ab56ab10..7fb34d5dcc 100644
--- a/patches/server/0205-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0204-Make-shield-blocking-delay-configurable.patch
@@ -35,10 +35,10 @@ index 226afea543b581dd1b8ba0f81ff7dab7cce96395..2786b4322d32950153c489941e1aed7c
          return this.isShiftKeyDown();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1d5b84449fb91dba87de040c1c37ad77e0741320..c790cbdc16b1f5e3d59cdf58e2c9795fccdb758a 100644
+index 7c0fe4772d171575be820ee66bb7facf1c3465f9..3805b32d3a4655577b59a0bc4bb6a508faf1e3e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -815,5 +815,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -814,5 +814,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setArrowsStuck(final int arrows) {
          this.getHandle().setArrowCount(arrows);
      }
diff --git a/patches/server/0206-Improve-EntityShootBowEvent.patch b/patches/server/0205-Improve-EntityShootBowEvent.patch
index eef1882378..eef1882378 100644
--- a/patches/server/0206-Improve-EntityShootBowEvent.patch
+++ b/patches/server/0205-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0207-PlayerReadyArrowEvent.patch b/patches/server/0206-PlayerReadyArrowEvent.patch
index ff8b066018..ff8b066018 100644
--- a/patches/server/0207-PlayerReadyArrowEvent.patch
+++ b/patches/server/0206-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0208-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0207-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
index 91f930c226..91f930c226 100644
--- a/patches/server/0208-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
+++ b/patches/server/0207-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
diff --git a/patches/server/0209-Expand-Explosions-API.patch b/patches/server/0208-Expand-Explosions-API.patch
index 6d57478d8a..6d57478d8a 100644
--- a/patches/server/0209-Expand-Explosions-API.patch
+++ b/patches/server/0208-Expand-Explosions-API.patch
diff --git a/patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0209-LivingEntity-Hand-Raised-Item-Use-API.patch
index 2a52d40343..3ceb2c48e7 100644
--- a/patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/server/0209-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c790cbdc16b1f5e3d59cdf58e2c9795fccdb758a..3c5d297ff8125e2c7e0a1fd10ed4b859c3ae0496 100644
+index 3805b32d3a4655577b59a0bc4bb6a508faf1e3e1..5001873aba00da0a1daf0e473593a332f0856cdd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -825,5 +825,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -824,5 +824,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setShieldBlockingDelay(int delay) {
          getHandle().setShieldBlockingDelay(delay);
      }
diff --git a/patches/server/0211-RangedEntity-API.patch b/patches/server/0210-RangedEntity-API.patch
index f20290a950..f20290a950 100644
--- a/patches/server/0211-RangedEntity-API.patch
+++ b/patches/server/0210-RangedEntity-API.patch
diff --git a/patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch
index adc52710df..adc52710df 100644
--- a/patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0213-Implement-World.getEntity-UUID-API.patch b/patches/server/0212-Implement-World.getEntity-UUID-API.patch
index a0b4225f05..a0b4225f05 100644
--- a/patches/server/0213-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0212-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0214-InventoryCloseEvent-Reason-API.patch b/patches/server/0213-InventoryCloseEvent-Reason-API.patch
index abbc09ef61..81728587ea 100644
--- a/patches/server/0214-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0213-InventoryCloseEvent-Reason-API.patch
@@ -144,10 +144,10 @@ index 8d40021ce31d5f8fd8a5462a80e92fb919b4b162..0d8261e15a1a66df17727788c387dca8
          this.containerMenu = this.inventoryMenu;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 7d6301ae9ee2added007b0c68ffabe5d79f7be62..801dca6bbafd6e1825a1291fc128efc165f4c8d1 100644
+index f0194d4431821638e43a0f1b12b39f668ad147d1..21e3070a9aab9b4d8d352655d0145c9921857c0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -377,7 +377,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -376,7 +376,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          if (((ServerPlayer) this.getHandle()).connection == null) return;
          if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
              // fire INVENTORY_CLOSE if one already open
@@ -156,7 +156,7 @@ index 7d6301ae9ee2added007b0c68ffabe5d79f7be62..801dca6bbafd6e1825a1291fc128efc1
          }
          ServerPlayer player = (ServerPlayer) this.getHandle();
          AbstractContainerMenu container;
-@@ -447,8 +447,14 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -446,8 +446,14 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
  
      @Override
      public void closeInventory() {
@@ -173,10 +173,10 @@ index 7d6301ae9ee2added007b0c68ffabe5d79f7be62..801dca6bbafd6e1825a1291fc128efc1
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a5b82436d929c17007cf55d12686ecdd948bdee3..9e34575c8ffff57d692349a4a05db3d1f769c687 100644
+index cb6cad55f02feaacfb1a194b63fa75c3b7e267be..d034c84a95f24233a8dd54b25c1ef670311c346a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1197,7 +1197,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1194,7 +1194,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
@@ -186,10 +186,10 @@ index a5b82436d929c17007cf55d12686ecdd948bdee3..9e34575c8ffff57d692349a4a05db3d1
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3b267a9a22a735af6f12427136816578c4a1e681..4d795ac868879a78d6893f9e93090038e3f1c678 100644
+index 42c4423979cb007f9e9270ee319d765f208dc61b..49b6b109eec1220b8d669adc435baf5636cba9cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1334,7 +1334,7 @@ public class CraftEventFactory {
+@@ -1331,7 +1331,7 @@ public class CraftEventFactory {
  
      public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) {
          if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
@@ -198,7 +198,7 @@ index 3b267a9a22a735af6f12427136816578c4a1e681..4d795ac868879a78d6893f9e93090038
          }
  
          CraftServer server = player.level().getCraftServer();
-@@ -1521,8 +1521,18 @@ public class CraftEventFactory {
+@@ -1518,8 +1518,18 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0215-Vex-get-setSummoner-API.patch b/patches/server/0214-Vex-get-setSummoner-API.patch
index 9c014ff1fc..9c014ff1fc 100644
--- a/patches/server/0215-Vex-get-setSummoner-API.patch
+++ b/patches/server/0214-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 63acab1822..63acab1822 100644
--- a/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0216-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 0feff6194d..9d489a6dd0 100644
--- a/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0216-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,17 +5,17 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2c885574b6c2667984b4996af0a421d8325842ef..4b4aa6cc48abb6a2d31c2043e0eff25bca0d05b3 100644
+index e2fec62f0da22fcae7533ede3a34f05807ded430..b2db0b51895200fc870e536ea97886db3d7a763c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -37,6 +37,7 @@ dependencies {
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
+     runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
 +    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
  
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+     runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
 index 88957220d5574e5590e8a545605d76c0c7b0a10e..ea4e2161c0bd43884055cc6b8d70b2139f70e720 100644
 --- a/src/main/resources/log4j2.xml
diff --git a/patches/server/0218-add-more-information-to-Entity.toString.patch b/patches/server/0217-add-more-information-to-Entity.toString.patch
index 1b5b3946c0..1b5b3946c0 100644
--- a/patches/server/0218-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0217-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0219-EnderDragon-Events.patch b/patches/server/0218-EnderDragon-Events.patch
index 0559cac19b..0559cac19b 100644
--- a/patches/server/0219-EnderDragon-Events.patch
+++ b/patches/server/0218-EnderDragon-Events.patch
diff --git a/patches/server/0220-PlayerElytraBoostEvent.patch b/patches/server/0219-PlayerElytraBoostEvent.patch
index e99be47ba0..e99be47ba0 100644
--- a/patches/server/0220-PlayerElytraBoostEvent.patch
+++ b/patches/server/0219-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0221-PlayerLaunchProjectileEvent.patch b/patches/server/0220-PlayerLaunchProjectileEvent.patch
index f512b0ab72..f512b0ab72 100644
--- a/patches/server/0221-PlayerLaunchProjectileEvent.patch
+++ b/patches/server/0220-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0222-Improve-BlockPosition-inlining.patch b/patches/server/0221-Improve-BlockPosition-inlining.patch
index 208af75831..208af75831 100644
--- a/patches/server/0222-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0221-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0222-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 13732a28b5..13732a28b5 100644
--- a/patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0222-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0224-Vanished-players-don-t-have-rights.patch b/patches/server/0223-Vanished-players-don-t-have-rights.patch
index 6814fedc44..5ff2477771 100644
--- a/patches/server/0224-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0223-Vanished-players-don-t-have-rights.patch
@@ -89,10 +89,10 @@ index 4751f83571688cf1e0aa669accc813942d85c60c..4fb29ca40e1caba3f205afc13fb4d7a9
      public boolean isClientSide() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4d795ac868879a78d6893f9e93090038e3f1c678..f55b1ccaab6f6bec89d92f79995abf331ea87c98 100644
+index 49b6b109eec1220b8d669adc435baf5636cba9cd..c5736eb070209d0ecad1007e4c4c633c4615be83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1371,6 +1371,14 @@ public class CraftEventFactory {
+@@ -1368,6 +1368,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/patches/server/0225-Allow-disabling-armour-stand-ticking.patch b/patches/server/0224-Allow-disabling-armour-stand-ticking.patch
index a8bcc90962..a8bcc90962 100644
--- a/patches/server/0225-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/server/0224-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0226-SkeletonHorse-Additions.patch b/patches/server/0225-SkeletonHorse-Additions.patch
index 16f74f0083..16f74f0083 100644
--- a/patches/server/0226-SkeletonHorse-Additions.patch
+++ b/patches/server/0225-SkeletonHorse-Additions.patch
diff --git a/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0226-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 0bf50e2c9c..0bf50e2c9c 100644
--- a/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/server/0226-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0228-Implement-Expanded-ArmorStand-API.patch b/patches/server/0227-Implement-Expanded-ArmorStand-API.patch
index 54d871b2b0..54d871b2b0 100644
--- a/patches/server/0228-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/server/0227-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0229-AnvilDamageEvent.patch b/patches/server/0228-AnvilDamageEvent.patch
index 267d158dc2..267d158dc2 100644
--- a/patches/server/0229-AnvilDamageEvent.patch
+++ b/patches/server/0228-AnvilDamageEvent.patch
diff --git a/patches/server/0230-Add-TNTPrimeEvent.patch b/patches/server/0229-Add-TNTPrimeEvent.patch
index b97e2a7eca..b97e2a7eca 100644
--- a/patches/server/0230-Add-TNTPrimeEvent.patch
+++ b/patches/server/0229-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0231-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0230-Break-up-and-make-tab-spam-limits-configurable.patch
index 4a8730ddc6..4a8730ddc6 100644
--- a/patches/server/0231-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0230-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0232-Fix-NBT-type-issues.patch b/patches/server/0231-Fix-NBT-type-issues.patch
index 427a4ad15a..427a4ad15a 100644
--- a/patches/server/0232-Fix-NBT-type-issues.patch
+++ b/patches/server/0231-Fix-NBT-type-issues.patch
diff --git a/patches/server/0233-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0232-Remove-unnecessary-itemmeta-handling.patch
index 7dea978861..7dea978861 100644
--- a/patches/server/0233-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/server/0232-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 7152ac53a8..9879154e81 100644
--- a/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -29,7 +29,7 @@ index ea520b828378c268d05425096c6493ca1c7ad385..8d3a9f8210bf529484aeaf84ef9a55b5
  
      protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cc499b31cf186412e575373a5fb7cad54946b0a7..8870e9999e2a1aba59e5e6e7927bc8c6041f8ad6 100644
+index 2e1cabfc3131f43feadf8ce61d0027c18d7c78e6..9d098a0836ea0b152eacd787ea7c43846f9122b2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,6 +223,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0235-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0234-Add-Early-Warning-Feature-to-WatchDog.patch
index 485e8e5b36..e83eb3b30a 100644
--- a/patches/server/0235-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0234-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -33,10 +33,10 @@ index fc2a55735b22f5a25d009a7157624fb0cdc853c0..adae2d7f9ced8ce6d2e15aafb8b53ef8
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 91598abecda54206f177976d4c7eed99bd949993..b0de5cfd60a61fcea681f95dabbdc16beeb4242d 100644
+index 146b21e3d3b1432d7b14cda4a9462d77b30e5fe2..f8499f4a70fbbaa99df0cc73aff6405bbbb135ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -914,6 +914,7 @@ public final class CraftServer implements Server {
+@@ -915,6 +915,7 @@ public final class CraftServer implements Server {
  
      @Override
      public void reload() {
@@ -44,7 +44,7 @@ index 91598abecda54206f177976d4c7eed99bd949993..b0de5cfd60a61fcea681f95dabbdc16b
          this.reloadCount++;
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
-@@ -1003,6 +1004,7 @@ public final class CraftServer implements Server {
+@@ -1004,6 +1005,7 @@ public final class CraftServer implements Server {
          this.enablePlugins(PluginLoadOrder.STARTUP);
          this.enablePlugins(PluginLoadOrder.POSTWORLD);
          this.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));
diff --git a/patches/server/0236-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch
index 25984880a5..25984880a5 100644
--- a/patches/server/0236-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0237-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0236-Use-a-Queue-for-Queueing-Commands.patch
index 4eedabbc17..4eedabbc17 100644
--- a/patches/server/0237-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0236-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0238-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0237-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 45533e8ac2..45533e8ac2 100644
--- a/patches/server/0238-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/server/0237-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0239-Optimize-BlockPosition-helper-methods.patch b/patches/server/0238-Optimize-BlockPosition-helper-methods.patch
index 892d0f1554..892d0f1554 100644
--- a/patches/server/0239-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/server/0238-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0240-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0239-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index aa9cfcc962..aa9cfcc962 100644
--- a/patches/server/0240-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0239-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0241-Slime-Pathfinder-Events.patch b/patches/server/0240-Slime-Pathfinder-Events.patch
index 92d79aa8c0..92d79aa8c0 100644
--- a/patches/server/0241-Slime-Pathfinder-Events.patch
+++ b/patches/server/0240-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0242-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0241-Configurable-speed-for-water-flowing-over-lava.patch
index 4c146b3d29..4c146b3d29 100644
--- a/patches/server/0242-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/server/0241-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0243-Optimize-CraftBlockData-Creation.patch b/patches/server/0242-Optimize-CraftBlockData-Creation.patch
index 92ec5764e1..5884b542b5 100644
--- a/patches/server/0243-Optimize-CraftBlockData-Creation.patch
+++ b/patches/server/0242-Optimize-CraftBlockData-Creation.patch
@@ -26,10 +26,10 @@ index bf42cead5fa040d87da28d7be521b109724da19b..b4241ccdf972feec3dc2802ceafeef4f
          private boolean calculateSolid() {
              if (((Block) this.owner).properties.forceSolidOn) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index ace340b8e4a7f881e662813f059208fbd75d48e5..ebe02507a394563ba51a207db8b24760467d936e 100644
+index 02b10005e7c6ac735de932fd12cff5579939c4d7..cf379f7da8d8e6db0d74f1ca0e4b42e017a8191e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -568,7 +568,17 @@ public class CraftBlockData implements BlockData {
+@@ -569,7 +569,17 @@ public class CraftBlockData implements BlockData {
          return craft;
      }
  
diff --git a/patches/server/0244-Optimize-MappedRegistry.patch b/patches/server/0243-Optimize-MappedRegistry.patch
index ae3bc03120..ae3bc03120 100644
--- a/patches/server/0244-Optimize-MappedRegistry.patch
+++ b/patches/server/0243-Optimize-MappedRegistry.patch
diff --git a/patches/server/0245-Add-PhantomPreSpawnEvent.patch b/patches/server/0244-Add-PhantomPreSpawnEvent.patch
index e92632febe..e92632febe 100644
--- a/patches/server/0245-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0244-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0246-Add-More-Creeper-API.patch b/patches/server/0245-Add-More-Creeper-API.patch
index 7f86a576b2..7f86a576b2 100644
--- a/patches/server/0246-Add-More-Creeper-API.patch
+++ b/patches/server/0245-Add-More-Creeper-API.patch
diff --git a/patches/server/0247-Inventory-removeItemAnySlot.patch b/patches/server/0246-Inventory-removeItemAnySlot.patch
index 1316343a0a..1316343a0a 100644
--- a/patches/server/0247-Inventory-removeItemAnySlot.patch
+++ b/patches/server/0246-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0248-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0247-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 4049d36c7b..4049d36c7b 100644
--- a/patches/server/0248-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0247-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0249-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0248-Add-ray-tracing-methods-to-LivingEntity.patch
index 6583e85ec4..596461e355 100644
--- a/patches/server/0249-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0248-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -30,10 +30,10 @@ index 55a939c74dad301e866e0711d6ff8e0379bf73c6..527af65884fd505616204876e22d54f3
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3c5d297ff8125e2c7e0a1fd10ed4b859c3ae0496..4c9b38fade398be72c5fc2799914df98d9170eaf 100644
+index 5001873aba00da0a1daf0e473593a332f0856cdd..602516c5e99d033bbf9529748c22a2e774f8425a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -202,6 +202,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -201,6 +201,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return blocks.get(0);
      }
  
diff --git a/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch
index 0c69959323..25cb085708 100644
--- a/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0249-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/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9e34575c8ffff57d692349a4a05db3d1f769c687..8417da1eb3a440adcd425ffbda9fdcb768857afd 100644
+index d034c84a95f24233a8dd54b25c1ef670311c346a..80ae7a85cf4dbad3aa6a17c4095b9db193a0aec9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2840,6 +2840,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2850,6 +2850,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          return this.adventure$pointers;
      }
diff --git a/patches/server/0251-Improve-death-events.patch b/patches/server/0250-Improve-death-events.patch
index 45829b0186..a5ec9d1720 100644
--- a/patches/server/0251-Improve-death-events.patch
+++ b/patches/server/0250-Improve-death-events.patch
@@ -392,10 +392,10 @@ index 948ba97e318506dad96e59121297b5bf8340d2e6..810bead2f19de70786027b190137f743
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8417da1eb3a440adcd425ffbda9fdcb768857afd..e55d31783396e87ef18f5b6dfc27742c0b4e3465 100644
+index 80ae7a85cf4dbad3aa6a17c4095b9db193a0aec9..d03b9c8a0253b217666a745db18271336fcaab56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2377,7 +2377,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2387,7 +2387,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void sendHealthUpdate() {
          FoodData foodData = this.getHandle().getFoodData();
@@ -412,10 +412,10 @@ index 8417da1eb3a440adcd425ffbda9fdcb768857afd..e55d31783396e87ef18f5b6dfc27742c
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f55b1ccaab6f6bec89d92f79995abf331ea87c98..64ab19fdc94164f6be505dd1d2c79cf339832813 100644
+index c5736eb070209d0ecad1007e4c4c633c4615be83..18074dab4529f92b164671543dd11d2628ea0982 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -893,9 +893,16 @@ public class CraftEventFactory {
+@@ -890,9 +890,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -432,7 +432,7 @@ index f55b1ccaab6f6bec89d92f79995abf331ea87c98..64ab19fdc94164f6be505dd1d2c79cf3
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -912,8 +919,15 @@ public class CraftEventFactory {
+@@ -909,8 +916,15 @@ public class CraftEventFactory {
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage, stringDeathMessage); // Paper - Adventure
          event.setKeepInventory(keepInventory);
          event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
@@ -448,7 +448,7 @@ index f55b1ccaab6f6bec89d92f79995abf331ea87c98..64ab19fdc94164f6be505dd1d2c79cf3
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -930,6 +944,31 @@ public class CraftEventFactory {
+@@ -927,6 +941,31 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0252-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0251-Allow-chests-to-be-placed-with-NBT-data.patch
index a261a829fa..a261a829fa 100644
--- a/patches/server/0252-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0251-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0253-Mob-Pathfinding-API.patch b/patches/server/0252-Mob-Pathfinding-API.patch
index e3120486fa..e3120486fa 100644
--- a/patches/server/0253-Mob-Pathfinding-API.patch
+++ b/patches/server/0252-Mob-Pathfinding-API.patch
diff --git a/patches/server/0254-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0253-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 74bb8cea6f..5354ba2b0e 100644
--- a/patches/server/0254-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/patches/server/0253-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b20c497de6 100644
+index be9acd6f975718c1ef254391e8ef9129558c86a3..e720778ccf009b0038aea72e06d91d5e5e061ecf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -85,6 +85,12 @@ import org.bukkit.persistence.PersistentDataContainer;
+@@ -84,6 +84,12 @@ import org.bukkit.persistence.PersistentDataContainer;
  import static org.spigotmc.ValidateUtils.*;
  // Spigot end
  
@@ -21,7 +21,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
  /**
   * Children must include the following:
   *
-@@ -273,6 +279,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -272,6 +278,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      @Specific(Specific.To.NBT)
      static final ItemMetaKey BLOCK_DATA = new ItemMetaKey("BlockStateTag");
      static final ItemMetaKey BUKKIT_CUSTOM_TAG = new ItemMetaKey("PublicBukkitValues");
@@ -32,7 +32,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
  
      // We store the raw original JSON representation of all text data. See SPIGOT-5063, SPIGOT-5656, SPIGOT-5304
      private String displayName;
-@@ -286,6 +296,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -285,6 +295,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      private int hideFlag;
      private boolean unbreakable;
      private int damage;
@@ -43,7 +43,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
  
      private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
-@@ -323,6 +337,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -322,6 +336,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          this.hideFlag = meta.hideFlag;
          this.unbreakable = meta.unbreakable;
          this.damage = meta.damage;
@@ -59,7 +59,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
          this.unhandledTags.putAll(meta.unhandledTags);
          this.persistentDataContainer.putAll(meta.persistentDataContainer.getRaw());
  
-@@ -386,6 +409,31 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -385,6 +408,31 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  this.persistentDataContainer.put(key, compound.get(key).copy());
              }
          }
@@ -91,7 +91,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
  
          Set<String> keys = tag.getAllKeys();
          for (String key : keys) {
-@@ -524,6 +572,34 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -523,6 +571,34 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              this.setDamage(damage);
          }
  
@@ -126,7 +126,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
          String internal = SerializableMeta.getString(map, "internal", true);
          if (internal != null) {
              ByteArrayInputStream buf = new ByteArrayInputStream(Base64.getDecoder().decode(internal));
-@@ -652,6 +728,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -651,6 +727,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          if (this.hasDamage()) {
              itemTag.putInt(CraftMetaItem.DAMAGE.NBT, this.damage);
          }
@@ -150,7 +150,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
  
          for (Map.Entry<String, Tag> e : this.unhandledTags.entrySet()) {
              itemTag.put(e.getKey(), e.getValue());
-@@ -668,6 +761,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -667,6 +760,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -172,7 +172,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
      ListTag createStringList(List<String> list) {
          if (list == null) {
              return null;
-@@ -751,7 +859,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -750,7 +858,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
      @Overridden
      boolean isEmpty() {
@@ -181,7 +181,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
      }
  
      // Paper start
-@@ -1183,7 +1291,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1182,7 +1290,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  && (this.hideFlag == that.hideFlag)
                  && (this.isUnbreakable() == that.isUnbreakable())
                  && (this.hasDamage() ? that.hasDamage() && this.damage == that.damage : !that.hasDamage())
@@ -194,7 +194,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
      }
  
      /**
-@@ -1218,6 +1330,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1217,6 +1329,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          hash = 61 * hash + (this.hasDamage() ? this.damage : 0);
          hash = 61 * hash + (this.hasAttributeModifiers() ? this.attributeModifiers.hashCode() : 0);
          hash = 61 * hash + this.version;
@@ -205,7 +205,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
          return hash;
      }
  
-@@ -1242,6 +1358,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1241,6 +1357,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              clone.unbreakable = this.unbreakable;
              clone.damage = this.damage;
              clone.version = this.version;
@@ -220,7 +220,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
              return clone;
          } catch (CloneNotSupportedException e) {
              throw new Error(e);
-@@ -1299,6 +1423,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1298,6 +1422,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              builder.put(CraftMetaItem.DAMAGE.BUKKIT, this.damage);
          }
  
@@ -244,7 +244,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
          final Map<String, Tag> internalTags = new HashMap<String, Tag>(this.unhandledTags);
          this.serializeInternal(internalTags);
          if (!internalTags.isEmpty()) {
-@@ -1471,6 +1612,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1470,6 +1611,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                          CraftMetaArmorStand.SHOW_ARMS.NBT,
                          CraftMetaArmorStand.SMALL.NBT,
                          CraftMetaArmorStand.MARKER.NBT,
@@ -253,7 +253,7 @@ index 4c66a0357c06e0b286e38624c874e33e45933fc9..4e1f436cbe47ba08c731be781fb372b2
                          // Paper end
                          CraftMetaCompass.LODESTONE_DIMENSION.NBT,
                          CraftMetaCompass.LODESTONE_POS.NBT,
-@@ -1500,4 +1643,146 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1499,4 +1642,146 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      }
      // Paper end
  
diff --git a/patches/server/0255-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0254-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 398cfb3792..398cfb3792 100644
--- a/patches/server/0255-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/patches/server/0254-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0256-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0255-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 4a0e2020ca..4a0e2020ca 100644
--- a/patches/server/0256-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0255-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0257-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0256-Implement-furnace-cook-speed-multiplier-API.patch
index 696f2a665f..696f2a665f 100644
--- a/patches/server/0257-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/server/0256-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0258-Honor-EntityAgeable.ageLock.patch b/patches/server/0257-Honor-EntityAgeable.ageLock.patch
index c1404b2aa7..c1404b2aa7 100644
--- a/patches/server/0258-Honor-EntityAgeable.ageLock.patch
+++ b/patches/server/0257-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0259-Configurable-connection-throttle-kick-message.patch b/patches/server/0258-Configurable-connection-throttle-kick-message.patch
index 2e44ed6b6d..2e44ed6b6d 100644
--- a/patches/server/0259-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0258-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 2a66b5c9da..2a66b5c9da 100644
--- a/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0261-Hook-into-CB-plugin-rewrites.patch b/patches/server/0260-Hook-into-CB-plugin-rewrites.patch
index 4dec2033b4..4dec2033b4 100644
--- a/patches/server/0261-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/server/0260-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0262-PreSpawnerSpawnEvent.patch b/patches/server/0261-PreSpawnerSpawnEvent.patch
index 766060fe2a..766060fe2a 100644
--- a/patches/server/0262-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0261-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0263-Add-LivingEntity-getTargetEntity.patch b/patches/server/0262-Add-LivingEntity-getTargetEntity.patch
index 4ca52cc4d0..15be1e828b 100644
--- a/patches/server/0263-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0262-Add-LivingEntity-getTargetEntity.patch
@@ -56,7 +56,7 @@ index d1b9726228cc0a7bdb1c570603b5d1b8a4d6debe..40b8b863c4662d8a6aa228763be16731
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4c9b38fade398be72c5fc2799914df98d9170eaf..e8cc06162f97eef14c47f2e19a979c6b92aa3252 100644
+index 602516c5e99d033bbf9529748c22a2e774f8425a..0c045752baf7346b53f1feedddfe4285f9bcb12c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1,5 +1,6 @@
@@ -66,7 +66,7 @@ index 4c9b38fade398be72c5fc2799914df98d9170eaf..e8cc06162f97eef14c47f2e19a979c6b
  import com.google.common.base.Preconditions;
  import com.google.common.collect.Sets;
  import java.util.ArrayList;
-@@ -227,6 +228,39 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -226,6 +227,39 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
          return null;
      }
diff --git a/patches/server/0264-Add-sun-related-API.patch b/patches/server/0263-Add-sun-related-API.patch
index 637ba02804..637ba02804 100644
--- a/patches/server/0264-Add-sun-related-API.patch
+++ b/patches/server/0263-Add-sun-related-API.patch
diff --git a/patches/server/0265-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 8cc6dd3b44..8cc6dd3b44 100644
--- a/patches/server/0265-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0266-Turtle-API.patch b/patches/server/0265-Turtle-API.patch
index fee89795f4..fee89795f4 100644
--- a/patches/server/0266-Turtle-API.patch
+++ b/patches/server/0265-Turtle-API.patch
diff --git a/patches/server/0267-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0266-Call-player-spectator-target-events-and-improve-impl.patch
index c5c24c8af7..c5c24c8af7 100644
--- a/patches/server/0267-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0266-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0268-Add-more-Witch-API.patch b/patches/server/0267-Add-more-Witch-API.patch
index c644efe98f..c644efe98f 100644
--- a/patches/server/0268-Add-more-Witch-API.patch
+++ b/patches/server/0267-Add-more-Witch-API.patch
diff --git a/patches/server/0269-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0268-Check-Drowned-for-Villager-Aggression-Config.patch
index 99463ffb07..99463ffb07 100644
--- a/patches/server/0269-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/server/0268-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0270-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0269-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 0c12261ec5..0c12261ec5 100644
--- a/patches/server/0270-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0269-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0271-Reset-players-airTicks-on-respawn.patch b/patches/server/0270-Reset-players-airTicks-on-respawn.patch
index e59d27a986..e59d27a986 100644
--- a/patches/server/0271-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0270-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0272-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0271-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index e419d107b0..e419d107b0 100644
--- a/patches/server/0272-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0271-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0273-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0272-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 8e1b598d3d..8e1b598d3d 100644
--- a/patches/server/0273-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0272-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0274-Optimize-World-Time-Updates.patch b/patches/server/0273-Optimize-World-Time-Updates.patch
index 26dc80001f..26dc80001f 100644
--- a/patches/server/0274-Optimize-World-Time-Updates.patch
+++ b/patches/server/0273-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0275-Restore-custom-InventoryHolder-support.patch b/patches/server/0274-Restore-custom-InventoryHolder-support.patch
index 4aed3a02b6..b7d1cce23e 100644
--- a/patches/server/0275-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0274-Restore-custom-InventoryHolder-support.patch
@@ -253,10 +253,10 @@ index fc0e1212022d1aa3506699b60ef338196eb54eba..da1c1fe0faf6819b15a81d6ad5337094
      static class MinecraftInventory implements Container {
          private final NonNullList<ItemStack> items;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
-index 7db801cc18945ce203d7ea30dc517dd65183f6d6..e97166d3008cae7897519eaaf56b39c927661098 100644
+index 3aecc929c0a9ea6a770326304dacd51fc08ac894..8d3f71689087d687e6400e2ea9750a6fb3535bf1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
-@@ -29,7 +29,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -28,7 +28,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
  
      @Override
      public Inventory createInventory(InventoryHolder holder, InventoryType type) {
@@ -265,7 +265,7 @@ index 7db801cc18945ce203d7ea30dc517dd65183f6d6..e97166d3008cae7897519eaaf56b39c9
      }
  
      // Paper start
-@@ -40,7 +40,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -39,7 +39,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
              ((RandomizableContainerBlockEntity) te).setCustomName(io.papermc.paper.adventure.PaperAdventure.asVanilla(title));
          }
  
@@ -274,7 +274,7 @@ index 7db801cc18945ce203d7ea30dc517dd65183f6d6..e97166d3008cae7897519eaaf56b39c9
      }
      // Paper end
  
-@@ -51,10 +51,18 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -50,10 +50,18 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
              ((RandomizableContainerBlockEntity) te).setCustomName(CraftChatMessage.fromStringOrNull(title));
          }
  
@@ -294,7 +294,7 @@ index 7db801cc18945ce203d7ea30dc517dd65183f6d6..e97166d3008cae7897519eaaf56b39c9
          return new CraftInventory(tileEntity);
      }
  
-@@ -71,7 +79,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -70,7 +78,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
          public Inventory createInventory(InventoryHolder owner, InventoryType type, net.kyori.adventure.text.Component title) {
              Container tileEntity = getTileEntity();
              ((AbstractFurnaceBlockEntity) tileEntity).setCustomName(io.papermc.paper.adventure.PaperAdventure.asVanilla(title));
@@ -303,7 +303,7 @@ index 7db801cc18945ce203d7ea30dc517dd65183f6d6..e97166d3008cae7897519eaaf56b39c9
          }
          // Paper end
  
-@@ -79,11 +87,19 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -78,11 +86,19 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
          public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
              Container tileEntity = this.getTileEntity();
              ((AbstractFurnaceBlockEntity) tileEntity).setCustomName(CraftChatMessage.fromStringOrNull(title));
@@ -324,7 +324,7 @@ index 7db801cc18945ce203d7ea30dc517dd65183f6d6..e97166d3008cae7897519eaaf56b39c9
              return new CraftInventoryFurnace((AbstractFurnaceBlockEntity) tileEntity);
          }
      }
-@@ -103,7 +119,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -102,7 +118,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
              if (tileEntity instanceof BrewingStandBlockEntity) {
                  ((BrewingStandBlockEntity) tileEntity).setCustomName(io.papermc.paper.adventure.PaperAdventure.asVanilla(title));
              }
@@ -333,7 +333,7 @@ index 7db801cc18945ce203d7ea30dc517dd65183f6d6..e97166d3008cae7897519eaaf56b39c9
          }
          // Paper end
  
-@@ -114,11 +130,19 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -113,11 +129,19 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
              if (tileEntity instanceof BrewingStandBlockEntity) {
                  ((BrewingStandBlockEntity) tileEntity).setCustomName(CraftChatMessage.fromStringOrNull(title));
              }
diff --git a/patches/server/0276-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0275-Use-Vanilla-Minecart-Speeds.patch
index 2d3cb9fe91..2d3cb9fe91 100644
--- a/patches/server/0276-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/server/0275-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0277-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0276-Fix-SpongeAbsortEvent-handling.patch
index 271eb63fd6..271eb63fd6 100644
--- a/patches/server/0277-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0276-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0278-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0277-Don-t-allow-digging-into-unloaded-chunks.patch
index 35c4715142..35c4715142 100644
--- a/patches/server/0278-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0277-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0279-Make-the-default-permission-message-configurable.patch b/patches/server/0278-Make-the-default-permission-message-configurable.patch
index 6a9b8408bb..a1e71df95f 100644
--- a/patches/server/0279-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0278-Make-the-default-permission-message-configurable.patch
@@ -18,10 +18,10 @@ index 0dd48e4098191c8b6e29945d62bc473e9f3a1e77..ae51993e0de706cb62c96795ca9de766
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b0de5cfd60a61fcea681f95dabbdc16beeb4242d..6f1e2ce0187460f78f7c0d8855f1f8f5cf897089 100644
+index f8499f4a70fbbaa99df0cc73aff6405bbbb135ad..ac8478720a4f4cf7016333cdf78f474e165f0492 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2803,6 +2803,16 @@ public final class CraftServer implements Server {
+@@ -2804,6 +2804,16 @@ public final class CraftServer implements Server {
          return io.papermc.paper.configuration.GlobalConfiguration.get().commands.suggestPlayerNamesWhenNullTabCompletions;
      }
  
diff --git a/patches/server/0280-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0279-Prevent-rayTrace-from-loading-chunks.patch
index 72d6ebc434..72d6ebc434 100644
--- a/patches/server/0280-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/server/0279-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0281-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0280-Handle-Large-Packets-disconnecting-client.patch
index 11027a5b3d..11027a5b3d 100644
--- a/patches/server/0281-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0280-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0282-force-entity-dismount-during-teleportation.patch b/patches/server/0281-force-entity-dismount-during-teleportation.patch
index b49a068454..b49a068454 100644
--- a/patches/server/0282-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0281-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0283-Add-more-Zombie-API.patch b/patches/server/0282-Add-more-Zombie-API.patch
index 552fe1f502..552fe1f502 100644
--- a/patches/server/0283-Add-more-Zombie-API.patch
+++ b/patches/server/0282-Add-more-Zombie-API.patch
diff --git a/patches/server/0284-Book-Size-Limits.patch b/patches/server/0283-Book-Size-Limits.patch
index b9841df559..b9841df559 100644
--- a/patches/server/0284-Book-Size-Limits.patch
+++ b/patches/server/0283-Book-Size-Limits.patch
diff --git a/patches/server/0285-Add-PlayerConnectionCloseEvent.patch b/patches/server/0284-Add-PlayerConnectionCloseEvent.patch
index 9998c22dff..9998c22dff 100644
--- a/patches/server/0285-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0284-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0286-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0285-Prevent-Enderman-from-loading-chunks.patch
index 29f11b20e3..29f11b20e3 100644
--- a/patches/server/0286-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/server/0285-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0287-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0286-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 5287e5fb3d..f7c53bade7 100644
--- a/patches/server/0287-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0286-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -106,10 +106,10 @@ index e8490a58dd4d9bc39a5bb2f9fc109526e031b971..5f590575f95eff8bf0cdcafde7dee0e3
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e55d31783396e87ef18f5b6dfc27742c0b4e3465..6ec80e3a838f8f7479ee965561043586d64c649a 100644
+index d03b9c8a0253b217666a745db18271336fcaab56..bfa59fc123af9189306d8482bac1ae478babab0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -194,6 +194,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -191,6 +191,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
      public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus; // Paper - more resource pack API
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
@@ -117,7 +117,7 @@ index e55d31783396e87ef18f5b6dfc27742c0b4e3465..6ec80e3a838f8f7479ee965561043586
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -1958,6 +1959,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1955,6 +1956,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index e55d31783396e87ef18f5b6dfc27742c0b4e3465..6ec80e3a838f8f7479ee965561043586
      public void readExtraData(CompoundTag nbttagcompound) {
          this.hasPlayedBefore = true;
          if (nbttagcompound.contains("bukkit")) {
-@@ -1980,6 +1993,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1977,6 +1990,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(CompoundTag nbttagcompound) {
@@ -145,7 +145,7 @@ index e55d31783396e87ef18f5b6dfc27742c0b4e3465..6ec80e3a838f8f7479ee965561043586
          if (!nbttagcompound.contains("bukkit")) {
              nbttagcompound.put("bukkit", new CompoundTag());
          }
-@@ -1994,6 +2009,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1991,6 +2006,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("firstPlayed", this.getFirstPlayed());
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());
diff --git a/patches/server/0288-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0287-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index cc30e56825..cc30e56825 100644
--- a/patches/server/0288-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0287-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0289-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0288-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 1de004a0a4..2bb621ac7d 100644
--- a/patches/server/0289-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0288-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,10 +8,10 @@ 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 6ec80e3a838f8f7479ee965561043586d64c649a..49da25428fa35a935bab2ca5a28081682284a79a 100644
+index bfa59fc123af9189306d8482bac1ae478babab0a..64380c3db88cf5a17a18d166d3869b9a75b1579f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -250,8 +250,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -247,8 +247,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void remove() {
diff --git a/patches/server/0290-BlockDestroyEvent.patch b/patches/server/0289-BlockDestroyEvent.patch
index 6b5aa51c80..6b5aa51c80 100644
--- a/patches/server/0290-BlockDestroyEvent.patch
+++ b/patches/server/0289-BlockDestroyEvent.patch
diff --git a/patches/server/0291-Async-command-map-building.patch b/patches/server/0290-Async-command-map-building.patch
index e717f31d1d..e717f31d1d 100644
--- a/patches/server/0291-Async-command-map-building.patch
+++ b/patches/server/0290-Async-command-map-building.patch
diff --git a/patches/server/0292-Implement-Brigadier-Mojang-API.patch b/patches/server/0291-Implement-Brigadier-Mojang-API.patch
index 9917b8e153..e5087d8474 100644
--- a/patches/server/0292-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0291-Implement-Brigadier-Mojang-API.patch
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 4b4aa6cc48abb6a2d31c2043e0eff25bca0d05b3..5fff9ffbede42644dc3639e9e0a31866981fa596 100644
+index 18613ca4e029dc5a514401753b850b442ae45bbf..5106a0e7c7d7f390fa439ca9a14dea94a5764402 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating
diff --git a/patches/server/0293-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0292-Improve-exact-choice-recipe-ingredients.patch
index 93069f3ed6..93069f3ed6 100644
--- a/patches/server/0293-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/server/0292-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0294-Limit-Client-Sign-length-more.patch b/patches/server/0293-Limit-Client-Sign-length-more.patch
index e761bf9a16..e761bf9a16 100644
--- a/patches/server/0294-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0293-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0295-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0294-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 95dd0416b7..95dd0416b7 100644
--- a/patches/server/0295-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0294-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0296-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0295-Handle-Oversized-Tile-Entities-in-chunks.patch
index a99bed7305..a99bed7305 100644
--- a/patches/server/0296-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/server/0295-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0297-Entity-getEntitySpawnReason.patch b/patches/server/0296-Entity-getEntitySpawnReason.patch
index 9f46264920..d2b110d6ec 100644
--- a/patches/server/0297-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0296-Entity-getEntitySpawnReason.patch
@@ -22,7 +22,7 @@ index 2eddeb8d5239bbfeefbf4d3bd363f1ad083299b6..a7c89cdf20cb63792c76de81c1ff9f2c
              });
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8870e9999e2a1aba59e5e6e7927bc8c6041f8ad6..3b7eea628d0b839900145b326a85733e9fec8aa0 100644
+index 9d098a0836ea0b152eacd787ea7c43846f9122b2..45a6277c93f6d6370442664a8777b08977df0a6b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1450,6 +1450,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -133,10 +133,10 @@ index faad948f089575e4988d989790cc1dd13f8a79cd..ee11a52e82091911aa3a196bcc1f7ab8
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 93363aabee8bafeb1bc1d0d5a94e80b647175509..b06c338ee9205d1f4d562571aba83c83f9abd20b 100644
+index 594eeb83425787e160f8051f15c7cdf61a7bb090..4d71849e8330e6f758e10223fabdb5d6ed0e7221 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1367,5 +1367,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1018,5 +1018,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean fromMobSpawner() {
          return getHandle().spawnedViaMobSpawner;
      }
diff --git a/patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0297-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index cbd7df1772..cbd7df1772 100644
--- a/patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0297-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0299-Fire-event-on-GS4-query.patch b/patches/server/0298-Fire-event-on-GS4-query.patch
index 445725e8b8..445725e8b8 100644
--- a/patches/server/0299-Fire-event-on-GS4-query.patch
+++ b/patches/server/0298-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0300-Implement-PlayerPostRespawnEvent.patch b/patches/server/0299-Implement-PlayerPostRespawnEvent.patch
index 798b8ae0dd..798b8ae0dd 100644
--- a/patches/server/0300-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0299-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0301-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0300-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index a43c825a0e..a43c825a0e 100644
--- a/patches/server/0301-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0300-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0302-Server-Tick-Events.patch b/patches/server/0301-Server-Tick-Events.patch
index cfb0af10e3..cfb0af10e3 100644
--- a/patches/server/0302-Server-Tick-Events.patch
+++ b/patches/server/0301-Server-Tick-Events.patch
diff --git a/patches/server/0303-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0302-PlayerDeathEvent-getItemsToKeep.patch
index 5757adc4bb..5757adc4bb 100644
--- a/patches/server/0303-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0302-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0304-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0303-Optimize-Captured-TileEntity-Lookup.patch
index ce3b4d80db..ce3b4d80db 100644
--- a/patches/server/0304-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0303-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0305-Add-Heightmap-API.patch b/patches/server/0304-Add-Heightmap-API.patch
index 97d81f2f2c..97d81f2f2c 100644
--- a/patches/server/0305-Add-Heightmap-API.patch
+++ b/patches/server/0304-Add-Heightmap-API.patch
diff --git a/patches/server/0306-Mob-Spawner-API-Enhancements.patch b/patches/server/0305-Mob-Spawner-API-Enhancements.patch
index b16a1d736b..b16a1d736b 100644
--- a/patches/server/0306-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0305-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0307-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0306-Fix-CB-call-to-changed-postToMainThread-method.patch
index 50febae5fc..cadafed4c9 100644
--- a/patches/server/0307-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0306-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 1bd0ed91f5f64c4cf89f6819bea7ecd3a72f1d5d..595086133c687d2f9752cbda475123063f22df42 100644
+index 40e25de6534f997b603e9b407e7ab3331b667585..698fc66f8c232644f2d747c81f8ac2e39204fd7f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -297,7 +297,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0308-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0307-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index a91800e4b3..a91800e4b3 100644
--- a/patches/server/0308-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0307-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0309-Implement-CraftBlockSoundGroup.patch b/patches/server/0308-Implement-CraftBlockSoundGroup.patch
index cdeaeff96c..cdeaeff96c 100644
--- a/patches/server/0309-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0308-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0309-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 9cda68fc76..9cda68fc76 100644
--- a/patches/server/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0309-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0311-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0310-Allow-Saving-of-Oversized-Chunks.patch
index 1233e2c468..1233e2c468 100644
--- a/patches/server/0311-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0310-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0312-Expose-the-internal-current-tick.patch b/patches/server/0311-Expose-the-internal-current-tick.patch
index b996f08073..a7dec7ae2d 100644
--- a/patches/server/0312-Expose-the-internal-current-tick.patch
+++ b/patches/server/0311-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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6f1e2ce0187460f78f7c0d8855f1f8f5cf897089..431750425e90b1e9d6b886e41a6d23d14b26b8ce 100644
+index ac8478720a4f4cf7016333cdf78f474e165f0492..83242862a49e39c40dd8467f1d2a0ac74ced8343 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2849,5 +2849,10 @@ public final class CraftServer implements Server {
+@@ -2850,5 +2850,10 @@ public final class CraftServer implements Server {
          profile.getProperties().putAll(((CraftPlayer) player).getHandle().getGameProfile().getProperties());
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(profile);
      }
diff --git a/patches/server/0313-Fix-World-isChunkGenerated-calls.patch b/patches/server/0312-Fix-World-isChunkGenerated-calls.patch
index d758acc217..d758acc217 100644
--- a/patches/server/0313-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0312-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0314-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0313-Show-blockstate-location-if-we-failed-to-read-it.patch
index 737d6a1d23..737d6a1d23 100644
--- a/patches/server/0314-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0313-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0315-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0314-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 239e4cf974..239e4cf974 100644
--- a/patches/server/0315-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0314-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0316-Configurable-projectile-relative-velocity.patch b/patches/server/0315-Configurable-projectile-relative-velocity.patch
index 2a3669dd8e..2a3669dd8e 100644
--- a/patches/server/0316-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0315-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0317-offset-item-frame-ticking.patch b/patches/server/0316-offset-item-frame-ticking.patch
index 9d852595f2..9d852595f2 100644
--- a/patches/server/0317-offset-item-frame-ticking.patch
+++ b/patches/server/0316-offset-item-frame-ticking.patch
diff --git a/patches/server/0318-Fix-MC-158900.patch b/patches/server/0317-Fix-MC-158900.patch
index 38342b5322..38342b5322 100644
--- a/patches/server/0318-Fix-MC-158900.patch
+++ b/patches/server/0317-Fix-MC-158900.patch
diff --git a/patches/server/0319-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0318-Prevent-consuming-the-wrong-itemstack.patch
index e2662cc559..e2662cc559 100644
--- a/patches/server/0319-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0318-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0320-Dont-send-unnecessary-sign-update.patch b/patches/server/0319-Dont-send-unnecessary-sign-update.patch
index 7991b6c129..7991b6c129 100644
--- a/patches/server/0320-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0319-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0321-Add-option-to-disable-pillager-patrols.patch b/patches/server/0320-Add-option-to-disable-pillager-patrols.patch
index 65d645b929..65d645b929 100644
--- a/patches/server/0321-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0320-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0322-Flat-bedrock-generator-settings.patch b/patches/server/0321-Flat-bedrock-generator-settings.patch
index e0e903d76c..e0e903d76c 100644
--- a/patches/server/0322-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0321-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0323-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0322-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 1bf426b9ec..1bf426b9ec 100644
--- a/patches/server/0323-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0322-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0324-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0323-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 4494b22853..4494b22853 100644
--- a/patches/server/0324-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0323-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0325-Duplicate-UUID-Resolve-Option.patch b/patches/server/0324-Duplicate-UUID-Resolve-Option.patch
index 18cf5ebd5a..18cf5ebd5a 100644
--- a/patches/server/0325-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0324-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0326-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0325-PlayerDeathEvent-shouldDropExperience.patch
index 40c52dd58c..40c52dd58c 100644
--- a/patches/server/0326-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0325-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0327-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0326-Prevent-bees-loading-chunks-checking-hive-position.patch
index b0582f28fa..b0582f28fa 100644
--- a/patches/server/0327-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0326-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0328-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0327-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index a8372c2321..a8372c2321 100644
--- a/patches/server/0328-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0327-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0329-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0328-Optimise-EntityGetter-getPlayerByUUID.patch
index a9e1bdd433..dd98a56be5 100644
--- a/patches/server/0329-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0328-Optimise-EntityGetter-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID
 Use the PlayerList map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f6d5b6e6ae6699de177ef5fca385bb27ccae70b1..dca77d98087bef92f4b1f135fa44c70ec61d09c4 100644
+index de4a35992002b962f680d3c43daf51f87f91fef0..316f6b2c111b4f8a5ae0fa4dcb9695fa5ec62ede 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -554,6 +554,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0330-Fix-items-not-falling-correctly.patch b/patches/server/0329-Fix-items-not-falling-correctly.patch
index 36ab49038d..36ab49038d 100644
--- a/patches/server/0330-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0329-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0331-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0330-Optimize-call-to-getFluid-for-explosions.patch
index b5c4ed9844..b5c4ed9844 100644
--- a/patches/server/0331-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0330-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0332-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0331-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 730b2e87d5..730b2e87d5 100644
--- a/patches/server/0332-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/server/0331-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0333-Entity-Activation-Range-2.0.patch b/patches/server/0332-Entity-Activation-Range-2.0.patch
index 24ecbef3be..2c2297baeb 100644
--- a/patches/server/0333-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0332-Entity-Activation-Range-2.0.patch
@@ -18,7 +18,7 @@ public net.minecraft.world.entity.Entity isInsidePortal
 public net.minecraft.world.entity.LivingEntity jumping
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dca77d98087bef92f4b1f135fa44c70ec61d09c4..5f8654ad9c15818fcb12361a0f76bb77d9a2ce75 100644
+index 316f6b2c111b4f8a5ae0fa4dcb9695fa5ec62ede..2a3d4a041345d5478916f4d2c5c3c382fca5758f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
diff --git a/patches/server/0334-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0333-Guard-against-serializing-mismatching-chunk-coordina.patch
index ee12496e7a..ee12496e7a 100644
--- a/patches/server/0334-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0333-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0335-Implement-alternative-item-despawn-rate.patch b/patches/server/0334-Implement-alternative-item-despawn-rate.patch
index 180d0f3884..180d0f3884 100644
--- a/patches/server/0335-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0334-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0336-Tracking-Range-Improvements.patch b/patches/server/0335-Tracking-Range-Improvements.patch
index f743c56a9e..f743c56a9e 100644
--- a/patches/server/0336-Tracking-Range-Improvements.patch
+++ b/patches/server/0335-Tracking-Range-Improvements.patch
diff --git a/patches/server/0337-Fix-items-vanishing-through-end-portal.patch b/patches/server/0336-Fix-items-vanishing-through-end-portal.patch
index 2033b87738..2033b87738 100644
--- a/patches/server/0337-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0336-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0338-implement-optional-per-player-mob-spawns.patch b/patches/server/0337-implement-optional-per-player-mob-spawns.patch
index 729ec88a82..729ec88a82 100644
--- a/patches/server/0338-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0337-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0339-Anti-Xray.patch b/patches/server/0338-Anti-Xray.patch
index 4b474f97c2..07beed1c7d 100644
--- a/patches/server/0339-Anti-Xray.patch
+++ b/patches/server/0338-Anti-Xray.patch
@@ -1104,7 +1104,7 @@ index be89e5b8c1ea7f85aef267a15986affa5fa1fd4b..43472855136f26b282d94fd241853d86
  
      public ClientboundLevelChunkWithLightPacket(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5f8654ad9c15818fcb12361a0f76bb77d9a2ce75..abf495ae094f647db4c9f826315e25c6a05cf67b 100644
+index 2a3d4a041345d5478916f4d2c5c3c382fca5758f..9c1b670a986f4507aab124225e7da68fef6e156c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -568,7 +568,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1558,10 +1558,10 @@ index 545b14f02ac72dda30891d681eba585d19fd5e1d..6dc7e23e96aaffb912611a9dbd41459c
      private static final byte[] EMPTY_LIGHT = new byte[2048];
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 431750425e90b1e9d6b886e41a6d23d14b26b8ce..729a65973beb1079e393a633488535c3ecaeefa1 100644
+index 83242862a49e39c40dd8467f1d2a0ac74ced8343..64d827c7e7f9cf76f9db900333b987a626ab53cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2373,7 +2373,7 @@ public final class CraftServer implements Server {
+@@ -2374,7 +2374,7 @@ public final class CraftServer implements Server {
      public ChunkGenerator.ChunkData createChunkData(World world) {
          Preconditions.checkArgument(world != null, "World cannot be null");
          ServerLevel handle = ((CraftWorld) world).getHandle();
@@ -1594,25 +1594,25 @@ index 4b3d04d891edda8c02470bae189fbf17eb4e8a36..fcf2571a7aa9e93a82171d4a8ae8c11e
          // Paper - rewrite player chunk loader
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
-index c23ce88cb9693291fec81a99e3a5bcb2615bb897..a9700b750f124b5367c91ac071ee5194e9f7f8d8 100644
+index a8b23d7eae867be95835bb76f9739a3d1d729973..5fbb9d2c4e419a3f31a8420437978606d75e5b62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
-@@ -27,8 +27,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
+@@ -26,8 +26,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
      private final Registry<net.minecraft.world.level.biome.Biome> biomes;
      private Set<BlockPos> tiles;
      private final Set<BlockPos> lights = new HashSet<>();
 +    // Paper start - Anti-Xray - Add parameters
-+    private final World world;
++    private final org.bukkit.World world;
  
 -    public OldCraftChunkData(int minHeight, int maxHeight, Registry<net.minecraft.world.level.biome.Biome> biomes) {
 +    @Deprecated @io.papermc.paper.annotation.DoNotUse public OldCraftChunkData(int minHeight, int maxHeight, Registry<net.minecraft.world.level.biome.Biome> biomes) { this(minHeight, maxHeight, biomes, null); }
-+    public OldCraftChunkData(int minHeight, int maxHeight, Registry<net.minecraft.world.level.biome.Biome> biomes, World world) {
++    public OldCraftChunkData(int minHeight, int maxHeight, Registry<net.minecraft.world.level.biome.Biome> biomes, org.bukkit.World world) {
 +        this.world = world;
 +        // Paper end
          this.minHeight = minHeight;
          this.maxHeight = maxHeight;
          this.biomes = biomes;
-@@ -176,7 +181,7 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
+@@ -175,7 +180,7 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
          int offset = (y - this.minHeight) >> 4;
          LevelChunkSection section = this.sections[offset];
          if (create && section == null) {
diff --git a/patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0339-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 60204a5824..60204a5824 100644
--- a/patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0339-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0341-Improve-Block-breakNaturally-API.patch b/patches/server/0340-Improve-Block-breakNaturally-API.patch
index b5d4bf1b2e..b5d4bf1b2e 100644
--- a/patches/server/0341-Improve-Block-breakNaturally-API.patch
+++ b/patches/server/0340-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0341-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 5a1569ff68..5a1569ff68 100644
--- a/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0341-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0343-Add-debug-for-sync-chunk-loads.patch b/patches/server/0342-Add-debug-for-sync-chunk-loads.patch
index 2000bc5dff..62c144b4f3 100644
--- a/patches/server/0343-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0342-Add-debug-for-sync-chunk-loads.patch
@@ -312,7 +312,7 @@ index 4039bd5a80bd2305082d21c0fe826f76d8beb4c4..974b4970be214ca36a801d39932abcc7
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index abf495ae094f647db4c9f826315e25c6a05cf67b..321f90a0ad7cdd3b0e8b136682947a467f2388b9 100644
+index 9c1b670a986f4507aab124225e7da68fef6e156c..8b34c951a56832cb67f51235d3e94643dd1820c4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -647,6 +647,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0344-Improve-java-version-check.patch b/patches/server/0343-Improve-java-version-check.patch
index b4f24c7c5f..b4f24c7c5f 100644
--- a/patches/server/0344-Improve-java-version-check.patch
+++ b/patches/server/0343-Improve-java-version-check.patch
diff --git a/patches/server/0345-Add-ThrownEggHatchEvent.patch b/patches/server/0344-Add-ThrownEggHatchEvent.patch
index a98738a89e..a98738a89e 100644
--- a/patches/server/0345-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0344-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0346-Entity-Jump-API.patch b/patches/server/0345-Entity-Jump-API.patch
index 4d9564b5bf..efe7bb3cf8 100644
--- a/patches/server/0346-Entity-Jump-API.patch
+++ b/patches/server/0345-Entity-Jump-API.patch
@@ -48,10 +48,10 @@ index 344e933311f5cdccb66069d486b111a003639dfe..add3cd866452df727107e94fb2039bdd
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e8cc06162f97eef14c47f2e19a979c6b92aa3252..1b7f2a23d475727644e22a60de0b2c7bfa7ca68f 100644
+index 0c045752baf7346b53f1feedddfe4285f9bcb12c..7aa69e4e5b687b836a11e9f5193edc03e9a1efbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -911,5 +911,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -910,5 +910,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public org.bukkit.inventory.EquipmentSlot getHandRaised() {
          return getHandle().getUsedItemHand() == net.minecraft.world.InteractionHand.MAIN_HAND ? org.bukkit.inventory.EquipmentSlot.HAND : org.bukkit.inventory.EquipmentSlot.OFF_HAND;
      }
diff --git a/patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0346-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 35816f0167..35816f0167 100644
--- a/patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0346-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0348-Make-the-GUI-graph-fancier.patch b/patches/server/0347-Make-the-GUI-graph-fancier.patch
index 3501af3b64..3501af3b64 100644
--- a/patches/server/0348-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0347-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0348-add-hand-to-BlockMultiPlaceEvent.patch
index 19cf75394b..8e4f584cda 100644
--- a/patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0348-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 64ab19fdc94164f6be505dd1d2c79cf339832813..a63ff3a8286f323f7f5891aa33fdd72b9e2260b0 100644
+index 18074dab4529f92b164671543dd11d2628ea0982..6e1cff5713e8e0ed8dc481f9c91071eb4b722a49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -403,13 +403,18 @@ public class CraftEventFactory {
+@@ -400,13 +400,18 @@ public class CraftEventFactory {
          }
  
          org.bukkit.inventory.ItemStack item;
diff --git a/patches/server/0350-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0349-Validate-tripwire-hook-placement-before-update.patch
index 65b54af128..65b54af128 100644
--- a/patches/server/0350-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0349-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0350-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 261a4d131f..261a4d131f 100644
--- a/patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0350-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0351-Configurable-chance-of-villager-zombie-infection.patch
index 7e3bf9fac2..7e3bf9fac2 100644
--- a/patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0351-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0353-Optimise-Chunk-getFluid.patch b/patches/server/0352-Optimise-Chunk-getFluid.patch
index 22982d0790..22982d0790 100644
--- a/patches/server/0353-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0352-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0353-Set-spigots-verbose-world-setting-to-false-by-def.patch
index b9d2820ee5..b9d2820ee5 100644
--- a/patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0353-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0355-Add-tick-times-API-and-mspt-command.patch b/patches/server/0354-Add-tick-times-API-and-mspt-command.patch
index 5ef254cd12..b9e2f078c0 100644
--- a/patches/server/0355-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0354-Add-tick-times-API-and-mspt-command.patch
@@ -184,10 +184,10 @@ index 96fd66ed2742a79064852af6e936830ddaf14f4c..2deb639d404943ef5b028c4ede59cab9
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 729a65973beb1079e393a633488535c3ecaeefa1..93f7667a0a62e6b9c1b7cf1caaecb68fc69ef747 100644
+index 64d827c7e7f9cf76f9db900333b987a626ab53cc..0ace3d1efa29565d02602574347e24ed425c8f35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2628,6 +2628,16 @@ public final class CraftServer implements Server {
+@@ -2629,6 +2629,16 @@ public final class CraftServer implements Server {
                  net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
          };
      }
diff --git a/patches/server/0356-Expose-MinecraftServer-isRunning.patch b/patches/server/0355-Expose-MinecraftServer-isRunning.patch
index 8a284e93b4..bb5fecfe5f 100644
--- a/patches/server/0356-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0355-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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 93f7667a0a62e6b9c1b7cf1caaecb68fc69ef747..2c7370b6103faa6979b8d347d9e20248cbfc1740 100644
+index 0ace3d1efa29565d02602574347e24ed425c8f35..cc08a752db71b7729f2474e129426153eb4fbc17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2864,5 +2864,10 @@ public final class CraftServer implements Server {
+@@ -2865,5 +2865,10 @@ public final class CraftServer implements Server {
      public int getCurrentTick() {
          return net.minecraft.server.MinecraftServer.currentTick;
      }
diff --git a/patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0356-Add-Raw-Byte-ItemStack-Serialization.patch
index afd9646f91..afd9646f91 100644
--- a/patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0356-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0357-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 05613934e0..05613934e0 100644
--- a/patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0357-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0358-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 4d20a48ad7..4d20a48ad7 100644
--- a/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0358-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0359-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 8de3e9bd41..8de3e9bd41 100644
--- a/patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0359-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0360-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index e76e1900fb..e76e1900fb 100644
--- a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0360-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0362-Don-t-tick-dead-players.patch b/patches/server/0361-Don-t-tick-dead-players.patch
index 7e658ff419..7e658ff419 100644
--- a/patches/server/0362-Don-t-tick-dead-players.patch
+++ b/patches/server/0361-Don-t-tick-dead-players.patch
diff --git a/patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0362-Dead-Player-s-shouldn-t-be-able-to-move.patch
index d5254786f8..d5254786f8 100644
--- a/patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0362-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0363-Optimize-Collision-to-not-load-chunks.patch
index 3d509bf03c..3d509bf03c 100644
--- a/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0363-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0364-Don-t-move-existing-players-to-world-spawn.patch
index 2134a7ae8d..2134a7ae8d 100644
--- a/patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0364-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0365-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 70dff6f0dc..70dff6f0dc 100644
--- a/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0365-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0367-Improved-Watchdog-Support.patch b/patches/server/0366-Improved-Watchdog-Support.patch
index 520fe4923f..520fe4923f 100644
--- a/patches/server/0367-Improved-Watchdog-Support.patch
+++ b/patches/server/0366-Improved-Watchdog-Support.patch
diff --git a/patches/server/0368-Optimize-Pathfinding.patch b/patches/server/0367-Optimize-Pathfinding.patch
index 8fca2b48b1..8fca2b48b1 100644
--- a/patches/server/0368-Optimize-Pathfinding.patch
+++ b/patches/server/0367-Optimize-Pathfinding.patch
diff --git a/patches/server/0369-Reduce-Either-Optional-allocation.patch b/patches/server/0368-Reduce-Either-Optional-allocation.patch
index 1833cacdfe..1833cacdfe 100644
--- a/patches/server/0369-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0368-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0369-Reduce-memory-footprint-of-NBTTagCompound.patch
index 691d9fdb4f..691d9fdb4f 100644
--- a/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/server/0369-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0371-Prevent-opening-inventories-when-frozen.patch b/patches/server/0370-Prevent-opening-inventories-when-frozen.patch
index 9d29f7559a..26e977f85f 100644
--- a/patches/server/0371-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0370-Prevent-opening-inventories-when-frozen.patch
@@ -27,10 +27,10 @@ index ff0191dd75b5014e224db8f1419dcec240cb1436..3a026f766e2d67e005ae8a06337d465f
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 801dca6bbafd6e1825a1291fc128efc165f4c8d1..03b3e5a49658ea6341cd303b75be36a328907863 100644
+index 21e3070a9aab9b4d8d352655d0145c9921857c0e..5e40ef1370ea150ea19bd8afc4243e38d1d2ef74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -326,7 +326,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -325,7 +325,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(container.getBukkitView().getTitle()); // Paper
  
          //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
@@ -39,7 +39,7 @@ index 801dca6bbafd6e1825a1291fc128efc165f4c8d1..03b3e5a49658ea6341cd303b75be36a3
          player.containerMenu = container;
          player.initMenu(container);
      }
-@@ -400,7 +400,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -399,7 +399,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          net.kyori.adventure.text.Component adventure$title = inventory.title(); // Paper
          if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(inventory.getTitle()); // Paper
          //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
diff --git a/patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0371-Don-t-run-entity-collision-code-if-not-needed.patch
index 37691c2cd2..37691c2cd2 100644
--- a/patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0371-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0373-Implement-Player-Client-Options-API.patch b/patches/server/0372-Implement-Player-Client-Options-API.patch
index 3f1de4718c..d3f83137c0 100644
--- a/patches/server/0373-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0372-Implement-Player-Client-Options-API.patch
@@ -136,10 +136,10 @@ index 3a026f766e2d67e005ae8a06337d465f92c8d1f3..352fbab070ccdb683e9a7558292c86cc
          this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(this.language); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 49da25428fa35a935bab2ca5a28081682284a79a..e10cad5e2b078ff6ff7cba84dfa105ea5704d019 100644
+index 64380c3db88cf5a17a18d166d3869b9a75b1579f..5fdd1bc97b3e04b59a76cfbf190cc9cb504837cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -612,6 +612,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -609,6 +609,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message);
          }
      }
diff --git a/patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0373-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 9c4eda5303..9c4eda5303 100644
--- a/patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0373-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0374-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index e3c1343a13..e3c1343a13 100644
--- a/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0374-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0375-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 7dc5f051b4..7dc5f051b4 100644
--- a/patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0375-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0376-Add-PlayerAttackEntityCooldownResetEvent.patch
index ae1d666725..ae1d666725 100644
--- a/patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0376-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0377-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 2d41b1259c..2d41b1259c 100644
--- a/patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0377-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0378-Add-phantom-creative-and-insomniac-controls.patch
index 47e6a46746..47e6a46746 100644
--- a/patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0378-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0379-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 176b39b9fb..83d62298fd 100644
--- a/patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0379-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -135,10 +135,10 @@ index 810bead2f19de70786027b190137f743a0c40ee7..4f9afae94a4cbf28a532e889d441c63d
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a63ff3a8286f323f7f5891aa33fdd72b9e2260b0..c743c9ad7cb68001a32317280ca8bedaae012a66 100644
+index 6e1cff5713e8e0ed8dc481f9c91071eb4b722a49..73f11d9d8b23568478e9fca603cbde1a42f3963f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -896,6 +896,11 @@ public class CraftEventFactory {
+@@ -893,6 +893,11 @@ public class CraftEventFactory {
      }
  
      public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim, List<org.bukkit.inventory.ItemStack> drops) {
@@ -150,7 +150,7 @@ index a63ff3a8286f323f7f5891aa33fdd72b9e2260b0..c743c9ad7cb68001a32317280ca8beda
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
          populateFields(victim, event); // Paper - make cancellable
-@@ -909,11 +914,13 @@ public class CraftEventFactory {
+@@ -906,11 +911,13 @@ public class CraftEventFactory {
          playDeathSound(victim, event);
          // Paper end
          victim.expToDrop = event.getDroppedExp();
diff --git a/patches/server/0381-Villager-Restocks-API.patch b/patches/server/0380-Villager-Restocks-API.patch
index 75b7928672..75b7928672 100644
--- a/patches/server/0381-Villager-Restocks-API.patch
+++ b/patches/server/0380-Villager-Restocks-API.patch
diff --git a/patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0381-Validate-PickItem-Packet-and-kick-for-invalid.patch
index a8808395a6..a8808395a6 100644
--- a/patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0381-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0383-Expose-game-version.patch b/patches/server/0382-Expose-game-version.patch
index 6a3fcdafe4..f8b42138bc 100644
--- a/patches/server/0383-Expose-game-version.patch
+++ b/patches/server/0382-Expose-game-version.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2c7370b6103faa6979b8d347d9e20248cbfc1740..4dfdb5bdfaf26921106a85ac0e6d4fc9ffbb9a7a 100644
+index cc08a752db71b7729f2474e129426153eb4fbc17..b805012214f1ff9526110e56b5ad9dde96c0468e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -581,6 +581,13 @@ public final class CraftServer implements Server {
+@@ -577,6 +577,13 @@ public final class CraftServer implements Server {
          return this.bukkitVersion;
      }
  
diff --git a/patches/server/0384-Optimize-Voxel-Shape-Merging.patch b/patches/server/0383-Optimize-Voxel-Shape-Merging.patch
index 2c47963e34..2c47963e34 100644
--- a/patches/server/0384-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0383-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0384-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 2fe2392d88..2fe2392d88 100644
--- a/patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0384-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0386-misc-debugging-dumps.patch b/patches/server/0385-misc-debugging-dumps.patch
index d72e5e6bbe..0ddfea4c6c 100644
--- a/patches/server/0386-misc-debugging-dumps.patch
+++ b/patches/server/0385-misc-debugging-dumps.patch
@@ -74,10 +74,10 @@ index 04a728a16bb629adbae1cd8586764a6dbc22b5dc..e48b287d6229f8043fba8a417f0b7558
              this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4dfdb5bdfaf26921106a85ac0e6d4fc9ffbb9a7a..66505398cff6f73a5c5d900ebb66450a5137a16a 100644
+index b805012214f1ff9526110e56b5ad9dde96c0468e..41bf17ccb60c3f66505539085de83017e2125afe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1005,6 +1005,7 @@ public final class CraftServer implements Server {
+@@ -1006,6 +1006,7 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getFullName(),
                  "This plugin is not properly shutting down its async tasks when it is being reloaded.  This may cause conflicts with the newly loaded version of the plugin"
              ));
diff --git a/patches/server/0387-Prevent-teleporting-dead-entities.patch b/patches/server/0386-Prevent-teleporting-dead-entities.patch
index d774b56761..d774b56761 100644
--- a/patches/server/0387-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0386-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0387-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index dcb5f84d35..5081f05f86 100644
--- a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0387-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5fff9ffbede42644dc3639e9e0a31866981fa596..2566e25f10136ebccb6c9bbdd0722d6cf226f7aa 100644
+index 6acb1f37f4c5cb1addd835626041cd3c28eb842f..7398b673f416fa2c05231f90a59600517a21c908 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -36,6 +36,7 @@ dependencies {
@@ -15,7 +15,7 @@ index 5fff9ffbede42644dc3639e9e0a31866981fa596..2566e25f10136ebccb6c9bbdd0722d6c
      implementation("commons-lang:commons-lang:2.6")
 +    implementation("net.fabricmc:mapping-io:0.5.0") // Paper - needed to read mappings for stacktrace deobfuscation
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
+     runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
 @@ -125,6 +126,18 @@ tasks.check {
  }
@@ -557,7 +557,7 @@ index fe47a38137f7b7fa94c507e790eec4fb7303595f..7f5ecea0ee78a534d7c56fa9e3ad2117
          paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
          org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 86015c6b289ce6fb6b9d1b0ca3f637e53192eea3..d672b95fe589a57d469811a12420d7d16ea173c7 100644
+index 3bfab189f3c81b086712b85ab1d4dd3209a3f6b8..c877aca6093435be9d349c07ea1b01d06bcbd416 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,7 +223,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0389-Implement-Mob-Goal-API.patch b/patches/server/0388-Implement-Mob-Goal-API.patch
index 7977dbba79..fe80446fd0 100644
--- a/patches/server/0389-Implement-Mob-Goal-API.patch
+++ b/patches/server/0388-Implement-Mob-Goal-API.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2566e25f10136ebccb6c9bbdd0722d6cf226f7aa..664fef8d6a901f0f4ebf03ad49a6baaf2dbd625e 100644
+index 7398b673f416fa2c05231f90a59600517a21c908..3a3a6ce8833afca0caff2a3b92ad593bf75e951a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -45,6 +45,7 @@ dependencies {
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
  
 +    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
@@ -794,10 +794,10 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 66505398cff6f73a5c5d900ebb66450a5137a16a..913c1e4ee2df8160e1cd15a352fc71d61e7e38dc 100644
+index 41bf17ccb60c3f66505539085de83017e2125afe..7ffd0447becaaaf4f26fa5a6be7f6d83bd816fb3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2877,5 +2877,11 @@ public final class CraftServer implements Server {
+@@ -2878,5 +2878,11 @@ public final class CraftServer implements Server {
      public boolean isStopping() {
          return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }
diff --git a/patches/server/0390-Add-villager-reputation-API.patch b/patches/server/0389-Add-villager-reputation-API.patch
index 95494c8d09..95494c8d09 100644
--- a/patches/server/0390-Add-villager-reputation-API.patch
+++ b/patches/server/0389-Add-villager-reputation-API.patch
diff --git a/patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0390-Option-for-maximum-exp-value-when-merging-orbs.patch
index 819bc6203e..f1d6501ff3 100644
--- a/patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0390-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c743c9ad7cb68001a32317280ca8bedaae012a66..ee28500547c6e069ce8702bfaa095e7a9abcd30d 100644
+index 73f11d9d8b23568478e9fca603cbde1a42f3963f..934d3a53d6d593043c8d58fb06e7d7855cde13c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -705,16 +705,30 @@ public class CraftEventFactory {
+@@ -702,16 +702,30 @@ public class CraftEventFactory {
          if (entity instanceof net.minecraft.world.entity.ExperienceOrb xp) {
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {
diff --git a/patches/server/0392-ExperienceOrbMergeEvent.patch b/patches/server/0391-ExperienceOrbMergeEvent.patch
index 46f62813a0..9b49344803 100644
--- a/patches/server/0392-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0391-ExperienceOrbMergeEvent.patch
@@ -9,10 +9,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ee28500547c6e069ce8702bfaa095e7a9abcd30d..839deebc72a575eea5db4decd82c8c8b1884e621 100644
+index 934d3a53d6d593043c8d58fb06e7d7855cde13c7..d0c267a79f262dafdd74a6c661a234b9301eddd2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -714,7 +714,7 @@ public class CraftEventFactory {
+@@ -711,7 +711,7 @@ public class CraftEventFactory {
                  for (Entity e : entities) {
                      if (e instanceof net.minecraft.world.entity.ExperienceOrb loopItem) {
                          // Paper start
diff --git a/patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0392-Fix-PotionEffect-ignores-icon-flag.patch
index f4f663c607..50b1cd2d18 100644
--- a/patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0392-Fix-PotionEffect-ignores-icon-flag.patch
@@ -6,33 +6,33 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag
 Co-authored-by: Tamion <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1b7f2a23d475727644e22a60de0b2c7bfa7ca68f..f5b9d1fe0d672e11b6295aefc9e182606dbebf88 100644
+index 7aa69e4e5b687b836a11e9f5193edc03e9a1efbd..ac85635bb5ff698712ffe7c48e8aa55d20e0302e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -444,7 +444,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -443,7 +443,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
  
      @Override
      public boolean addPotionEffect(PotionEffect effect, boolean force) {
 -        this.getHandle().addEffect(new MobEffectInstance(CraftPotionEffectType.bukkitToMinecraft(effect.getType()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles()), EntityPotionEffectEvent.Cause.PLUGIN);
-+        this.getHandle().addEffect(CraftPotionUtil.fromBukkit(effect), EntityPotionEffectEvent.Cause.PLUGIN); // Paper - Don't ignore icon
++        this.getHandle().addEffect(org.bukkit.craftbukkit.potion.CraftPotionUtil.fromBukkit(effect), EntityPotionEffectEvent.Cause.PLUGIN); // Paper - Don't ignore icon
          return true;
      }
  
-@@ -465,7 +465,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -464,7 +464,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      @Override
      public PotionEffect getPotionEffect(PotionEffectType type) {
          MobEffectInstance handle = this.getHandle().getEffect(CraftPotionEffectType.bukkitToMinecraft(type));
 -        return (handle == null) ? null : new PotionEffect(CraftPotionEffectType.minecraftToBukkit(handle.getEffect()), handle.getDuration(), handle.getAmplifier(), handle.isAmbient(), handle.isVisible());
-+        return (handle == null) ? null : CraftPotionUtil.toBukkit(handle); // Paper
++        return (handle == null) ? null : org.bukkit.craftbukkit.potion.CraftPotionUtil.toBukkit(handle); // Paper
      }
  
      @Override
-@@ -477,7 +477,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -476,7 +476,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public Collection<PotionEffect> getActivePotionEffects() {
          List<PotionEffect> effects = new ArrayList<PotionEffect>();
          for (MobEffectInstance handle : this.getHandle().activeEffects.values()) {
 -            effects.add(new PotionEffect(CraftPotionEffectType.minecraftToBukkit(handle.getEffect()), handle.getDuration(), handle.getAmplifier(), handle.isAmbient(), handle.isVisible()));
-+            effects.add(CraftPotionUtil.toBukkit(handle)); // Paper
++            effects.add(org.bukkit.craftbukkit.potion.CraftPotionUtil.toBukkit(handle)); // Paper
          }
          return effects;
      }
diff --git a/patches/server/0394-Potential-bed-API.patch b/patches/server/0393-Potential-bed-API.patch
index b281ffe8a0..4ce0dba0fa 100644
--- a/patches/server/0394-Potential-bed-API.patch
+++ b/patches/server/0393-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 03b3e5a49658ea6341cd303b75be36a328907863..9541ebf81c3c2c282c6d04f5e51b309e69d0802e 100644
+index 5e40ef1370ea150ea19bd8afc4243e38d1d2ef74..2d0e861275a921ccb3aabcb76ae6eb31f67dd373 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
@@ -19,7 +19,7 @@ index 03b3e5a49658ea6341cd303b75be36a328907863..9541ebf81c3c2c282c6d04f5e51b309e
  import net.minecraft.server.level.ServerPlayer;
  import net.minecraft.world.MenuProvider;
  import net.minecraft.world.entity.Entity;
-@@ -131,6 +132,22 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -130,6 +131,22 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          return this.getHandle().sleepCounter;
      }
  
diff --git a/patches/server/0395-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0394-Wait-for-Async-Tasks-during-shutdown.patch
index 9aac5f9248..5f866e1b33 100644
--- a/patches/server/0395-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0394-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,10 +22,10 @@ index e230a6e3810929c2f9ac70a98c9fc41734ec06c2..81d4870060ea418fecfdd01f13578990
          // CraftBukkit end
          this.getConnection().stop();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 913c1e4ee2df8160e1cd15a352fc71d61e7e38dc..e12b1d7c30d4365130f5761614b095971e047241 100644
+index 7ffd0447becaaaf4f26fa5a6be7f6d83bd816fb3..dfe8d6d8b592a7dc9b1f1d7fb68d0960dbeb387f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1015,6 +1015,31 @@ public final class CraftServer implements Server {
+@@ -1016,6 +1016,31 @@ public final class CraftServer implements Server {
          org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
      }
  
diff --git a/patches/server/0396-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0395-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index d47ba47011..d47ba47011 100644
--- a/patches/server/0396-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0395-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0397-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0396-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 3318713b1f..3318713b1f 100644
--- a/patches/server/0397-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0396-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0398-Ensure-safe-gateway-teleport.patch b/patches/server/0397-Ensure-safe-gateway-teleport.patch
index 2782768b84..c878ac4854 100644
--- a/patches/server/0398-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0397-Ensure-safe-gateway-teleport.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure safe gateway teleport
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 85914124014b4e6f0a561cf560918af68682b6f5..1ec80f9c901dff1c9f29befa5a8e3c3f6f37aaf7 100644
+index 676c2a4c9423e37319b097b99a307dd0186061a0..7491e075baebc7d412d35593bb844b200e304447 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 @@ -105,7 +105,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
diff --git a/patches/server/0399-Add-option-for-console-having-all-permissions.patch b/patches/server/0398-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0399-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0398-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0400-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0399-Fix-villager-trading-demand-MC-163962.patch
index 79eb053dba..79eb053dba 100644
--- a/patches/server/0400-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0399-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0401-Maps-shouldn-t-load-chunks.patch b/patches/server/0400-Maps-shouldn-t-load-chunks.patch
index 4c561b2a04..4c561b2a04 100644
--- a/patches/server/0401-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0400-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0402-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0401-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 2fe0708669..2fe0708669 100644
--- a/patches/server/0402-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0401-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0403-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0402-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 79528977b9..79528977b9 100644
--- a/patches/server/0403-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0402-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0404-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0403-Fix-piston-physics-inconsistency-MC-188840.patch
index 3bef753cf5..3bef753cf5 100644
--- a/patches/server/0404-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0403-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0405-Fix-sand-duping.patch b/patches/server/0404-Fix-sand-duping.patch
index d616a66fc1..d616a66fc1 100644
--- a/patches/server/0405-Fix-sand-duping.patch
+++ b/patches/server/0404-Fix-sand-duping.patch
diff --git a/patches/server/0406-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0405-Fix-missing-chunks-due-to-integer-overflow.patch
index 979e1e474e..979e1e474e 100644
--- a/patches/server/0406-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0405-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0407-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0406-Prevent-position-desync-in-playerconnection-causing-.patch
index 3ee7dd74a1..3ee7dd74a1 100644
--- a/patches/server/0407-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0406-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0408-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0407-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0408-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0407-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0409-Improve-Arrow-API.patch b/patches/server/0408-Improve-Arrow-API.patch
index cbf5d4d815..cbf5d4d815 100644
--- a/patches/server/0409-Improve-Arrow-API.patch
+++ b/patches/server/0408-Improve-Arrow-API.patch
diff --git a/patches/server/0410-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0409-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 6efb439b54..6efb439b54 100644
--- a/patches/server/0410-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0409-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0411-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0410-Use-distance-map-to-optimise-entity-tracker.patch
index b0bbb8a721..b0bbb8a721 100644
--- a/patches/server/0411-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0410-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0412-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0411-Hide-sync-chunk-writes-behind-flag.patch
index d3846bbd23..d3846bbd23 100644
--- a/patches/server/0412-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0411-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0413-Add-permission-for-command-blocks.patch b/patches/server/0412-Add-permission-for-command-blocks.patch
index 1889fe7de5..1889fe7de5 100644
--- a/patches/server/0413-Add-permission-for-command-blocks.patch
+++ b/patches/server/0412-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0414-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0413-Ensure-Entity-AABB-s-are-never-invalid.patch
index f436d1a9ab..f436d1a9ab 100644
--- a/patches/server/0414-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0413-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0415-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0414-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index bc4b1c6e6f..bb80c18fdf 100644
--- a/patches/server/0415-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0414-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -102,10 +102,10 @@ index 361ea663e6a2449855e0b7aa85c1b61a1bf211c2..dce7e232b4e2c2a7aa997da1c6aef955
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e12b1d7c30d4365130f5761614b095971e047241..d7a9673e7f07f5bc6739fe814fa2f9205c764b06 100644
+index dfe8d6d8b592a7dc9b1f1d7fb68d0960dbeb387f..1b43d61f3464218bdf5221ffbf87a7280fa8028c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -954,8 +954,8 @@ public final class CraftServer implements Server {
+@@ -955,8 +955,8 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          for (ServerLevel world : this.console.getAllLevels()) {
diff --git a/patches/server/0416-Paper-dumpitem-command.patch b/patches/server/0415-Paper-dumpitem-command.patch
index 5722936af7..5722936af7 100644
--- a/patches/server/0416-Paper-dumpitem-command.patch
+++ b/patches/server/0415-Paper-dumpitem-command.patch
diff --git a/patches/server/0417-Improve-Legacy-Component-serialization-size.patch b/patches/server/0416-Improve-Legacy-Component-serialization-size.patch
index 91a66f0072..91a66f0072 100644
--- a/patches/server/0417-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0416-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0418-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0417-Optimize-Bit-Operations-by-inlining.patch
index 468568d8aa..468568d8aa 100644
--- a/patches/server/0418-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0417-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0419-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0418-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 0beec63bd1..3fdf6f1d14 100644
--- a/patches/server/0419-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0418-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,10 +22,10 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d7a9673e7f07f5bc6739fe814fa2f9205c764b06..d355b46f23201163b70995a883994fcea1ac1689 100644
+index 1b43d61f3464218bdf5221ffbf87a7280fa8028c..84ff901c4805516bbe438b4ad808e75cd2e15a9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -381,7 +381,7 @@ public final class CraftServer implements Server {
+@@ -377,7 +377,7 @@ public final class CraftServer implements Server {
          this.overrideSpawnLimits();
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
          this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
@@ -34,7 +34,7 @@ index d7a9673e7f07f5bc6739fe814fa2f9205c764b06..d355b46f23201163b70995a883994fce
          this.minimumAPI = this.configuration.getString("settings.minimum-api");
          this.loadIcon();
  
-@@ -934,7 +934,7 @@ public final class CraftServer implements Server {
+@@ -935,7 +935,7 @@ public final class CraftServer implements Server {
          this.console.setMotd(config.motd);
          this.overrideSpawnLimits();
          this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
diff --git a/patches/server/0420-incremental-chunk-and-player-saving.patch b/patches/server/0419-incremental-chunk-and-player-saving.patch
index 5ad93c49bb..5ad93c49bb 100644
--- a/patches/server/0420-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0419-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0421-Support-old-UUID-format-for-NBT.patch b/patches/server/0420-Support-old-UUID-format-for-NBT.patch
index d261c78922..d261c78922 100644
--- a/patches/server/0421-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0420-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0422-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0421-Convert-legacy-attributes-in-Item-Meta.patch
index 52c687a7a5..60834c2184 100644
--- a/patches/server/0422-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0421-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,15 +30,15 @@ index d4dba8c733c7560e5108b8d239b52e593f8debec..ea48f1119a940056c37d1d203437bfbf
      public CraftAttributeMap(AttributeMap handle) {
          this.handle = handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 4e1f436cbe47ba08c731be781fb372b20c497de6..f66104abef112ed1056f6f70b38c1d7865431a6c 100644
+index e720778ccf009b0038aea72e06d91d5e5e061ecf..8548ed80555bc2b80f8fa1a699ab668307122b8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -485,7 +485,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -484,7 +484,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
              AttributeModifier attribMod = CraftAttributeInstance.convert(nmsModifier);
  
 -            String attributeName = entry.getString(CraftMetaItem.ATTRIBUTES_IDENTIFIER.NBT);
-+            String attributeName = CraftAttributeMap.convertIfNeeded(entry.getString(CraftMetaItem.ATTRIBUTES_IDENTIFIER.NBT)); // Paper
++            String attributeName = org.bukkit.craftbukkit.attribute.CraftAttributeMap.convertIfNeeded(entry.getString(CraftMetaItem.ATTRIBUTES_IDENTIFIER.NBT)); // Paper
              if (attributeName == null || attributeName.isEmpty()) {
                  continue;
              }
diff --git a/patches/server/0423-Remove-some-streams-from-structures.patch b/patches/server/0422-Remove-some-streams-from-structures.patch
index 136b102df3..136b102df3 100644
--- a/patches/server/0423-Remove-some-streams-from-structures.patch
+++ b/patches/server/0422-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0423-Remove-streams-from-classes-related-villager-gossip.patch
index b9c37f3a08..b9c37f3a08 100644
--- a/patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/server/0423-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0425-Support-components-in-ItemMeta.patch b/patches/server/0424-Support-components-in-ItemMeta.patch
index b9a53bc4e5..d385e9af6e 100644
--- a/patches/server/0425-Support-components-in-ItemMeta.patch
+++ b/patches/server/0424-Support-components-in-ItemMeta.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index f66104abef112ed1056f6f70b38c1d7865431a6c..9c20c225ba46f2126a43e2f879f4849081cae90a 100644
+index 8548ed80555bc2b80f8fa1a699ab668307122b8e..a93847d69729fade6b81efb41627026ae4aec282 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -879,11 +879,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -878,11 +878,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return CraftChatMessage.fromJSONComponent(this.displayName);
      }
  
@@ -32,7 +32,7 @@ index f66104abef112ed1056f6f70b38c1d7865431a6c..9c20c225ba46f2126a43e2f879f48490
      @Override
      public boolean hasDisplayName() {
          return this.displayName != null;
-@@ -1026,6 +1038,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1025,6 +1037,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return this.lore == null ? null : new ArrayList<String>(Lists.transform(this.lore, CraftChatMessage::fromJSONComponent));
      }
  
@@ -47,7 +47,7 @@ index f66104abef112ed1056f6f70b38c1d7865431a6c..9c20c225ba46f2126a43e2f879f48490
      @Override
      public void setLore(List<String> lore) {
          if (lore == null || lore.isEmpty()) {
-@@ -1040,6 +1060,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1039,6 +1059,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -69,7 +69,7 @@ index f66104abef112ed1056f6f70b38c1d7865431a6c..9c20c225ba46f2126a43e2f879f48490
      @Override
      public boolean hasCustomModelData() {
          return this.customModelData != null;
-@@ -1508,6 +1543,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1507,6 +1542,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
  
          for (Object object : addFrom) {
diff --git a/patches/server/0426-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0425-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0426-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0425-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0427-Add-entity-liquid-API.patch b/patches/server/0426-Add-entity-liquid-API.patch
index 8989db3c09..165c4bb55b 100644
--- a/patches/server/0427-Add-entity-liquid-API.patch
+++ b/patches/server/0426-Add-entity-liquid-API.patch
@@ -8,10 +8,10 @@ public net.minecraft.world.entity.Entity isInRain()Z
 public net.minecraft.world.entity.Entity isInBubbleColumn()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b06c338ee9205d1f4d562571aba83c83f9abd20b..ded0332f5be000e31962e34033e69d17eed51280 100644
+index 4d71849e8330e6f758e10223fabdb5d6ed0e7221..3444051416632eb30ef2cb820767285718095497 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1372,5 +1372,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1023,5 +1023,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() {
          return getHandle().spawnReason;
      }
diff --git a/patches/server/0428-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0427-Update-itemstack-legacy-name-and-lore.patch
index d6f85477a6..d6f85477a6 100644
--- a/patches/server/0428-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0427-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0429-Add-PrepareResultEvent.patch b/patches/server/0428-Add-PrepareResultEvent.patch
index 6f521aff59..25662bdf0a 100644
--- a/patches/server/0429-Add-PrepareResultEvent.patch
+++ b/patches/server/0428-Add-PrepareResultEvent.patch
@@ -94,10 +94,10 @@ index 9c2fe69ced7a46bbd8b0fbe10fa67d0a39b0f375..70ecc3f673ebd56b65ad901e10f40c28
  
      private void setupRecipeList(Container input, ItemStack stack) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 839deebc72a575eea5db4decd82c8c8b1884e621..ce0d05009a9b88607a143ad40421d70148491817 100644
+index d0c267a79f262dafdd74a6c661a234b9301eddd2..31de936ece1391d75d41a00479a82f8dd0cbc850 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1717,26 +1717,53 @@ public class CraftEventFactory {
+@@ -1714,26 +1714,53 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0430-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0429-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index abea401531..abea401531 100644
--- a/patches/server/0430-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0429-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0431-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0430-Fix-arrows-never-despawning-MC-125757.patch
index abed4b5fa6..abed4b5fa6 100644
--- a/patches/server/0431-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0430-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0432-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0431-Thread-Safe-Vanilla-Command-permission-checking.patch
index 048e161f33..048e161f33 100644
--- a/patches/server/0432-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0431-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0433-Fix-SPIGOT-5989.patch b/patches/server/0432-Fix-SPIGOT-5989.patch
index 6b4d6c7bc1..6b4d6c7bc1 100644
--- a/patches/server/0433-Fix-SPIGOT-5989.patch
+++ b/patches/server/0432-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0434-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0433-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index f133ccbdb2..f133ccbdb2 100644
--- a/patches/server/0434-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0433-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0435-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0434-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index e67a4ea7a6..e67a4ea7a6 100644
--- a/patches/server/0435-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0434-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0436-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0435-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index e1b1387447..e1b1387447 100644
--- a/patches/server/0436-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0435-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0436-Optimize-NetworkManager-Exception-Handling.patch
index a98c46b0d8..a98c46b0d8 100644
--- a/patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0436-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0438-Fix-some-rails-connecting-improperly.patch b/patches/server/0437-Fix-some-rails-connecting-improperly.patch
index f7cfa8c509..f7cfa8c509 100644
--- a/patches/server/0438-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0437-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0439-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0438-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 68d17065ec..75cd32bb83 100644
--- a/patches/server/0439-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0438-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
@@ -13,10 +13,10 @@ This commit forces numbers to be present prior to the ending "i"
 letter.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java b/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java
-index 2cfa312aec7fe513b9f0e517fa935cd8aceeb868..eea35e63fcbb598b6c89625e69160a46891ceb5f 100644
+index be9686a4240acf24a9ee022cff6ba848524b4498..1d282b1f3cf968364474ce5700bc95ebc46b9f1c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java
-@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
  public class CraftNBTTagConfigSerializer {
  
      private static final Pattern ARRAY = Pattern.compile("^\\[.*]");
diff --git a/patches/server/0440-Brand-support.patch b/patches/server/0439-Brand-support.patch
index 9db7930656..aa37ac5dde 100644
--- a/patches/server/0440-Brand-support.patch
+++ b/patches/server/0439-Brand-support.patch
@@ -57,10 +57,10 @@ index 698fc66f8c232644f2d747c81f8ac2e39204fd7f..8cb7e9d67fc4713dc327ad0459518f06
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fb3b8f8eab00a2aadfee7780dfb0988f6fe3fc65..bb5c1a3ce83d737ac218a5b590b585916ac2d4d7 100644
+index 5fdd1bc97b3e04b59a76cfbf190cc9cb504837cf..d90e61917142624ec831fcf775a69b66200a1625 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2999,6 +2999,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3009,6 +3009,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/server/0441-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0440-Add-playPickupItemAnimation-to-LivingEntity.patch
index 4f99ae26b9..3ff92c8b68 100644
--- a/patches/server/0441-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0440-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f5b9d1fe0d672e11b6295aefc9e182606dbebf88..95406737a6c72fd118a0022e07cdf15936e3911a 100644
+index ac85635bb5ff698712ffe7c48e8aa55d20e0302e..d79f0c81bc7758f91c3f69b084f571af36bfa32f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -925,5 +925,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -924,5 +924,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              ((Mob) getHandle()).getJumpControl().jump();
          }
      }
diff --git a/patches/server/0442-Don-t-require-FACING-data.patch b/patches/server/0441-Don-t-require-FACING-data.patch
index 3191bbac86..3191bbac86 100644
--- a/patches/server/0442-Don-t-require-FACING-data.patch
+++ b/patches/server/0441-Don-t-require-FACING-data.patch
diff --git a/patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0442-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 43a7633250..43a7633250 100644
--- a/patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0442-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0444-Add-moon-phase-API.patch b/patches/server/0443-Add-moon-phase-API.patch
index 8a5548fc82..56f71054b9 100644
--- a/patches/server/0444-Add-moon-phase-API.patch
+++ b/patches/server/0443-Add-moon-phase-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 53385eb0fb6c79052f508f8feeff7cbd8559c19f..6433ac4053e7c39aa4ec73db4159422e501c9d21 100644
+index 954d7a92d9deaf2332ddcfbb7f53f425ada822b6..be0ca9e82b88518109eec88735e628b8de9ebe72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -1015,4 +1015,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -499,4 +499,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
  
          throw new IllegalArgumentException("Cannot spawn an entity for " + clazz.getName());
      }
diff --git a/patches/server/0445-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0444-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 977fecbd78..977fecbd78 100644
--- a/patches/server/0445-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0444-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0446-Prevent-headless-pistons-from-being-created.patch b/patches/server/0445-Prevent-headless-pistons-from-being-created.patch
index b52eb6291f..b52eb6291f 100644
--- a/patches/server/0446-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0445-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0447-Add-BellRingEvent.patch b/patches/server/0446-Add-BellRingEvent.patch
index ce008b49dd..d307d78495 100644
--- a/patches/server/0447-Add-BellRingEvent.patch
+++ b/patches/server/0446-Add-BellRingEvent.patch
@@ -7,10 +7,10 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ce0d05009a9b88607a143ad40421d70148491817..bb7ec8b5a76155ec5a6bfa29eda4e395cf3f23d2 100644
+index 31de936ece1391d75d41a00479a82f8dd0cbc850..e33dbade37e4763f838b6cd1267a4f0b9c1533b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -369,10 +369,11 @@ public class CraftEventFactory {
+@@ -366,10 +366,11 @@ public class CraftEventFactory {
          return tradeSelectEvent;
      }
  
diff --git a/patches/server/0448-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0447-Add-zombie-targets-turtle-egg-config.patch
index 232c618025..232c618025 100644
--- a/patches/server/0448-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0447-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0449-Buffer-joins-to-world.patch b/patches/server/0448-Buffer-joins-to-world.patch
index a0a51f955d..a0a51f955d 100644
--- a/patches/server/0449-Buffer-joins-to-world.patch
+++ b/patches/server/0448-Buffer-joins-to-world.patch
diff --git a/patches/server/0450-Eigencraft-redstone-implementation.patch b/patches/server/0449-Eigencraft-redstone-implementation.patch
index 0022f6b8df..0022f6b8df 100644
--- a/patches/server/0450-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0449-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0451-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0450-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 176fafac47..176fafac47 100644
--- a/patches/server/0451-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0450-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0452-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0451-PortalCreateEvent-needs-to-know-its-entity.patch
index 86c18082c5..86c18082c5 100644
--- a/patches/server/0452-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0451-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0453-Add-more-Evoker-API.patch b/patches/server/0452-Add-more-Evoker-API.patch
index 742d85985e..742d85985e 100644
--- a/patches/server/0453-Add-more-Evoker-API.patch
+++ b/patches/server/0452-Add-more-Evoker-API.patch
diff --git a/patches/server/0454-Add-methods-to-get-translation-keys.patch b/patches/server/0453-Add-methods-to-get-translation-keys.patch
index 7307a84d68..7307a84d68 100644
--- a/patches/server/0454-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0453-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0455-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0454-Create-HoverEvent-from-ItemStack-Entity.patch
index b2004f6a12..b2004f6a12 100644
--- a/patches/server/0455-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0454-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0456-Cache-block-data-strings.patch b/patches/server/0455-Cache-block-data-strings.patch
index cede9b658d..7fdf40bd9d 100644
--- a/patches/server/0456-Cache-block-data-strings.patch
+++ b/patches/server/0455-Cache-block-data-strings.patch
@@ -17,10 +17,10 @@ index a82f7dd2cbc2f6311b810f117f0970a47db85818..2616d771a8a95dac4440b74933c8aa7b
  
          if (this.isSameThread()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index ebe02507a394563ba51a207db8b24760467d936e..c673e311a5508c7264a8765c266892f9d346d39a 100644
+index cf379f7da8d8e6db0d74f1ca0e4b42e017a8191e..c1506afacb6a73ef4a4692c0ae0722b240f01606 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -535,9 +535,39 @@ public class CraftBlockData implements BlockData {
+@@ -536,9 +536,39 @@ public class CraftBlockData implements BlockData {
          Preconditions.checkState(CraftBlockData.MAP.put(nms, bukkit) == null, "Duplicate mapping %s->%s", nms, bukkit);
      }
  
diff --git a/patches/server/0457-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0456-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index a7c24784c3..f5bedb1c01 100644
--- a/patches/server/0457-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0456-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -69,10 +69,10 @@ index 41f549f16f69f9bc50a004096e6c3c0f6e4d4eaf..9ec83d6eeff22c2ce25374a83f581a67
                          if (entity instanceof Mob) {
                              Mob entityinsentient = (Mob) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ded0332f5be000e31962e34033e69d17eed51280..370011b7de936a427f211edf306a5b6f3b8ea1a0 100644
+index 3444051416632eb30ef2cb820767285718095497..fdf22cb358040738a1b7fabf1cef47a5d33af832 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -586,7 +586,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -237,7 +237,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
  
          // entity.setLocation() throws no event, and so cannot be cancelled
diff --git a/patches/server/0458-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0457-Add-additional-open-container-api-to-HumanEntity.patch
index 9096a46047..2cac2e1af0 100644
--- a/patches/server/0458-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0457-Add-additional-open-container-api-to-HumanEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 9541ebf81c3c2c282c6d04f5e51b309e69d0802e..2609da834c014e82d0038de580d50163dd0c5687 100644
+index 2d0e861275a921ccb3aabcb76ae6eb31f67dd373..7406094fc58e5df4f5d553bb882c75ba6ef766a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -462,6 +462,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -461,6 +461,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          return this.getHandle().containerMenu.getBukkitView();
      }
  
diff --git a/patches/server/0459-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0458-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index b5d192ac20..b5d192ac20 100644
--- a/patches/server/0459-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0458-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0460-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0459-Extend-block-drop-capture-to-capture-all-items-added.patch
index 4bb5817380..4bb5817380 100644
--- a/patches/server/0460-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0459-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0461-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0460-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 35e55d554a..35e55d554a 100644
--- a/patches/server/0461-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0460-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0462-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0461-Lazily-track-plugin-scoreboards-by-default.patch
index 2f7c4855e1..2f7c4855e1 100644
--- a/patches/server/0462-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0461-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0463-Entity-isTicking.patch b/patches/server/0462-Entity-isTicking.patch
index e03bc39974..b225bb8bca 100644
--- a/patches/server/0463-Entity-isTicking.patch
+++ b/patches/server/0462-Entity-isTicking.patch
@@ -19,10 +19,10 @@ index e3275f09f48c9e69179fd17901d4294ddb68a435..46637e6913e5f2aae0be6aa67b95f1fe
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 370011b7de936a427f211edf306a5b6f3b8ea1a0..2979678d8640324f5c28e4051bbb3b61b81a1e71 100644
+index fdf22cb358040738a1b7fabf1cef47a5d33af832..58b591d047e88c00ea09b33ece9f16fde98d3208 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1407,5 +1407,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1058,5 +1058,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isInLava() {
          return getHandle().isInLava();
      }
diff --git a/patches/server/0464-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0463-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 1749b211f0..1749b211f0 100644
--- a/patches/server/0464-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0463-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0465-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0464-Fix-Concurrency-issue-in-ShufflingList.patch
index 07c57efa62..07c57efa62 100644
--- a/patches/server/0465-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0464-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0466-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0465-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index fd459bdab5..fd459bdab5 100644
--- a/patches/server/0466-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0465-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0467-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0466-Fix-for-large-move-vectors-crashing-server.patch
index 62867a8d49..62867a8d49 100644
--- a/patches/server/0467-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0466-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0468-Optimise-getType-calls.patch b/patches/server/0467-Optimise-getType-calls.patch
index a83aa2af21..a8e75fd419 100644
--- a/patches/server/0468-Optimise-getType-calls.patch
+++ b/patches/server/0467-Optimise-getType-calls.patch
@@ -67,10 +67,10 @@ index a193583f596c0a587cd0c2d6eac994226ee4fde0..aca63719790429d3d7c7c59a1931a982
  
      public void setFlag(int flag) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index c673e311a5508c7264a8765c266892f9d346d39a..d6ba9030b0736afda9f7d2effa95d6d63e983b34 100644
+index c1506afacb6a73ef4a4692c0ae0722b240f01606..89997c2a11b247d2a23dc7c176bce3231639e777 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -59,7 +59,7 @@ public class CraftBlockData implements BlockData {
+@@ -60,7 +60,7 @@ public class CraftBlockData implements BlockData {
  
      @Override
      public Material getMaterial() {
diff --git a/patches/server/0469-Villager-resetOffers.patch b/patches/server/0468-Villager-resetOffers.patch
index f094a1397c..f094a1397c 100644
--- a/patches/server/0469-Villager-resetOffers.patch
+++ b/patches/server/0468-Villager-resetOffers.patch
diff --git a/patches/server/0470-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0469-Retain-block-place-order-when-capturing-blockstates.patch
index 2d7288e3c4..2d7288e3c4 100644
--- a/patches/server/0470-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0469-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0471-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0470-Reduce-blockpos-allocation-from-pathfinding.patch
index a3846cba0b..a3846cba0b 100644
--- a/patches/server/0471-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0470-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0472-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0471-Fix-item-locations-dropped-from-campfires.patch
index d8e81d50ef..d8e81d50ef 100644
--- a/patches/server/0472-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0471-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0473-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0472-Fixed-TileEntityBell-memory-leak.patch
index 0cd7feb8d4..0cd7feb8d4 100644
--- a/patches/server/0473-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0472-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0474-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0473-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 27b0ff407c..27b0ff407c 100644
--- a/patches/server/0474-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0473-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0475-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0474-Add-getOfflinePlayerIfCached-String.patch
index 779a1fcb5a..d91285ae46 100644
--- a/patches/server/0475-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0474-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d355b46f23201163b70995a883994fcea1ac1689..561436bdff6b1a46b37cad519885c952da7e5b5d 100644
+index 84ff901c4805516bbe438b4ad808e75cd2e15a9d..508ccf9685058674020c04914d8107e7fb1912ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1909,6 +1909,28 @@ public final class CraftServer implements Server {
+@@ -1910,6 +1910,28 @@ public final class CraftServer implements Server {
          return result;
      }
  
diff --git a/patches/server/0476-Add-ignore-discounts-API.patch b/patches/server/0475-Add-ignore-discounts-API.patch
index 84d0e086b7..84d0e086b7 100644
--- a/patches/server/0476-Add-ignore-discounts-API.patch
+++ b/patches/server/0475-Add-ignore-discounts-API.patch
diff --git a/patches/server/0477-Toggle-for-removing-existing-dragon.patch b/patches/server/0476-Toggle-for-removing-existing-dragon.patch
index 0ec8e9d4ef..0ec8e9d4ef 100644
--- a/patches/server/0477-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0476-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0478-Fix-client-lag-on-advancement-loading.patch b/patches/server/0477-Fix-client-lag-on-advancement-loading.patch
index 68881e20e8..68881e20e8 100644
--- a/patches/server/0478-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0477-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0479-Item-no-age-no-player-pickup.patch b/patches/server/0478-Item-no-age-no-player-pickup.patch
index f7228c3b99..f7228c3b99 100644
--- a/patches/server/0479-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0478-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0479-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 9a80ce81b8..9a80ce81b8 100644
--- a/patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0479-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0481-Beacon-API-custom-effect-ranges.patch b/patches/server/0480-Beacon-API-custom-effect-ranges.patch
index f3b72c6e9c..f3b72c6e9c 100644
--- a/patches/server/0481-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0480-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0482-Add-API-for-quit-reason.patch b/patches/server/0481-Add-API-for-quit-reason.patch
index 42c8560325..42c8560325 100644
--- a/patches/server/0482-Add-API-for-quit-reason.patch
+++ b/patches/server/0481-Add-API-for-quit-reason.patch
diff --git a/patches/server/0483-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0482-Add-Wandering-Trader-spawn-rate-config-options.patch
index 09e0c87600..09e0c87600 100644
--- a/patches/server/0483-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0482-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0484-Expose-world-spawn-angle.patch b/patches/server/0483-Expose-world-spawn-angle.patch
index 80e8e1b939..80e8e1b939 100644
--- a/patches/server/0484-Expose-world-spawn-angle.patch
+++ b/patches/server/0483-Expose-world-spawn-angle.patch
diff --git a/patches/server/0485-Add-Destroy-Speed-API.patch b/patches/server/0484-Add-Destroy-Speed-API.patch
index 135f2eafc9..56532eca85 100644
--- a/patches/server/0485-Add-Destroy-Speed-API.patch
+++ b/patches/server/0484-Add-Destroy-Speed-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Destroy Speed API
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index d6ba9030b0736afda9f7d2effa95d6d63e983b34..79c469d461ce9df0994214ebc8b157a095a4c848 100644
+index 89997c2a11b247d2a23dc7c176bce3231639e777..f116f6997562a3ccb1a4830515ea6ee25ce29d77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -696,4 +696,19 @@ public class CraftBlockData implements BlockData {
+@@ -702,4 +702,19 @@ public class CraftBlockData implements BlockData {
      public BlockState createBlockState() {
          return CraftBlockStates.getBlockState(this.state, null);
      }
diff --git a/patches/server/0486-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0485-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 73114872d2..94dae33c49 100644
--- a/patches/server/0486-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0485-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bb5c1a3ce83d737ac218a5b590b585916ac2d4d7..b3cbd7779ca2046d952352a9cb9f509e8525b344 100644
+index d90e61917142624ec831fcf775a69b66200a1625..cd8b40db82a42f55c8253dc91df3caa415aabed1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2562,7 +2562,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2572,7 +2572,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null) {
              Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
          }
diff --git a/patches/server/0487-Add-LivingEntity-clearActiveItem.patch b/patches/server/0486-Add-LivingEntity-clearActiveItem.patch
index 099d2c057a..a75cf4d032 100644
--- a/patches/server/0487-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0486-Add-LivingEntity-clearActiveItem.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 95406737a6c72fd118a0022e07cdf15936e3911a..66c762c13a70f917e06795dcee85cae66cd316d4 100644
+index d79f0c81bc7758f91c3f69b084f571af36bfa32f..6fdf8460dcb396f2c83f1394bc9cfbb3f35cbd48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -892,6 +892,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -891,6 +891,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return getHandle().getUseItem().asBukkitMirror();
      }
  
diff --git a/patches/server/0488-Add-PlayerItemCooldownEvent.patch b/patches/server/0487-Add-PlayerItemCooldownEvent.patch
index 751841d117..751841d117 100644
--- a/patches/server/0488-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0487-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0488-Significantly-improve-performance-of-the-end-generat.patch
index 95f0914262..95f0914262 100644
--- a/patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0488-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0490-More-lightning-API.patch b/patches/server/0489-More-lightning-API.patch
index bda291858a..bda291858a 100644
--- a/patches/server/0490-More-lightning-API.patch
+++ b/patches/server/0489-More-lightning-API.patch
diff --git a/patches/server/0491-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0490-Climbing-should-not-bypass-cramming-gamerule.patch
index ade6b3feea..ade6b3feea 100644
--- a/patches/server/0491-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0490-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0492-Added-missing-default-perms-for-commands.patch b/patches/server/0491-Added-missing-default-perms-for-commands.patch
index d2a26cc7c1..d2a26cc7c1 100644
--- a/patches/server/0492-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0491-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0493-Add-PlayerShearBlockEvent.patch b/patches/server/0492-Add-PlayerShearBlockEvent.patch
index a3a7ee694b..a3a7ee694b 100644
--- a/patches/server/0493-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0492-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0494-Limit-recipe-packets.patch b/patches/server/0493-Limit-recipe-packets.patch
index 72b2bedf0b..72b2bedf0b 100644
--- a/patches/server/0494-Limit-recipe-packets.patch
+++ b/patches/server/0493-Limit-recipe-packets.patch
diff --git a/patches/server/0495-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0494-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0495-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0494-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0496-Player-Chunk-Load-Unload-Events.patch b/patches/server/0495-Player-Chunk-Load-Unload-Events.patch
index 504b607773..504b607773 100644
--- a/patches/server/0496-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0495-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0497-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0496-Optimize-Dynamic-get-Missing-Keys.patch
index d664f7ff69..d664f7ff69 100644
--- a/patches/server/0497-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0496-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0498-Expose-LivingEntity-hurt-direction.patch b/patches/server/0497-Expose-LivingEntity-hurt-direction.patch
index 42d8addf4e..0bcdac5c1d 100644
--- a/patches/server/0498-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0497-Expose-LivingEntity-hurt-direction.patch
@@ -18,10 +18,10 @@ index 4bac05cb48d81dc9776d90502b6f12285b92122b..2957b3929c1e92af1b1a2636b83b757a
      public boolean affectsSpawning = true;
      // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 2609da834c014e82d0038de580d50163dd0c5687..6a5f5c00f9276337ddee8c8d1458a429bc5443d9 100644
+index 7406094fc58e5df4f5d553bb882c75ba6ef766a9..faaed968a3e771c1db3957e2b42acf6d87a38842 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -127,6 +127,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -126,6 +126,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          }
      }
  
@@ -36,10 +36,10 @@ index 2609da834c014e82d0038de580d50163dd0c5687..6a5f5c00f9276337ddee8c8d1458a429
      public int getSleepTicks() {
          return this.getHandle().sleepCounter;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 66c762c13a70f917e06795dcee85cae66cd316d4..4fc1ea695611e636349ea9d4d4ae48bab93d3b98 100644
+index 6fdf8460dcb396f2c83f1394bc9cfbb3f35cbd48..022741182869348e377746bf2a3792a07155abc5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -937,5 +937,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -936,5 +936,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void playPickupItemAnimation(org.bukkit.entity.Item item, int quantity) {
          getHandle().take(((CraftItem) item).getHandle(), quantity);
      }
diff --git a/patches/server/0499-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0498-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 6e3ee38c71..ca858b50f0 100644
--- a/patches/server/0499-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0498-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index bb7ec8b5a76155ec5a6bfa29eda4e395cf3f23d2..c4dd2ab7afe61d354418dc5475c3b444609ccd80 100644
+index e33dbade37e4763f838b6cd1267a4f0b9c1533b9..0e0c64c9fad14ad77af784e719fe6f203479db14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -304,6 +304,10 @@ public class CraftEventFactory {
+@@ -301,6 +301,10 @@ public class CraftEventFactory {
                          return BedEnterResult.TOO_FAR_AWAY;
                      case NOT_SAFE:
                          return BedEnterResult.NOT_SAFE;
diff --git a/patches/server/0500-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0499-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index 429087e774..429087e774 100644
--- a/patches/server/0500-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0499-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0501-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0500-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index f32afc053e..f32afc053e 100644
--- a/patches/server/0501-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0500-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0502-Implement-TargetHitEvent.patch b/patches/server/0501-Implement-TargetHitEvent.patch
index 917dc86b41..917dc86b41 100644
--- a/patches/server/0502-Implement-TargetHitEvent.patch
+++ b/patches/server/0501-Implement-TargetHitEvent.patch
diff --git a/patches/server/0503-MC-4-Fix-item-position-desync.patch b/patches/server/0502-MC-4-Fix-item-position-desync.patch
index 48a9f48a82..48a9f48a82 100644
--- a/patches/server/0503-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0502-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0504-Additional-Block-Material-API-s.patch b/patches/server/0503-Additional-Block-Material-API-s.patch
index d688dc87dc..d688dc87dc 100644
--- a/patches/server/0504-Additional-Block-Material-API-s.patch
+++ b/patches/server/0503-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0505-Fix-harming-potion-dupe.patch b/patches/server/0504-Fix-harming-potion-dupe.patch
index 545b594e94..545b594e94 100644
--- a/patches/server/0505-Fix-harming-potion-dupe.patch
+++ b/patches/server/0504-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0506-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0505-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 754c03c42c..754c03c42c 100644
--- a/patches/server/0506-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0505-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0507-Cache-burn-durations.patch b/patches/server/0506-Cache-burn-durations.patch
index c4372f6401..c4372f6401 100644
--- a/patches/server/0507-Cache-burn-durations.patch
+++ b/patches/server/0506-Cache-burn-durations.patch
diff --git a/patches/server/0508-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0507-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 7580ba7931..7580ba7931 100644
--- a/patches/server/0508-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0507-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0509-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0508-Fix-Not-a-string-Map-Conversion-spam.patch
index 38593b84f5..38593b84f5 100644
--- a/patches/server/0509-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0508-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0510-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0509-Implement-PlayerFlowerPotManipulateEvent.patch
index 112c7c7dde..112c7c7dde 100644
--- a/patches/server/0510-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0509-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0511-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0510-Fix-interact-event-not-being-called-sometimes.patch
index 513123dfe6..513123dfe6 100644
--- a/patches/server/0511-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0510-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0512-Zombie-API-breaking-doors.patch b/patches/server/0511-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0512-Zombie-API-breaking-doors.patch
+++ b/patches/server/0511-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0513-Fix-nerfed-slime-when-splitting.patch b/patches/server/0512-Fix-nerfed-slime-when-splitting.patch
index 02b201e9ce..02b201e9ce 100644
--- a/patches/server/0513-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0512-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0514-Add-EntityLoadCrossbowEvent.patch b/patches/server/0513-Add-EntityLoadCrossbowEvent.patch
index 07e5946fbf..07e5946fbf 100644
--- a/patches/server/0514-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0513-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0515-Added-WorldGameRuleChangeEvent.patch b/patches/server/0514-Added-WorldGameRuleChangeEvent.patch
index 551deb10be..551deb10be 100644
--- a/patches/server/0515-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0514-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0516-Added-ServerResourcesReloadedEvent.patch b/patches/server/0515-Added-ServerResourcesReloadedEvent.patch
index cb19b400e4..cb19b400e4 100644
--- a/patches/server/0516-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0515-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0517-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0516-Added-world-settings-for-mobs-picking-up-loot.patch
index 9198f417c1..9198f417c1 100644
--- a/patches/server/0517-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0516-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0518-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0517-Implemented-BlockFailedDispenseEvent.patch
index ac4f3c84f1..31283d0db6 100644
--- a/patches/server/0518-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0517-Implemented-BlockFailedDispenseEvent.patch
@@ -32,10 +32,10 @@ index 913ed110d8402d377152753325901eb7f3ac82d6..675644974ae6fb5380a6496a2ac3ec4d
              } else {
                  ItemStack itemstack = tileentitydispenser.getItem(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c4dd2ab7afe61d354418dc5475c3b444609ccd80..7b6ed5812a9ea1ba1a4a2183c1568e9c60cc9c21 100644
+index 0e0c64c9fad14ad77af784e719fe6f203479db14..8b2fda9c6cbb0872798ce3240d9a6d32cb61b82e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2043,4 +2043,12 @@ public class CraftEventFactory {
+@@ -2040,4 +2040,12 @@ public class CraftEventFactory {
          Bukkit.getPluginManager().callEvent(event);
          return event;
      }
diff --git a/patches/server/0519-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0518-Added-PlayerLecternPageChangeEvent.patch
index 57485f4ee7..57485f4ee7 100644
--- a/patches/server/0519-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0518-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0520-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0519-Added-PlayerLoomPatternSelectEvent.patch
index 93e862a643..93e862a643 100644
--- a/patches/server/0520-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0519-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0521-Configurable-door-breaking-difficulty.patch b/patches/server/0520-Configurable-door-breaking-difficulty.patch
index 63aebe8098..63aebe8098 100644
--- a/patches/server/0521-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0520-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0522-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0521-Empty-commands-shall-not-be-dispatched.patch
index 3eefe6463d..3eefe6463d 100644
--- a/patches/server/0522-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0521-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0523-Remove-stale-POIs.patch b/patches/server/0522-Remove-stale-POIs.patch
index bea67cb132..bea67cb132 100644
--- a/patches/server/0523-Remove-stale-POIs.patch
+++ b/patches/server/0522-Remove-stale-POIs.patch
diff --git a/patches/server/0524-Fix-villager-boat-exploit.patch b/patches/server/0523-Fix-villager-boat-exploit.patch
index 53da0387cc..53da0387cc 100644
--- a/patches/server/0524-Fix-villager-boat-exploit.patch
+++ b/patches/server/0523-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0525-Add-sendOpLevel-API.patch b/patches/server/0524-Add-sendOpLevel-API.patch
index d78ec67bce..e646e90e63 100644
--- a/patches/server/0525-Add-sendOpLevel-API.patch
+++ b/patches/server/0524-Add-sendOpLevel-API.patch
@@ -32,10 +32,10 @@ index 1131ee88f35c3898f0119c414c8376b0d9130169..bf361396bc2ec5d5c7b45d425af990c0
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b3cbd7779ca2046d952352a9cb9f509e8525b344..b6beb02be7864c8fda297dead74d86258025348e 100644
+index cd8b40db82a42f55c8253dc91df3caa415aabed1..ece389c0f124c65b4adce1f8ce53e9139b46fd6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -636,6 +636,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -633,6 +633,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0526-TODO-Registry-Modification-API.patch b/patches/server/0525-TODO-Registry-Modification-API.patch
index 6ad8645be8..6ad8645be8 100644
--- a/patches/server/0526-TODO-Registry-Modification-API.patch
+++ b/patches/server/0525-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0527-Add-StructuresLocateEvent.patch b/patches/server/0526-Add-StructuresLocateEvent.patch
index 982ef1e426..982ef1e426 100644
--- a/patches/server/0527-Add-StructuresLocateEvent.patch
+++ b/patches/server/0526-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0528-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0527-Collision-option-for-requiring-a-player-participant.patch
index a6df151a0e..a6df151a0e 100644
--- a/patches/server/0528-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0527-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0529-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0528-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 345522a05d..345522a05d 100644
--- a/patches/server/0529-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0528-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0530-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0529-Return-chat-component-with-empty-text-instead-of-thr.patch
index ea9a7d39b0..ea9a7d39b0 100644
--- a/patches/server/0530-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0529-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0531-Make-schedule-command-per-world.patch b/patches/server/0530-Make-schedule-command-per-world.patch
index 25654c4b85..25654c4b85 100644
--- a/patches/server/0531-Make-schedule-command-per-world.patch
+++ b/patches/server/0530-Make-schedule-command-per-world.patch
diff --git a/patches/server/0532-Configurable-max-leash-distance.patch b/patches/server/0531-Configurable-max-leash-distance.patch
index c1ac4b5634..c1ac4b5634 100644
--- a/patches/server/0532-Configurable-max-leash-distance.patch
+++ b/patches/server/0531-Configurable-max-leash-distance.patch
diff --git a/patches/server/0533-Implement-BlockPreDispenseEvent.patch b/patches/server/0532-Implement-BlockPreDispenseEvent.patch
index 601692f41b..92e4e0ee35 100644
--- a/patches/server/0533-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0532-Implement-BlockPreDispenseEvent.patch
@@ -17,10 +17,10 @@ index 21c37ad365e09a296c3e7a2d0cde7a29ced09c33..52e92ffd6bf5d3d721807a0b3a8e2d30
                      tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7b6ed5812a9ea1ba1a4a2183c1568e9c60cc9c21..63a8ef00c6b3cc39165324e16e90c8ff4db7ece7 100644
+index 8b2fda9c6cbb0872798ce3240d9a6d32cb61b82e..59dcf578c326354bde835b5ebe94f8425f6b53b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2050,5 +2050,11 @@ public class CraftEventFactory {
+@@ -2047,5 +2047,11 @@ public class CraftEventFactory {
          io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
          return event.callEvent();
      }
diff --git a/patches/server/0534-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0533-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 03d8cdf4c8..03d8cdf4c8 100644
--- a/patches/server/0534-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0533-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0535-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0534-Add-toggle-for-always-placing-the-dragon-egg.patch
index 39e24e6044..39e24e6044 100644
--- a/patches/server/0535-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0534-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0536-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0535-Added-PlayerStonecutterRecipeSelectEvent.patch
index 9750570e73..9750570e73 100644
--- a/patches/server/0536-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0535-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0537-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0536-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index eccf0f6011..def86a56f0 100644
--- a/patches/server/0537-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0536-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -122,10 +122,10 @@ index 16784fcc853e23689a854e7dc6c03ed8182a164e..4eb97572a97a8d98af37c4223f42fc63
                              flag1 = true;
                          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 63a8ef00c6b3cc39165324e16e90c8ff4db7ece7..6581fe79ce30ea9462c989289e3757d478f95ea8 100644
+index 59dcf578c326354bde835b5ebe94f8425f6b53b9..158f2656864f559100b33c8a48b6a1c0f2d827fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1640,8 +1640,10 @@ public class CraftEventFactory {
+@@ -1637,8 +1637,10 @@ public class CraftEventFactory {
          Bukkit.getPluginManager().callEvent(new PlayerRecipeBookSettingsChangeEvent(player.getBukkitEntity(), bukkitType, open, filter));
      }
  
diff --git a/patches/server/0538-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0537-Reset-shield-blocking-on-dimension-change.patch
index 4f5662626d..4f5662626d 100644
--- a/patches/server/0538-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0537-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0539-add-DragonEggFormEvent.patch b/patches/server/0538-add-DragonEggFormEvent.patch
index e4c888b12d..e4c888b12d 100644
--- a/patches/server/0539-add-DragonEggFormEvent.patch
+++ b/patches/server/0538-add-DragonEggFormEvent.patch
diff --git a/patches/server/0540-EntityMoveEvent.patch b/patches/server/0539-EntityMoveEvent.patch
index d21c548240..d21c548240 100644
--- a/patches/server/0540-EntityMoveEvent.patch
+++ b/patches/server/0539-EntityMoveEvent.patch
diff --git a/patches/server/0541-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0540-added-option-to-disable-pathfinding-updates-on-block.patch
index 1b96c337d6..1b96c337d6 100644
--- a/patches/server/0541-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0540-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0542-Inline-shift-direction-fields.patch b/patches/server/0541-Inline-shift-direction-fields.patch
index f0c71d61f2..f0c71d61f2 100644
--- a/patches/server/0542-Inline-shift-direction-fields.patch
+++ b/patches/server/0541-Inline-shift-direction-fields.patch
diff --git a/patches/server/0543-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0542-Allow-adding-items-to-BlockDropItemEvent.patch
index 69df7592ec..bb5ff4cea6 100644
--- a/patches/server/0543-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0542-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6581fe79ce30ea9462c989289e3757d478f95ea8..9bb9be0c73386c3f1c49f8831402789e92e23c0f 100644
+index 158f2656864f559100b33c8a48b6a1c0f2d827fa..ca586aef7a22b4824f3c954d9574682f6a25ab28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -453,13 +453,30 @@ public class CraftEventFactory {
+@@ -450,13 +450,30 @@ public class CraftEventFactory {
      }
  
      public static void handleBlockDropItemEvent(Block block, BlockState state, ServerPlayer player, List<ItemEntity> items) {
diff --git a/patches/server/0544-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0543-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index fae7ff0de6..fae7ff0de6 100644
--- a/patches/server/0544-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0543-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0545-living-entity-allow-attribute-registration.patch b/patches/server/0544-living-entity-allow-attribute-registration.patch
index 2902130e92..e08d2f029a 100644
--- a/patches/server/0545-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0544-living-entity-allow-attribute-registration.patch
@@ -38,10 +38,10 @@ index ea48f1119a940056c37d1d203437bfbfdf13663b..a3f989fd1775adbb84d197c51e22c188
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4fc1ea695611e636349ea9d4d4ae48bab93d3b98..23e1d67bb239fb1ceb66d7b4a69bdba4917fa19c 100644
+index 022741182869348e377746bf2a3792a07155abc5..762220f4e8762e8c6ec45cd22cb745fe676543ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -715,6 +715,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -714,6 +714,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().craftAttributes.getAttribute(attribute);
      }
  
diff --git a/patches/server/0546-fix-dead-slime-setSize-invincibility.patch b/patches/server/0545-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0546-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0545-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0547-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0546-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0547-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0546-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0548-Expose-Tracked-Players.patch b/patches/server/0547-Expose-Tracked-Players.patch
index b261dee925..bc451e12be 100644
--- a/patches/server/0548-Expose-Tracked-Players.patch
+++ b/patches/server/0547-Expose-Tracked-Players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 2979678d8640324f5c28e4051bbb3b61b81a1e71..92893d2c9bb921ab40fd8a53300d71fac417eb83 100644
+index 58b591d047e88c00ea09b33ece9f16fde98d3208..f72c20c8b427c1dee1e58f03a02a6a59e28da0e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1412,5 +1412,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1063,5 +1063,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isTicking() {
          return getHandle().isTicking();
      }
diff --git a/patches/server/0549-Remove-streams-from-SensorNearest.patch b/patches/server/0548-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0549-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0548-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0550-Improve-ServerGUI.patch b/patches/server/0549-Improve-ServerGUI.patch
index 2ae5d9262e..2ae5d9262e 100644
--- a/patches/server/0550-Improve-ServerGUI.patch
+++ b/patches/server/0549-Improve-ServerGUI.patch
diff --git a/patches/server/0551-fix-converting-txt-to-json-file.patch b/patches/server/0550-fix-converting-txt-to-json-file.patch
index 5ba9235c6a..5ba9235c6a 100644
--- a/patches/server/0551-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0550-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0552-Add-worldborder-events.patch b/patches/server/0551-Add-worldborder-events.patch
index 176d1259e4..176d1259e4 100644
--- a/patches/server/0552-Add-worldborder-events.patch
+++ b/patches/server/0551-Add-worldborder-events.patch
diff --git a/patches/server/0553-added-PlayerNameEntityEvent.patch b/patches/server/0552-added-PlayerNameEntityEvent.patch
index d5a8060153..d5a8060153 100644
--- a/patches/server/0553-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0552-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0554-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0553-Prevent-grindstones-from-overstacking-items.patch
index 896e20afba..896e20afba 100644
--- a/patches/server/0554-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0553-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0555-Add-recipe-to-cook-events.patch b/patches/server/0554-Add-recipe-to-cook-events.patch
index e7fabd3ae9..e7fabd3ae9 100644
--- a/patches/server/0555-Add-recipe-to-cook-events.patch
+++ b/patches/server/0554-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0556-Add-Block-isValidTool.patch b/patches/server/0555-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0556-Add-Block-isValidTool.patch
+++ b/patches/server/0555-Add-Block-isValidTool.patch
diff --git a/patches/server/0557-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0556-Allow-using-signs-inside-spawn-protection.patch
index 8a882ed51f..8a882ed51f 100644
--- a/patches/server/0557-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0556-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0558-Expand-world-key-API.patch b/patches/server/0557-Expand-world-key-API.patch
index c2607d4cb0..9acc10109b 100644
--- a/patches/server/0558-Expand-world-key-API.patch
+++ b/patches/server/0557-Expand-world-key-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 6433ac4053e7c39aa4ec73db4159422e501c9d21..31969ed9b6f8660dc969eab83d11c24d5932cef0 100644
+index be0ca9e82b88518109eec88735e628b8de9ebe72..2667822413c329fc004aad826e5890ab4dc5bfeb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -1021,5 +1021,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -505,5 +505,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
      public io.papermc.paper.world.MoonPhase getMoonPhase() {
          return io.papermc.paper.world.MoonPhase.getPhase(this.getHandle().dayTime() / 24000L);
      }
@@ -20,10 +20,10 @@ index 6433ac4053e7c39aa4ec73db4159422e501c9d21..31969ed9b6f8660dc969eab83d11c24d
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 561436bdff6b1a46b37cad519885c952da7e5b5d..f9e8882b1a85fbdf1901d96b4e8ce69ba230ae65 100644
+index 508ccf9685058674020c04914d8107e7fb1912ce..0d0f575c07fc1cc31a3b648720558c6f8d639eb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1136,9 +1136,15 @@ public final class CraftServer implements Server {
+@@ -1137,9 +1137,15 @@ public final class CraftServer implements Server {
          File folder = new File(this.getWorldContainer(), name);
          World world = this.getWorld(name);
  
@@ -41,7 +41,7 @@ index 561436bdff6b1a46b37cad519885c952da7e5b5d..f9e8882b1a85fbdf1901d96b4e8ce69b
  
          if (folder.exists()) {
              Preconditions.checkArgument(folder.isDirectory(), "File (%s) exists and isn't a folder", name);
-@@ -1262,7 +1268,7 @@ public final class CraftServer implements Server {
+@@ -1263,7 +1269,7 @@ public final class CraftServer implements Server {
          } else if (name.equals(levelName + "_the_end")) {
              worldKey = net.minecraft.world.level.Level.END;
          } else {
@@ -50,7 +50,7 @@ index 561436bdff6b1a46b37cad519885c952da7e5b5d..f9e8882b1a85fbdf1901d96b4e8ce69b
          }
  
          ServerLevel internal = (ServerLevel) new ServerLevel(this.console, this.console.executor, worldSession, worlddata, worldKey, worlddimension, this.getServer().progressListenerFactory.create(11),
-@@ -1355,6 +1361,15 @@ public final class CraftServer implements Server {
+@@ -1356,6 +1362,15 @@ public final class CraftServer implements Server {
          return null;
      }
  
diff --git a/patches/server/0559-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0558-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0559-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0558-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0560-Item-Rarity-API.patch b/patches/server/0559-Item-Rarity-API.patch
index ec2a02c6d8..ec2a02c6d8 100644
--- a/patches/server/0560-Item-Rarity-API.patch
+++ b/patches/server/0559-Item-Rarity-API.patch
diff --git a/patches/server/0561-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0560-Drop-carried-item-when-player-has-disconnected.patch
index b3bc183092..b3bc183092 100644
--- a/patches/server/0561-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0560-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0562-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0561-forced-whitelist-use-configurable-kick-message.patch
index dfe9eda9fc..dfe9eda9fc 100644
--- a/patches/server/0562-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0561-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0563-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0562-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index b262e12a06..b262e12a06 100644
--- a/patches/server/0563-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0562-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0564-Expose-protocol-version.patch b/patches/server/0563-Expose-protocol-version.patch
index 98a2a8529a..98a2a8529a 100644
--- a/patches/server/0564-Expose-protocol-version.patch
+++ b/patches/server/0563-Expose-protocol-version.patch
diff --git a/patches/server/0565-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0564-Enhance-console-tab-completions-for-brigadier-comman.patch
index 5513bfc5df..5513bfc5df 100644
--- a/patches/server/0565-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0564-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0566-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0565-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 2843bff0c0..2843bff0c0 100644
--- a/patches/server/0566-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0565-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0567-Add-bypass-host-check.patch b/patches/server/0566-Add-bypass-host-check.patch
index 21a11f4ee1..21a11f4ee1 100644
--- a/patches/server/0567-Add-bypass-host-check.patch
+++ b/patches/server/0566-Add-bypass-host-check.patch
diff --git a/patches/server/0567-Set-area-affect-cloud-rotation.patch b/patches/server/0567-Set-area-affect-cloud-rotation.patch
new file mode 100644
index 0000000000..e7e876d3fb
--- /dev/null
+++ b/patches/server/0567-Set-area-affect-cloud-rotation.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+Date: Mon, 5 Apr 2021 16:58:20 -0400
+Subject: [PATCH] Set area affect cloud rotation
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+index 4e7c37c384116ddb9525994428e1bfac35b4a85e..f06e308adb90e2cfb1fdd8d905547fc4cb159c5c 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+@@ -365,7 +365,7 @@ public final class CraftEntityTypes {
+         register(new EntityTypeData<>(EntityType.EXPERIENCE_ORB, ExperienceOrb.class, CraftExperienceOrb::new,
+                 spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null) // Paper
+         ));
+-        register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, spawnData -> new net.minecraft.world.entity.AreaEffectCloud(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z())));
++        register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, createAndMove(net.minecraft.world.entity.EntityType.AREA_EFFECT_CLOUD))); // Paper - set area effect cloud rotation
+         register(new EntityTypeData<>(EntityType.EGG, Egg.class, CraftEgg::new, spawnData -> new ThrownEgg(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z())));
+         register(new EntityTypeData<>(EntityType.LEASH_HITCH, LeashHitch.class, CraftLeash::new, spawnData -> new LeashFenceKnotEntity(spawnData.minecraftWorld(), BlockPos.containing(spawnData.x(), spawnData.y(), spawnData.z())))); // SPIGOT-5732: LeashHitch has no direction and is always centered at a block
+         register(new EntityTypeData<>(EntityType.SNOWBALL, Snowball.class, CraftSnowball::new, spawnData -> new net.minecraft.world.entity.projectile.Snowball(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z())));
diff --git a/patches/server/0568-Set-area-affect-cloud-rotation.patch b/patches/server/0568-Set-area-affect-cloud-rotation.patch
deleted file mode 100644
index 5e2c058c10..0000000000
--- a/patches/server/0568-Set-area-affect-cloud-rotation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <[email protected]>
-Date: Mon, 5 Apr 2021 16:58:20 -0400
-Subject: [PATCH] Set area affect cloud rotation
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 31969ed9b6f8660dc969eab83d11c24d5932cef0..29369cab2ccdd1d43fc67dbe2e666e477f96b26d 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -987,6 +987,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-             entity.moveTo(location.getX(), location.getY(), location.getZ());
-         } else if (AreaEffectCloud.class.isAssignableFrom(clazz)) {
-             entity = new net.minecraft.world.entity.AreaEffectCloud(world, x, y, z);
-+            entity.moveTo(x, y, z, yaw, pitch); // Paper - Set area effect cloud Rotation
-         } else if (EvokerFangs.class.isAssignableFrom(clazz)) {
-             entity = new net.minecraft.world.entity.projectile.EvokerFangs(world, x, y, z, (float) Math.toRadians(yaw), 0, null);
-         } else if (Marker.class.isAssignableFrom(clazz)) {
diff --git a/patches/server/0569-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0568-add-isDeeplySleeping-to-HumanEntity.patch
index 35f9caf112..c1c7283532 100644
--- a/patches/server/0569-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0568-add-isDeeplySleeping-to-HumanEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 6a5f5c00f9276337ddee8c8d1458a429bc5443d9..bd2c3425cb17d14ccb6f8390997cc07de354468c 100644
+index faaed968a3e771c1db3957e2b42acf6d87a38842..a5ca7c33565a3ffbb6ff991f5be2e1d807b4b4bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -134,6 +134,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -133,6 +133,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
      }
      // Paper end
  
diff --git a/patches/server/0570-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0569-add-consumeFuel-to-FurnaceBurnEvent.patch
index 68c2cd3ffe..68c2cd3ffe 100644
--- a/patches/server/0570-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0569-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0571-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0570-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0571-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0570-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0572-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0571-fix-PigZombieAngerEvent-cancellation.patch
index ecc0f6c3cd..ecc0f6c3cd 100644
--- a/patches/server/0572-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0571-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0573-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0572-fix-PlayerItemHeldEvent-firing-twice.patch
index c6b14a829e..c6b14a829e 100644
--- a/patches/server/0573-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0572-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0574-Added-PlayerDeepSleepEvent.patch b/patches/server/0573-Added-PlayerDeepSleepEvent.patch
index 50e7ec7f4c..50e7ec7f4c 100644
--- a/patches/server/0574-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0573-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0575-More-World-API.patch b/patches/server/0574-More-World-API.patch
index e987c8121f..e987c8121f 100644
--- a/patches/server/0575-More-World-API.patch
+++ b/patches/server/0574-More-World-API.patch
diff --git a/patches/server/0576-Added-PlayerBedFailEnterEvent.patch b/patches/server/0575-Added-PlayerBedFailEnterEvent.patch
index 3aaa99a580..3aaa99a580 100644
--- a/patches/server/0576-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0575-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0577-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0576-Implement-methods-to-convert-between-Component-and-B.patch
index dd25fe454b..dd25fe454b 100644
--- a/patches/server/0577-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0576-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0578-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0577-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index a79fb53695..a79fb53695 100644
--- a/patches/server/0578-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0577-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0579-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0578-Introduce-beacon-activation-deactivation-events.patch
index d28ff36b79..d28ff36b79 100644
--- a/patches/server/0579-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0578-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0580-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0579-add-RespawnFlags-to-PlayerRespawnEvent.patch
index b61bdd338c..b61bdd338c 100644
--- a/patches/server/0580-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0579-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0581-Add-Channel-initialization-listeners.patch b/patches/server/0580-Add-Channel-initialization-listeners.patch
index 360d19718e..360d19718e 100644
--- a/patches/server/0581-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0580-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0582-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0581-Send-empty-commands-if-tab-completion-is-disabled.patch
index a092e4c367..a092e4c367 100644
--- a/patches/server/0582-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0581-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0583-Add-more-WanderingTrader-API.patch b/patches/server/0582-Add-more-WanderingTrader-API.patch
index e7542c5ef9..e7542c5ef9 100644
--- a/patches/server/0583-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0582-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0584-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0583-Add-EntityBlockStorage-clearEntities.patch
index 440b15481b..440b15481b 100644
--- a/patches/server/0584-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0583-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0585-Entity-load-save-limit-per-chunk.patch b/patches/server/0584-Entity-load-save-limit-per-chunk.patch
index 89c43c4b06..89c43c4b06 100644
--- a/patches/server/0585-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0584-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0586-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0585-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index fad0f8a7d9..fad0f8a7d9 100644
--- a/patches/server/0586-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0585-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0587-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0586-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 0846ef70e1..0846ef70e1 100644
--- a/patches/server/0587-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0586-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0588-Inventory-close.patch b/patches/server/0587-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0588-Inventory-close.patch
+++ b/patches/server/0587-Inventory-close.patch
diff --git a/patches/server/0589-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0588-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 33c6b6d97f..33c6b6d97f 100644
--- a/patches/server/0589-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0588-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0590-Add-basic-Datapack-API.patch b/patches/server/0589-Add-basic-Datapack-API.patch
index 220d212b53..3492a32538 100644
--- a/patches/server/0590-Add-basic-Datapack-API.patch
+++ b/patches/server/0589-Add-basic-Datapack-API.patch
@@ -92,10 +92,10 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f9e8882b1a85fbdf1901d96b4e8ce69ba230ae65..c644374b3f24b6ca7830df1b95007d1cb7383dea 100644
+index 0d0f575c07fc1cc31a3b648720558c6f8d639eb5..cda604e72a6335e18bdff0ab0f1d61d1584fa925 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -306,6 +306,7 @@ public final class CraftServer implements Server {
+@@ -301,6 +301,7 @@ public final class CraftServer implements Server {
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
      public int reloadCount;
@@ -103,7 +103,7 @@ index f9e8882b1a85fbdf1901d96b4e8ce69ba230ae65..c644374b3f24b6ca7830df1b95007d1c
      public static Exception excessiveVelEx; // Paper - Velocity warnings
  
      static {
-@@ -389,6 +390,7 @@ public final class CraftServer implements Server {
+@@ -385,6 +386,7 @@ public final class CraftServer implements Server {
          if (this.configuration.getBoolean("settings.use-map-color-cache")) {
              MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
          }
@@ -111,7 +111,7 @@ index f9e8882b1a85fbdf1901d96b4e8ce69ba230ae65..c644374b3f24b6ca7830df1b95007d1c
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -2945,5 +2947,11 @@ public final class CraftServer implements Server {
+@@ -2946,5 +2948,11 @@ public final class CraftServer implements Server {
      public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return mobGoals;
      }
diff --git a/patches/server/0591-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0590-Add-environment-variable-to-disable-server-gui.patch
index 0e06008d89..0e06008d89 100644
--- a/patches/server/0591-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0590-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0592-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0591-additions-to-PlayerGameModeChangeEvent.patch
index 7900f1ef70..0b02f175c4 100644
--- a/patches/server/0592-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0591-additions-to-PlayerGameModeChangeEvent.patch
@@ -144,10 +144,10 @@ index ba6f0c057f182b823d27d00e8c78349ca79c35ab..353f85398aff20f15b78ff4334a24255
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b6beb02be7864c8fda297dead74d86258025348e..d3cd67fa46fa2ad3f642c752fb274085494420a2 100644
+index ece389c0f124c65b4adce1f8ce53e9139b46fd6f..ef707c71f3ba78a54c7bcaf74d4bc3a4b844dc9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1562,7 +1562,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1559,7 +1559,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(mode != null, "GameMode cannot be null");
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0593-ItemStack-repair-check-API.patch b/patches/server/0592-ItemStack-repair-check-API.patch
index cbd86fa511..cbd86fa511 100644
--- a/patches/server/0593-ItemStack-repair-check-API.patch
+++ b/patches/server/0592-ItemStack-repair-check-API.patch
diff --git a/patches/server/0594-More-Enchantment-API.patch b/patches/server/0593-More-Enchantment-API.patch
index 9b304d64af..5544903e53 100644
--- a/patches/server/0594-More-Enchantment-API.patch
+++ b/patches/server/0593-More-Enchantment-API.patch
@@ -78,10 +78,10 @@ index 92922e8eef7fa4638a01f3cefc4c46a1451e40e7..4daf2c54c7127e8e091ffc49362f2885
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 23e1d67bb239fb1ceb66d7b4a69bdba4917fa19c..d54a67c9942b986adc9e0a06640c90d99bdcdada 100644
+index 762220f4e8762e8c6ec45cd22cb745fe676543ec..85e33cb959eada67f3a4ac93f979bf96fc0fb98d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -954,5 +954,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -953,5 +953,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setHurtDirection(float hurtDirection) {
          throw new UnsupportedOperationException("Cannot set the hurt direction on a non player");
      }
diff --git a/patches/server/0595-Move-range-check-for-block-placing-up.patch b/patches/server/0594-Move-range-check-for-block-placing-up.patch
index dda56bda00..dda56bda00 100644
--- a/patches/server/0595-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0594-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0596-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0595-Fix-and-optimise-world-force-upgrading.patch
index 5bc181f573..e7c3e4464c 100644
--- a/patches/server/0596-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0595-Fix-and-optimise-world-force-upgrading.patch
@@ -352,10 +352,10 @@ index b850dba2b0fa5bc762b170ed7083cf8904761f17..7dee0f7d49f3492c92fceff7750e6962
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c644374b3f24b6ca7830df1b95007d1cb7383dea..f3f15463332056ae108e49e3f72bbaa061ed7270 100644
+index cda604e72a6335e18bdff0ab0f1d61d1584fa925..0ed5db37759e66647bc54cdaa0e612cf2e851771 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1250,9 +1250,7 @@ public final class CraftServer implements Server {
+@@ -1251,9 +1251,7 @@ public final class CraftServer implements Server {
          worlddata.checkName(name);
          worlddata.setModdedInfo(this.console.getServerModName(), this.console.getModdedStatus().shouldReportAsModified());
  
@@ -366,7 +366,7 @@ index c644374b3f24b6ca7830df1b95007d1cb7383dea..f3f15463332056ae108e49e3f72bbaa0
  
          long j = BiomeManager.obfuscateSeed(creator.seed());
          List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
-@@ -1263,6 +1261,13 @@ public final class CraftServer implements Server {
+@@ -1264,6 +1262,13 @@ public final class CraftServer implements Server {
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
  
diff --git a/patches/server/0597-Add-Mob-lookAt-API.patch b/patches/server/0596-Add-Mob-lookAt-API.patch
index 1215b07374..1215b07374 100644
--- a/patches/server/0597-Add-Mob-lookAt-API.patch
+++ b/patches/server/0596-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0598-Add-Unix-domain-socket-support.patch b/patches/server/0597-Add-Unix-domain-socket-support.patch
index a8a46b7765..a8a46b7765 100644
--- a/patches/server/0598-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0597-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0599-Add-EntityInsideBlockEvent.patch b/patches/server/0598-Add-EntityInsideBlockEvent.patch
index c1f06ac325..c1f06ac325 100644
--- a/patches/server/0599-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0598-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0600-Attributes-API-for-item-defaults.patch b/patches/server/0599-Attributes-API-for-item-defaults.patch
index 0ffe27c99d..0ffe27c99d 100644
--- a/patches/server/0600-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0599-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0601-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0600-Add-cause-to-Weather-ThunderChangeEvents.patch
index 3c5d0139b6..3c5d0139b6 100644
--- a/patches/server/0601-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0600-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0602-More-Lidded-Block-API.patch b/patches/server/0601-More-Lidded-Block-API.patch
index e65c6a26cb..e65c6a26cb 100644
--- a/patches/server/0602-More-Lidded-Block-API.patch
+++ b/patches/server/0601-More-Lidded-Block-API.patch
diff --git a/patches/server/0603-Limit-item-frame-cursors-on-maps.patch b/patches/server/0602-Limit-item-frame-cursors-on-maps.patch
index 64dc46158b..64dc46158b 100644
--- a/patches/server/0603-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0602-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0604-Add-PlayerKickEvent-causes.patch b/patches/server/0603-Add-PlayerKickEvent-causes.patch
index 7c7c97fcba..2e37e93e24 100644
--- a/patches/server/0604-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0603-Add-PlayerKickEvent-causes.patch
@@ -491,10 +491,10 @@ index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f62
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d3cd67fa46fa2ad3f642c752fb274085494420a2..7b197b9b6b912956b3f71d24a57091caf5661635 100644
+index ef707c71f3ba78a54c7bcaf74d4bc3a4b844dc9c..2f12019edc3dd578d66f70d0510c16270fa9193d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -594,7 +594,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -591,7 +591,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          org.spigotmc.AsyncCatcher.catchOp("player kick"); // Spigot
          if (this.getHandle().connection == null) return;
  
@@ -503,7 +503,7 @@ index d3cd67fa46fa2ad3f642c752fb274085494420a2..7b197b9b6b912956b3f71d24a57091ca
      }
  
      // Paper start
-@@ -606,10 +606,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -603,10 +603,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void kick(final net.kyori.adventure.text.Component message) {
@@ -520,7 +520,7 @@ index d3cd67fa46fa2ad3f642c752fb274085494420a2..7b197b9b6b912956b3f71d24a57091ca
          }
      }
  
-@@ -668,7 +673,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -665,7 +670,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Paper start - Improve chat handling
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(msg)) {
diff --git a/patches/server/0605-Add-PufferFishStateChangeEvent.patch b/patches/server/0604-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0605-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0604-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0606-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0605-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 1dbdf33922..1dbdf33922 100644
--- a/patches/server/0606-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0605-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0607-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0606-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index e8ae16c851..e8ae16c851 100644
--- a/patches/server/0607-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0606-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0608-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0607-Add-option-to-fix-items-merging-through-walls.patch
index 2a731447f7..2a731447f7 100644
--- a/patches/server/0608-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0607-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0609-Add-BellRevealRaiderEvent.patch b/patches/server/0608-Add-BellRevealRaiderEvent.patch
index ed8e81f6a2..ed8e81f6a2 100644
--- a/patches/server/0609-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0608-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0610-Fix-invulnerable-end-crystals.patch b/patches/server/0609-Fix-invulnerable-end-crystals.patch
index 195d6b8a42..195d6b8a42 100644
--- a/patches/server/0610-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0609-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0611-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0610-Add-ElderGuardianAppearanceEvent.patch
index 1e6a1117c1..1e6a1117c1 100644
--- a/patches/server/0611-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0610-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0612-Fix-dangerous-end-portal-logic.patch b/patches/server/0611-Fix-dangerous-end-portal-logic.patch
index 57f7231a1d..57f7231a1d 100644
--- a/patches/server/0612-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0611-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0613-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0612-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index ef457d74af..ef457d74af 100644
--- a/patches/server/0613-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0612-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0614-Make-item-validations-configurable.patch b/patches/server/0613-Make-item-validations-configurable.patch
index 3ff3015597..37706dc367 100644
--- a/patches/server/0614-Make-item-validations-configurable.patch
+++ b/patches/server/0613-Make-item-validations-configurable.patch
@@ -32,10 +32,10 @@ index 5e01357208fe52c1d270c68cb19029ea0f4057bb..6d85237b21650edf1d2dc71abaf0edbe
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 9c20c225ba46f2126a43e2f879f4849081cae90a..cbf1a518406bf478811c737e6dabf0a8c451d16c 100644
+index a93847d69729fade6b81efb41627026ae4aec282..ece1ef7285c1859b4e90aa4f77453827f52521cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -362,7 +362,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -361,7 +361,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              CompoundTag display = tag.getCompound(CraftMetaItem.DISPLAY.NBT);
  
              if (display.contains(CraftMetaItem.NAME.NBT)) {
@@ -44,7 +44,7 @@ index 9c20c225ba46f2126a43e2f879f4849081cae90a..cbf1a518406bf478811c737e6dabf0a8
              }
  
              if (display.contains(CraftMetaItem.LOCNAME.NBT)) {
-@@ -373,7 +373,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -372,7 +372,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  ListTag list = display.getList(CraftMetaItem.LORE.NBT, CraftMagicNumbers.NBT.TAG_STRING);
                  this.lore = new ArrayList<String>(list.size());
                  for (int index = 0; index < list.size(); index++) {
diff --git a/patches/server/0615-Line-Of-Sight-Changes.patch b/patches/server/0614-Line-Of-Sight-Changes.patch
index 8cfc77a081..de0b4b6069 100644
--- a/patches/server/0615-Line-Of-Sight-Changes.patch
+++ b/patches/server/0614-Line-Of-Sight-Changes.patch
@@ -19,10 +19,10 @@ index d6b80be711b11758ef0bb3187dbcb6e597ef35d3..4a11bf06a725a5c1927e24ac4ad066f7
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 29369cab2ccdd1d43fc67dbe2e666e477f96b26d..50c1d8ee5804d6e44e2dbbd84328dcd46708ea2e 100644
+index 2667822413c329fc004aad826e5890ab4dc5bfeb..eeb1bd05d4407224aefa26b5ae2f2a8da1101b31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -1027,5 +1027,21 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -510,5 +510,21 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
      public org.bukkit.NamespacedKey getKey() {
          return org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(this.getHandle().getLevel().dimension().location());
      }
@@ -45,10 +45,10 @@ index 29369cab2ccdd1d43fc67dbe2e666e477f96b26d..50c1d8ee5804d6e44e2dbbd84328dcd4
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d54a67c9942b986adc9e0a06640c90d99bdcdada..72fd16ad8bc08dd3189e56d504000453a8d5cd92 100644
+index 85e33cb959eada67f3a4ac93f979bf96fc0fb98d..7857ce7b0404f1f41988d02eead5394946607854 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -588,6 +588,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -587,6 +587,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().hasLineOfSight(((CraftEntity) other).getHandle());
      }
  
diff --git a/patches/server/0616-add-per-world-spawn-limits.patch b/patches/server/0615-add-per-world-spawn-limits.patch
index 86c78ef31d..86c78ef31d 100644
--- a/patches/server/0616-add-per-world-spawn-limits.patch
+++ b/patches/server/0615-add-per-world-spawn-limits.patch
diff --git a/patches/server/0617-Fix-potions-splash-events.patch b/patches/server/0616-Fix-potions-splash-events.patch
index e217ede002..e217ede002 100644
--- a/patches/server/0617-Fix-potions-splash-events.patch
+++ b/patches/server/0616-Fix-potions-splash-events.patch
diff --git a/patches/server/0618-Add-more-LimitedRegion-API.patch b/patches/server/0617-Add-more-LimitedRegion-API.patch
index ff692d5181..ff692d5181 100644
--- a/patches/server/0618-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0617-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0619-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0618-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 15b3e0851d..15b3e0851d 100644
--- a/patches/server/0619-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0618-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0620-Missing-Entity-API.patch b/patches/server/0619-Missing-Entity-API.patch
index 504bdae740..98258b19ac 100644
--- a/patches/server/0620-Missing-Entity-API.patch
+++ b/patches/server/0619-Missing-Entity-API.patch
@@ -370,36 +370,6 @@ index 2645f52f5071bf57daf584e21a1f5cb6098110a8..cbe8593cecd84f1598649801bebcb463
      @Nullable
      @Override
      protected EntityHitResult findHitEntity(Vec3 currentPosition, Vec3 nextPosition) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 50c1d8ee5804d6e44e2dbbd84328dcd46708ea2e..44c08acdbc8316e501d9f25159f712a55d444b17 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -861,14 +861,19 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-             } else if (Phantom.class.isAssignableFrom(clazz)) {
-                 entity = net.minecraft.world.entity.EntityType.PHANTOM.create(world);
-             } else if (Fish.class.isAssignableFrom(clazz)) {
--                if (Cod.class.isAssignableFrom(clazz)) {
--                    entity = net.minecraft.world.entity.EntityType.COD.create(world);
-+                // Paper start - Schooling Fish API
-+                if (io.papermc.paper.entity.SchoolableFish.class.isAssignableFrom(clazz)) {
-+                    if (Cod.class.isAssignableFrom(clazz)) {
-+                        entity = net.minecraft.world.entity.EntityType.COD.create(world);
-+                    } else if (Salmon.class.isAssignableFrom(clazz)) {
-+                        entity = net.minecraft.world.entity.EntityType.SALMON.create(world);
-+                    } else if (TropicalFish.class.isAssignableFrom(clazz)) {
-+                        entity = net.minecraft.world.entity.EntityType.TROPICAL_FISH.create(world);
-+                    }
-+                // Paper stop
-                 } else if (PufferFish.class.isAssignableFrom(clazz)) {
-                     entity = net.minecraft.world.entity.EntityType.PUFFERFISH.create(world);
--                } else if (Salmon.class.isAssignableFrom(clazz)) {
--                    entity = net.minecraft.world.entity.EntityType.SALMON.create(world);
--                } else if (TropicalFish.class.isAssignableFrom(clazz)) {
--                    entity = net.minecraft.world.entity.EntityType.TROPICAL_FISH.create(world);
-+                // Paper - remove old fish impl
-                 } else if (Tadpole.class.isAssignableFrom(clazz)) {
-                     entity = net.minecraft.world.entity.EntityType.TADPOLE.create(world);
-                 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 index 264b3fb45c47fbb6be78262838a5c0438860915f..f9cd595ec28f0284d11bae6bfc5bf92d56526ef9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
@@ -668,30 +638,6 @@ index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee
 +    }
 +    // Paper end
  }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 92893d2c9bb921ab40fd8a53300d71fac417eb83..6065336cd30e6400bd8875768f06c44a4be0a1e1 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -237,10 +237,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-                     else { return new CraftSquid(server, (Squid) entity); }
-                 }
-                 else if (entity instanceof AbstractFish) {
--                    if (entity instanceof Cod) { return new CraftCod(server, (Cod) entity); }
-+                    // Paper start - Schooling Fish API
-+                    if (entity instanceof net.minecraft.world.entity.animal.AbstractSchoolingFish abstractSchoolingFish) {
-+                       if (entity instanceof Cod) { return new CraftCod(server, (Cod) entity); }
-+                       else if (entity instanceof Salmon) { return new CraftSalmon(server, (Salmon) entity); }
-+                       else if (entity instanceof TropicalFish) { return new CraftTropicalFish(server, (TropicalFish) entity); }
-+                       else { return new io.papermc.paper.entity.PaperSchoolableFish(server, abstractSchoolingFish); }
-+                    }
-+                    // Paper end
-                     else if (entity instanceof Pufferfish) { return new CraftPufferFish(server, (Pufferfish) entity); }
--                    else if (entity instanceof Salmon) { return new CraftSalmon(server, (Salmon) entity); }
--                    else if (entity instanceof TropicalFish) { return new CraftTropicalFish(server, (TropicalFish) entity); }
-+                    // Paper - move fish
-                     else if (entity instanceof Tadpole) { return new CraftTadpole(server, (Tadpole) entity); }
-                     else { return new CraftFish(server, (AbstractFish) entity); }
-                 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
 index 17164811bbcf983bef62c47bc99330074762267b..c455deb4fd2a7684bcc01a8212c362a2375c190b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
@@ -761,10 +707,10 @@ index 2cec61a1bb050c1ef81c5fc3d0afafe9ff29d459..97fa4e1e70203194bd939618b2fad926
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 72fd16ad8bc08dd3189e56d504000453a8d5cd92..353d8b35052cb1b2ed10c89f3b062846e0c271f8 100644
+index 7857ce7b0404f1f41988d02eead5394946607854..524633826140227b7d0efa292cb2378922d9a6e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -889,6 +889,22 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -888,6 +888,22 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.getHandle().persistentInvisibility = invisible;
          this.getHandle().setSharedFlag(5, invisible);
      }
@@ -1059,10 +1005,10 @@ index c7aec6f28e5d3546235b30f6b1112440a76163c5..fe075cfdf3097d6cb768e71b8cc360ab
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
-index be20d5a3d5914683f40dc4a585b08a2f55616580..eb7e2902dc134847711284dd2af8abda7627c7ab 100644
+index 6b48b117a9cba12aae055c0ea981dfb5bc03a86e..519ef701a7d6534f7cb516f6296b95ee521f661d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
-@@ -30,4 +30,15 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
+@@ -29,4 +29,15 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
      public void setRabbitType(Type type) {
          this.getHandle().setVariant(net.minecraft.world.entity.animal.Rabbit.Variant.values()[type.ordinal()]);
      }
diff --git a/patches/server/0621-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0620-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 9d41ae7d9f..9d41ae7d9f 100644
--- a/patches/server/0621-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0620-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0622-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0621-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0622-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0621-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0623-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0622-Use-getChunkIfLoadedImmediately-in-places.patch
index ac79853979..ac79853979 100644
--- a/patches/server/0623-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0622-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0624-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0623-Fix-commands-from-signs-not-firing-command-events.patch
index ce92bd18fa..ce92bd18fa 100644
--- a/patches/server/0624-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0623-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0625-Adds-PlayerArmSwingEvent.patch b/patches/server/0624-Adds-PlayerArmSwingEvent.patch
index 1c96a2596e..1c96a2596e 100644
--- a/patches/server/0625-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0624-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0626-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0625-Fixes-kick-event-leave-message-not-being-sent.patch
index e5d7a22d60..e5d7a22d60 100644
--- a/patches/server/0626-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0625-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0627-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0626-Add-config-for-mobs-immune-to-default-effects.patch
index 3d70123c99..3d70123c99 100644
--- a/patches/server/0627-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0626-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0628-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0627-Fix-incorrect-message-for-outdated-client.patch
index c668a16be5..c668a16be5 100644
--- a/patches/server/0628-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0627-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0629-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0628-Don-t-apply-cramming-damage-to-players.patch
index ef71dafd53..ef71dafd53 100644
--- a/patches/server/0629-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0628-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0630-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0629-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 5ef4de39f3..5ef4de39f3 100644
--- a/patches/server/0630-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0629-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0631-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0630-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 4a998000b2..4a998000b2 100644
--- a/patches/server/0631-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0630-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0632-Stinger-API.patch b/patches/server/0631-Stinger-API.patch
index 176290b027..e804ac81fd 100644
--- a/patches/server/0632-Stinger-API.patch
+++ b/patches/server/0631-Stinger-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 353d8b35052cb1b2ed10c89f3b062846e0c271f8..faf32ed224f5471d8994ad09e493c1fb724904a0 100644
+index 524633826140227b7d0efa292cb2378922d9a6e6..9e42117e605efbbbbf91f10b385ef76f9cf884b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -339,7 +339,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -338,7 +338,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
          // Paper end
      }
diff --git a/patches/server/0633-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0632-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index d2553b1897..d2553b1897 100644
--- a/patches/server/0633-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0632-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0634-Add-System.out-err-catcher.patch b/patches/server/0633-Add-System.out-err-catcher.patch
index 3e807c4639..0b6cdc01dc 100644
--- a/patches/server/0634-Add-System.out-err-catcher.patch
+++ b/patches/server/0633-Add-System.out-err-catcher.patch
@@ -105,10 +105,10 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f3f15463332056ae108e49e3f72bbaa061ed7270..0b422ba3241b31ad9e4f227bcb5033df2545d84b 100644
+index 0ed5db37759e66647bc54cdaa0e612cf2e851771..21dfa2d10e1c67c968b59eb11132ab1ff46ba2d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -308,6 +308,7 @@ public final class CraftServer implements Server {
+@@ -303,6 +303,7 @@ public final class CraftServer implements Server {
      public int reloadCount;
      private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
      public static Exception excessiveVelEx; // Paper - Velocity warnings
diff --git a/patches/server/0635-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0634-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index f4242ad30e..f4242ad30e 100644
--- a/patches/server/0635-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0634-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0636-Improve-boat-collision-performance.patch b/patches/server/0635-Improve-boat-collision-performance.patch
index f201f2e4fd..f201f2e4fd 100644
--- a/patches/server/0636-Improve-boat-collision-performance.patch
+++ b/patches/server/0635-Improve-boat-collision-performance.patch
diff --git a/patches/server/0637-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0636-Prevent-AFK-kick-while-watching-end-credits.patch
index 5fa1f46e86..5fa1f46e86 100644
--- a/patches/server/0637-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0636-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0638-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0637-Allow-skipping-writing-of-comments-to-server.propert.patch
index 9fba827e12..9fba827e12 100644
--- a/patches/server/0638-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0637-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0639-Add-PlayerSetSpawnEvent.patch b/patches/server/0638-Add-PlayerSetSpawnEvent.patch
index 4f8f2b0b30..ea8881662a 100644
--- a/patches/server/0639-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0638-Add-PlayerSetSpawnEvent.patch
@@ -187,10 +187,10 @@ index ecaa7f0b2bf795f16187f11fa27f6d5d435ccbfe..c83ffba568f33323b0f8b9a03fa0b7bb
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7b197b9b6b912956b3f71d24a57091caf5661635..5a9fe8f1149cb52f2b2bb31202cefe3ec9ab9d3a 100644
+index 2f12019edc3dd578d66f70d0510c16270fa9193d..d8c4f8573498fba43a0db61c6a4363be34ce45e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1321,9 +1321,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1318,9 +1318,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void setBedSpawnLocation(Location location, boolean override) {
          if (location == null) {
diff --git a/patches/server/0640-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0639-Make-hoppers-respect-inventory-max-stack-size.patch
index 45531b8594..45531b8594 100644
--- a/patches/server/0640-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0639-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0641-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0640-Optimize-entity-tracker-passenger-checks.patch
index 524e1fabfb..524e1fabfb 100644
--- a/patches/server/0641-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0640-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0642-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0641-Config-option-for-Piglins-guarding-chests.patch
index 63865bec49..63865bec49 100644
--- a/patches/server/0642-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0641-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0643-Added-EntityDamageItemEvent.patch b/patches/server/0642-Added-EntityDamageItemEvent.patch
index ef1aeee736..ef1aeee736 100644
--- a/patches/server/0643-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0642-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0644-Optimize-indirect-passenger-iteration.patch b/patches/server/0643-Optimize-indirect-passenger-iteration.patch
index 04f5ad2db9..04f5ad2db9 100644
--- a/patches/server/0644-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0643-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0645-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0644-Configurable-item-frame-map-cursor-update-interval.patch
index a1e4f933cb..a1e4f933cb 100644
--- a/patches/server/0645-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0644-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0646-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0645-Make-EntityUnleashEvent-cancellable.patch
index 027330d9f9..027330d9f9 100644
--- a/patches/server/0646-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0645-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0647-Clear-bucket-NBT-after-dispense.patch b/patches/server/0646-Clear-bucket-NBT-after-dispense.patch
index e0ba56c333..e0ba56c333 100644
--- a/patches/server/0647-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0646-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0648-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0647-Change-EnderEye-target-without-changing-other-things.patch
index 48c5524ab8..48c5524ab8 100644
--- a/patches/server/0648-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0647-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0649-Add-BlockBreakBlockEvent.patch b/patches/server/0648-Add-BlockBreakBlockEvent.patch
index bd3d51aa81..bd3d51aa81 100644
--- a/patches/server/0649-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0648-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0650-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0649-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index bd57709b19..bd57709b19 100644
--- a/patches/server/0650-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0649-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0651-More-CommandBlock-API.patch b/patches/server/0650-More-CommandBlock-API.patch
index 65a5093980..65a5093980 100644
--- a/patches/server/0651-More-CommandBlock-API.patch
+++ b/patches/server/0650-More-CommandBlock-API.patch
diff --git a/patches/server/0652-Add-missing-team-sidebar-display-slots.patch b/patches/server/0651-Add-missing-team-sidebar-display-slots.patch
index 0d7e79e26d..0d7e79e26d 100644
--- a/patches/server/0652-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0651-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0653-Add-back-EntityPortalExitEvent.patch b/patches/server/0652-Add-back-EntityPortalExitEvent.patch
index 97155b3279..97155b3279 100644
--- a/patches/server/0653-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0652-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0654-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0653-Add-methods-to-find-targets-for-lightning-strikes.patch
index 25eb515f25..25eb515f25 100644
--- a/patches/server/0654-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0653-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0655-Get-entity-default-attributes.patch b/patches/server/0654-Get-entity-default-attributes.patch
index 0bd7acf63f..0bd7acf63f 100644
--- a/patches/server/0655-Get-entity-default-attributes.patch
+++ b/patches/server/0654-Get-entity-default-attributes.patch
diff --git a/patches/server/0656-Left-handed-API.patch b/patches/server/0655-Left-handed-API.patch
index 41836756f3..41836756f3 100644
--- a/patches/server/0656-Left-handed-API.patch
+++ b/patches/server/0655-Left-handed-API.patch
diff --git a/patches/server/0657-Add-more-advancement-API.patch b/patches/server/0656-Add-more-advancement-API.patch
index 898749f4af..898749f4af 100644
--- a/patches/server/0657-Add-more-advancement-API.patch
+++ b/patches/server/0656-Add-more-advancement-API.patch
diff --git a/patches/server/0658-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0657-Add-ItemFactory-getSpawnEgg-API.patch
index 0c570a0951..0c570a0951 100644
--- a/patches/server/0658-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0657-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0659-Add-critical-damage-API.patch b/patches/server/0658-Add-critical-damage-API.patch
index 70dba1b3af..05210d88e4 100644
--- a/patches/server/0659-Add-critical-damage-API.patch
+++ b/patches/server/0658-Add-critical-damage-API.patch
@@ -71,10 +71,10 @@ index 004c130fc03dc01ef75fabdb4ef1ef711e33cb95..ae4319c2532855315bc45995a39d7eb9
          int k = entity.getRemainingFireTicks();
          boolean flag1 = entity.getType().is(EntityTypeTags.DEFLECTS_ARROWS);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9bb9be0c73386c3f1c49f8831402789e92e23c0f..cc679e7042c5a5fba2ce34598f2c1eaf49bb065f 100644
+index ca586aef7a22b4824f3c954d9574682f6a25ab28..e4d08d4b85f9ce57af50e6aaf4a308a8a6c85ce3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1046,7 +1046,7 @@ public class CraftEventFactory {
+@@ -1043,7 +1043,7 @@ public class CraftEventFactory {
                  } else {
                      damageCause = DamageCause.ENTITY_EXPLOSION;
                  }
@@ -83,7 +83,7 @@ index 9bb9be0c73386c3f1c49f8831402789e92e23c0f..cc679e7042c5a5fba2ce34598f2c1eaf
              }
              event.setCancelled(cancelled);
  
-@@ -1078,7 +1078,7 @@ public class CraftEventFactory {
+@@ -1075,7 +1075,7 @@ public class CraftEventFactory {
                  cause = DamageCause.SONIC_BOOM;
              }
  
@@ -92,7 +92,7 @@ index 9bb9be0c73386c3f1c49f8831402789e92e23c0f..cc679e7042c5a5fba2ce34598f2c1eaf
          } else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) {
              EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions);
              event.setCancelled(cancelled);
-@@ -1148,7 +1148,7 @@ public class CraftEventFactory {
+@@ -1145,7 +1145,7 @@ public class CraftEventFactory {
              } else {
                  throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.getMsgId()));
              }
@@ -101,7 +101,7 @@ index 9bb9be0c73386c3f1c49f8831402789e92e23c0f..cc679e7042c5a5fba2ce34598f2c1eaf
              event.setCancelled(cancelled);
              CraftEventFactory.callEvent(event);
              if (!event.isCancelled()) {
-@@ -1197,20 +1197,28 @@ public class CraftEventFactory {
+@@ -1194,20 +1194,28 @@ public class CraftEventFactory {
          }
  
          if (cause != null) {
diff --git a/patches/server/0660-Fix-issues-with-mob-conversion.patch b/patches/server/0659-Fix-issues-with-mob-conversion.patch
index 237d313b89..237d313b89 100644
--- a/patches/server/0660-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0659-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0661-Add-isCollidable-methods-to-various-places.patch b/patches/server/0660-Add-isCollidable-methods-to-various-places.patch
index f02bfe0a1d..f02bfe0a1d 100644
--- a/patches/server/0661-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0660-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0662-Goat-ram-API.patch b/patches/server/0661-Goat-ram-API.patch
index 443c58b4ee..443c58b4ee 100644
--- a/patches/server/0662-Goat-ram-API.patch
+++ b/patches/server/0661-Goat-ram-API.patch
diff --git a/patches/server/0663-Add-API-for-resetting-a-single-score.patch b/patches/server/0662-Add-API-for-resetting-a-single-score.patch
index 0fc3bdf5fe..0fc3bdf5fe 100644
--- a/patches/server/0663-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0662-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0664-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0663-Add-Raw-Byte-Entity-Serialization.patch
index 3ab3ca8f28..e53f64ac9c 100644
--- a/patches/server/0664-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0663-Add-Raw-Byte-Entity-Serialization.patch
@@ -27,10 +27,10 @@ index 6f023b22a1051baaa5310d8c5a1aa6d8b76d8992..65ab99c3f3f1478db6e14d713e82346d
          return this.isPassenger() ? false : this.saveAsPassenger(nbt);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6065336cd30e6400bd8875768f06c44a4be0a1e1..32fd3b7067894bc442bc5a74dbcf60164a8fd70f 100644
+index f72c20c8b427c1dee1e58f03a02a6a59e28da0e7..5a498ccfa7832f0819ccf4c4c1d6ec5dbd4f48b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1431,5 +1431,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1076,5 +1076,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
          return set;
      }
diff --git a/patches/server/0665-Vanilla-command-permission-fixes.patch b/patches/server/0664-Vanilla-command-permission-fixes.patch
index ba5701ea68..b0ff5eb32d 100644
--- a/patches/server/0665-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0664-Vanilla-command-permission-fixes.patch
@@ -51,10 +51,10 @@ index 1409801946be84e3256748c68ba0c62d42b869de..713e665ee962d9e8bebeb13d2621d438
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 35746f4fc45568c32497677b63a2a746c7a9ba94..13804bb81a13d51d2e9e55d8a477369ba20fc301 100644
+index 5e6645e16b185aaa6f719055ddbf670b8741fead..f4961a0f360a39124544cbe0adbd94eeeef32ab5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -88,7 +88,23 @@ public final class VanillaCommandWrapper extends BukkitCommand {
+@@ -86,7 +86,23 @@ public final class VanillaCommandWrapper extends BukkitCommand {
      }
  
      public static String getPermission(CommandNode<CommandSourceStack> vanillaCommand) {
diff --git a/patches/server/0666-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0665-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 12eed70505..12eed70505 100644
--- a/patches/server/0666-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0665-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0667-Fix-GameProfileCache-concurrency.patch b/patches/server/0666-Fix-GameProfileCache-concurrency.patch
index e95139c0f4..e95139c0f4 100644
--- a/patches/server/0667-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0666-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0668-Improve-and-expand-AsyncCatcher.patch b/patches/server/0667-Improve-and-expand-AsyncCatcher.patch
index 8f2bd876f9..9e5aa10814 100644
--- a/patches/server/0668-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0667-Improve-and-expand-AsyncCatcher.patch
@@ -166,15 +166,15 @@ index bbbf6dd8e566ecdca8794e3b03765fe7e426a2bd..66ab901956ca394c251c420338643d39
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index faf32ed224f5471d8994ad09e493c1fb724904a0..68d827b95a67f2fb65ed806221bb4e7e906a05f4 100644
+index 9e42117e605efbbbbf91f10b385ef76f9cf884b6..d8977cc464e477bb679f597bde8b0e6f3f3cfa24 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -465,6 +465,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -464,6 +464,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
  
      @Override
      public boolean addPotionEffect(PotionEffect effect, boolean force) {
 +        org.spigotmc.AsyncCatcher.catchOp("effect add"); // Paper
-         this.getHandle().addEffect(CraftPotionUtil.fromBukkit(effect), EntityPotionEffectEvent.Cause.PLUGIN); // Paper - Don't ignore icon
+         this.getHandle().addEffect(org.bukkit.craftbukkit.potion.CraftPotionUtil.fromBukkit(effect), EntityPotionEffectEvent.Cause.PLUGIN); // Paper - Don't ignore icon
          return true;
      }
 diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
diff --git a/patches/server/0669-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0668-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 7df46f6910..db8fb6c458 100644
--- a/patches/server/0669-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0668-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -278,10 +278,10 @@ index 9df761f5cf043e8d2dffa711c20ab32fe2992331..d08c7b0b52065980f1f13c5533ff6355
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0b422ba3241b31ad9e4f227bcb5033df2545d84b..dcb3bc211b834aa6fd4cb19197debc93df3f4839 100644
+index 21dfa2d10e1c67c968b59eb11132ab1ff46ba2d7..ca605b33c57159add46f6b84c975c25c678fdf17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2279,6 +2279,11 @@ public final class CraftServer implements Server {
+@@ -2280,6 +2280,11 @@ public final class CraftServer implements Server {
  
      @Override
      public int getSpawnLimit(SpawnCategory spawnCategory) {
diff --git a/patches/server/0670-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0669-Sanitize-ResourceLocation-error-logging.patch
index 989716f6fd..989716f6fd 100644
--- a/patches/server/0670-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0669-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0671-Optimise-general-POI-access.patch b/patches/server/0670-Optimise-general-POI-access.patch
index 332786d627..332786d627 100644
--- a/patches/server/0671-Optimise-general-POI-access.patch
+++ b/patches/server/0670-Optimise-general-POI-access.patch
diff --git a/patches/server/0672-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0671-Custom-table-implementation-for-blockstate-state-loo.patch
index 0023c8bd8c..0023c8bd8c 100644
--- a/patches/server/0672-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0671-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0673-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0672-Manually-inline-methods-in-BlockPosition.patch
index c8b8adfce9..c8b8adfce9 100644
--- a/patches/server/0673-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0672-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0674-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0673-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e97fc69558..e97fc69558 100644
--- a/patches/server/0674-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0673-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0675-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0674-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index b0d144de35..b0d144de35 100644
--- a/patches/server/0675-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0674-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0676-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0675-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 5475ff2092..5475ff2092 100644
--- a/patches/server/0676-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0675-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0677-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0676-Don-t-lookup-fluid-state-when-raytracing.patch
index d931ef54fa..d931ef54fa 100644
--- a/patches/server/0677-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0676-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0678-Time-scoreboard-search.patch b/patches/server/0677-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0678-Time-scoreboard-search.patch
+++ b/patches/server/0677-Time-scoreboard-search.patch
diff --git a/patches/server/0679-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0678-Send-full-pos-packets-for-hard-colliding-entities.patch
index f005ae7e71..f005ae7e71 100644
--- a/patches/server/0679-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0678-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0680-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0679-Do-not-run-raytrace-logic-for-AIR.patch
index 75ece1bf8b..75ece1bf8b 100644
--- a/patches/server/0680-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0679-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0681-Execute-chunk-tasks-mid-tick.patch b/patches/server/0680-Execute-chunk-tasks-mid-tick.patch
index d73797f2c2..d73797f2c2 100644
--- a/patches/server/0681-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0680-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0682-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0681-Oprimise-map-impl-for-tracked-players.patch
index 42fe98d24e..42fe98d24e 100644
--- a/patches/server/0682-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0681-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0683-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0682-Optimise-BlockSoil-nearby-water-lookup.patch
index ec0e0d60a8..ec0e0d60a8 100644
--- a/patches/server/0683-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0682-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0684-Optimise-random-block-ticking.patch b/patches/server/0683-Optimise-random-block-ticking.patch
index 309f87c655..309f87c655 100644
--- a/patches/server/0684-Optimise-random-block-ticking.patch
+++ b/patches/server/0683-Optimise-random-block-ticking.patch
diff --git a/patches/server/0685-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0684-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0a7c36c977..0a7c36c977 100644
--- a/patches/server/0685-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0684-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0685-Use-Velocity-compression-and-cipher-natives.patch
index 57520e8b5f..8ed6f70476 100644
--- a/patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0685-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 664fef8d6a901f0f4ebf03ad49a6baaf2dbd625e..060b9adae21e75e1627f41846e17bc51759b023f 100644
+index 3a3a6ce8833afca0caff2a3b92ad593bf75e951a..ed352bcf238199534720b17ab94401153eeeed1b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -40,6 +40,11 @@ dependencies {
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
+     runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
 +    // Paper start - Use Velocity cipher
 +    implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
@@ -18,8 +18,8 @@ index 664fef8d6a901f0f4ebf03ad49a6baaf2dbd625e..060b9adae21e75e1627f41846e17bc51
 +    }
 +    // Paper end
  
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+     runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
 diff --git a/src/main/java/net/minecraft/network/CipherDecoder.java b/src/main/java/net/minecraft/network/CipherDecoder.java
 index 778beb445eac5769b9e4e07b4d1294c50ae2602b..c712fb8193115e1ab71b5e40fb0ccb9413062b03 100644
 --- a/src/main/java/net/minecraft/network/CipherDecoder.java
diff --git a/patches/server/0687-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0686-Detail-more-information-in-watchdog-dumps.patch
index 1724729bbf..1724729bbf 100644
--- a/patches/server/0687-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0686-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0688-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index e1abb64ae9..e1abb64ae9 100644
--- a/patches/server/0688-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0689-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0688-Fix-Bukkit-NamespacedKey-shenanigans.patch
index c77b9ae0d6..c77b9ae0d6 100644
--- a/patches/server/0689-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0688-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0690-Distance-manager-tick-timings.patch b/patches/server/0689-Distance-manager-tick-timings.patch
index 731b2b5f86..731b2b5f86 100644
--- a/patches/server/0690-Distance-manager-tick-timings.patch
+++ b/patches/server/0689-Distance-manager-tick-timings.patch
diff --git a/patches/server/0691-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0690-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 0542a5f892..0542a5f892 100644
--- a/patches/server/0691-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0690-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0692-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0691-Check-requirement-before-suggesting-root-nodes.patch
index ae4829b98a..ae4829b98a 100644
--- a/patches/server/0692-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0691-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0693-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0692-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 7275450e69..7275450e69 100644
--- a/patches/server/0693-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0692-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0694-Add-packet-limiter-config.patch b/patches/server/0693-Add-packet-limiter-config.patch
index 6b454b34dd..6b454b34dd 100644
--- a/patches/server/0694-Add-packet-limiter-config.patch
+++ b/patches/server/0693-Add-packet-limiter-config.patch
diff --git a/patches/server/0695-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0694-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 341421e59d..341421e59d 100644
--- a/patches/server/0695-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0694-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0696-Ensure-valid-vehicle-status.patch b/patches/server/0695-Ensure-valid-vehicle-status.patch
index 76665bf095..76665bf095 100644
--- a/patches/server/0696-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0695-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0697-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0696-Prevent-softlocked-end-exit-portal-generation.patch
index df49391139..df49391139 100644
--- a/patches/server/0697-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0696-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0698-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0697-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0698-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0697-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0699-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0698-Don-t-log-debug-logging-being-disabled.patch
index 2130840734..2130840734 100644
--- a/patches/server/0699-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0698-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0700-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0699-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0700-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0699-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0701-Preserve-overstacked-loot.patch b/patches/server/0700-Preserve-overstacked-loot.patch
index 004c7c6f77..004c7c6f77 100644
--- a/patches/server/0701-Preserve-overstacked-loot.patch
+++ b/patches/server/0700-Preserve-overstacked-loot.patch
diff --git a/patches/server/0702-Update-head-rotation-in-missing-places.patch b/patches/server/0701-Update-head-rotation-in-missing-places.patch
index b45a4c13f8..b45a4c13f8 100644
--- a/patches/server/0702-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0701-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0703-prevent-unintended-light-block-manipulation.patch b/patches/server/0702-prevent-unintended-light-block-manipulation.patch
index 6aa3f47843..6aa3f47843 100644
--- a/patches/server/0703-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0702-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0704-Fix-CraftCriteria-defaults-map.patch b/patches/server/0703-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0704-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0703-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0705-Fix-upstreams-block-state-factories.patch b/patches/server/0704-Fix-upstreams-block-state-factories.patch
index 002fba7d2b..002fba7d2b 100644
--- a/patches/server/0705-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0704-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0706-Configurable-feature-seeds.patch b/patches/server/0705-Configurable-feature-seeds.patch
index 2e7ba7f297..2e7ba7f297 100644
--- a/patches/server/0706-Configurable-feature-seeds.patch
+++ b/patches/server/0705-Configurable-feature-seeds.patch
diff --git a/patches/server/0707-Add-root-admin-user-detection.patch b/patches/server/0706-Add-root-admin-user-detection.patch
index 1b3440b012..1b3440b012 100644
--- a/patches/server/0707-Add-root-admin-user-detection.patch
+++ b/patches/server/0706-Add-root-admin-user-detection.patch
diff --git a/patches/server/0708-Always-allow-item-changing-in-Fireball.patch b/patches/server/0707-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0708-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0707-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0709-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0708-don-t-attempt-to-teleport-dead-entities.patch
index e0c851266a..e0c851266a 100644
--- a/patches/server/0709-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0708-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0710-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0709-Prevent-excessive-velocity-through-repeated-crits.patch
index 7ddf26373b..7ddf26373b 100644
--- a/patches/server/0710-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0709-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0711-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0710-Remove-client-side-code-using-deprecated-for-removal.patch
index 41ae87a8e9..41ae87a8e9 100644
--- a/patches/server/0711-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0710-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0712-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0711-Fix-removing-recipes-from-RecipeIterator.patch
index c57379be37..c57379be37 100644
--- a/patches/server/0712-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0711-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0713-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0712-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 8e246d3397..8e246d3397 100644
--- a/patches/server/0713-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0712-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0714-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0713-Hide-unnecessary-itemmeta-from-clients.patch
index 02804541cb..02804541cb 100644
--- a/patches/server/0714-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0713-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0715-Fix-Spigot-growth-modifiers.patch b/patches/server/0714-Fix-Spigot-growth-modifiers.patch
index 08d4226379..08d4226379 100644
--- a/patches/server/0715-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0714-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0716-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0715-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0716-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0715-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0717-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0716-Add-PlayerItemFrameChangeEvent.patch
index c1cf489efd..c1cf489efd 100644
--- a/patches/server/0717-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0716-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0718-Optimize-HashMapPalette.patch b/patches/server/0717-Optimize-HashMapPalette.patch
index 9e2b26701e..9e2b26701e 100644
--- a/patches/server/0718-Optimize-HashMapPalette.patch
+++ b/patches/server/0717-Optimize-HashMapPalette.patch
diff --git a/patches/server/0719-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0718-Allow-delegation-to-vanilla-chunk-gen.patch
index 8067d6b856..c7ea8e3ba4 100644
--- a/patches/server/0719-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0718-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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dcb3bc211b834aa6fd4cb19197debc93df3f4839..77ca534fda8bf1a36e51e857dcbc1d4f5fe5c6de 100644
+index ca605b33c57159add46f6b84c975c25c678fdf17..aa7fa1211b88f14ac01a4562f4819151bc23db27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2459,6 +2459,88 @@ public final class CraftServer implements Server {
+@@ -2460,6 +2460,88 @@ public final class CraftServer implements Server {
          return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME), world); // Paper - Anti-Xray - Add parameters
      }
  
@@ -98,10 +98,10 @@ index dcb3bc211b834aa6fd4cb19197debc93df3f4839..77ca534fda8bf1a36e51e857dcbc1d4f
      public BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag... flags) {
          return new CraftBossBar(title, color, style, flags);
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
-index a9700b750f124b5367c91ac071ee5194e9f7f8d8..1a363ceeefbf69618e5f17f67b6f6a2660579ba5 100644
+index 5fbb9d2c4e419a3f31a8420437978606d75e5b62..5e73bd943231fd7f9ab1c850706cfde8cddc92c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
-@@ -23,7 +23,7 @@ import org.bukkit.material.MaterialData;
+@@ -22,7 +22,7 @@ import org.bukkit.material.MaterialData;
  public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
      private final int minHeight;
      private final int maxHeight;
@@ -110,7 +110,7 @@ index a9700b750f124b5367c91ac071ee5194e9f7f8d8..1a363ceeefbf69618e5f17f67b6f6a26
      private final Registry<net.minecraft.world.level.biome.Biome> biomes;
      private Set<BlockPos> tiles;
      private final Set<BlockPos> lights = new HashSet<>();
-@@ -194,7 +194,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
+@@ -193,7 +193,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
          return this.tiles;
      }
  
diff --git a/patches/server/0720-Collision-optimisations.patch b/patches/server/0719-Collision-optimisations.patch
index 62c51edd7e..62c51edd7e 100644
--- a/patches/server/0720-Collision-optimisations.patch
+++ b/patches/server/0719-Collision-optimisations.patch
diff --git a/patches/server/0721-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0720-Optimise-collision-checking-in-player-move-packet-ha.patch
index cf16f8b4db..cf16f8b4db 100644
--- a/patches/server/0721-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0720-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0722-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0721-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index c92ed9b709..c92ed9b709 100644
--- a/patches/server/0722-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0721-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0723-Add-more-Campfire-API.patch b/patches/server/0722-Add-more-Campfire-API.patch
index 61de925634..61de925634 100644
--- a/patches/server/0723-Add-more-Campfire-API.patch
+++ b/patches/server/0722-Add-more-Campfire-API.patch
diff --git a/patches/server/0724-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0723-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 5c74ea64c9..5c74ea64c9 100644
--- a/patches/server/0724-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0723-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0725-Fix-tripwire-state-inconsistency.patch b/patches/server/0724-Fix-tripwire-state-inconsistency.patch
index 4433ab45c4..4433ab45c4 100644
--- a/patches/server/0725-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0724-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0726-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0725-Forward-CraftEntity-in-teleport-command.patch
index 614b09f4c6..614b09f4c6 100644
--- a/patches/server/0726-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0725-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0727-Improve-scoreboard-entries.patch b/patches/server/0726-Improve-scoreboard-entries.patch
index c4fee36579..c4fee36579 100644
--- a/patches/server/0727-Improve-scoreboard-entries.patch
+++ b/patches/server/0726-Improve-scoreboard-entries.patch
diff --git a/patches/server/0728-Entity-powdered-snow-API.patch b/patches/server/0727-Entity-powdered-snow-API.patch
index 8e1b348837..6901161b4d 100644
--- a/patches/server/0728-Entity-powdered-snow-API.patch
+++ b/patches/server/0727-Entity-powdered-snow-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Entity powdered snow API
 public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 32fd3b7067894bc442bc5a74dbcf60164a8fd70f..c88cf1b476eb50a51c292f3c849513d653edde83 100644
+index 5a498ccfa7832f0819ccf4c4c1d6ec5dbd4f48b3..65cfce005ecad1c6f7823f2e227235e9e22b710d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1441,5 +1441,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1086,5 +1086,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.entity.setRot(location.getYaw(), location.getPitch());
          return !this.entity.valid && this.entity.level().addFreshEntity(this.entity, reason);
      }
diff --git a/patches/server/0729-Add-API-for-item-entity-health.patch b/patches/server/0728-Add-API-for-item-entity-health.patch
index 902552710c..902552710c 100644
--- a/patches/server/0729-Add-API-for-item-entity-health.patch
+++ b/patches/server/0728-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0730-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0729-Fix-entity-type-tags-suggestions-in-selectors.patch
index 2064d7103a..2064d7103a 100644
--- a/patches/server/0730-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0729-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0731-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0730-Configurable-max-block-light-for-monster-spawning.patch
index c7f4c136fd..c7f4c136fd 100644
--- a/patches/server/0731-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0730-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0732-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0731-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 8e2d63bd62..8e2d63bd62 100644
--- a/patches/server/0732-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0731-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0733-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0732-Load-effect-amplifiers-greater-than-127-correctly.patch
index b0884e52bd..b0884e52bd 100644
--- a/patches/server/0733-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0732-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0734-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0733-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0734-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0733-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0735-Fix-bees-aging-inside-hives.patch b/patches/server/0734-Fix-bees-aging-inside-hives.patch
index 6adfc7fc04..6adfc7fc04 100644
--- a/patches/server/0735-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0734-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0736-Bucketable-API.patch b/patches/server/0735-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0736-Bucketable-API.patch
+++ b/patches/server/0735-Bucketable-API.patch
diff --git a/patches/server/0737-Validate-usernames.patch b/patches/server/0736-Validate-usernames.patch
index 39e337ef3e..39e337ef3e 100644
--- a/patches/server/0737-Validate-usernames.patch
+++ b/patches/server/0736-Validate-usernames.patch
diff --git a/patches/server/0738-Make-water-animal-spawn-height-configurable.patch b/patches/server/0737-Make-water-animal-spawn-height-configurable.patch
index 697ffe061e..697ffe061e 100644
--- a/patches/server/0738-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0737-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0739-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0738-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 8f37266b00..29119b407d 100644
--- a/patches/server/0739-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0738-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -18,10 +18,10 @@ index 0a23cfeaba071c2179de1931caa86bc46462c338..bc181f3f59eef3f2f3645e3facb37d5e
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 77ca534fda8bf1a36e51e857dcbc1d4f5fe5c6de..92acff9a1079b7fa4d3781f423b17fe67b7fe495 100644
+index aa7fa1211b88f14ac01a4562f4819151bc23db27..1eeefb6ac8af5928925180a1c5850f8e398a44a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1257,7 +1257,7 @@ public final class CraftServer implements Server {
+@@ -1258,7 +1258,7 @@ public final class CraftServer implements Server {
          List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
          LevelStem worlddimension = iregistry.get(actualDimension);
  
diff --git a/patches/server/0740-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0739-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0740-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0739-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0741-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0740-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index 08a8876b57..08a8876b57 100644
--- a/patches/server/0741-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0740-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0742-Multiple-Entries-with-Scoreboards.patch b/patches/server/0741-Multiple-Entries-with-Scoreboards.patch
index db517fb063..db517fb063 100644
--- a/patches/server/0742-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0741-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0743-Reset-placed-block-on-exception.patch b/patches/server/0742-Reset-placed-block-on-exception.patch
index 308089d693..308089d693 100644
--- a/patches/server/0743-Reset-placed-block-on-exception.patch
+++ b/patches/server/0742-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0744-Add-configurable-height-for-slime-spawn.patch b/patches/server/0743-Add-configurable-height-for-slime-spawn.patch
index c105ef61b0..c105ef61b0 100644
--- a/patches/server/0744-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0743-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0745-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0744-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 185664caf6..185664caf6 100644
--- a/patches/server/0745-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0744-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0746-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0745-Fix-xp-reward-for-baby-zombies.patch
index ed685b8f6b..ed685b8f6b 100644
--- a/patches/server/0746-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0745-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0747-Multi-Block-Change-API-Implementation.patch b/patches/server/0746-Multi-Block-Change-API-Implementation.patch
index 3377c47c6a..2ae165f1e3 100644
--- a/patches/server/0747-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0746-Multi-Block-Change-API-Implementation.patch
@@ -24,10 +24,10 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5a9fe8f1149cb52f2b2bb31202cefe3ec9ab9d3a..89c90b704045345d0a6d37a032de8483a43a634b 100644
+index d8c4f8573498fba43a0db61c6a4363be34ce45e8..a0c09dd6561c056d989c12e2c9e126cef310ea0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -889,6 +889,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -886,6 +886,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0748-Fix-NotePlayEvent.patch b/patches/server/0747-Fix-NotePlayEvent.patch
index 5385ce97b2..5385ce97b2 100644
--- a/patches/server/0748-Fix-NotePlayEvent.patch
+++ b/patches/server/0747-Fix-NotePlayEvent.patch
diff --git a/patches/server/0749-Freeze-Tick-Lock-API.patch b/patches/server/0748-Freeze-Tick-Lock-API.patch
index 50457eeeaa..7b08b79162 100644
--- a/patches/server/0749-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0748-Freeze-Tick-Lock-API.patch
@@ -59,10 +59,10 @@ index f5f612c3114c10bff6cecea2900f3c8f79370fd4..b8c7f0077118825848bddee8279e2529
  
              if (this.isInPowderSnow && this.canFreeze()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c88cf1b476eb50a51c292f3c849513d653edde83..d4fffcc5bb746df8dc177780f15ff4dbca64c018 100644
+index 65cfce005ecad1c6f7823f2e227235e9e22b710d..34e9172ef95d3d81a294df41ea7cbeaa175f3753 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -675,6 +675,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -320,6 +320,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.getHandle().isFullyFrozen();
      }
  
diff --git a/patches/server/0750-Dolphin-API.patch b/patches/server/0749-Dolphin-API.patch
index e971f87322..e971f87322 100644
--- a/patches/server/0750-Dolphin-API.patch
+++ b/patches/server/0749-Dolphin-API.patch
diff --git a/patches/server/0751-More-PotionEffectType-API.patch b/patches/server/0750-More-PotionEffectType-API.patch
index 7aa4f2a366..7aa4f2a366 100644
--- a/patches/server/0751-More-PotionEffectType-API.patch
+++ b/patches/server/0750-More-PotionEffectType-API.patch
diff --git a/patches/server/0752-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0751-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 42598199e1..42598199e1 100644
--- a/patches/server/0752-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0751-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0753-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0752-API-for-creating-command-sender-which-forwards-feedb.patch
index 53c484a819..ec86c1f1d0 100644
--- a/patches/server/0753-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0752-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 92acff9a1079b7fa4d3781f423b17fe67b7fe495..8684867f92637ba0f3b7db4f3cff5bc85ad7e15b 100644
+index 1eeefb6ac8af5928925180a1c5850f8e398a44a8..37bacd8e83df278d32282d0000a8de112aafbde4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2110,6 +2110,13 @@ public final class CraftServer implements Server {
+@@ -2111,6 +2111,13 @@ public final class CraftServer implements Server {
          return this.console.console;
      }
  
@@ -161,10 +161,10 @@ index eaff8df6c8c12c64e005a68a02e2e35ed88f757c..1c638a4b1f2c841928d8b2a7ae43e4eb
          if (this instanceof CraftBlockCommandSender) {
              if (ServerCommandSender.blockPermInst == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 13804bb81a13d51d2e9e55d8a477369ba20fc301..3453eccf524d58c25f09b7a9772da703b85f4865 100644
+index f4961a0f360a39124544cbe0adbd94eeeef32ab5..11d7471faf35339b290b5b90c7db595e4813deb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -83,6 +83,11 @@ public final class VanillaCommandWrapper extends BukkitCommand {
+@@ -81,6 +81,11 @@ public final class VanillaCommandWrapper extends BukkitCommand {
          if (sender instanceof ProxiedCommandSender) {
              return ((ProxiedNativeCommandSender) sender).getHandle();
          }
diff --git a/patches/server/0754-Add-missing-structure-set-seed-configs.patch b/patches/server/0753-Add-missing-structure-set-seed-configs.patch
index 4cdc2133d0..4cdc2133d0 100644
--- a/patches/server/0754-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0753-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0755-Implement-regenerateChunk.patch b/patches/server/0754-Implement-regenerateChunk.patch
index ca798783da..ca798783da 100644
--- a/patches/server/0755-Implement-regenerateChunk.patch
+++ b/patches/server/0754-Implement-regenerateChunk.patch
diff --git a/patches/server/0756-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0755-Fix-cancelled-powdered-snow-bucket-placement.patch
index 72be2c3420..72be2c3420 100644
--- a/patches/server/0756-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0755-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0757-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0756-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index ecb830bd86..ed53e0ce44 100644
--- a/patches/server/0757-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0756-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8684867f92637ba0f3b7db4f3cff5bc85ad7e15b..d51695f14ca8c3030f924974ebfa0baba6884924 100644
+index 37bacd8e83df278d32282d0000a8de112aafbde4..d113f7a4dbe7aabf4d5d26cc8d015ce5ba863dd0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2287,6 +2287,8 @@ public final class CraftServer implements Server {
+@@ -2288,6 +2288,8 @@ public final class CraftServer implements Server {
      @Override
      public int getSpawnLimit(SpawnCategory spawnCategory) {
          // Paper start
diff --git a/patches/server/0758-Add-GameEvent-tags.patch b/patches/server/0757-Add-GameEvent-tags.patch
index 33e9653974..a6a1398656 100644
--- a/patches/server/0758-Add-GameEvent-tags.patch
+++ b/patches/server/0757-Add-GameEvent-tags.patch
@@ -46,10 +46,10 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d51695f14ca8c3030f924974ebfa0baba6884924..a8dc0e654d063a1b0c24bf6be454a168776ea600 100644
+index d113f7a4dbe7aabf4d5d26cc8d015ce5ba863dd0..ed69f084dc8a0c97ff83932d014d1020e16bd7f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2708,6 +2708,15 @@ public final class CraftServer implements Server {
+@@ -2709,6 +2709,15 @@ public final class CraftServer implements Server {
                      return (org.bukkit.Tag<T>) new CraftEntityTag(BuiltInRegistries.ENTITY_TYPE, entityTagKey);
                  }
              }
@@ -65,7 +65,7 @@ index d51695f14ca8c3030f924974ebfa0baba6884924..a8dc0e654d063a1b0c24bf6be454a168
              default -> throw new IllegalArgumentException();
          }
  
-@@ -2740,6 +2749,13 @@ public final class CraftServer implements Server {
+@@ -2741,6 +2750,13 @@ public final class CraftServer implements Server {
                  net.minecraft.core.Registry<EntityType<?>> entityTags = BuiltInRegistries.ENTITY_TYPE;
                  return entityTags.getTags().map(pair -> (org.bukkit.Tag<T>) new CraftEntityTag(entityTags, pair.getFirst())).collect(ImmutableList.toImmutableList());
              }
diff --git a/patches/server/0759-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0758-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index d4ee6e925e..d4ee6e925e 100644
--- a/patches/server/0759-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0758-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0760-Furnace-RecipesUsed-API.patch b/patches/server/0759-Furnace-RecipesUsed-API.patch
index 075cd97b56..075cd97b56 100644
--- a/patches/server/0760-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0759-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0761-Configurable-sculk-sensor-listener-range.patch b/patches/server/0760-Configurable-sculk-sensor-listener-range.patch
index ff5a549be0..ff5a549be0 100644
--- a/patches/server/0761-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0760-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0762-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0761-Add-missing-block-data-mins-and-maxes.patch
index defc7411be..defc7411be 100644
--- a/patches/server/0762-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0761-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0763-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0762-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index b584e52ee2..b584e52ee2 100644
--- a/patches/server/0763-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0762-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0764-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0763-Put-world-into-worldlist-before-initing-the-world.patch
index e775299bad..3930cc57c6 100644
--- a/patches/server/0764-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0763-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,10 +23,10 @@ index abd20b1bbda4177a3f3be8abf3977866780a9b67..330a7921849a4b3ab0d7ef156af4880e
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a8dc0e654d063a1b0c24bf6be454a168776ea600..1cf55dc3c358f5f2e0cb5acefc550699e021c1d9 100644
+index ed69f084dc8a0c97ff83932d014d1020e16bd7f8..be57ec31869e2cf9db131ec64c7581564f2b42e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1287,10 +1287,11 @@ public final class CraftServer implements Server {
+@@ -1288,10 +1288,11 @@ public final class CraftServer implements Server {
              return null;
          }
  
diff --git a/patches/server/0765-Fix-Entity-Position-Desync.patch b/patches/server/0764-Fix-Entity-Position-Desync.patch
index 1a885e69f8..1a885e69f8 100644
--- a/patches/server/0765-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0764-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0766-Custom-Potion-Mixes.patch b/patches/server/0765-Custom-Potion-Mixes.patch
index c2502f87fb..b860cd65c7 100644
--- a/patches/server/0766-Custom-Potion-Mixes.patch
+++ b/patches/server/0765-Custom-Potion-Mixes.patch
@@ -172,10 +172,10 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1cf55dc3c358f5f2e0cb5acefc550699e021c1d9..ab8d2d5a8cde5174412e6c1c8d37816999ad09e2 100644
+index be57ec31869e2cf9db131ec64c7581564f2b42e6..37822390d9cf71890a81e66509fa9f5ef77b2f5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -309,6 +309,7 @@ public final class CraftServer implements Server {
+@@ -304,6 +304,7 @@ public final class CraftServer implements Server {
      private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
      public static Exception excessiveVelEx; // Paper - Velocity warnings
      private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
@@ -183,7 +183,7 @@ index 1cf55dc3c358f5f2e0cb5acefc550699e021c1d9..ab8d2d5a8cde5174412e6c1c8d378169
  
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
-@@ -334,7 +335,7 @@ public final class CraftServer implements Server {
+@@ -330,7 +331,7 @@ public final class CraftServer implements Server {
  
          CraftRegistry.setMinecraftRegistry(console.registryAccess());
  
@@ -192,7 +192,7 @@ index 1cf55dc3c358f5f2e0cb5acefc550699e021c1d9..ab8d2d5a8cde5174412e6c1c8d378169
          // Ugly hack :(
  
          if (!Main.useConsole) {
-@@ -3072,5 +3073,10 @@ public final class CraftServer implements Server {
+@@ -3073,5 +3074,10 @@ public final class CraftServer implements Server {
          return datapackManager;
      }
  
diff --git a/patches/server/0767-Force-close-world-loading-screen.patch b/patches/server/0766-Force-close-world-loading-screen.patch
index 0b85261bfe..0b85261bfe 100644
--- a/patches/server/0767-Force-close-world-loading-screen.patch
+++ b/patches/server/0766-Force-close-world-loading-screen.patch
diff --git a/patches/server/0768-Fix-falling-block-spawn-methods.patch b/patches/server/0767-Fix-falling-block-spawn-methods.patch
index 3cbc860a56..0be6032572 100644
--- a/patches/server/0768-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0767-Fix-falling-block-spawn-methods.patch
@@ -10,19 +10,6 @@ Restores the API behavior from previous versions of the server
 == AT ==
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 44c08acdbc8316e501d9f25159f712a55d444b17..2ef96856920a8fb032ccc113c73a1b6271596a06 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -629,7 +629,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-             // Paper end
-         } else if (FallingBlock.class.isAssignableFrom(clazz)) {
-             BlockPos pos = BlockPos.containing(x, y, z);
--            entity = FallingBlockEntity.fall(world, pos, this.getHandle().getBlockState(pos));
-+            entity = new FallingBlockEntity(world, x, y, z, this.getHandle().getBlockState(pos)); // Paper
-         } else if (Projectile.class.isAssignableFrom(clazz)) {
-             if (Snowball.class.isAssignableFrom(clazz)) {
-                 entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 index 3405c349bb211e11caac131a2ba5c1bb4175b9f8..713e7600fb845cf8c4f0880ca10bad5cf04f100b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -55,3 +42,16 @@ index 3405c349bb211e11caac131a2ba5c1bb4175b9f8..713e7600fb845cf8c4f0880ca10bad5c
          return (FallingBlock) entity.getBukkitEntity();
      }
  
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+index f06e308adb90e2cfb1fdd8d905547fc4cb159c5c..ee0f33ece945d71d67d11cd9bc825f5ca54333c4 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+@@ -378,7 +378,7 @@ public final class CraftEntityTypes {
+         register(new EntityTypeData<>(EntityType.PRIMED_TNT, TNTPrimed.class, CraftTNTPrimed::new, spawnData -> new PrimedTnt(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), null)));
+         register(new EntityTypeData<>(EntityType.FALLING_BLOCK, FallingBlock.class, CraftFallingBlock::new, spawnData -> {
+             BlockPos pos = BlockPos.containing(spawnData.x(), spawnData.y(), spawnData.z());
+-            return FallingBlockEntity.fall(spawnData.minecraftWorld(), pos, spawnData.world().getBlockState(pos));
++            return new FallingBlockEntity(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), spawnData.world().getBlockState(pos)); // Paper - create falling block entities correctly
+         }));
+         register(new EntityTypeData<>(EntityType.FIREWORK, Firework.class, CraftFirework::new, spawnData -> new FireworkRocketEntity(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), net.minecraft.world.item.ItemStack.EMPTY)));
+         register(new EntityTypeData<>(EntityType.EVOKER_FANGS, EvokerFangs.class, CraftEvokerFangs::new, spawnData -> new net.minecraft.world.entity.projectile.EvokerFangs(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), (float) Math.toRadians(spawnData.yaw()), 0, null)));
diff --git a/patches/server/0769-Expose-furnace-minecart-push-values.patch b/patches/server/0768-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0769-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0768-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0770-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0769-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 8826989056..8826989056 100644
--- a/patches/server/0770-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0769-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0771-More-Projectile-API.patch b/patches/server/0770-More-Projectile-API.patch
index 42d1845d4c..c2fd22589b 100644
--- a/patches/server/0771-More-Projectile-API.patch
+++ b/patches/server/0770-More-Projectile-API.patch
@@ -509,10 +509,10 @@ index 20f9735c7cb76024e15dbdca7684f5c560876175..8a6af0db8e0aa0cffbf19584be747076
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index cc679e7042c5a5fba2ce34598f2c1eaf49bb065f..58dbb94f101103249028987eda7004c66aa8717b 100644
+index e4d08d4b85f9ce57af50e6aaf4a308a8a6c85ce3..50b26cbd121f57fc0e3c7c958295e38fad756572 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -834,19 +834,19 @@ public class CraftEventFactory {
+@@ -831,19 +831,19 @@ public class CraftEventFactory {
      /**
       * PotionSplashEvent
       */
@@ -535,7 +535,7 @@ index cc679e7042c5a5fba2ce34598f2c1eaf49bb065f..58dbb94f101103249028987eda7004c6
              hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity();
          }
  
-@@ -855,20 +855,20 @@ public class CraftEventFactory {
+@@ -852,20 +852,20 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0772-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0771-Fix-swamp-hut-cat-generation-deadlock.patch
index b2499e69cc..b2499e69cc 100644
--- a/patches/server/0772-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0771-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0773-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0772-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 3972197453..3972197453 100644
--- a/patches/server/0773-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0772-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0774-Implement-getComputedBiome-API.patch b/patches/server/0773-Implement-getComputedBiome-API.patch
index a141826041..805784f862 100644
--- a/patches/server/0774-Implement-getComputedBiome-API.patch
+++ b/patches/server/0773-Implement-getComputedBiome-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 2ef96856920a8fb032ccc113c73a1b6271596a06..9c31a042d2ff82689a4bcc9d90fe08e5f8329985 100644
+index eeb1bd05d4407224aefa26b5ae2f2a8da1101b31..d46ab8b75fe99e03874539956ca6389d3cdd0641 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -224,6 +224,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -76,6 +76,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
          return CraftBiome.minecraftHolderToBukkit(this.getHandle().getNoiseBiome(x >> 2, y >> 2, z >> 2));
      }
  
diff --git a/patches/server/0775-Make-some-itemstacks-nonnull.patch b/patches/server/0774-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0775-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0774-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0776-Implement-enchantWithLevels-API.patch b/patches/server/0775-Implement-enchantWithLevels-API.patch
index b5459454d4..b5459454d4 100644
--- a/patches/server/0776-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0775-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0777-Fix-saving-in-unloadWorld.patch b/patches/server/0776-Fix-saving-in-unloadWorld.patch
index f44e177fe3..79ad012645 100644
--- a/patches/server/0777-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0776-Fix-saving-in-unloadWorld.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ab8d2d5a8cde5174412e6c1c8d37816999ad09e2..2a8855aae6f67193c172cab997c1bcdac923d7ac 100644
+index 37822390d9cf71890a81e66509fa9f5ef77b2f5d..8682503d66ccdd6c6dce5f30c9b71ab3ae2f262a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1335,7 +1335,7 @@ public final class CraftServer implements Server {
+@@ -1336,7 +1336,7 @@ public final class CraftServer implements Server {
  
          try {
              if (save) {
diff --git a/patches/server/0778-Buffer-OOB-setBlock-calls.patch b/patches/server/0777-Buffer-OOB-setBlock-calls.patch
index c3098333e9..c3098333e9 100644
--- a/patches/server/0778-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0777-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0779-Add-TameableDeathMessageEvent.patch b/patches/server/0778-Add-TameableDeathMessageEvent.patch
index 53da18382c..53da18382c 100644
--- a/patches/server/0779-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0778-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0780-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0779-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 45b2a00e6e..71a9201798 100644
--- a/patches/server/0780-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0779-Fix-new-block-data-for-EntityChangeBlockEvent.patch
@@ -196,10 +196,10 @@ index c01cc63497917b0c5d95424c060c69f3693fc871..b6105d178778b326c11b7d29c5e4d8aa
              }
              // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 58dbb94f101103249028987eda7004c66aa8717b..2b0a969b185dd959067d8828254f9c48f5b49161 100644
+index 50b26cbd121f57fc0e3c7c958295e38fad756572..72a33f9e981d7a5e9a30a7ea8ef2a970c986cece 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1413,11 +1413,11 @@ public class CraftEventFactory {
+@@ -1410,11 +1410,11 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0781-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0780-fix-player-loottables-running-when-mob-loot-gamerule.patch
index c157a83ae7..c157a83ae7 100644
--- a/patches/server/0781-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0780-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0782-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0781-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 89d95d4c80..89d95d4c80 100644
--- a/patches/server/0782-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0781-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0783-Guard-against-invalid-entity-positions.patch b/patches/server/0782-Guard-against-invalid-entity-positions.patch
index 9ec2f9c8da..9ec2f9c8da 100644
--- a/patches/server/0783-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0782-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0784-cache-resource-keys.patch b/patches/server/0783-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0784-cache-resource-keys.patch
+++ b/patches/server/0783-cache-resource-keys.patch
diff --git a/patches/server/0785-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0784-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 44d65a775a..44d65a775a 100644
--- a/patches/server/0785-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0784-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0786-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0785-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 57d912648d..57d912648d 100644
--- a/patches/server/0786-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0785-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0787-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0786-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index dfa3c3ac08..dfa3c3ac08 100644
--- a/patches/server/0787-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0786-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0788-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0787-Prevent-tile-entity-copies-loading-chunks.patch
index cf25ea8b5b..cf25ea8b5b 100644
--- a/patches/server/0788-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0787-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0789-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0788-Use-username-instead-of-display-name-in-PlayerList-g.patch
index f6eb91a04c..f6eb91a04c 100644
--- a/patches/server/0789-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0788-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0790-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0789-Pass-ServerLevel-for-gamerule-callbacks.patch
index f9af4b541a..f9af4b541a 100644
--- a/patches/server/0790-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0789-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0791-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0790-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 81c4ab47d1..81c4ab47d1 100644
--- a/patches/server/0791-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0790-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0792-WorldCreator-keepSpawnLoaded.patch b/patches/server/0791-WorldCreator-keepSpawnLoaded.patch
index 609931ffb7..374c68cec1 100644
--- a/patches/server/0792-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0791-WorldCreator-keepSpawnLoaded.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2a8855aae6f67193c172cab997c1bcdac923d7ac..d005bcd0a64c4a18697aec802732d4f06b7ed85a 100644
+index 8682503d66ccdd6c6dce5f30c9b71ab3ae2f262a..66844cc781910324cf7ad07033f2493be032bf0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1282,7 +1282,7 @@ public final class CraftServer implements Server {
+@@ -1283,7 +1283,7 @@ public final class CraftServer implements Server {
  
          ServerLevel internal = (ServerLevel) new ServerLevel(this.console, this.console.executor, worldSession, worlddata, worldKey, worlddimension, this.getServer().progressListenerFactory.create(11),
                  worlddata.isDebugWorld(), j, creator.environment() == Environment.NORMAL ? list : ImmutableList.of(), true, this.console.overworld().getRandomSequences(), creator.environment(), generator, biomeProvider);
@@ -17,7 +17,7 @@ index 2a8855aae6f67193c172cab997c1bcdac923d7ac..d005bcd0a64c4a18697aec802732d4f0
  
          if (!(this.worlds.containsKey(name.toLowerCase(java.util.Locale.ENGLISH)))) {
              return null;
-@@ -1294,6 +1294,7 @@ public final class CraftServer implements Server {
+@@ -1295,6 +1295,7 @@ public final class CraftServer implements Server {
          internal.setSpawnSettings(true, true);
          // Paper - move up
  
diff --git a/patches/server/0793-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0792-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index 0510692ca9..0510692ca9 100644
--- a/patches/server/0793-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0792-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0794-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0793-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 893840fdd5..893840fdd5 100644
--- a/patches/server/0794-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0793-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0795-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0794-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 76380e425b..76380e425b 100644
--- a/patches/server/0795-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0794-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0796-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0795-Fire-CauldronLevelChange-on-initial-fill.patch
index 2d6f6a9296..2d6f6a9296 100644
--- a/patches/server/0796-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0795-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0797-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0796-fix-powder-snow-cauldrons-not-turning-to-water.patch
index 26317d1b0b..26317d1b0b 100644
--- a/patches/server/0797-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0796-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0798-Add-PlayerStopUsingItemEvent.patch b/patches/server/0797-Add-PlayerStopUsingItemEvent.patch
index 622fc353c2..622fc353c2 100644
--- a/patches/server/0798-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0797-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0799-Don-t-tick-markers.patch b/patches/server/0798-Don-t-tick-markers.patch
index fa030b09e2..fa030b09e2 100644
--- a/patches/server/0799-Don-t-tick-markers.patch
+++ b/patches/server/0798-Don-t-tick-markers.patch
diff --git a/patches/server/0800-Expand-FallingBlock-API.patch b/patches/server/0799-Expand-FallingBlock-API.patch
index 2a31126860..2a31126860 100644
--- a/patches/server/0800-Expand-FallingBlock-API.patch
+++ b/patches/server/0799-Expand-FallingBlock-API.patch
diff --git a/patches/server/0801-Do-not-accept-invalid-client-settings.patch b/patches/server/0800-Do-not-accept-invalid-client-settings.patch
index 61fd24e399..61fd24e399 100644
--- a/patches/server/0801-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0800-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0802-Add-support-for-Proxy-Protocol.patch b/patches/server/0801-Add-support-for-Proxy-Protocol.patch
index e061f16a5a..8b9ee6ddf8 100644
--- a/patches/server/0802-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0801-Add-support-for-Proxy-Protocol.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 060b9adae21e75e1627f41846e17bc51759b023f..6cfc43610940d3ab7c867352b27980a207ce3045 100644
+index fa31c726f8883ae9789e972c4807f190cfc6ecc5..3a1448084b50c614c2e0288fea951402aa449d8e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,6 +30,7 @@ dependencies {
diff --git a/patches/server/0803-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0802-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 7d9e9d920f..7d9e9d920f 100644
--- a/patches/server/0803-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0802-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0804-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0803-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 0a25f626ba..6fdd1fd271 100644
--- a/patches/server/0804-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0803-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix FurnaceInventory for smokers and blast furnaces
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
-index e97166d3008cae7897519eaaf56b39c927661098..b835782c9c9b8b47a3ce8727e376f795286299a3 100644
+index 8d3f71689087d687e6400e2ea9750a6fb3535bf1..f59a972cb4516623f9715e4a5a3a9fa3bfd8f989 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
-@@ -66,7 +66,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -65,7 +65,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
          return new CraftInventory(tileEntity);
      }
  
@@ -17,7 +17,7 @@ index e97166d3008cae7897519eaaf56b39c927661098..b835782c9c9b8b47a3ce8727e376f795
  
          @Override
          public Container getTileEntity() {
-@@ -74,6 +74,11 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -73,6 +73,11 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
              return furnace;
          }
  
@@ -29,7 +29,7 @@ index e97166d3008cae7897519eaaf56b39c927661098..b835782c9c9b8b47a3ce8727e376f795
          // Paper start
          @Override
          public Inventory createInventory(InventoryHolder owner, InventoryType type, net.kyori.adventure.text.Component title) {
-@@ -171,7 +176,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -170,7 +175,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
          }
      }
  
@@ -38,7 +38,7 @@ index e97166d3008cae7897519eaaf56b39c927661098..b835782c9c9b8b47a3ce8727e376f795
  
          @Override
          public Container getTileEntity() {
-@@ -187,7 +192,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
+@@ -186,7 +191,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
          }
      }
  
diff --git a/patches/server/0805-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0804-Sanitize-Sent-BlockEntity-NBT.patch
index b3404362f9..b3404362f9 100644
--- a/patches/server/0805-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0804-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0806-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0805-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0806-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0805-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0807-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0806-Prevent-entity-loading-causing-async-lookups.patch
index 673402cf15..673402cf15 100644
--- a/patches/server/0807-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0806-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0808-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0807-Throw-exception-on-world-create-while-being-ticked.patch
index 07fb3cf230..4b8e3640fc 100644
--- a/patches/server/0808-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0807-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,10 +45,10 @@ index 3da647154516ded20fd18ee4baa7242e73ab91e8..5b39e4a6b39e73cfe5645d80cd823e58
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d005bcd0a64c4a18697aec802732d4f06b7ed85a..0759824929144805d55b4953863eacd5ae1542e0 100644
+index 66844cc781910324cf7ad07033f2493be032bf0d..fafea05e8b09fd97f8a98997730af9e5695633b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -873,6 +873,11 @@ public final class CraftServer implements Server {
+@@ -874,6 +874,11 @@ public final class CraftServer implements Server {
          return new ArrayList<World>(this.worlds.values());
      }
  
@@ -60,7 +60,7 @@ index d005bcd0a64c4a18697aec802732d4f06b7ed85a..0759824929144805d55b4953863eacd5
      public DedicatedPlayerList getHandle() {
          return this.playerList;
      }
-@@ -1132,6 +1137,7 @@ public final class CraftServer implements Server {
+@@ -1133,6 +1138,7 @@ public final class CraftServer implements Server {
      @Override
      public World createWorld(WorldCreator creator) {
          Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
@@ -68,7 +68,7 @@ index d005bcd0a64c4a18697aec802732d4f06b7ed85a..0759824929144805d55b4953863eacd5
          Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");
  
          String name = creator.name();
-@@ -1309,6 +1315,7 @@ public final class CraftServer implements Server {
+@@ -1310,6 +1316,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean unloadWorld(World world, boolean save) {
diff --git a/patches/server/0809-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0808-Add-Alternate-Current-redstone-implementation.patch
index 41f7096da9..41f7096da9 100644
--- a/patches/server/0809-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0808-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0810-Dont-resent-entity-on-art-update.patch b/patches/server/0809-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0810-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0809-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0811-Add-WardenAngerChangeEvent.patch b/patches/server/0810-Add-WardenAngerChangeEvent.patch
index 8e13bfe2f5..8e13bfe2f5 100644
--- a/patches/server/0811-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0810-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0812-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0811-Add-option-for-strict-advancement-dimension-checks.patch
index 6a46cf623e..6a46cf623e 100644
--- a/patches/server/0812-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0811-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0813-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0812-Add-missing-important-BlockStateListPopulator-method.patch
index 70241cc9b8..70241cc9b8 100644
--- a/patches/server/0813-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0812-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0814-Nameable-Banner-API.patch b/patches/server/0813-Nameable-Banner-API.patch
index 351d3597e0..351d3597e0 100644
--- a/patches/server/0814-Nameable-Banner-API.patch
+++ b/patches/server/0813-Nameable-Banner-API.patch
diff --git a/patches/server/0815-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0814-Don-t-broadcast-messages-to-command-blocks.patch
index c5919aa53c..fb129ecb6d 100644
--- a/patches/server/0815-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0814-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,10 +20,10 @@ index c56f5173fda6b38c2dcaea196217f2f5a7d7c641..d4ff8c6b7801e33be4ff69b8bae13c09
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0759824929144805d55b4953863eacd5ae1542e0..7c8d21499d49aa88ad771e98a8e5302d1b3a3229 100644
+index fafea05e8b09fd97f8a98997730af9e5695633b9..193a1d096bee81d0b51be7253316d326f604caf4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1872,7 +1872,7 @@ public final class CraftServer implements Server {
+@@ -1873,7 +1873,7 @@ public final class CraftServer implements Server {
          // Paper end
          Set<CommandSender> recipients = new HashSet<>();
          for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
diff --git a/patches/server/0816-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0815-Prevent-empty-items-from-being-added-to-world.patch
index 6ac2045202..6ac2045202 100644
--- a/patches/server/0816-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0815-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0817-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0816-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 5816232b91..5816232b91 100644
--- a/patches/server/0817-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0816-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0818-Add-Player-getFishHook.patch b/patches/server/0817-Add-Player-getFishHook.patch
index 5f52bca7aa..76aa8357c9 100644
--- a/patches/server/0818-Add-Player-getFishHook.patch
+++ b/patches/server/0817-Add-Player-getFishHook.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getFishHook
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index bd2c3425cb17d14ccb6f8390997cc07de354468c..1bfd3f66bf5f269685774b7cd75112ba3429c484 100644
+index a5ca7c33565a3ffbb6ff991f5be2e1d807b4b4bf..7ce6d05b99cce1672ce397b5ce64d266f68a8cae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -162,6 +162,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -161,6 +161,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          return new Location(worldServer.getWorld(), bed.getX(), bed.getY(), bed.getZ());
      }
      // Paper end
diff --git a/patches/server/0819-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0818-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 3956916b04..3956916b04 100644
--- a/patches/server/0819-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0818-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0820-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0819-Add-various-missing-EntityDropItemEvent-calls.patch
index 9a5870d6fe..9a5870d6fe 100644
--- a/patches/server/0820-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0819-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0821-Fix-Bee-flower-NPE.patch b/patches/server/0820-Fix-Bee-flower-NPE.patch
index 7e9696d0ac..7e9696d0ac 100644
--- a/patches/server/0821-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0820-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0822-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0821-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 320e5bca68..320e5bca68 100644
--- a/patches/server/0822-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0821-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0823-More-Teleport-API.patch b/patches/server/0822-More-Teleport-API.patch
index 78587db55d..e9a85d2d73 100644
--- a/patches/server/0823-More-Teleport-API.patch
+++ b/patches/server/0822-More-Teleport-API.patch
@@ -29,10 +29,10 @@ index 65bc013e9dc603ef0d64a9340353869f06ce18c2..23522e52cd8da1208004a6982b718c2a
              d0 = to.getX();
              d1 = to.getY();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d4fffcc5bb746df8dc177780f15ff4dbca64c018..ed30e079c23f564cbd0a45b38586bd12e17c525e 100644
+index 34e9172ef95d3d81a294df41ea7cbeaa175f3753..4f09da9338cb1180f5bfb2048d50392d0b6fb206 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -573,15 +573,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -218,15 +218,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
  
      @Override
      public boolean teleport(Location location, TeleportCause cause) {
@@ -72,10 +72,10 @@ index d4fffcc5bb746df8dc177780f15ff4dbca64c018..ed30e079c23f564cbd0a45b38586bd12
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 89c90b704045345d0a6d37a032de8483a43a634b..a8ca69a7d1faf1aae1719fd1c125943424e778dd 100644
+index a0c09dd6561c056d989c12e2c9e126cef310ea0d..eaef5277b15f821aa005ac22fca7b74769026dd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1210,13 +1210,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1207,13 +1207,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setRotation(float yaw, float pitch) {
@@ -178,8 +178,8 @@ index 89c90b704045345d0a6d37a032de8483a43a634b..a8ca69a7d1faf1aae1719fd1c1259434
          location.checkFinite();
  
          ServerPlayer entity = this.getHandle();
-@@ -1229,7 +1317,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-            return false;
+@@ -1226,7 +1314,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+             return false;
          }
  
 -        if (entity.isVehicle()) {
@@ -187,7 +187,7 @@ index 89c90b704045345d0a6d37a032de8483a43a634b..a8ca69a7d1faf1aae1719fd1c1259434
              return false;
          }
  
-@@ -1247,7 +1335,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1244,7 +1332,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          // If this player is riding another entity, we must dismount before teleporting.
@@ -196,7 +196,7 @@ index 89c90b704045345d0a6d37a032de8483a43a634b..a8ca69a7d1faf1aae1719fd1c1259434
  
          // SPIGOT-5509: Wakeup, similar to riding
          if (this.isSleeping()) {
-@@ -1263,13 +1351,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1260,13 +1348,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ServerLevel toWorld = ((CraftWorld) to.getWorld()).getHandle();
  
          // Close any foreign inventory
diff --git a/patches/server/0824-Add-EntityPortalReadyEvent.patch b/patches/server/0823-Add-EntityPortalReadyEvent.patch
index 8741a56d25..8741a56d25 100644
--- a/patches/server/0824-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0823-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0825-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0824-Don-t-use-level-random-in-entity-constructors.patch
index d895b4283c..d895b4283c 100644
--- a/patches/server/0825-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0824-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0826-Send-block-entities-after-destroy-prediction.patch b/patches/server/0825-Send-block-entities-after-destroy-prediction.patch
index 0f2280dba0..0f2280dba0 100644
--- a/patches/server/0826-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0825-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0827-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0826-Warn-on-plugins-accessing-faraway-chunks.patch
index 68393ca908..68393ca908 100644
--- a/patches/server/0827-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0826-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0828-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0827-Custom-Chat-Completion-Suggestions-API.patch
index 6af06925ba..a3b65247a8 100644
--- a/patches/server/0828-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0827-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/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a8ca69a7d1faf1aae1719fd1c125943424e778dd..bb8453efee610a7d6b905f4ad57bc68bf8c3535f 100644
+index eaef5277b15f821aa005ac22fca7b74769026dd7..adab5ee4eb2b3ff84ed00ec770fcce1939ba9b9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -650,6 +650,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -647,6 +647,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end - sendOpLevel API
  
diff --git a/patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0828-Add-and-fix-missing-BlockFadeEvents.patch
index 45acbcd56f..45acbcd56f 100644
--- a/patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0828-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0830-Collision-API.patch b/patches/server/0829-Collision-API.patch
index 1a8631fdd2..c6f415c569 100644
--- a/patches/server/0830-Collision-API.patch
+++ b/patches/server/0829-Collision-API.patch
@@ -5,27 +5,27 @@ Subject: [PATCH] Collision API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 9c31a042d2ff82689a4bcc9d90fe08e5f8329985..76d529ad7d1ce543b8f262b3a36f17405cc9da92 100644
+index d46ab8b75fe99e03874539956ca6389d3cdd0641..ec11732b5c3285429aa370c7bed80c3ec5d64d22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -1055,5 +1055,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -533,5 +533,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
  
          return this.getHandle().clip(new net.minecraft.world.level.ClipContext(start, end, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, net.minecraft.world.phys.shapes.CollisionContext.empty())).getType() == net.minecraft.world.phys.HitResult.Type.MISS;
      }
 +
 +    @Override
 +    public boolean hasCollisionsIn(@org.jetbrains.annotations.NotNull org.bukkit.util.BoundingBox boundingBox) {
-+        net.minecraft.world.phys.AABB aabb = new AABB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ(), false);
++        net.minecraft.world.phys.AABB aabb = new net.minecraft.world.phys.AABB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ(), false);
 +
 +        return !this.getHandle().noCollision(aabb);
 +    }
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ed30e079c23f564cbd0a45b38586bd12e17c525e..1075c90e51cfea5823a74c07847545e227968ad2 100644
+index 4f09da9338cb1180f5bfb2048d50392d0b6fb206..eddbf38e8628b509c5b56b74732f22f5e97f332b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1479,4 +1479,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1124,4 +1124,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
      }
      // Paper end
diff --git a/patches/server/0831-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0830-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 391e55a13a..391e55a13a 100644
--- a/patches/server/0831-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0830-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0832-Block-Ticking-API.patch b/patches/server/0831-Block-Ticking-API.patch
index f899661a15..45523d4df5 100644
--- a/patches/server/0832-Block-Ticking-API.patch
+++ b/patches/server/0831-Block-Ticking-API.patch
@@ -31,10 +31,10 @@ index 6d10396347b69d9243ab902ecc68ede93fa17b7d..0a96b00a98227714ef99005e0a223765
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 79c469d461ce9df0994214ebc8b157a095a4c848..28a798e497c2c12794169068e69b56dd954978f3 100644
+index f116f6997562a3ccb1a4830515ea6ee25ce29d77..c6a0fac2ee35056f31b60eebc364c7bda8252d74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -711,4 +711,11 @@ public class CraftBlockData implements BlockData {
+@@ -717,4 +717,11 @@ public class CraftBlockData implements BlockData {
          return speed;
      }
      // Paper end - destroy speed API
diff --git a/patches/server/0833-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0832-Add-Velocity-IP-Forwarding-Support.patch
index 81a27494b0..c0e8eae7c9 100644
--- a/patches/server/0833-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0832-Add-Velocity-IP-Forwarding-Support.patch
@@ -215,10 +215,10 @@ index d52d3808a058b6eef57639f1d455986b9681f645..89b3184be952fd0803520dd0f717f3ac
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7c8d21499d49aa88ad771e98a8e5302d1b3a3229..97a32d1d4bc4042c72c488eee92dff69f8336464 100644
+index 193a1d096bee81d0b51be7253316d326f604caf4..e85439c7124655f0f078ae395bad250fa1d3c88e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -802,7 +802,7 @@ public final class CraftServer implements Server {
+@@ -803,7 +803,7 @@ public final class CraftServer implements Server {
      @Override
      public long getConnectionThrottle() {
          // Spigot Start - Automatically set connection throttle for bungee configurations
diff --git a/patches/server/0834-Add-NamespacedKey-biome-methods.patch b/patches/server/0833-Add-NamespacedKey-biome-methods.patch
index 897f91ee26..897f91ee26 100644
--- a/patches/server/0834-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0833-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0835-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0834-Fix-plugin-loggers-on-server-shutdown.patch
index dd919dfb20..dd919dfb20 100644
--- a/patches/server/0835-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0834-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0836-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0835-Stop-large-look-changes-from-crashing-the-server.patch
index 128f6b1226..128f6b1226 100644
--- a/patches/server/0836-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0835-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0837-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0836-Fire-EntityChangeBlockEvent-in-more-places.patch
index 68bb448890..68bb448890 100644
--- a/patches/server/0837-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0836-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0838-Missing-eating-regain-reason.patch b/patches/server/0837-Missing-eating-regain-reason.patch
index e04644ebf1..e04644ebf1 100644
--- a/patches/server/0838-Missing-eating-regain-reason.patch
+++ b/patches/server/0837-Missing-eating-regain-reason.patch
diff --git a/patches/server/0839-Missing-effect-cause.patch b/patches/server/0838-Missing-effect-cause.patch
index 2e4ef13ae7..2e4ef13ae7 100644
--- a/patches/server/0839-Missing-effect-cause.patch
+++ b/patches/server/0838-Missing-effect-cause.patch
diff --git a/patches/server/0840-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0839-Added-byte-array-serialization-deserialization-for-P.patch
index 03ee249744..03ee249744 100644
--- a/patches/server/0840-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0839-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0841-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0840-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index b377321cea..4f1349e559 100644
--- a/patches/server/0841-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0840-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 68d827b95a67f2fb65ed806221bb4e7e906a05f4..bd58fdd7001e41418f4bbc881274814cf9fe79c3 100644
+index d8977cc464e477bb679f597bde8b0e6f3f3cfa24..fc66fb79144c9654f7d38841927b143787395b61 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -510,8 +510,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -509,8 +509,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      }
  
      @Override
@@ -25,7 +25,7 @@ index 68d827b95a67f2fb65ed806221bb4e7e906a05f4..bd58fdd7001e41418f4bbc881274814c
          Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation");
  
          net.minecraft.world.level.Level world = ((CraftWorld) this.getWorld()).getHandle();
-@@ -598,6 +605,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -597,6 +604,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          if (velocity != null) {
              ((T) launch.getBukkitEntity()).setVelocity(velocity);
          }
diff --git a/patches/server/0842-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0841-Call-BlockPhysicsEvent-more-often.patch
index ea04c3e249..ea04c3e249 100644
--- a/patches/server/0842-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0841-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0843-Configurable-chat-thread-limit.patch b/patches/server/0842-Configurable-chat-thread-limit.patch
index 5e312d3a14..5e312d3a14 100644
--- a/patches/server/0843-Configurable-chat-thread-limit.patch
+++ b/patches/server/0842-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0844-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0843-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 5601e80875..5601e80875 100644
--- a/patches/server/0844-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0843-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0845-fix-Jigsaw-block-kicking-user.patch b/patches/server/0844-fix-Jigsaw-block-kicking-user.patch
index 2972f2f48c..2972f2f48c 100644
--- a/patches/server/0845-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0844-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0846-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0845-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 443d960dbb..443d960dbb 100644
--- a/patches/server/0846-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0845-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0847-Add-getDrops-to-BlockState.patch b/patches/server/0846-Add-getDrops-to-BlockState.patch
index f1c9e20197..f1c9e20197 100644
--- a/patches/server/0847-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0846-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0848-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0847-Fix-a-bunch-of-vanilla-bugs.patch
index 507aa830ad..1650c4b687 100644
--- a/patches/server/0848-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0847-Fix-a-bunch-of-vanilla-bugs.patch
@@ -48,9 +48,6 @@ https://bugs.mojang.com/browse/MC-123848
   by: BillyGalbreath <[email protected]>
   Fixes item frames dropping items above when pointing down
 
-https://bugs.mojang.com/browse/MC-264285
-  Fix unbreakable flint and steel being consumed when igniting creepers
-
 https://bugs.mojang.com/browse/MC-84789
   Fix wild wolves not considering bones interesting
 
@@ -319,19 +316,6 @@ index 63ef00eb6f93a471de1e9c2355099d9dd3a71dd9..6849429c3577f36eb699083375824ae5
      private void removeFramedMap(ItemStack itemstack) {
          this.getFramedMapId().ifPresent((i) -> {
              MapItemSavedData worldmap = MapItem.getSavedData(i, this.level());
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 7fe90ebc8eced53f72c7f935e40745075f02421b..fd1b5a1beea7594fa65decfdcccfa15781fc005b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -248,7 +248,7 @@ public class Creeper extends Monster implements PowerableMob {
-             this.level().playSound(player, this.getX(), this.getY(), this.getZ(), soundeffect, this.getSoundSource(), 1.0F, this.random.nextFloat() * 0.4F + 0.8F);
-             if (!this.level().isClientSide) {
-                 this.ignite();
--                if (!itemstack.isDamageableItem()) {
-+                if (itemstack.getItem().getMaxDamage() == 0) { // Paper - fix MC-264285, only shrink the stack if the item type actually has no durability
-                     itemstack.shrink(1);
-                 } else {
-                     itemstack.hurtAndBreak(1, player, (entityhuman1) -> {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
 index f174094febfdfdc309f1b50877be60bae8a98156..5f407535298a31a34cfe114dd863fd6a9b977707 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
diff --git a/patches/server/0849-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0848-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 9a13680600..9a13680600 100644
--- a/patches/server/0849-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0848-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0850-Fix-custom-piglin-loved-items.patch b/patches/server/0849-Fix-custom-piglin-loved-items.patch
index 41c934194f..41c934194f 100644
--- a/patches/server/0850-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0849-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0851-EntityPickupItemEvent-fixes.patch b/patches/server/0850-EntityPickupItemEvent-fixes.patch
index ac3383dced..ac3383dced 100644
--- a/patches/server/0851-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0850-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0852-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0851-Correctly-handle-interactions-with-items-on-cooldown.patch
index 9846be7ee8..a6e2105024 100644
--- a/patches/server/0852-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0851-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -30,10 +30,10 @@ index 805c9b9b0e89002b97e1e11e1e6e2435315b8f2c..f58386e952d29a16d160b628a23efbe1
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2b0a969b185dd959067d8828254f9c48f5b49161..1854933bb3400f44da835364edda51d430da2160 100644
+index 72a33f9e981d7a5e9a30a7ea8ef2a970c986cece..5d1a2d90363596801b043f8ef11a74c1ee6ae166 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -546,7 +546,13 @@ public class CraftEventFactory {
+@@ -543,7 +543,13 @@ public class CraftEventFactory {
          return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, false, hand, null);
      }
  
@@ -47,7 +47,7 @@ index 2b0a969b185dd959067d8828254f9c48f5b49161..1854933bb3400f44da835364edda51d4
          Player player = (who == null) ? null : (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
  
-@@ -581,6 +587,11 @@ public class CraftEventFactory {
+@@ -578,6 +584,11 @@ public class CraftEventFactory {
          if (cancelledBlock) {
              event.setUseInteractedBlock(Event.Result.DENY);
          }
diff --git a/patches/server/0853-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0852-Add-PlayerInventorySlotChangeEvent.patch
index 97b8e694c5..97b8e694c5 100644
--- a/patches/server/0853-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0852-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0854-Elder-Guardian-appearance-API.patch b/patches/server/0853-Elder-Guardian-appearance-API.patch
index 47e86cd523..d0a3071093 100644
--- a/patches/server/0854-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0853-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bb8453efee610a7d6b905f4ad57bc68bf8c3535f..1d32c0e3aca96b52899dc3734ea927820b7229c0 100644
+index adab5ee4eb2b3ff84ed00ec770fcce1939ba9b9a..936ecf12fb3fc9c4d62cfc4dfed0bd02af46ac41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3152,6 +3152,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3162,6 +3162,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0855-Allow-changing-bed-s-occupied-property.patch b/patches/server/0854-Allow-changing-bed-s-occupied-property.patch
index f1d50caf78..f1d50caf78 100644
--- a/patches/server/0855-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0854-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0856-Add-entity-knockback-API.patch b/patches/server/0855-Add-entity-knockback-API.patch
index 1fcd00b6ec..06574e2f11 100644
--- a/patches/server/0856-Add-entity-knockback-API.patch
+++ b/patches/server/0855-Add-entity-knockback-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index bd58fdd7001e41418f4bbc881274814cf9fe79c3..3e99b80bb8d20198e905b18985941e3d32121e5d 100644
+index fc66fb79144c9654f7d38841927b143787395b61..3fdab42e24a660b437c2e9a3d49f583c758f0156 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1037,5 +1037,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1036,5 +1036,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
          throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
diff --git a/patches/server/0857-Detect-headless-JREs.patch b/patches/server/0856-Detect-headless-JREs.patch
index a686a1859b..a686a1859b 100644
--- a/patches/server/0857-Detect-headless-JREs.patch
+++ b/patches/server/0856-Detect-headless-JREs.patch
diff --git a/patches/server/0858-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0857-fixed-entity-vehicle-collision-event-not-called.patch
index d24d5b3681..d24d5b3681 100644
--- a/patches/server/0858-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0857-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0859-optimized-dirt-and-snow-spreading.patch b/patches/server/0858-optimized-dirt-and-snow-spreading.patch
index e2c360d692..e2c360d692 100644
--- a/patches/server/0859-optimized-dirt-and-snow-spreading.patch
+++ b/patches/server/0858-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0860-Added-EntityToggleSitEvent.patch b/patches/server/0859-Added-EntityToggleSitEvent.patch
index 69127e6467..69127e6467 100644
--- a/patches/server/0860-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0859-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0861-Add-fire-tick-delay-option.patch b/patches/server/0860-Add-fire-tick-delay-option.patch
index a18fb56ba7..a18fb56ba7 100644
--- a/patches/server/0861-Add-fire-tick-delay-option.patch
+++ b/patches/server/0860-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0862-Add-Moving-Piston-API.patch b/patches/server/0861-Add-Moving-Piston-API.patch
index b0b64257f1..b0b64257f1 100644
--- a/patches/server/0862-Add-Moving-Piston-API.patch
+++ b/patches/server/0861-Add-Moving-Piston-API.patch
diff --git a/patches/server/0863-Ignore-impossible-spawn-tick.patch b/patches/server/0862-Ignore-impossible-spawn-tick.patch
index fb255aaec0..fb255aaec0 100644
--- a/patches/server/0863-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0862-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0864-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0863-Track-projectile-source-for-fireworks-from-dispenser.patch
index aa366ccef9..aa366ccef9 100644
--- a/patches/server/0864-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0863-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0865-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0864-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index a840f9a576..a840f9a576 100644
--- a/patches/server/0865-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0864-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0866-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0865-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index b222f94c0e..b222f94c0e 100644
--- a/patches/server/0866-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0865-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0867-Prevent-compass-from-loading-chunks.patch b/patches/server/0866-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0867-Prevent-compass-from-loading-chunks.patch
+++ b/patches/server/0866-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0868-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0867-Add-PrePlayerAttackEntityEvent.patch
index ede93986e1..ede93986e1 100644
--- a/patches/server/0868-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0867-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0869-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0868-ensure-reset-EnderDragon-boss-event-name.patch
index 6107fe92f8..6107fe92f8 100644
--- a/patches/server/0869-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0868-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0870-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0869-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 02dc8427c2..02dc8427c2 100644
--- a/patches/server/0870-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0869-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0871-Add-Player-Warden-Warning-API.patch b/patches/server/0870-Add-Player-Warden-Warning-API.patch
index 6971eb5a91..9625090e91 100644
--- a/patches/server/0871-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0870-Add-Player-Warden-Warning-API.patch
@@ -10,10 +10,10 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1d32c0e3aca96b52899dc3734ea927820b7229c0..59c5c752f8a98dd20a42961045ced69c5e640f7f 100644
+index 936ecf12fb3fc9c4d62cfc4dfed0bd02af46ac41..7caf184a658b1307e342471ab000c2a8b5352e0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3157,6 +3157,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3167,6 +3167,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void showElderGuardian(boolean silent) {
          if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
      }
diff --git a/patches/server/0872-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0871-More-vanilla-friendly-methods-to-update-trades.patch
index fef9414a8f..fef9414a8f 100644
--- a/patches/server/0872-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0871-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0873-Add-paper-dumplisteners-command.patch b/patches/server/0872-Add-paper-dumplisteners-command.patch
index 9669276c0a..9669276c0a 100644
--- a/patches/server/0873-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0872-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0874-check-global-player-list-where-appropriate.patch b/patches/server/0873-check-global-player-list-where-appropriate.patch
index 16808c9719..16808c9719 100644
--- a/patches/server/0874-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0873-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0875-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0874-Fix-async-entity-add-due-to-fungus-trees.patch
index 52867ed817..4fc48254a8 100644
--- a/patches/server/0875-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0874-Fix-async-entity-add-due-to-fungus-trees.patch
@@ -17,10 +17,10 @@ index 49c7825156afd053df1b7721a63070b51427aff2..14a5492428eac823a295ef3746d0aca6
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 76d529ad7d1ce543b8f262b3a36f17405cc9da92..866fd29fe52d7eec4e72db400a05645eb8984a2b 100644
+index ec11732b5c3285429aa370c7bed80c3ec5d64d22..45fd28f26aa2e53785919abbfe42bb237131e453 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -405,10 +405,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -257,10 +257,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
                  ((ChorusFlowerBlock) Blocks.CHORUS_FLOWER).generatePlant(access, pos, random, 8);
                  return true;
              case CRIMSON_FUNGUS:
diff --git a/patches/server/0876-ItemStack-damage-API.patch b/patches/server/0875-ItemStack-damage-API.patch
index c5fd883258..cb9b0f6c2d 100644
--- a/patches/server/0876-ItemStack-damage-API.patch
+++ b/patches/server/0875-ItemStack-damage-API.patch
@@ -11,10 +11,10 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3e99b80bb8d20198e905b18985941e3d32121e5d..14ff9f9951bbb567ad76198477d61d22d522dac9 100644
+index 3fdab42e24a660b437c2e9a3d49f583c758f0156..1af42e8f5161a24e908bf6bf5b29e0163e18082c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1038,6 +1038,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1037,6 +1037,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
  
diff --git a/patches/server/0877-Friction-API.patch b/patches/server/0876-Friction-API.patch
index 3311783f69..1effce0f64 100644
--- a/patches/server/0877-Friction-API.patch
+++ b/patches/server/0876-Friction-API.patch
@@ -132,10 +132,10 @@ index b1bbab951ef9a3d2bd98cc54665ba824263542eb..81498941748d646ebe6495f4a7ce6953
      public int getHealth() {
          return this.getHandle().health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 14ff9f9951bbb567ad76198477d61d22d522dac9..edb086d479f2485b3ec7a6fffe2c7e4a15f0c319 100644
+index 1af42e8f5161a24e908bf6bf5b29e0163e18082c..94f65fdc4e5657cc765bf63710621c2d24b7b27b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1085,6 +1085,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1084,6 +1084,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          });
      }
  
diff --git a/patches/server/0878-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0877-Ability-to-control-player-s-insomnia-and-phantoms.patch
index c5ec7d4e2f..c5ec7d4e2f 100644
--- a/patches/server/0878-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0877-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0879-Fix-player-kick-on-shutdown.patch b/patches/server/0878-Fix-player-kick-on-shutdown.patch
index 236f62d6c1..236f62d6c1 100644
--- a/patches/server/0879-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0878-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0880-Sync-offhand-slot-in-menus.patch b/patches/server/0879-Sync-offhand-slot-in-menus.patch
index 2dc65d0d3e..2dc65d0d3e 100644
--- a/patches/server/0880-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0879-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0881-Player-Entity-Tracking-Events.patch b/patches/server/0880-Player-Entity-Tracking-Events.patch
index 7deeb6f655..7deeb6f655 100644
--- a/patches/server/0881-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0880-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0882-Limit-pet-look-distance.patch b/patches/server/0881-Limit-pet-look-distance.patch
index 6b827724a3..6b827724a3 100644
--- a/patches/server/0882-Limit-pet-look-distance.patch
+++ b/patches/server/0881-Limit-pet-look-distance.patch
diff --git a/patches/server/0883-Properly-resend-entities.patch b/patches/server/0882-Properly-resend-entities.patch
index 3bc49c2536..585510d991 100644
--- a/patches/server/0883-Properly-resend-entities.patch
+++ b/patches/server/0882-Properly-resend-entities.patch
@@ -125,10 +125,10 @@ index 37596c7b65f280be00e8e59ae18bd1aceae21080..eca18540aeb0b0d4098477d73b14c78a
              }
              entity.playSound(((Bucketable) entity).getPickupSound(), 1.0F, 1.0F);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1075c90e51cfea5823a74c07847545e227968ad2..c0f11fb8de8c15f8b07023fc05a7856413bc8036 100644
+index eddbf38e8628b509c5b56b74732f22f5e97f332b..674915ea22d6bdbe85c84687a33d27656b4d39fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1302,7 +1302,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -947,7 +947,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return;
          }
  
diff --git a/patches/server/0884-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0883-Fixes-and-additions-to-the-SpawnReason-API.patch
index 4bdb479cd7..4bdb479cd7 100644
--- a/patches/server/0884-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0883-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0885-fix-Instruments.patch b/patches/server/0884-fix-Instruments.patch
index 9d74161588..8c3e9f6e56 100644
--- a/patches/server/0885-fix-Instruments.patch
+++ b/patches/server/0884-fix-Instruments.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 59c5c752f8a98dd20a42961045ced69c5e640f7f..46f6e1d3a87617440e1855580a2e20ea106a0216 100644
+index 7caf184a658b1307e342471ab000c2a8b5352e0e..cf0d420747f4004e80553c783e29226cdb848c5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -727,7 +727,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -724,7 +724,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Sound instrumentSound = instrument.getSound();
          if (instrumentSound == null) return;
  
diff --git a/patches/server/0886-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0885-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index e454a32d6d..e454a32d6d 100644
--- a/patches/server/0886-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0885-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0887-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0886-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 0b3ae447f6..0b3ae447f6 100644
--- a/patches/server/0887-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0886-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0888-Add-BlockLockCheckEvent.patch b/patches/server/0887-Add-BlockLockCheckEvent.patch
index 860cae73de..860cae73de 100644
--- a/patches/server/0888-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0887-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0889-Add-Sneaking-API-for-Entities.patch b/patches/server/0888-Add-Sneaking-API-for-Entities.patch
index 1ef0037098..9146d45051 100644
--- a/patches/server/0889-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0888-Add-Sneaking-API-for-Entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Sneaking API for Entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c0f11fb8de8c15f8b07023fc05a7856413bc8036..908da9217c6553301c22ca0415924d2aebe993ef 100644
+index 674915ea22d6bdbe85c84687a33d27656b4d39fa..e2d3c81790cbbc514cc4bb045d8565c56fb75e4a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1226,6 +1226,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -871,6 +871,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return Pose.values()[this.getHandle().getPose().ordinal()];
      }
  
diff --git a/patches/server/0890-Improve-logging-and-errors.patch b/patches/server/0889-Improve-logging-and-errors.patch
index 0f6d3a7501..0f6d3a7501 100644
--- a/patches/server/0890-Improve-logging-and-errors.patch
+++ b/patches/server/0889-Improve-logging-and-errors.patch
diff --git a/patches/server/0891-Improve-PortalEvents.patch b/patches/server/0890-Improve-PortalEvents.patch
index e4cfe4be44..e4cfe4be44 100644
--- a/patches/server/0891-Improve-PortalEvents.patch
+++ b/patches/server/0890-Improve-PortalEvents.patch
diff --git a/patches/server/0892-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0891-Add-config-option-for-spider-worldborder-climbing.patch
index 10224d6629..10224d6629 100644
--- a/patches/server/0892-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0891-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0893-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0892-Add-missing-SpigotConfig-logCommands-check.patch
index 70205aaf05..70205aaf05 100644
--- a/patches/server/0893-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0892-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0894-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0893-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0894-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0893-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0895-Flying-Fall-Damage.patch b/patches/server/0894-Flying-Fall-Damage.patch
index 346011c78e..adb6852410 100644
--- a/patches/server/0895-Flying-Fall-Damage.patch
+++ b/patches/server/0894-Flying-Fall-Damage.patch
@@ -26,10 +26,10 @@ index 28fa46f29639a6b643b475912133d601028facb2..7f3466340891b4409d1399ebeb2ca865
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 46f6e1d3a87617440e1855580a2e20ea106a0216..b2b3b0fef761a4a096af35258d168f0e5eb5b58f 100644
+index cf0d420747f4004e80553c783e29226cdb848c5a..de261416f6746f32388f373030f09b867edd2b9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2434,6 +2434,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2444,6 +2444,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().onUpdateAbilities();
      }
  
diff --git a/patches/server/0896-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0895-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index f3bf07ddaf..8186bbed81 100644
--- a/patches/server/0896-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0895-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
@@ -130,10 +130,10 @@ index 000724a070f7f053c14cb53ecc45f0ee14454c53..9271ff2a9ea05569e3c81886399aa7ab
      // See BlockStateFactory#createBlockState(World, BlockPosition, IBlockData, TileEntity)
      private static CraftBlockState getBlockState(World world, BlockPos blockPosition, net.minecraft.world.level.block.state.BlockState blockData, BlockEntity tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1854933bb3400f44da835364edda51d430da2160..6b49ae3b64bc2b62996e5d82c8cf81c94c2e7578 100644
+index 5d1a2d90363596801b043f8ef11a74c1ee6ae166..0d488d4553ee604081fb481f4d89ec04882e83ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1048,7 +1048,7 @@ public class CraftEventFactory {
+@@ -1045,7 +1045,7 @@ public class CraftEventFactory {
              CraftEventFactory.entityDamage = null;
              EntityDamageEvent event;
              if (damager == null) {
diff --git a/patches/server/0897-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0896-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 8ef515d686..8ef515d686 100644
--- a/patches/server/0897-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0896-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0898-config-for-disabling-entity-tag-tags.patch b/patches/server/0897-config-for-disabling-entity-tag-tags.patch
index e97b239097..e97b239097 100644
--- a/patches/server/0898-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0897-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0899-Use-single-player-info-update-packet-on-join.patch b/patches/server/0898-Use-single-player-info-update-packet-on-join.patch
index 2043f5795b..2043f5795b 100644
--- a/patches/server/0899-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0898-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0900-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0899-Correctly-shrink-items-during-EntityResurrectEvent.patch
index a5fbba3317..a5fbba3317 100644
--- a/patches/server/0900-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0899-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0901-Win-Screen-API.patch b/patches/server/0900-Win-Screen-API.patch
index 2434be446a..9648c2550a 100644
--- a/patches/server/0901-Win-Screen-API.patch
+++ b/patches/server/0900-Win-Screen-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b2b3b0fef761a4a096af35258d168f0e5eb5b58f..975961b230de5138de73723d318adf7e9fe8eeb6 100644
+index de261416f6746f32388f373030f09b867edd2b9a..0359969cd950649031ce5d4120e865507844b4b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1229,6 +1229,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1226,6 +1226,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0902-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0901-Remove-CraftItemStack-setAmount-null-assignment.patch
index 2cc8370e15..2cc8370e15 100644
--- a/patches/server/0902-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0901-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0903-Fix-force-opening-enchantment-tables.patch b/patches/server/0902-Fix-force-opening-enchantment-tables.patch
index 4bc99d0580..b258d63751 100644
--- a/patches/server/0903-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0902-Fix-force-opening-enchantment-tables.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix force-opening enchantment tables
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 1bfd3f66bf5f269685774b7cd75112ba3429c484..15b6f7cfd9d7dcabe4e69a017d6b22dd14584b99 100644
+index 7ce6d05b99cce1672ce397b5ce64d266f68a8cae..4e2e16a7c40f69ff79979a7b580364224c64585f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -403,7 +403,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -402,7 +402,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
  
          // If there isn't an enchant table we can force create one, won't be very useful though.
          BlockPos pos = CraftLocation.toBlockPosition(location);
diff --git a/patches/server/0904-Add-Entity-Body-Yaw-API.patch b/patches/server/0903-Add-Entity-Body-Yaw-API.patch
index f368bd7003..da49b27ec3 100644
--- a/patches/server/0904-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0903-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/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 908da9217c6553301c22ca0415924d2aebe993ef..fd2af6fefb990181a06de7864ea8a229c2a84bc4 100644
+index e2d3c81790cbbc514cc4bb045d8565c56fb75e4a..96579becd1d21a4288a6f8fc5980c04cd1934f78 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1494,6 +1494,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1139,6 +1139,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isInPowderedSnow() {
          return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
      }
@@ -41,10 +41,10 @@ index 908da9217c6553301c22ca0415924d2aebe993ef..fd2af6fefb990181a06de7864ea8a229
      // Paper Start - Collision API
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index edb086d479f2485b3ec7a6fffe2c7e4a15f0c319..c7381ceae2d15738b72d6bb48ea7d40f7de11c3e 100644
+index 94f65fdc4e5657cc765bf63710621c2d24b7b27b..bd616462bc65063bd19683aa1674072a6f7da94a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1077,6 +1077,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1076,6 +1076,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot);
      }
  
diff --git a/patches/server/0905-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0904-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0905-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0904-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0906-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0905-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 10e3a02f03..10e3a02f03 100644
--- a/patches/server/0906-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0905-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0907-Add-EntityFertilizeEggEvent.patch b/patches/server/0906-Add-EntityFertilizeEggEvent.patch
index be2678238a..ac703119d1 100644
--- a/patches/server/0907-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0906-Add-EntityFertilizeEggEvent.patch
@@ -69,10 +69,10 @@ index 36b3945832733b5ad66d25aa3a31335234d2acff..47a5125e44cea1ece84657cdb874807f
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
          } // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6b49ae3b64bc2b62996e5d82c8cf81c94c2e7578..4f4e58d900d6fa0e437acee0eb600ba4a9e842c4 100644
+index 0d488d4553ee604081fb481f4d89ec04882e83ac..6570b9c2043a549c0dba71f2683f64300d7b3bfe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2095,4 +2095,29 @@ public class CraftEventFactory {
+@@ -2092,4 +2092,29 @@ public class CraftEventFactory {
          return event.callEvent();
      }
      // Paper end
diff --git a/patches/server/0908-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0907-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 543615dd57..9e8f8139fb 100644
--- a/patches/server/0908-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0907-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix HumanEntity#drop not updating the client inv
 public net.minecraft.server.level.ServerPlayer containerSynchronizer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 15b6f7cfd9d7dcabe4e69a017d6b22dd14584b99..c6b3bc218ac440cc66dee97c21b3db4ad86938be 100644
+index 4e2e16a7c40f69ff79979a7b580364224c64585f..e0ab2124b339d0053a1d075204ca1070be572e75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -756,8 +756,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -755,8 +755,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
      // Paper end
      @Override
      public boolean dropItem(boolean dropAll) {
diff --git a/patches/server/0909-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0908-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index efa34d8b7c..efa34d8b7c 100644
--- a/patches/server/0909-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0908-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0910-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0909-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0910-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0909-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0911-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0910-Fix-advancement-triggers-for-entity-damage.patch
index a12dbbcc1a..a12dbbcc1a 100644
--- a/patches/server/0911-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0910-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0912-Fix-text-display-error-on-spawn.patch b/patches/server/0911-Fix-text-display-error-on-spawn.patch
index 359b41bd67..359b41bd67 100644
--- a/patches/server/0912-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0911-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0913-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0912-Fix-certain-inventories-returning-null-Locations.patch
index 47b96132fa..47b96132fa 100644
--- a/patches/server/0913-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/server/0912-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0914-Add-Shearable-API.patch b/patches/server/0913-Add-Shearable-API.patch
index 0cd904ff9d..0cd904ff9d 100644
--- a/patches/server/0914-Add-Shearable-API.patch
+++ b/patches/server/0913-Add-Shearable-API.patch
diff --git a/patches/server/0915-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0914-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 682696f502..682696f502 100644
--- a/patches/server/0915-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0914-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0916-Optimize-Hoppers.patch b/patches/server/0915-Optimize-Hoppers.patch
index 096267e230..096267e230 100644
--- a/patches/server/0916-Optimize-Hoppers.patch
+++ b/patches/server/0915-Optimize-Hoppers.patch
diff --git a/patches/server/0917-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0916-Fix-beehives-generating-from-using-bonemeal.patch
index 05f26545e4..05f26545e4 100644
--- a/patches/server/0917-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0916-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0918-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0917-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 6bd28ec0d8..6bd28ec0d8 100644
--- a/patches/server/0918-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0917-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0919-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0918-Treat-sequence-violations-like-they-should-be.patch
index 2fda1635ac..2fda1635ac 100644
--- a/patches/server/0919-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0918-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0920-remove-duplicate-animate-packet-for-records.patch b/patches/server/0919-remove-duplicate-animate-packet-for-records.patch
index 9254f5b8cf..9254f5b8cf 100644
--- a/patches/server/0920-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0919-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0921-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0920-Prevent-causing-expired-keys-from-impacting-new-join.patch
index cdcb6012dd..cdcb6012dd 100644
--- a/patches/server/0921-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0920-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0922-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0921-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index fcb9da83f3..fcb9da83f3 100644
--- a/patches/server/0922-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0921-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0923-Use-array-for-gamerule-storage.patch b/patches/server/0922-Use-array-for-gamerule-storage.patch
index 6750b6a93a..6750b6a93a 100644
--- a/patches/server/0923-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0922-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0924-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0923-Fix-a-couple-of-upstream-bed-issues.patch
index 6f14d13eb0..6f14d13eb0 100644
--- a/patches/server/0924-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0923-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0925-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0924-Fix-demo-flag-not-enabling-demo-mode.patch
index 7810e020e8..7810e020e8 100644
--- a/patches/server/0925-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0924-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0926-Add-Mob-Experience-reward-API.patch b/patches/server/0925-Add-Mob-Experience-reward-API.patch
index f8e4f5e754..f8e4f5e754 100644
--- a/patches/server/0926-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0925-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0927-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0926-Break-redstone-on-top-of-trap-doors-early.patch
index 905055e24f..905055e24f 100644
--- a/patches/server/0927-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0926-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0928-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0927-Fix-DamageCause-for-Falling-Blocks.patch
index dd2af9d821..37456569e2 100644
--- a/patches/server/0928-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0927-Fix-DamageCause-for-Falling-Blocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4f4e58d900d6fa0e437acee0eb600ba4a9e842c4..cb2c5c54668cc83e2b0019462be89a1928924b4b 100644
+index 6570b9c2043a549c0dba71f2683f64300d7b3bfe..8d423a7ace9c140119dd49866c3a4c42017cfb60 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1088,6 +1088,11 @@ public class CraftEventFactory {
+@@ -1085,6 +1085,11 @@ public class CraftEventFactory {
              } else if (source.is(DamageTypes.SONIC_BOOM)) {
                  cause = DamageCause.SONIC_BOOM;
              }
diff --git a/patches/server/0929-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0928-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0929-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0928-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0930-More-accurate-isInOpenWater-impl.patch b/patches/server/0929-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0930-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0929-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0931-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0930-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 2127f28b00..2127f28b00 100644
--- a/patches/server/0931-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0930-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0932-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0931-Optimise-recalcBlockCounts-for-empty-sections.patch
index 0e23a9a123..0e23a9a123 100644
--- a/patches/server/0932-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0931-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0933-Expand-PlayerItemMendEvent.patch b/patches/server/0932-Expand-PlayerItemMendEvent.patch
index ca1da3876a..bea46cc259 100644
--- a/patches/server/0933-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0932-Expand-PlayerItemMendEvent.patch
@@ -33,10 +33,10 @@ index cab5636fe6be9ee7f23ffbd5a399d2aeea1cd538..fb74f13ab2a977224e843a468ea8c72d
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 975961b230de5138de73723d318adf7e9fe8eeb6..70a75170fb6516ab143b8e4da6d453876b02942d 100644
+index 0359969cd950649031ce5d4120e865507844b4b2..77329a16b9208c0cefe22875f3c2b55e051f1744 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1751,11 +1751,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1748,11 +1748,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ());
  
              int i = Math.min(orb.xpToDurability(amount), itemstack.getDamageValue());
@@ -51,10 +51,10 @@ index 975961b230de5138de73723d318adf7e9fe8eeb6..70a75170fb6516ab143b8e4da6d45387
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index cb2c5c54668cc83e2b0019462be89a1928924b4b..4c14bcf9396b4ee9649c4647b485797f6fce06f3 100644
+index 8d423a7ace9c140119dd49866c3a4c42017cfb60..864ff2d3c8e2e2bef744e8048ba0cdbb42787268 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1324,10 +1324,10 @@ public class CraftEventFactory {
+@@ -1321,10 +1321,10 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0934-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0933-Refresh-ProjectileSource-for-projectiles.patch
index aecbbce494..aecbbce494 100644
--- a/patches/server/0934-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0933-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0935-Add-transient-modifier-API.patch b/patches/server/0934-Add-transient-modifier-API.patch
index 8144e5dc44..8144e5dc44 100644
--- a/patches/server/0935-Add-transient-modifier-API.patch
+++ b/patches/server/0934-Add-transient-modifier-API.patch
diff --git a/patches/server/0936-Fix-block-place-logic.patch b/patches/server/0935-Fix-block-place-logic.patch
index 8c7f0376e1..8c7f0376e1 100644
--- a/patches/server/0936-Fix-block-place-logic.patch
+++ b/patches/server/0935-Fix-block-place-logic.patch
diff --git a/patches/server/0937-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0936-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 432233fa2b..432233fa2b 100644
--- a/patches/server/0937-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0936-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0938-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0937-Ignore-inline-definitions-of-trim-material-pattern.patch
index 2b71534642..2b71534642 100644
--- a/patches/server/0938-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ b/patches/server/0937-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0939-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0938-Call-BlockGrowEvent-for-missing-blocks.patch
index a3c48d3fff..a3c48d3fff 100644
--- a/patches/server/0939-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0938-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0940-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0939-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 404b63c45b..5108d60fea 100644
--- a/patches/server/0940-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0939-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 97a32d1d4bc4042c72c488eee92dff69f8336464..d1d81ad90ee1c007b46c9afd1f4e918af2834d38 100644
+index e85439c7124655f0f078ae395bad250fa1d3c88e..940f79b4456e94fd15b3e6eec38e8fa59ab01d14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -356,7 +356,11 @@ public final class CraftServer implements Server {
+@@ -352,7 +352,11 @@ public final class CraftServer implements Server {
          }
          this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
          this.commandsConfiguration.options().copyDefaults(true);
diff --git a/patches/server/0941-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0940-fix-MapLike-spam-for-missing-key-selector.patch
index 2fee78531f..2fee78531f 100644
--- a/patches/server/0941-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0940-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0942-Fix-sniffer-removeExploredLocation.patch b/patches/server/0941-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0942-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0941-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0943-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0942-Add-method-to-remove-all-active-potion-effects.patch
index 51910df176..b8aecb78a0 100644
--- a/patches/server/0943-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0942-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c7381ceae2d15738b72d6bb48ea7d40f7de11c3e..ba2cd9c4cdbd5ddab1300320d7e0ede4d4b7a31a 100644
+index bd616462bc65063bd19683aa1674072a6f7da94a..25ffc92c3d6055285a64d9fe36c0054228fe81dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -504,6 +504,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -503,6 +503,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return effects;
      }
  
diff --git a/patches/server/0944-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0943-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
index f54a8ab1ea..f54a8ab1ea 100644
--- a/patches/server/0944-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ b/patches/server/0943-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0945-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0944-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index cfcf15909a..cfcf15909a 100644
--- a/patches/server/0945-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0944-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0946-Properly-Cancel-Usable-Items.patch b/patches/server/0945-Properly-Cancel-Usable-Items.patch
index bf1aac71a2..bf1aac71a2 100644
--- a/patches/server/0946-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0945-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0947-Add-event-for-player-editing-sign.patch b/patches/server/0946-Add-event-for-player-editing-sign.patch
index b00e7135b0..b00e7135b0 100644
--- a/patches/server/0947-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0946-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0948-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0947-Only-tick-item-frames-if-players-can-see-it.patch
index b3de8c9a7c..b3de8c9a7c 100644
--- a/patches/server/0948-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0947-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0949-Improve-command-function-perm-level-checks.patch b/patches/server/0948-Improve-command-function-perm-level-checks.patch
index 3413470663..3413470663 100644
--- a/patches/server/0949-Improve-command-function-perm-level-checks.patch
+++ b/patches/server/0948-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0950-Add-option-to-disable-block-updates.patch b/patches/server/0949-Add-option-to-disable-block-updates.patch
index e10753047a..e10753047a 100644
--- a/patches/server/0950-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0949-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0951-Call-missing-BlockDispenseEvent.patch b/patches/server/0950-Call-missing-BlockDispenseEvent.patch
index 5fc247ae54..67c9651ff8 100644
--- a/patches/server/0951-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0950-Call-missing-BlockDispenseEvent.patch
@@ -50,10 +50,10 @@ index dd017c33ff89a516022378160410bc41cce9222e..105bb94b844c5ee85b53aca95360e7b2
                              for (int k = 0; k < 5; ++k) {
                                  worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4c14bcf9396b4ee9649c4647b485797f6fce06f3..e4551a6d984928457af4fb6cc2d0bf3673ef8fb1 100644
+index 864ff2d3c8e2e2bef744e8048ba0cdbb42787268..c62396041c1546f3136ab6de3b174983f49287b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2101,6 +2101,32 @@ public class CraftEventFactory {
+@@ -2098,6 +2098,32 @@ public class CraftEventFactory {
      }
      // Paper end
  
diff --git a/patches/server/0952-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0951-Don-t-load-chunks-for-supporting-block-checks.patch
index 87c1a77544..87c1a77544 100644
--- a/patches/server/0952-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0951-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0953-Optimize-player-lookups-for-beacons.patch b/patches/server/0952-Optimize-player-lookups-for-beacons.patch
index 5245e38833..5245e38833 100644
--- a/patches/server/0953-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0952-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0954-Add-Sign-getInteractableSideFor.patch b/patches/server/0953-Add-Sign-getInteractableSideFor.patch
index 4f30795f22..4f30795f22 100644
--- a/patches/server/0954-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0953-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0955-Array-backed-synched-entity-data.patch b/patches/server/0954-Array-backed-synched-entity-data.patch
index 84bf2095b4..84bf2095b4 100644
--- a/patches/server/0955-Array-backed-synched-entity-data.patch
+++ b/patches/server/0954-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0956-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0955-fix-item-meta-for-tadpole-buckets.patch
index 4d1c012286..4d1c012286 100644
--- a/patches/server/0956-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0955-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0957-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0956-Suppress-Item-Meta-Validation-Checks.patch
index ee326bb6ed..d45a20db74 100644
--- a/patches/server/0957-Suppress-Item-Meta-Validation-Checks.patch
+++ b/patches/server/0956-Suppress-Item-Meta-Validation-Checks.patch
@@ -47,10 +47,10 @@ index f393e0844889c967d9e83d9a1e73c134fcb6e33b..f8996ee643a46db301577f6c523f24e9
      CraftMetaArmor(Map<String, Object> map) {
          super(map);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index cbf1a518406bf478811c737e6dabf0a8c451d16c..039197efb05432b8139fbabe92338572c1bf078e 100644
+index ece1ef7285c1859b4e90aa4f77453827f52521cb..11da7d51ea8f46234f00f3312f21350e157026b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -490,7 +490,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -489,7 +489,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  continue;
              }
  
diff --git a/patches/server/0958-Fix-BanList-API.patch b/patches/server/0957-Fix-BanList-API.patch
index d466acddb4..5662bc24b5 100644
--- a/patches/server/0958-Fix-BanList-API.patch
+++ b/patches/server/0957-Fix-BanList-API.patch
@@ -208,10 +208,10 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 70a75170fb6516ab143b8e4da6d453876b02942d..ef0f3199a9a0fe1ab8457af647a8f4912d3b38eb 100644
+index 77329a16b9208c0cefe22875f3c2b55e051f1744..370fab81bbcf5091e6ef1eaadcd19629b5e15f15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1649,23 +1649,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1646,23 +1646,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
@@ -240,7 +240,7 @@ index 70a75170fb6516ab143b8e4da6d453876b02942d..ef0f3199a9a0fe1ab8457af647a8f491
          if (kickPlayer) {
              this.kickPlayer(reason);
          }
-@@ -1673,12 +1673,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1670,12 +1670,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0959-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0958-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 05fb1ac2ac..05fb1ac2ac 100644
--- a/patches/server/0959-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0958-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0959-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0959-Fix-possible-NPE-on-painting-creation.patch
new file mode 100644
index 0000000000..21636376d5
--- /dev/null
+++ b/patches/server/0959-Fix-possible-NPE-on-painting-creation.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 24 Jun 2023 09:42:53 -0700
+Subject: [PATCH] Fix possible NPE on painting creation
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+index ee0f33ece945d71d67d11cd9bc825f5ca54333c4..be34abf2772f905be43125de4f78c0a6a3d3adf6 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+@@ -318,8 +318,13 @@ public final class CraftEntityTypes {
+         // Hanging
+         register(new EntityTypeData<>(EntityType.PAINTING, Painting.class, CraftPainting::new, createHanging(Painting.class, (spawnData, hangingData) -> {
+                     if (spawnData.normalWorld && hangingData.randomize()) {
+-                        return net.minecraft.world.entity.decoration.Painting.create(spawnData.minecraftWorld(), hangingData.position(), hangingData.direction()).orElse(null);
+-                    } else {
++                        // Paper start - if randomizeData fails, force it
++                        final net.minecraft.world.entity.decoration.Painting entity = net.minecraft.world.entity.decoration.Painting.create(spawnData.minecraftWorld(), hangingData.position(), hangingData.direction()).orElse(null);
++                        if (entity != null) {
++                            return entity;
++                        }
++                    } /*else*/ {
++                        // Paper end - if randomizeData fails, force it
+                         net.minecraft.world.entity.decoration.Painting entity = new net.minecraft.world.entity.decoration.Painting(net.minecraft.world.entity.EntityType.PAINTING, spawnData.minecraftWorld());
+                         entity.absMoveTo(spawnData.x(), spawnData.y(), spawnData.z(), spawnData.yaw(), spawnData.pitch());
+                         entity.setDirection(hangingData.direction());
+@@ -457,6 +462,7 @@ public final class CraftEntityTypes {
+                     AABB bb = (ItemFrame.class.isAssignableFrom(clazz))
+                             ? net.minecraft.world.entity.decoration.ItemFrame.calculateBoundingBox(null, pos, CraftBlock.blockFaceToNotch(dir).getOpposite(), width, height)
+                             : HangingEntity.calculateBoundingBox(null, pos, CraftBlock.blockFaceToNotch(dir).getOpposite(), width, height);
++                    if (!spawnData.world.noCollision(bb)) continue; // Paper - add collision check
+                     List<net.minecraft.world.entity.Entity> list = spawnData.world().getEntities(null, bb);
+                     for (Iterator<net.minecraft.world.entity.Entity> it = list.iterator(); !taken && it.hasNext(); ) {
+                         net.minecraft.world.entity.Entity e = it.next();
diff --git a/patches/server/0960-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0960-Fix-possible-NPE-on-painting-creation.patch
deleted file mode 100644
index 93383802dd..0000000000
--- a/patches/server/0960-Fix-possible-NPE-on-painting-creation.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Sat, 24 Jun 2023 09:42:53 -0700
-Subject: [PATCH] Fix possible NPE on painting creation
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 866fd29fe52d7eec4e72db400a05645eb8984a2b..de015e675b40fa391bb7d03d30c86dc3dd72cb13 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -951,6 +951,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-                         AABB bb = (ItemFrame.class.isAssignableFrom(clazz))
-                                 ? net.minecraft.world.entity.decoration.ItemFrame.calculateBoundingBox(null, pos, CraftBlock.blockFaceToNotch(dir).getOpposite(), width, height)
-                                 : HangingEntity.calculateBoundingBox(null, pos, CraftBlock.blockFaceToNotch(dir).getOpposite(), width, height);
-+                        if (!this.getHandle().noCollision(bb)) continue; // Paper - add collision check
-                         List<net.minecraft.world.entity.Entity> list = (List<net.minecraft.world.entity.Entity>) this.getHandle().getEntities(null, bb);
-                         for (Iterator<net.minecraft.world.entity.Entity> it = list.iterator(); !taken && it.hasNext(); ) {
-                             net.minecraft.world.entity.Entity e = it.next();
-@@ -977,7 +978,8 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-                 if (Painting.class.isAssignableFrom(clazz)) {
-                     if (this.isNormalWorld() && randomizeData) {
-                         entity = net.minecraft.world.entity.decoration.Painting.create(world, pos, dir).orElse(null);
--                    } else {
-+                    } // Paper
-+                    if (entity == null) { // Paper - if randomizeData fails, force it
-                         entity = new net.minecraft.world.entity.decoration.Painting(net.minecraft.world.entity.EntityType.PAINTING, this.getHandle().getMinecraftWorld());
-                         entity.absMoveTo(x, y, z, yaw, pitch);
-                         ((net.minecraft.world.entity.decoration.Painting) entity).setDirection(dir);
diff --git a/patches/server/0961-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0960-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index d72ec05289..d72ec05289 100644
--- a/patches/server/0961-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0960-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0962-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0961-ExperienceOrb-should-call-EntitySpawnEvent.patch
index f9729a3590..c02e259652 100644
--- a/patches/server/0962-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0961-ExperienceOrb-should-call-EntitySpawnEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e4551a6d984928457af4fb6cc2d0bf3673ef8fb1..8f78b9e714c472f59f3abf565c53bd87a6811674 100644
+index c62396041c1546f3136ab6de3b174983f49287b3..68bc859fe8615fd59ef98f69f0190bea8261c15a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -737,7 +737,10 @@ public class CraftEventFactory {
+@@ -734,7 +734,10 @@ public class CraftEventFactory {
          // Spigot start - SPIGOT-7523: Merge after spawn event and only merge if the event was not cancelled (gets checked above)
          if (entity instanceof net.minecraft.world.entity.ExperienceOrb xp) {
              double radius = world.spigotConfig.expMerge;
diff --git a/patches/server/0964-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0962-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 392fad1ce8..392fad1ce8 100644
--- a/patches/server/0964-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0962-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0965-Add-whitelist-events.patch b/patches/server/0963-Add-whitelist-events.patch
index 42eff5bfe1..42eff5bfe1 100644
--- a/patches/server/0965-Add-whitelist-events.patch
+++ b/patches/server/0963-Add-whitelist-events.patch
diff --git a/patches/server/0963-Don-t-tick-signs.patch b/patches/server/0963-Don-t-tick-signs.patch
deleted file mode 100644
index 7d9da1c24e..0000000000
--- a/patches/server/0963-Don-t-tick-signs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <[email protected]>
-Date: Wed, 12 Jul 2023 17:38:26 -0400
-Subject: [PATCH] Don't tick signs
-
-Minecraft now ticks signs in order to validate the playerWhoMayEdit field. This is a horrible idea, as this means that even waxed signs are ticked for essentially no reason. This moves the logic lazily onto the getter.
-
-== AT ==
-private net.minecraft.world.level.block.entity.SignBlockEntity playerWhoMayEdit
-
-diff --git a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java
-index cee371fde78e7e95e166b138d9437e5e8087f7c7..90fe181d035e43c4cc220cbb984f8f8c7fd29602 100644
---- a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java
-@@ -154,6 +154,6 @@ public class CeilingHangingSignBlock extends SignBlock {
-     @Nullable
-     @Override
-     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level world, BlockState state, BlockEntityType<T> type) {
--        return createTickerHelper(type, BlockEntityType.HANGING_SIGN, SignBlockEntity::tick);
-+        return null; // Paper
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/SignBlock.java b/src/main/java/net/minecraft/world/level/block/SignBlock.java
-index 28cba43e42354b87e08ef87b70c274a2fdc0bb48..ade170b4c76ad4a36eb2fba831d438642c096205 100644
---- a/src/main/java/net/minecraft/world/level/block/SignBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SignBlock.java
-@@ -210,6 +210,6 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
-     @Nullable
-     @Override
-     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level world, BlockState state, BlockEntityType<T> type) {
--        return createTickerHelper(type, BlockEntityType.SIGN, SignBlockEntity::tick);
-+        return null; // Paper
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java
-index 32a463104593ecf00d44c449edda24a13ac8224e..484a2a689f240f1916e911459111782e91c20940 100644
---- a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java
-@@ -177,6 +177,6 @@ public class WallHangingSignBlock extends SignBlock {
-     @Nullable
-     @Override
-     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level world, BlockState state, BlockEntityType<T> type) {
--        return createTickerHelper(type, BlockEntityType.HANGING_SIGN, SignBlockEntity::tick);
-+        return null; // Paper
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 68f95a8eb4aa659e62394bf98ecd5f5d46879cbf..bc01970c5ef9cde4a75394d6977837e924a38463 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-@@ -365,6 +365,12 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
- 
-     @Nullable
-     public UUID getPlayerWhoMayEdit() {
-+        // Paper start
-+        if (this.hasLevel() && this.playerWhoMayEdit != null) {
-+            // Manually invalidate the value lazily.
-+            this.clearInvalidPlayerWhoMayEdit(this, this.getLevel(), this.playerWhoMayEdit);
-+        }
-+        // Paper end
-         return this.playerWhoMayEdit;
-     }
- 
diff --git a/patches/server/0966-Implement-PlayerFailMoveEvent.patch b/patches/server/0964-Implement-PlayerFailMoveEvent.patch
index 328c69ac9c..328c69ac9c 100644
--- a/patches/server/0966-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0964-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0967-Folia-scheduler-and-owned-region-API.patch b/patches/server/0965-Folia-scheduler-and-owned-region-API.patch
index 3efe7051b1..612ca05c65 100644
--- a/patches/server/0967-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0965-Folia-scheduler-and-owned-region-API.patch
@@ -1224,10 +1224,10 @@ index 8af2d49fdb46deab17fd801e5ba56eec289b4dd0..23488823fe48f502c1f64ace79030bf0
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d1d81ad90ee1c007b46c9afd1f4e918af2834d38..99d02cfed25b10c1418d2ee40c7f3d4f054897e4 100644
+index 940f79b4456e94fd15b3e6eec38e8fa59ab01d14..79e342b5d28f445671191e3bf4d3b7f592cf2e9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -311,6 +311,76 @@ public final class CraftServer implements Server {
+@@ -306,6 +306,76 @@ public final class CraftServer implements Server {
      private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
      private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper
  
@@ -1305,10 +1305,10 @@ index d1d81ad90ee1c007b46c9afd1f4e918af2834d38..99d02cfed25b10c1418d2ee40c7f3d4f
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
          ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index fd2af6fefb990181a06de7864ea8a229c2a84bc4..3b730c298c0e902bd1888d69e426513c57514c93 100644
+index 96579becd1d21a4288a6f8fc5980c04cd1934f78..c574f4060b58590bf9b917b078678ccd3cce2f0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -212,6 +212,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -67,6 +67,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      private EntityDamageEvent lastDamageEvent;
      private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftEntity.DATA_TYPE_REGISTRY);
      protected net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers
@@ -1324,7 +1324,7 @@ index fd2af6fefb990181a06de7864ea8a229c2a84bc4..3b730c298c0e902bd1888d69e426513c
  
      public CraftEntity(final CraftServer server, final Entity entity) {
          this.server = server;
-@@ -838,6 +847,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -483,6 +492,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.entity;
      }
  
diff --git a/patches/server/0968-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0966-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0968-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0966-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0969-API-for-updating-recipes-on-clients.patch b/patches/server/0967-API-for-updating-recipes-on-clients.patch
index a4f1e59125..871c312743 100644
--- a/patches/server/0969-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0967-API-for-updating-recipes-on-clients.patch
@@ -39,10 +39,10 @@ index 895c4accbcf43baaa8a4d560e8b5c0d4dfae3ccc..098bb36a66e022da30302936aba10d29
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 99d02cfed25b10c1418d2ee40c7f3d4f054897e4..4282f3c585877a477c52074059e9a5a7c1244e93 100644
+index 79e342b5d28f445671191e3bf4d3b7f592cf2e9e..8a8cc2da46eac78c2871e4920eb78d04d4cbc0d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1128,6 +1128,18 @@ public final class CraftServer implements Server {
+@@ -1129,6 +1129,18 @@ public final class CraftServer implements Server {
          ReloadCommand.reload(this.console);
      }
  
@@ -61,7 +61,7 @@ index 99d02cfed25b10c1418d2ee40c7f3d4f054897e4..4282f3c585877a477c52074059e9a5a7
      private void loadIcon() {
          this.icon = new CraftIconCache(null);
          try {
-@@ -1508,6 +1520,13 @@ public final class CraftServer implements Server {
+@@ -1509,6 +1521,13 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean addRecipe(Recipe recipe) {
@@ -75,7 +75,7 @@ index 99d02cfed25b10c1418d2ee40c7f3d4f054897e4..4282f3c585877a477c52074059e9a5a7
          CraftRecipe toAdd;
          if (recipe instanceof CraftRecipe) {
              toAdd = (CraftRecipe) recipe;
-@@ -1537,6 +1556,11 @@ public final class CraftServer implements Server {
+@@ -1538,6 +1557,11 @@ public final class CraftServer implements Server {
              }
          }
          toAdd.addToCraftingManager();
@@ -87,7 +87,7 @@ index 99d02cfed25b10c1418d2ee40c7f3d4f054897e4..4282f3c585877a477c52074059e9a5a7
          return true;
      }
  
-@@ -1717,10 +1741,23 @@ public final class CraftServer implements Server {
+@@ -1718,10 +1742,23 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean removeRecipe(NamespacedKey recipeKey) {
diff --git a/patches/server/0968-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0968-Fix-rotation-when-spawning-display-entities.patch
new file mode 100644
index 0000000000..d195a58747
--- /dev/null
+++ b/patches/server/0968-Fix-rotation-when-spawning-display-entities.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Gameoholic <[email protected]>
+Date: Sun, 30 Jul 2023 13:30:34 +0300
+Subject: [PATCH] Fix rotation when spawning display entities
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+index be34abf2772f905be43125de4f78c0a6a3d3adf6..90b681c153b31dbab33ff26478a6a7d09d6f29e1 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+@@ -216,6 +216,7 @@ public final class CraftEntityTypes {
+         Vector direction = spawnData.location().getDirection().multiply(10);
+         entity.setDirection(direction.getX(), direction.getY(), direction.getZ());
+     };
++    private static final BiConsumer<SpawnData, net.minecraft.world.entity.Entity> ROT = (spawnData, entity) -> entity.setRot(spawnData.yaw(), spawnData.pitch()); // Paper
+     private static final Map<Class<?>, EntityTypeData<?, ?>> CLASS_TYPE_DATA = new HashMap<>();
+     private static final Map<EntityType, EntityTypeData<?, ?>> ENTITY_TYPE_DATA = new HashMap<>();
+ 
+@@ -352,10 +353,10 @@ public final class CraftEntityTypes {
+ 
+         // Set pos
+         register(new EntityTypeData<>(EntityType.MARKER, Marker.class, CraftMarker::new, createAndSetPos(net.minecraft.world.entity.EntityType.MARKER)));
+-        register(new EntityTypeData<>(EntityType.BLOCK_DISPLAY, BlockDisplay.class, CraftBlockDisplay::new, createAndSetPos(net.minecraft.world.entity.EntityType.BLOCK_DISPLAY)));
++        register(new EntityTypeData<>(EntityType.BLOCK_DISPLAY, BlockDisplay.class, CraftBlockDisplay::new, combine(createAndSetPos(net.minecraft.world.entity.EntityType.BLOCK_DISPLAY), ROT))); // Paper
+         register(new EntityTypeData<>(EntityType.INTERACTION, Interaction.class, CraftInteraction::new, createAndSetPos(net.minecraft.world.entity.EntityType.INTERACTION)));
+-        register(new EntityTypeData<>(EntityType.ITEM_DISPLAY, ItemDisplay.class, CraftItemDisplay::new, createAndSetPos(net.minecraft.world.entity.EntityType.ITEM_DISPLAY)));
+-        register(new EntityTypeData<>(EntityType.TEXT_DISPLAY, TextDisplay.class, CraftTextDisplay::new, createAndSetPos(net.minecraft.world.entity.EntityType.TEXT_DISPLAY)));
++        register(new EntityTypeData<>(EntityType.ITEM_DISPLAY, ItemDisplay.class, CraftItemDisplay::new, combine(createAndSetPos(net.minecraft.world.entity.EntityType.ITEM_DISPLAY), ROT))); // Paper
++        register(new EntityTypeData<>(EntityType.TEXT_DISPLAY, TextDisplay.class, CraftTextDisplay::new, combine(createAndSetPos(net.minecraft.world.entity.EntityType.TEXT_DISPLAY), ROT))); // Paper
+ 
+         // MISC
+         register(new EntityTypeData<>(EntityType.DROPPED_ITEM, Item.class, CraftItem::new, spawnData -> {
diff --git a/patches/server/0971-Only-capture-actual-tree-growth.patch b/patches/server/0969-Only-capture-actual-tree-growth.patch
index f97b14591b..f97b14591b 100644
--- a/patches/server/0971-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0969-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0970-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0970-Fix-rotation-when-spawning-display-entities.patch
deleted file mode 100644
index 9887bc2462..0000000000
--- a/patches/server/0970-Fix-rotation-when-spawning-display-entities.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gameoholic <[email protected]>
-Date: Sun, 30 Jul 2023 13:30:34 +0300
-Subject: [PATCH] Fix rotation when spawning display entities
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index de015e675b40fa391bb7d03d30c86dc3dd72cb13..b7fd9448ea9f26636724b229af5cffc28d927d62 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -1021,6 +1021,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
- 
-             if (entity != null) {
-                 entity.setPos(x, y, z);
-+                entity.setRot(yaw, pitch); // Paper - Set Display Rotation
-             }
-         }
- 
diff --git a/patches/server/0972-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0970-Use-correct-source-for-mushroom-block-spread-event.patch
index b5e0bc1a5e..b5e0bc1a5e 100644
--- a/patches/server/0972-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0970-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0971-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0971-Respect-randomizeData-on-more-entities-when-spawning.patch
new file mode 100644
index 0000000000..6232607db4
--- /dev/null
+++ b/patches/server/0971-Respect-randomizeData-on-more-entities-when-spawning.patch
@@ -0,0 +1,68 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 13 Jul 2023 16:10:07 -0700
+Subject: [PATCH] Respect randomizeData on more entities when spawning
+
+* ItemEntity
+* PrimedTNT
+* FireworkRocketEntity
+* ExperienceOrb
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+index 90b681c153b31dbab33ff26478a6a7d09d6f29e1..444b770425c55e17aa15d83dcb5bafa669c0b93f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
+@@ -217,6 +217,13 @@ public final class CraftEntityTypes {
+         entity.setDirection(direction.getX(), direction.getY(), direction.getZ());
+     };
+     private static final BiConsumer<SpawnData, net.minecraft.world.entity.Entity> ROT = (spawnData, entity) -> entity.setRot(spawnData.yaw(), spawnData.pitch()); // Paper
++    // Paper start - respect randomizeData
++    private static final BiConsumer<SpawnData, net.minecraft.world.entity.Entity> CLEAR_MOVE_IF_NOT_RANDOMIZED = (spawnData, entity) -> {
++        if (!spawnData.randomizeData()) {
++            entity.setDeltaMovement(net.minecraft.world.phys.Vec3.ZERO);
++        }
++    };
++    // Paper end - respect randomizeData
+     private static final Map<Class<?>, EntityTypeData<?, ?>> CLASS_TYPE_DATA = new HashMap<>();
+     private static final Map<EntityType, EntityTypeData<?, ?>> ENTITY_TYPE_DATA = new HashMap<>();
+ 
+@@ -365,11 +372,12 @@ public final class CraftEntityTypes {
+             net.minecraft.world.item.ItemStack itemStack = new net.minecraft.world.item.ItemStack(Items.STONE);
+             ItemEntity item = new ItemEntity(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), itemStack);
+             item.setPickUpDelay(10);
++            CLEAR_MOVE_IF_NOT_RANDOMIZED.accept(spawnData, item); // Paper - respect randomizeData
+ 
+             return item;
+         }));
+         register(new EntityTypeData<>(EntityType.EXPERIENCE_ORB, ExperienceOrb.class, CraftExperienceOrb::new,
+-                spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null) // Paper
++                combine(combine(spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null), CLEAR_MOVE_IF_NOT_RANDOMIZED), (spawnData, experienceOrb) -> { if (!spawnData.randomizeData()) { experienceOrb.setYRot(0); } }) // Paper - respect randomizeData
+         ));
+         register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, createAndMove(net.minecraft.world.entity.EntityType.AREA_EFFECT_CLOUD))); // Paper - set area effect cloud rotation
+         register(new EntityTypeData<>(EntityType.EGG, Egg.class, CraftEgg::new, spawnData -> new ThrownEgg(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z())));
+@@ -381,12 +389,23 @@ public final class CraftEntityTypes {
+             entity.setItem(CraftItemStack.asNMSCopy(new ItemStack(Material.SPLASH_POTION, 1)));
+             return entity;
+         }));
+-        register(new EntityTypeData<>(EntityType.PRIMED_TNT, TNTPrimed.class, CraftTNTPrimed::new, spawnData -> new PrimedTnt(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), null)));
++        register(new EntityTypeData<>(EntityType.PRIMED_TNT, TNTPrimed.class, CraftTNTPrimed::new, combine(spawnData -> new PrimedTnt(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), null), CLEAR_MOVE_IF_NOT_RANDOMIZED))); // Paper - respect randomizeData
+         register(new EntityTypeData<>(EntityType.FALLING_BLOCK, FallingBlock.class, CraftFallingBlock::new, spawnData -> {
+             BlockPos pos = BlockPos.containing(spawnData.x(), spawnData.y(), spawnData.z());
+             return new FallingBlockEntity(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), spawnData.world().getBlockState(pos)); // Paper - create falling block entities correctly
+         }));
+-        register(new EntityTypeData<>(EntityType.FIREWORK, Firework.class, CraftFirework::new, spawnData -> new FireworkRocketEntity(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), net.minecraft.world.item.ItemStack.EMPTY)));
++        // Paper start - respect randomizeData
++        register(new EntityTypeData<>(EntityType.FIREWORK, Firework.class, CraftFirework::new, spawnData -> {
++            FireworkRocketEntity entity = new FireworkRocketEntity(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), net.minecraft.world.item.ItemStack.EMPTY);
++            if (!spawnData.randomizeData()) {
++                // logic below was taken from FireworkRocketEntity constructor
++                entity.setDeltaMovement(0, 0.05, 0);
++                //noinspection PointlessArithmeticExpression
++                entity.lifetime = 10 * 1 + 6;
++            }
++            return entity;
++        }));
++        // Paper end - respect randomizeData
+         register(new EntityTypeData<>(EntityType.EVOKER_FANGS, EvokerFangs.class, CraftEvokerFangs::new, spawnData -> new net.minecraft.world.entity.projectile.EvokerFangs(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), (float) Math.toRadians(spawnData.yaw()), 0, null)));
+         register(new EntityTypeData<>(EntityType.MINECART_COMMAND, CommandMinecart.class, CraftMinecartCommand::new, spawnData -> new MinecartCommandBlock(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z())));
+         register(new EntityTypeData<>(EntityType.MINECART, RideableMinecart.class, CraftMinecartRideable::new, spawnData -> new Minecart(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z())));
diff --git a/patches/server/0974-Use-correct-seed-on-api-world-load.patch b/patches/server/0972-Use-correct-seed-on-api-world-load.patch
index 7373b49cb9..f290584fb1 100644
--- a/patches/server/0974-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0972-Use-correct-seed-on-api-world-load.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4282f3c585877a477c52074059e9a5a7c1244e93..b64d08d5fed98a919fcdfda1592a1f825525075d 100644
+index 8a8cc2da46eac78c2871e4920eb78d04d4cbc0d6..9a022a79b7a5357bfc640e8dbe414f50645e6d33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1346,7 +1346,7 @@ public final class CraftServer implements Server {
+@@ -1347,7 +1347,7 @@ public final class CraftServer implements Server {
  
          // Paper - move down
  
diff --git a/patches/server/0975-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0973-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 84f919c796..84f919c796 100644
--- a/patches/server/0975-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0973-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0973-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0973-Respect-randomizeData-on-more-entities-when-spawning.patch
deleted file mode 100644
index 5321d8c5c0..0000000000
--- a/patches/server/0973-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Thu, 13 Jul 2023 16:10:07 -0700
-Subject: [PATCH] Respect randomizeData on more entities when spawning
-
-* ItemEntity
-* PrimedTNT
-* FireworkRocketEntity
-* ExperienceOrb
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index b7fd9448ea9f26636724b229af5cffc28d927d62..87698a123ce027b4f7b0dcc9eaf034a5b8de6de3 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -634,6 +634,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-         } else if (org.bukkit.entity.Item.class.isAssignableFrom(clazz)) {
-             entity = new net.minecraft.world.entity.item.ItemEntity(world, x, y, z, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.DIRT));
-             // Paper end
-+            // Paper start - respect randomizeData
-+            if (!randomizeData) {
-+                entity.setDeltaMovement(net.minecraft.world.phys.Vec3.ZERO);
-+            }
-+            // Paper end - respect randomizeData
-         } else if (FallingBlock.class.isAssignableFrom(clazz)) {
-             BlockPos pos = BlockPos.containing(x, y, z);
-             entity = new FallingBlockEntity(world, x, y, z, this.getHandle().getBlockState(pos)); // Paper
-@@ -691,6 +696,14 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-                 entity.moveTo(x, y, z, yaw, pitch);
-             } else if (Firework.class.isAssignableFrom(clazz)) {
-                 entity = new FireworkRocketEntity(world, x, y, z, net.minecraft.world.item.ItemStack.EMPTY);
-+                // Paper start - respect randomizeData
-+                if (!randomizeData) {
-+                    // logic below was taken from FireworkRocketEntity constructor
-+                    entity.setDeltaMovement(0, 0.05, 0);
-+                    //noinspection PointlessArithmeticExpression
-+                    ((FireworkRocketEntity) entity).lifetime = 10 * 1 + 6;
-+                }
-+                // Paper end - respect randomizeData
-             }
-         } else if (Minecart.class.isAssignableFrom(clazz)) {
-             if (PoweredMinecart.class.isAssignableFrom(clazz)) {
-@@ -994,8 +1007,19 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-             }
-         } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
-             entity = new PrimedTnt(world, x, y, z, null);
-+            // Paper start - respect randomizeData
-+            if (!randomizeData) {
-+                entity.setDeltaMovement(net.minecraft.world.phys.Vec3.ZERO);
-+            }
-+            // Paper end - respect randomizeData
-         } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
-             entity = new net.minecraft.world.entity.ExperienceOrb(world, x, y, z, 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null); // Paper
-+            // Paper start - respect randomizeData
-+            if (!randomizeData) {
-+                entity.setDeltaMovement(net.minecraft.world.phys.Vec3.ZERO);
-+                entity.setYRot(0);
-+            }
-+            // Paper end - respect randomizeData
-         } else if (LightningStrike.class.isAssignableFrom(clazz)) {
-             entity = net.minecraft.world.entity.EntityType.LIGHTNING_BOLT.create(world);
-             entity.moveTo(location.getX(), location.getY(), location.getZ());
diff --git a/patches/server/0976-Cache-map-ids-on-item-frames.patch b/patches/server/0974-Cache-map-ids-on-item-frames.patch
index 2c0fbde170..2c0fbde170 100644
--- a/patches/server/0976-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0974-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0977-Fix-custom-statistic-criteria-creation.patch b/patches/server/0975-Fix-custom-statistic-criteria-creation.patch
index 8811d3a725..8811d3a725 100644
--- a/patches/server/0977-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0975-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0978-Bandaid-fix-for-Effect.patch b/patches/server/0976-Bandaid-fix-for-Effect.patch
index d3a0eb2a15..d64ced283e 100644
--- a/patches/server/0978-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0976-Bandaid-fix-for-Effect.patch
@@ -73,10 +73,10 @@ index c77fec78636805a496ecea3e56f26290dbcbffff..abb14719496971a780650782bdce17c6
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ef0f3199a9a0fe1ab8457af647a8f4912d3b38eb..5b26e8b4d57360562d9d2859826577da58256d87 100644
+index 370fab81bbcf5091e6ef1eaadcd19629b5e15f15..0b547a5f6101142dabe04ea39abd7b35fde0c58b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -876,7 +876,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -873,7 +873,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(effect != null, "Effect cannot be null");
          if (data != null) {
              Preconditions.checkArgument(effect.getData() != null, "Effect.%s does not have a valid Data", effect);
diff --git a/patches/server/0979-SculkCatalyst-bloom-API.patch b/patches/server/0977-SculkCatalyst-bloom-API.patch
index 77742addde..77742addde 100644
--- a/patches/server/0979-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0977-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0980-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0978-API-for-an-entity-s-scoreboard-name.patch
index 568b4beee3..a1129d549d 100644
--- a/patches/server/0980-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0978-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/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 3b730c298c0e902bd1888d69e426513c57514c93..c4343cbdea19a0dd671ed136a6a19ebf831ce8ab 100644
+index c574f4060b58590bf9b917b078678ccd3cce2f0a..7a75402ffe671ed9c0483a864a5e9d306847fc85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1550,4 +1550,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1195,4 +1195,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return !this.getHandle().level().noCollision(this.getHandle(), aabb);
      }
      // Paper End - Collision API
diff --git a/patches/server/0981-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0979-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index b80693be70..b80693be70 100644
--- a/patches/server/0981-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0979-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0982-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0980-Deprecate-and-replace-methods-with-old-StructureType.patch
index 565a24bbde..109b9af768 100644
--- a/patches/server/0982-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0980-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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b64d08d5fed98a919fcdfda1592a1f825525075d..782bb8ca67517dde5dba8f0a133eb8699353dd01 100644
+index 9a022a79b7a5357bfc640e8dbe414f50645e6d33..e011cfcdda2e0a609d4158b0454bdf046b04c9d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1950,6 +1950,11 @@ public final class CraftServer implements Server {
+@@ -1951,6 +1951,11 @@ public final class CraftServer implements Server {
  
          ServerLevel worldServer = ((CraftWorld) world).getHandle();
          Location structureLocation = world.locateNearestStructure(location, structureType, radius, findUnexplored);
@@ -20,7 +20,7 @@ index b64d08d5fed98a919fcdfda1592a1f825525075d..782bb8ca67517dde5dba8f0a133eb869
          BlockPos structurePosition = CraftLocation.toBlockPosition(structureLocation);
  
          // Create map with trackPlayer = true, unlimitedTracking = true
-@@ -1960,6 +1965,31 @@ public final class CraftServer implements Server {
+@@ -1961,6 +1966,31 @@ public final class CraftServer implements Server {
  
          return CraftItemStack.asBukkitCopy(stack);
      }
diff --git a/patches/server/0983-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0981-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 1511ed2158..1511ed2158 100644
--- a/patches/server/0983-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0981-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0984-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0982-Properly-handle-BlockBreakEvent-isDropItems.patch
index 8808e90bd1..8808e90bd1 100644
--- a/patches/server/0984-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0982-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0985-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0983-Fire-entity-death-event-for-ender-dragon.patch
index 5401a9dbc6..5401a9dbc6 100644
--- a/patches/server/0985-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0983-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0986-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0984-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 74202812a3..74202812a3 100644
--- a/patches/server/0986-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0984-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0987-Add-Listing-API-for-Player.patch b/patches/server/0985-Add-Listing-API-for-Player.patch
index 3ce68e3230..f4f86d449f 100644
--- a/patches/server/0987-Add-Listing-API-for-Player.patch
+++ b/patches/server/0985-Add-Listing-API-for-Player.patch
@@ -113,10 +113,10 @@ index 098bb36a66e022da30302936aba10d296587ac88..a35638a92479b90afa89cf201fc45b49
          // Paper end
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5b26e8b4d57360562d9d2859826577da58256d87..b7f5c1ec495a61528d95fd91b9d60428e9b00438 100644
+index 0b547a5f6101142dabe04ea39abd7b35fde0c58b..5ef73e8a968df95456b2a48b37f7e325bdcae5d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -185,6 +185,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -182,6 +182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private final ConversationTracker conversationTracker = new ConversationTracker();
      private final Set<String> channels = new HashSet<String>();
      private final Map<UUID, Set<WeakReference<Plugin>>> invertedVisibilityEntities = new HashMap<>();
@@ -124,7 +124,7 @@ index 5b26e8b4d57360562d9d2859826577da58256d87..b7f5c1ec495a61528d95fd91b9d60428
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
      private double health = 20;
-@@ -1989,7 +1990,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1986,7 +1987,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  otherPlayer.setUUID(uuidOverride);
              }
              // Paper end
@@ -133,7 +133,7 @@ index 5b26e8b4d57360562d9d2859826577da58256d87..b7f5c1ec495a61528d95fd91b9d60428
              if (original != null) otherPlayer.setUUID(original); // Paper - uuid override
          }
  
-@@ -2098,6 +2099,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2095,6 +2096,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (entity != null) ? this.canSee(entity) : false; // If we can't find it, we can't see it
      }
  
diff --git a/patches/server/0988-Configurable-Region-Compression-Format.patch b/patches/server/0986-Configurable-Region-Compression-Format.patch
index 08de696dde..08de696dde 100644
--- a/patches/server/0988-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0986-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0989-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0987-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 333f6fae04..a15bf1988b 100644
--- a/patches/server/0989-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/server/0987-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
@@ -18,10 +18,10 @@ index 511221a686c1d2cad3b4abf79ee32b26058dad27..899439e0af639e8d9124522b3cb6a106
                  if (blockEvent.isCancelled()) {
                      // Let the client know the block still exists
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8f78b9e714c472f59f3abf565c53bd87a6811674..704ba208d5cbaef8bc2eb0a87d6fbb1be42e0460 100644
+index 68bc859fe8615fd59ef98f69f0190bea8261c15a..b21729eea9c65d1262ab9a78cb08278ffc431b7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -652,13 +652,13 @@ public class CraftEventFactory {
+@@ -649,13 +649,13 @@ public class CraftEventFactory {
      /**
       * BlockDamageEvent
       */
diff --git a/patches/server/0990-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0988-Fix-NPE-on-Boat-getStatus.patch
index f2b53faa13..f2b53faa13 100644
--- a/patches/server/0990-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0988-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0991-Expand-Pose-API.patch b/patches/server/0989-Expand-Pose-API.patch
index 40eb4c3386..742d338e92 100644
--- a/patches/server/0991-Expand-Pose-API.patch
+++ b/patches/server/0989-Expand-Pose-API.patch
@@ -25,10 +25,10 @@ index 23488823fe48f502c1f64ace79030bf0f7e85626..62bdce9516804942862b33667bc571e3
          if (pose == this.getPose()) {
              return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c4343cbdea19a0dd671ed136a6a19ebf831ce8ab..0349d9b6ad12e0a426cb1307be8633240b7426fe 100644
+index 7a75402ffe671ed9c0483a864a5e9d306847fc85..f4e4599336f8fa75ac200b1415a92ea203422fb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1251,6 +1251,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -896,6 +896,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isSneaking() {
          return this.getHandle().isShiftKeyDown();
      }
diff --git a/patches/server/0992-More-DragonBattle-API.patch b/patches/server/0990-More-DragonBattle-API.patch
index d14bf53224..d14bf53224 100644
--- a/patches/server/0992-More-DragonBattle-API.patch
+++ b/patches/server/0990-More-DragonBattle-API.patch
diff --git a/patches/server/0993-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0991-Deep-clone-unhandled-nbt-tags.patch
index 73640d521c..8d84a6b272 100644
--- a/patches/server/0993-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/server/0991-Deep-clone-unhandled-nbt-tags.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Deep clone unhandled nbt tags
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 039197efb05432b8139fbabe92338572c1bf078e..8762a7a22723150a1a42b3459f3744b8235da142 100644
+index 11da7d51ea8f46234f00f3312f21350e157026b4..4396043fb5d86978e9dbac6e0efb2ec1e1298b24 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -305,7 +305,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -304,7 +304,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
  
      private CompoundTag internalTag;
@@ -17,7 +17,7 @@ index 039197efb05432b8139fbabe92338572c1bf078e..8762a7a22723150a1a42b3459f3744b8
      private CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftMetaItem.DATA_TYPE_REGISTRY);
  
      private int version = CraftMagicNumbers.INSTANCE.getDataVersion(); // Internal use only
-@@ -346,8 +346,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -345,8 +345,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              this.destroyableKeys = new java.util.HashSet<>(meta.destroyableKeys);
          }
          // Paper end
@@ -30,7 +30,7 @@ index 039197efb05432b8139fbabe92338572c1bf078e..8762a7a22723150a1a42b3459f3744b8
  
          this.internalTag = meta.internalTag;
          if (this.internalTag != null) {
-@@ -1395,7 +1397,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1394,7 +1396,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              if (this.hasAttributeModifiers()) {
                  clone.attributeModifiers = LinkedHashMultimap.create(this.attributeModifiers);
              }
diff --git a/patches/server/0994-Add-PlayerPickItemEvent.patch b/patches/server/0992-Add-PlayerPickItemEvent.patch
index d3f62c2961..d3f62c2961 100644
--- a/patches/server/0994-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0992-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0995-Improve-performance-of-mass-crafts.patch b/patches/server/0993-Improve-performance-of-mass-crafts.patch
index 65946d4731..65946d4731 100644
--- a/patches/server/0995-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/0993-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/0996-Allow-trident-custom-damage.patch b/patches/server/0994-Allow-trident-custom-damage.patch
index 3b1f6db132..3b1f6db132 100644
--- a/patches/server/0996-Allow-trident-custom-damage.patch
+++ b/patches/server/0994-Allow-trident-custom-damage.patch
diff --git a/patches/server/0997-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/0995-Expose-hand-during-BlockCanBuildEvent.patch
index dc68b12fb2..dc68b12fb2 100644
--- a/patches/server/0997-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/server/0995-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/0998-Optimize-nearest-structure-border-iteration.patch b/patches/server/0996-Optimize-nearest-structure-border-iteration.patch
index 07d0358cbb..07d0358cbb 100644
--- a/patches/server/0998-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0996-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0999-Implement-OfflinePlayer-isConnected.patch b/patches/server/0997-Implement-OfflinePlayer-isConnected.patch
index 3a92f89bbe..87520511fd 100644
--- a/patches/server/0999-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0997-Implement-OfflinePlayer-isConnected.patch
@@ -23,10 +23,10 @@ index 9daec0782774ab51ea8091cb8ed9d0a106e34cfa..2bbc39c257965ad91ee360cdfcd3538a
      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 b7f5c1ec495a61528d95fd91b9d60428e9b00438..11d56ec04b2f63c8a0fb54e586bebe98afc1a3ad 100644
+index 5ef73e8a968df95456b2a48b37f7e325bdcae5d8..26ef78ea23a9b3abdf3e43aa5e90eec15bf1d78b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -282,6 +282,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -279,6 +279,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.server.getPlayer(this.getUniqueId()) != null;
      }
  
diff --git a/patches/server/1000-Fix-inventory-desync.patch b/patches/server/0998-Fix-inventory-desync.patch
index 6da7d78b43..6da7d78b43 100644
--- a/patches/server/1000-Fix-inventory-desync.patch
+++ b/patches/server/0998-Fix-inventory-desync.patch
diff --git a/patches/server/1001-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0999-Add-titleOverride-to-InventoryOpenEvent.patch
index 20d0ecb9ab..f4fa8c6e37 100644
--- a/patches/server/1001-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0999-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -37,10 +37,10 @@ index 25772043f3b4483b9f5e32ba9489da52add6941a..695a103f2517f3e888e86e76f3615bd6
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index c6b3bc218ac440cc66dee97c21b3db4ad86938be..8a1e765363aeb61078fd23980d3856dc680cb05e 100644
+index e0ab2124b339d0053a1d075204ca1070be572e75..c3dbcb317b7d366feb31f707ad1199c60169f07f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -358,12 +358,16 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -357,12 +357,16 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          Preconditions.checkArgument(windowType != null, "Unknown windowType");
          AbstractContainerMenu container = new CraftContainer(inventory, player, player.nextContainerCounter());
  
@@ -58,7 +58,7 @@ index c6b3bc218ac440cc66dee97c21b3db4ad86938be..8a1e765363aeb61078fd23980d3856dc
  
          //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
          if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
-@@ -439,7 +443,10 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -438,7 +442,10 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          }
  
          // Trigger an INVENTORY_OPEN event
@@ -70,7 +70,7 @@ index c6b3bc218ac440cc66dee97c21b3db4ad86938be..8a1e765363aeb61078fd23980d3856dc
          if (container == null) {
              return;
          }
-@@ -450,6 +457,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -449,6 +456,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          //String title = inventory.getTitle(); // Paper - comment
          net.kyori.adventure.text.Component adventure$title = inventory.title(); // Paper
          if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(inventory.getTitle()); // Paper
@@ -79,10 +79,10 @@ index c6b3bc218ac440cc66dee97c21b3db4ad86938be..8a1e765363aeb61078fd23980d3856dc
          if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
          player.containerMenu = container;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 704ba208d5cbaef8bc2eb0a87d6fbb1be42e0460..916b29914f77bed0dbfdcd5eae8a6ef22948b9b0 100644
+index b21729eea9c65d1262ab9a78cb08278ffc431b7a..a7da88af0a41f16b3a54b28023a5afb6d9396262 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1443,10 +1443,21 @@ public class CraftEventFactory {
+@@ -1440,10 +1440,21 @@ public class CraftEventFactory {
      }
  
      public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container) {
@@ -105,7 +105,7 @@ index 704ba208d5cbaef8bc2eb0a87d6fbb1be42e0460..916b29914f77bed0dbfdcd5eae8a6ef2
          if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
              player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId), InventoryCloseEvent.Reason.OPEN_NEW); // Paper
          }
-@@ -1461,10 +1472,10 @@ public class CraftEventFactory {
+@@ -1458,10 +1469,10 @@ public class CraftEventFactory {
  
          if (event.isCancelled()) {
              container.transferTo(player.containerMenu, craftPlayer);
diff --git a/patches/server/1002-Configure-sniffer-egg-hatch-time.patch b/patches/server/1000-Configure-sniffer-egg-hatch-time.patch
index 4b20794de9..4b20794de9 100644
--- a/patches/server/1002-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/1000-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1003-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1001-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0244f274f5..0244f274f5 100644
--- a/patches/server/1003-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/1001-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1002-Skip-POI-finding-if-stuck-in-vehicle.patch
index e45ced771d..e45ced771d 100644
--- a/patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/1002-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1005-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1003-Add-slot-sanity-checks-in-container-clicks.patch
index 6aae76295f..6aae76295f 100644
--- a/patches/server/1005-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/1003-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1006-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1004-Call-BlockRedstoneEvents-for-lecterns.patch
index aebbe3eb31..aebbe3eb31 100644
--- a/patches/server/1006-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/1004-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1007-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1005-Allow-proper-checking-of-empty-item-stacks.patch
index be37c27f01..be37c27f01 100644
--- a/patches/server/1007-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/1005-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1008-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1006-Fix-silent-equipment-change-for-mobs.patch
index bfc06d052d..bfc06d052d 100644
--- a/patches/server/1008-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/1006-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1009-Fix-spigot-s-Forced-Stats.patch b/patches/server/1007-Fix-spigot-s-Forced-Stats.patch
index 8e012f221e..8e012f221e 100644
--- a/patches/server/1009-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/1007-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1010-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1008-Add-missing-InventoryHolders-to-inventories.patch
index d633e8c51a..d633e8c51a 100644
--- a/patches/server/1010-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/1008-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1011-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1009-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 738c4d4886..738c4d4886 100644
--- a/patches/server/1011-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/1009-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1012-Actually-optimise-explosions.patch b/patches/server/1010-Actually-optimise-explosions.patch
index 879be2c332..879be2c332 100644
--- a/patches/server/1012-Actually-optimise-explosions.patch
+++ b/patches/server/1010-Actually-optimise-explosions.patch
diff --git a/patches/server/1013-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1011-Add-missing-logs-for-log-ips-config-option.patch
index 604b80916e..604b80916e 100644
--- a/patches/server/1013-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/1011-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1014-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1012-Remove-Spigot-Bug-Fix-for-MC-109346.patch
index d3ecc69301..d3ecc69301 100644
--- a/patches/server/1014-Remove-Spigot-Bug-Fix-for-MC-109346.patch
+++ b/patches/server/1012-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1015-Fix-SuspiciousStewMeta.patch b/patches/server/1013-Fix-SuspiciousStewMeta.patch
index 834deff5db..834deff5db 100644
--- a/patches/server/1015-Fix-SuspiciousStewMeta.patch
+++ b/patches/server/1013-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1016-Optimise-chunk-tick-iteration.patch b/patches/server/1014-Optimise-chunk-tick-iteration.patch
index 9550476e55..9550476e55 100644
--- a/patches/server/1016-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1014-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1017-Lag-compensation-ticks.patch b/patches/server/1015-Lag-compensation-ticks.patch
index 70f9907730..70f9907730 100644
--- a/patches/server/1017-Lag-compensation-ticks.patch
+++ b/patches/server/1015-Lag-compensation-ticks.patch
diff --git a/patches/server/1018-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1016-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index 352537a5ad..352537a5ad 100644
--- a/patches/server/1018-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/1016-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1019-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1017-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/1019-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/1017-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1020-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1018-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/1020-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/1018-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1021-Optimise-nearby-player-retrieval.patch b/patches/server/1019-Optimise-nearby-player-retrieval.patch
index 728c9ea672..728c9ea672 100644
--- a/patches/server/1021-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1019-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1022-Remove-streams-for-villager-AI.patch b/patches/server/1020-Remove-streams-for-villager-AI.patch
index a2538da4d0..a2538da4d0 100644
--- a/patches/server/1022-Remove-streams-for-villager-AI.patch
+++ b/patches/server/1020-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1023-Fix-missing-map-initialize-event-call.patch b/patches/server/1021-Fix-missing-map-initialize-event-call.patch
index cb7ba8687a..cb7ba8687a 100644
--- a/patches/server/1023-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1021-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/1024-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1022-Update-entity-data-when-attaching-firework-to-entity.patch
index 40c89bc2cc..40c89bc2cc 100644
--- a/patches/server/1024-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/1022-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1025-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1023-Use-correct-variable-for-initializing-CraftLootTable.patch
index fb5878659b..fb5878659b 100644
--- a/patches/server/1025-Use-correct-variable-for-initializing-CraftLootTable.patch
+++ b/patches/server/1023-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1026-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1024-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
index b36b8cf1f6..b36b8cf1f6 100644
--- a/patches/server/1026-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
+++ b/patches/server/1024-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1027-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1025-Fix-UnsafeValues-loadAdvancement.patch
index 834c4d579b..834c4d579b 100644
--- a/patches/server/1027-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/1025-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1028-Add-player-idle-duration-API.patch b/patches/server/1026-Add-player-idle-duration-API.patch
index 9baa7c4ace..f11ef85b68 100644
--- a/patches/server/1028-Add-player-idle-duration-API.patch
+++ b/patches/server/1026-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/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 11d56ec04b2f63c8a0fb54e586bebe98afc1a3ad..8a99ce2806d0ef5bf8125f37e6c95980aeb9e7c5 100644
+index 26ef78ea23a9b3abdf3e43aa5e90eec15bf1d78b..5ff67321df91bcf66b198ff346630e4d912ae341 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3274,6 +3274,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3284,6 +3284,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/1029-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1027-Don-t-check-if-we-can-see-non-visible-entities.patch
index 81712ec1a3..81712ec1a3 100644
--- a/patches/server/1029-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/1027-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1030-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1028-Fix-NPE-in-SculkBloomEvent-world-access.patch
index f4db24ce29..f4db24ce29 100644
--- a/patches/server/1030-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/1028-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1031-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1029-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 7748c22a1a..33cf3fc362 100644
--- a/patches/server/1031-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1029-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8a99ce2806d0ef5bf8125f37e6c95980aeb9e7c5..3c0fb2821c3b621b463accc0ca6915bd51992993 100644
+index 5ff67321df91bcf66b198ff346630e4d912ae341..d5b5bb52a0d678bfe69be54b2cd25c95c39daf8d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1086,7 +1086,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1083,7 +1083,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void sendEquipmentChange(LivingEntity entity, EquipmentSlot slot, ItemStack item) {
diff --git a/patches/server/1032-Optimize-VarInts.patch b/patches/server/1030-Optimize-VarInts.patch
index 19e7fc574a..19e7fc574a 100644
--- a/patches/server/1032-Optimize-VarInts.patch
+++ b/patches/server/1030-Optimize-VarInts.patch
diff --git a/patches/server/1033-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1031-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 16c81c5de7..bed6750ecf 100644
--- a/patches/server/1033-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/1031-Add-API-to-get-the-collision-shape-of-a-block-before.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add API to get the collision shape of a block before it's
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 28a798e497c2c12794169068e69b56dd954978f3..7b4086240fad7eb3ef8eed9eb94ffeb79308e3da 100644
+index c6a0fac2ee35056f31b60eebc364c7bda8252d74..c7b93b8d4ed15db0803e2304e2da70ed3624f13f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -676,6 +676,20 @@ public class CraftBlockData implements BlockData {
+@@ -677,6 +677,20 @@ public class CraftBlockData implements BlockData {
          return this.state.isFaceSturdy(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CraftBlock.blockFaceToNotch(face), CraftBlockSupport.toNMS(support));
      }
  
@@ -28,5 +28,5 @@ index 28a798e497c2c12794169068e69b56dd954978f3..7b4086240fad7eb3ef8eed9eb94ffeb7
 +    // Paper end
 +
      @Override
-     public Material getPlacementMaterial() {
-         return CraftMagicNumbers.getMaterial(this.state.getBlock().asItem());
+     public Color getMapColor() {
+         return Color.fromRGB(this.state.getMapColor(null, null).col);
diff --git a/patches/server/1034-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1032-Add-predicate-for-blocks-when-raytracing.patch
index e4a2f0de7a..e4a2f0de7a 100644
--- a/patches/server/1034-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/1032-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/1035-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1033-Broadcast-take-item-packets-with-collector-as-source.patch
index 812aa7c18f..812aa7c18f 100644
--- a/patches/server/1035-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/1033-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/1036-fix-secure-profile-with-proxy-online-mode.patch b/patches/server/1034-fix-secure-profile-with-proxy-online-mode.patch
index 36016755bf..36016755bf 100644
--- a/patches/server/1036-fix-secure-profile-with-proxy-online-mode.patch
+++ b/patches/server/1034-fix-secure-profile-with-proxy-online-mode.patch
diff --git a/patches/server/1037-Expand-LingeringPotion-API.patch b/patches/server/1035-Expand-LingeringPotion-API.patch
index 9939920a04..9939920a04 100644
--- a/patches/server/1037-Expand-LingeringPotion-API.patch
+++ b/patches/server/1035-Expand-LingeringPotion-API.patch
diff --git a/patches/server/1038-Add-MaterialTagsTest.patch b/patches/server/1036-Add-MaterialTagsTest.patch
index 34233ba1ca..34233ba1ca 100644
--- a/patches/server/1038-Add-MaterialTagsTest.patch
+++ b/patches/server/1036-Add-MaterialTagsTest.patch
diff --git a/patches/server/1039-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1037-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index e03173000f..e03173000f 100644
--- a/patches/server/1039-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/1037-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/1040-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1038-Add-hand-to-fish-event-for-all-player-interactions.patch
index 6fef553fc5..6fef553fc5 100644
--- a/patches/server/1040-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/1038-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/1041-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1039-Fix-several-issues-with-EntityBreedEvent.patch
index b2d68ef645..b2d68ef645 100644
--- a/patches/server/1041-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/1039-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/1042-Add-UUID-attribute-modifier-API.patch b/patches/server/1040-Add-UUID-attribute-modifier-API.patch
index 37efcab4b6..37efcab4b6 100644
--- a/patches/server/1042-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/1040-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1043-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1041-Fix-missing-event-call-for-entity-teleport-API.patch
index e92b5d28d2..5e5c7129ce 100644
--- a/patches/server/1043-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/1041-Fix-missing-event-call-for-entity-teleport-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix missing event call for entity teleport API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0349d9b6ad12e0a426cb1307be8633240b7426fe..aa4dbf91cf6da329fdcacbde98bb870eb48e8f5c 100644
+index f4e4599336f8fa75ac200b1415a92ea203422fb7..1727e932ac6b9ca09b5df96f9547ff125114e15a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -610,6 +610,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -255,6 +255,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return false;
          }
  
diff --git a/patches/server/1044-Lazily-create-LootContext-for-criterions.patch b/patches/server/1042-Lazily-create-LootContext-for-criterions.patch
index 64a83b5146..64a83b5146 100644
--- a/patches/server/1044-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/1042-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/1045-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch b/patches/server/1043-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
index eb16d7e1fc..eb16d7e1fc 100644
--- a/patches/server/1045-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
+++ b/patches/server/1043-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
diff --git a/patches/server/1046-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1044-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index d9c157516b..380c7008be 100644
--- a/patches/server/1046-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/1044-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix CraftMetaItem#getAttributeModifier duplication check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 8762a7a22723150a1a42b3459f3744b8235da142..ed87722957a0bd5f6348b91ac2ea9bb5ceb6d853 100644
+index 4396043fb5d86978e9dbac6e0efb2ec1e1298b24..2ded472dbf0ed5ad3205e1dc8cbb20e1482a6ff6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -1176,7 +1176,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1175,7 +1175,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          Preconditions.checkNotNull(modifier, "AttributeModifier cannot be null");
          this.checkAttributeList();
          for (Map.Entry<Attribute, AttributeModifier> entry : this.attributeModifiers.entries()) {
diff --git a/patches/server/1047-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1045-Restore-vanilla-entity-drops-behavior.patch
index 648946920d..21ea7ded90 100644
--- a/patches/server/1047-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/1045-Restore-vanilla-entity-drops-behavior.patch
@@ -154,10 +154,10 @@ index ab708b256183fc54fe8e13f341d8a38acf611739..1e86e86b0a100a5d14aee10b60e70c32
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 916b29914f77bed0dbfdcd5eae8a6ef22948b9b0..f5a5ae30dfba21d5cf3990c046cfe41547e8a87a 100644
+index a7da88af0a41f16b3a54b28023a5afb6d9396262..f67ec3f5f4b7e2f678609f2387cc8afa2adce161 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -942,17 +942,21 @@ public class CraftEventFactory {
+@@ -939,17 +939,21 @@ public class CraftEventFactory {
      }
  
      public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim) {
@@ -183,7 +183,7 @@ index 916b29914f77bed0dbfdcd5eae8a6ef22948b9b0..f5a5ae30dfba21d5cf3990c046cfe415
          populateFields(victim, event); // Paper - make cancellable
          CraftWorld world = (CraftWorld) entity.getWorld();
          Bukkit.getServer().getPluginManager().callEvent(event);
-@@ -966,19 +970,23 @@ public class CraftEventFactory {
+@@ -963,19 +967,23 @@ public class CraftEventFactory {
          victim.expToDrop = event.getDroppedExp();
          lootCheck.run(); // Paper - advancement triggers before destroying items
  
@@ -211,7 +211,7 @@ index 916b29914f77bed0dbfdcd5eae8a6ef22948b9b0..f5a5ae30dfba21d5cf3990c046cfe415
          event.setKeepInventory(keepInventory);
          event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
          populateFields(victim, event); // Paper - make cancellable
-@@ -997,10 +1005,14 @@ public class CraftEventFactory {
+@@ -994,10 +1002,14 @@ public class CraftEventFactory {
          victim.expToDrop = event.getDroppedExp();
          victim.newExp = event.getNewExp();
  
diff --git a/patches/server/1048-Add-Structure-check-API.patch b/patches/server/1046-Add-Structure-check-API.patch
index 3f4c6ca1fc..3f4c6ca1fc 100644
--- a/patches/server/1048-Add-Structure-check-API.patch
+++ b/patches/server/1046-Add-Structure-check-API.patch
diff --git a/patches/server/1049-Dont-resend-blocks-on-interactions.patch b/patches/server/1047-Dont-resend-blocks-on-interactions.patch
index 8f8f7102fb..8f8f7102fb 100644
--- a/patches/server/1049-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/1047-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/1050-Temp-adventure-update.patch b/patches/server/1048-Temp-adventure-update.patch
index ad2dfe8fde..f98589261d 100644
--- a/patches/server/1050-Temp-adventure-update.patch
+++ b/patches/server/1048-Temp-adventure-update.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Temp adventure update
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6cfc43610940d3ab7c867352b27980a207ce3045..170a915098f09ace226648da342a04c5c7583d11 100644
+index 58da26ad2f128ba0b66f86820f60853f4be352f0..b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,7 +12,21 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
diff --git a/patches/server/1051-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/1049-Keep-previous-behavior-for-setResourcePack.patch
index c2d217c1ba..9d94d39634 100644
--- a/patches/server/1051-Keep-previous-behavior-for-setResourcePack.patch
+++ b/patches/server/1049-Keep-previous-behavior-for-setResourcePack.patch
@@ -10,10 +10,10 @@ packs before sending the new pack. Other API exists
 for adding a new pack to the existing packs on a client.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3c0fb2821c3b621b463accc0ca6915bd51992993..fd84786f3e72875e79df46416f47f3403876cef3 100644
+index d5b5bb52a0d678bfe69be54b2cd25c95c39daf8d..3be5e4df190bff0087c8450b16e4e37b07169040 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2350,8 +2350,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2347,8 +2347,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (hash != null) {
              Preconditions.checkArgument(hash.length == 20, "Resource pack hash should be 20 bytes long but was %s", hash.length);
  
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh
index 3e5e79f1b9..e994d90a5f 100755
--- a/scripts/upstreamCommit.sh
+++ b/scripts/upstreamCommit.sh
@@ -5,7 +5,7 @@ PS1="$"
 
 function changelog() {
     base=$(git ls-tree HEAD $1  | cut -d' ' -f3 | cut -f1)
-    cd $1 && git log --oneline ${base}...HEAD | sed -E 's/(^[0-9a-f]{8,}( SPIGOT-[0-9]{1,4},?)* |Revert ")#([0-9]+)/\1PR-\3/'
+    cd $1 && git log --oneline ${base}...HEAD | sed -E 's/(^[0-9a-f]{8,}( (SPIGOT-[0-9]{1,4}|MC-[0-9]{1,6}),?)* |Revert ")#([0-9]+)/\1PR-\4/'
 }
 bukkit=$(changelog work/Bukkit)
 cb=$(changelog work/CraftBukkit)
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 01bb6ba7d0add97af46db9ae8c2c991912033aa
+Subproject f29cb8015897da1bca0c93522c5884c4c9f9360
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject cb2ea54def89e749d9d1f6a4a7ea029110f03a4
+Subproject b3b43a6ad21c9f7fc2dd0a1e7e94abae0057770
diff --git a/work/Spigot b/work/Spigot
-Subproject ce0f71e4276e911707a258a968371f06f8718ac
+Subproject 06d602e7c3165ebf32f7419cb5873ec82d54ff7