994 files changed, 580 insertions, 577 deletions

diff --git a/README.md b/README.md
index 81900c34ce..07949c622e 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.19.2-R0.1-SNAPSHOT</version>
+    <version>1.19.3-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
  ```
@@ -54,7 +54,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
 }
 
 java {
diff --git a/build.gradle.kts b/build.gradle.kts
index 4984b4b877..443c5ec79d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,7 +61,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.19.2+build.28:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.19.3+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
     decompiler("net.minecraftforge:forgeflower:1.5.605.7")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
@@ -133,7 +133,7 @@ allprojects {
 
 tasks.collectAtsFromPatches {
     // Uncomment while updating for a new Minecraft version
-    // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
+    extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
 }
 
 tasks.register("printMinecraftVersion") {
diff --git a/gradle.properties b/gradle.properties
index d2cf8c41f7..0c899c224a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.19.2-R0.1-SNAPSHOT
-mcVersion=1.19.2
+version=1.19.3-R0.1-SNAPSHOT
+mcVersion=1.19.3
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 11e12cc29e..a815082dfe 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -27,7 +27,7 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..e1e7c0ff7edcc5865e81d458795755649837d7fc
+index 0000000000000000000000000000000000000000..9686f621c7b837a7a38ffb2fea10ae492b18556d
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,81 @@
@@ -43,8 +43,8 @@ index 0000000000000000000000000000000000000000..e1e7c0ff7edcc5865e81d45879575564
 +
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
-+    api("com.google.guava:guava:31.0.1-jre")
-+    api("com.google.code.gson:gson:2.8.9")
++    api("com.google.guava:guava:31.1-jre")
++    api("com.google.code.gson:gson:2.10")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4")
 +    api("org.yaml:snakeyaml:1.33")
 +
@@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..e1e7c0ff7edcc5865e81d45879575564
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index becaae6cc840ee2ac49853e41d86087bc0e893a8..0000000000000000000000000000000000000000
+index 389f3761876d2a667309d317d1a99b545f36771a..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,252 +0,0 @@
@@ -125,7 +125,7 @@ index becaae6cc840ee2ac49853e41d86087bc0e893a8..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.19.2-R0.1-SNAPSHOT</version>
+-    <version>1.19.3-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -155,14 +155,14 @@ index becaae6cc840ee2ac49853e41d86087bc0e893a8..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.google.guava</groupId>
 -            <artifactId>guava</artifactId>
--            <version>31.0.1-jre</version>
+-            <version>31.1-jre</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
 -        <dependency>
 -            <groupId>com.google.code.gson</groupId>
 -            <artifactId>gson</artifactId>
--            <version>2.8.9</version>
+-            <version>2.10</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index fd42c769ba..f56de5eb15 100644
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e1e7c0ff7edcc5865e81d458795755649837d7fc..fc6cd4fcab1b7430cb3d5c66e386bf4ea6e8f599 100644
+index 9686f621c7b837a7a38ffb2fea10ae492b18556d..2b3288057d67e5add4e22e6b7072527057bcd808 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,15 +14,27 @@ dependencies {
-     api("com.google.code.gson:gson:2.8.9")
+     api("com.google.code.gson:gson:2.10")
      api("net.md-5:bungeecord-chat:1.16-R0.4")
      api("org.yaml:snakeyaml:1.33")
 +    // Paper start
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index 692bddd2f2..7ad98abbcd 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f4b289d92892003bcc254a65cefe4d73c368aa55..3320666626cdadefc045331d33c3e9e9741344fc 100644
+index c2928c6f2d54de0ffde164fd9407085cf9fa18a6..ab62ed5c6767d0a858583af795018a82c94d2fc3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,17 +8,37 @@ java {
@@ -29,8 +29,8 @@ index f4b289d92892003bcc254a65cefe4d73c368aa55..3320666626cdadefc045331d33c3e9e9
 +
  dependencies {
      // api dependencies are listed transitively to API consumers
-     api("com.google.guava:guava:31.0.1-jre")
-     api("com.google.code.gson:gson:2.8.9")
+     api("com.google.guava:guava:31.1-jre")
+     api("com.google.code.gson:gson:2.10")
 -    api("net.md-5:bungeecord-chat:1.16-R0.4")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper
      api("org.yaml:snakeyaml:1.33")
@@ -735,7 +735,7 @@ index 0000000000000000000000000000000000000000..6e94562d79206d88b74b53814f9423f1
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b7066d6cad3 100644
+index 446e4d21c5b9b624e633875df62160a7351517d9..0084898567e8bb74fa271b65b56523a5c26d387c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -358,7 +358,9 @@ public final class Bukkit {
@@ -748,7 +748,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70
      public static int broadcastMessage(@NotNull String message) {
          return server.broadcastMessage(message);
      }
-@@ -1072,6 +1074,19 @@ public final class Bukkit {
+@@ -1074,6 +1076,19 @@ public final class Bukkit {
          server.shutdown();
      }
  
@@ -768,7 +768,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70
      /**
       * Broadcasts the specified message to every user with the given
       * permission name.
-@@ -1081,6 +1096,21 @@ public final class Bukkit {
+@@ -1083,6 +1098,21 @@ public final class Bukkit {
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
       */
@@ -790,7 +790,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70
      public static int broadcast(@NotNull String message, @NotNull String permission) {
          return server.broadcast(message, permission);
      }
-@@ -1319,6 +1349,7 @@ public final class Bukkit {
+@@ -1321,6 +1351,7 @@ public final class Bukkit {
          return server.createInventory(owner, type);
      }
  
@@ -798,7 +798,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70
      /**
       * 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;
-@@ -1344,6 +1375,38 @@ public final class Bukkit {
+@@ -1346,6 +1377,38 @@ public final class Bukkit {
       * @see InventoryType#isCreatable()
       */
      @NotNull
@@ -837,7 +837,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70
      public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
          return server.createInventory(owner, type, title);
      }
-@@ -1362,6 +1425,7 @@ public final class Bukkit {
+@@ -1364,6 +1427,7 @@ public final class Bukkit {
          return server.createInventory(owner, size);
      }
  
@@ -845,7 +845,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1374,10 +1438,30 @@ public final class Bukkit {
+@@ -1376,10 +1440,30 @@ public final class Bukkit {
       * @throws IllegalArgumentException if the size is not a multiple of 9
       */
      @NotNull
@@ -876,7 +876,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70
      /**
       * Creates an empty merchant.
       *
-@@ -1385,7 +1469,20 @@ public final class Bukkit {
+@@ -1387,7 +1471,20 @@ public final class Bukkit {
       * when the merchant inventory is viewed
       * @return a new merchant
       */
@@ -897,7 +897,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70
      public static Merchant createMerchant(@Nullable String title) {
          return server.createMerchant(title);
      }
-@@ -1502,22 +1599,47 @@ public final class Bukkit {
+@@ -1504,22 +1601,47 @@ public final class Bukkit {
          return server.isPrimaryThread();
      }
  
@@ -1070,7 +1070,7 @@ index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..c65f0d6569c130b4920a9e71ad24af64
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe3580854fd5 100644
+index 52dd3148ae2a3480982593dc627ef7eede52bc5a..892e03189957b0072827be4fd485dd98352334e8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -59,13 +59,13 @@ import org.jetbrains.annotations.Nullable;
@@ -1108,7 +1108,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
      public int broadcastMessage(@NotNull String message);
  
      /**
-@@ -911,8 +913,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -913,8 +915,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
@@ -1142,7 +1142,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
  
      /**
       * Gets the player by the given name, regardless if they are offline or
-@@ -1110,6 +1137,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -1112,6 +1139,7 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
  
@@ -1150,7 +1150,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
      /**
       * 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;
-@@ -1135,6 +1163,36 @@ public interface Server extends PluginMessageRecipient {
+@@ -1137,6 +1165,36 @@ public interface Server extends PluginMessageRecipient {
       * @see InventoryType#isCreatable()
       */
      @NotNull
@@ -1187,7 +1187,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
  
      /**
-@@ -1149,6 +1207,22 @@ public interface Server extends PluginMessageRecipient {
+@@ -1151,6 +1209,22 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
  
@@ -1210,7 +1210,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1159,10 +1233,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1161,10 +1235,13 @@ public interface Server extends PluginMessageRecipient {
       *     viewed
       * @return a new inventory
       * @throws IllegalArgumentException if the size is not a multiple of 9
@@ -1224,7 +1224,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
      /**
       * Creates an empty merchant.
       *
-@@ -1170,7 +1247,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -1172,7 +1249,18 @@ public interface Server extends PluginMessageRecipient {
       * when the merchant inventory is viewed
       * @return a new merchant
       */
@@ -1243,7 +1243,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
      Merchant createMerchant(@Nullable String title);
  
      /**
-@@ -1266,20 +1354,41 @@ public interface Server extends PluginMessageRecipient {
+@@ -1268,20 +1356,41 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean isPrimaryThread();
  
@@ -1285,7 +1285,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
      String getShutdownMessage();
  
      /**
-@@ -1661,7 +1770,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1663,7 +1772,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends the component to the player
           *
           * @param component the components to send
@@ -1295,7 +1295,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
          public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1670,7 +1781,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1672,7 +1783,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends an array of components as a single message to the player
           *
           * @param components the components to send
@@ -1306,7 +1306,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35
              throw new UnsupportedOperationException("Not supported yet.");
          }
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 21b95d404fbdf7f972f8a13ecd07dc28481f2286..da844079a9d3efd1a92c892de79fc7b3aeecaf4b 100644
+index 6b360758cd4cb02145f18ce743b51f91a471a650..bf8eea5464f4b09198e7b621419a3adade9f4601 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
 @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
@@ -1318,7 +1318,7 @@ index 21b95d404fbdf7f972f8a13ecd07dc28481f2286..da844079a9d3efd1a92c892de79fc7b3
  
      AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"),
      AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"),
-@@ -1345,4 +1345,12 @@ public enum Sound implements Keyed {
+@@ -1416,4 +1416,12 @@ public enum Sound implements Keyed {
      public NamespacedKey getKey() {
          return key;
      }
@@ -2689,10 +2689,10 @@ index 3c2ea8fec3a748cab7f5ad9100d12bd8213ec6c9..7941c60b0e1840785ba2b250071591bd
       * Gets how much EXP the Player should have at respawn.
       * <p>
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 441362d2fbdc9413ed64a1f00b50fb6d06327e79..e1e7f45fd0f65d0874dd0698da436c7ac2e7951b 100644
+index 21ef4150d41a57fdc4f405fea1f578448f0c860b..b917c13a30254a83cc2ea87279d427276bc75074 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -140,6 +140,18 @@ public enum InventoryType {
+@@ -144,6 +144,18 @@ public enum InventoryType {
      private final String title;
      private final boolean isCreatable;
  
@@ -2711,7 +2711,7 @@ index 441362d2fbdc9413ed64a1f00b50fb6d06327e79..e1e7f45fd0f65d0874dd0698da436c7a
      private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) {
          this(defaultSize, defaultTitle, true);
      }
-@@ -148,6 +160,7 @@ public enum InventoryType {
+@@ -152,6 +164,7 @@ public enum InventoryType {
          size = defaultSize;
          title = defaultTitle;
          this.isCreatable = isCreatable;
@@ -2719,7 +2719,7 @@ index 441362d2fbdc9413ed64a1f00b50fb6d06327e79..e1e7f45fd0f65d0874dd0698da436c7a
      }
  
      public int getDefaultSize() {
-@@ -155,6 +168,7 @@ public enum InventoryType {
+@@ -159,6 +172,7 @@ public enum InventoryType {
      }
  
      @NotNull
@@ -3501,55 +3501,53 @@ index 03bfca9d368bbe4b7c1353d52c883e756bf69bda..943d324435350d3f16fad3e21cb472a0
  
      /**
 diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-index cf13380b23b70edb73b5879397b64b24a1088729..77173e1ca3ce972632608c620aa1a2fffed27e04 100644
+index 5adbe0514129abf3cfbc4b29a213f522359fe2e1..732d8d0436dc76cff33394b43452ff8f7a9b7fab 100644
 --- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
 +++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-@@ -23,7 +23,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
+@@ -22,7 +22,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
+     private static final HandlerList handlers = new HandlerList();
      private final String hostname;
      private final InetAddress address;
-     private final boolean shouldSendChatPreviews;
 -    private String motd;
 +    private net.kyori.adventure.text.Component motd; // Paper
      private final int numPlayers;
      private int maxPlayers;
  
-@@ -37,7 +37,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
+@@ -31,7 +31,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
          Preconditions.checkArgument(numPlayers >= 0, "Cannot have negative number of players online", numPlayers);
          this.hostname = hostname;
          this.address = address;
 -        this.motd = motd;
 +        this.motd = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(motd); // Paper
-         this.shouldSendChatPreviews = shouldSendChatPreviews;
          this.numPlayers = numPlayers;
          this.maxPlayers = maxPlayers;
-@@ -58,16 +58,83 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
+     }
+@@ -45,15 +45,80 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
+      * @param address the address of the pinger
       * @param motd the message of the day
-      * @param shouldSendChatPreviews if the server should send chat previews
       * @param maxPlayers the max number of players
-+     * @deprecated in favour of {@link #ServerListPingEvent(String, java.net.InetAddress, net.kyori.adventure.text.Component, boolean, int)}
++     * @deprecated in favour of {@link #ServerListPingEvent(String, java.net.InetAddress, net.kyori.adventure.text.Component, int)}
       */
 +    @Deprecated // Paper
-     protected ServerListPingEvent(@NotNull final String hostname, @NotNull final InetAddress address, @NotNull final String motd, boolean shouldSendChatPreviews, final int maxPlayers) {
+     protected ServerListPingEvent(@NotNull final String hostname, @NotNull final InetAddress address, @NotNull final String motd, final int maxPlayers) {
          super(true);
          this.numPlayers = MAGIC_PLAYER_COUNT;
          this.hostname = hostname;
          this.address = address;
 +        this.motd = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(motd); // Paper
-+        this.shouldSendChatPreviews = shouldSendChatPreviews;
 +        this.maxPlayers = maxPlayers;
 +    }
 +    // Paper start
 +    @Deprecated
-+    public ServerListPingEvent(@NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, boolean shouldSendChatPreviews, final int numPlayers, final int maxPlayers) {
-+        this("", address, motd, shouldSendChatPreviews, numPlayers, maxPlayers);
++    public ServerListPingEvent(@NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, final int numPlayers, final int maxPlayers) {
++        this("", address, motd, numPlayers, maxPlayers);
 +    }
-+    public ServerListPingEvent(@NotNull final String hostname, @NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, boolean shouldSendChatPreviews, final int numPlayers, final int maxPlayers) {
++    public ServerListPingEvent(@NotNull final String hostname, @NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, final int numPlayers, final int maxPlayers) {
 +        super(true);
 +        Preconditions.checkArgument(numPlayers >= 0, "Cannot have negative number of players online (%s)", numPlayers);
 +        this.hostname = hostname;
 +        this.address = address;
          this.motd = motd;
-         this.shouldSendChatPreviews = shouldSendChatPreviews;
 +        this.numPlayers = numPlayers;
          this.maxPlayers = maxPlayers;
      }
@@ -3561,11 +3559,11 @@ index cf13380b23b70edb73b5879397b64b24a1088729..77173e1ca3ce972632608c620aa1a2ff
 +     * @param address the address of the pinger
 +     * @param motd the message of the day
 +     * @param maxPlayers the max number of players
-+     * @deprecated in favour of {@link #ServerListPingEvent(String, java.net.InetAddress, net.kyori.adventure.text.Component, boolean, int)}
++     * @deprecated in favour of {@link #ServerListPingEvent(String, java.net.InetAddress, net.kyori.adventure.text.Component, int)}
 +     */
 +    @Deprecated
-+    protected ServerListPingEvent(@NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, boolean shouldSendChatPreviews, final int maxPlayers) {
-+        this("", address, motd, shouldSendChatPreviews, maxPlayers);
++    protected ServerListPingEvent(@NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, final int maxPlayers) {
++        this("", address, motd, maxPlayers);
 +    }
 +
 +    /**
@@ -3578,12 +3576,11 @@ index cf13380b23b70edb73b5879397b64b24a1088729..77173e1ca3ce972632608c620aa1a2ff
 +     * @param motd the message of the day
 +     * @param maxPlayers the max number of players
 +     */
-+    protected ServerListPingEvent(final @NotNull String hostname, final @NotNull InetAddress address, final @NotNull net.kyori.adventure.text.Component motd, final boolean shouldSendChatPreviews, final int maxPlayers) {
++    protected ServerListPingEvent(final @NotNull String hostname, final @NotNull InetAddress address, final @NotNull net.kyori.adventure.text.Component motd, final int maxPlayers) {
 +        this.numPlayers = MAGIC_PLAYER_COUNT;
 +        this.hostname = hostname;
 +        this.address = address;
 +        this.motd = motd;
-+        this.shouldSendChatPreviews = shouldSendChatPreviews;
 +        this.maxPlayers = maxPlayers;
 +    }
 +    /**
@@ -3606,7 +3603,7 @@ index cf13380b23b70edb73b5879397b64b24a1088729..77173e1ca3ce972632608c620aa1a2ff
  
      /**
       * Gets the hostname that the player used to connect to the server, or
-@@ -94,19 +161,23 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
+@@ -80,19 +145,23 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
       * Get the message of the day message.
       *
       * @return the message of the day
diff --git a/patches/api/0007-Timings-v2.patch b/patches/api/0007-Timings-v2.patch
index 59277e9e04..9303d3c156 100644
--- a/patches/api/0007-Timings-v2.patch
+++ b/patches/api/0007-Timings-v2.patch
@@ -2791,7 +2791,7 @@ index 0000000000000000000000000000000000000000..5989ee21297935651b0edd44b8239e65
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c800da7aba43de995682eb724ccf8b7066d6cad3..557cf1ff29e16fa942545ceca14696c2a50b2d4d 100644
+index 0084898567e8bb74fa271b65b56523a5c26d387c..e24589a4cb42b0163e4a1455b8b11d7130b5cd41 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -802,7 +802,6 @@ public final class Bukkit {
@@ -2803,10 +2803,10 @@ index c800da7aba43de995682eb724ccf8b7066d6cad3..557cf1ff29e16fa942545ceca14696c2
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 4d5c3af2e1f0030aa7415fbe9d11fe3580854fd5..a2ae6b84fe20e43292f1442401a472dcce1600ec 100644
+index 892e03189957b0072827be4fd485dd98352334e8..ac087402c90dad4b3c499fcf8507e50e9099cea5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1766,6 +1766,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1768,6 +1768,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
diff --git a/patches/api/0010-Add-getTPS-method.patch b/patches/api/0010-Add-getTPS-method.patch
index 71a488925f..978f773c66 100644
--- a/patches/api/0010-Add-getTPS-method.patch
+++ b/patches/api/0010-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 a5c02f744664248f46aa35452318b6a728cd4afd..3603bcdadeea10f2babe8d6c609d7eaee3f0f89c 100644
+index 71a09ed2b9863d2d339967f41ab6373ec27429d3..397f57f0ab4844fb88c60681bf6e6e3db8a98945 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1889,6 +1889,17 @@ public final class Bukkit {
+@@ -1891,6 +1891,17 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -27,10 +27,10 @@ index a5c02f744664248f46aa35452318b6a728cd4afd..3603bcdadeea10f2babe8d6c609d7eae
       * 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 da13ae75ca1892c21a35aff02f92b91783a868bf..36f5e47ffcdce23b0b5594881fdd49a3a3337578 100644
+index a4f8035b40eebff8afe01788781128b04247f28c..3f3531e208472a0e76f76e2b1a08a699527cef8f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1603,6 +1603,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1605,6 +1605,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  
diff --git a/patches/api/0018-Expose-server-CommandMap.patch b/patches/api/0018-Expose-server-CommandMap.patch
index b491f0f613..02a4a3417a 100644
--- a/patches/api/0018-Expose-server-CommandMap.patch
+++ b/patches/api/0018-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 3603bcdadeea10f2babe8d6c609d7eaee3f0f89c..5475f7df443a31e839d353e251b0d9d55e53a84f 100644
+index 397f57f0ab4844fb88c60681bf6e6e3db8a98945..1035ce181415a19f8d6460f70d3d900e3f7017d3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2090,6 +2090,19 @@ public final class Bukkit {
+@@ -2092,6 +2092,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index 3603bcdadeea10f2babe8d6c609d7eaee3f0f89c..5475f7df443a31e839d353e251b0d9d5
      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 36f5e47ffcdce23b0b5594881fdd49a3a3337578..2dac2c6e01b4f230750605ab1f49317927705c6b 100644
+index 3f3531e208472a0e76f76e2b1a08a699527cef8f..6a7b91af3e738613cf79c13e2844efe9a2efd254 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1613,6 +1613,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1615,6 +1615,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public double[] getTPS();
      // Paper end
  
diff --git a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
index 52b78c56c4..9f6ec05cf3 100644
--- a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -6,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 7a8eaf46ecd37163dbe34beb2cf8754bddae302f..9463169bdb45a53ad774a0e3a5ec07704508685f 100644
+index 316146305465b68b703e898206745de94ad5350f..6311d7ef36b3c6922c73695c353c561c507f2128 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2125,6 +2125,13 @@ public final class Bukkit {
+@@ -2127,6 +2127,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 7a8eaf46ecd37163dbe34beb2cf8754bddae302f..9463169bdb45a53ad774a0e3a5ec0770
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1aed052ea337f2875b581064bd8e79d8a5a1a9ec..cd51a1a9a59cfa868237ab750d98d9df8464152f 100644
+index bef555b3de44fed312b45a5d5cd811b18fda88c8..994f494fe7cace5c88738858def4051788391a3c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1874,4 +1874,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1876,4 +1876,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      Spigot spigot();
      // Spigot end
diff --git a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
index 6e73474e0f..5be01c94c3 100644
--- a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0042-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 9463169bdb45a53ad774a0e3a5ec07704508685f..fe5f6494fb0610dd11e59793701b2182fa862419 100644
+index 6311d7ef36b3c6922c73695c353c561c507f2128..a314ff1363cb527fa7e1b366f9191939e9c7ca6e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2132,6 +2132,15 @@ public final class Bukkit {
+@@ -2134,6 +2134,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 9463169bdb45a53ad774a0e3a5ec07704508685f..fe5f6494fb0610dd11e59793701b2182
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index cd51a1a9a59cfa868237ab750d98d9df8464152f..29e71b746adcec45657787bf38427027508b0043 100644
+index 994f494fe7cace5c88738858def4051788391a3c..610475aff60b7f19c4bedb932985c736fb890684 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1876,4 +1876,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1878,4 +1878,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Spigot end
  
      void reloadPermissions(); // Paper
diff --git a/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch
index 96389ab056..3053e5bf28 100644
--- a/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/api/0053-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 fe5f6494fb0610dd11e59793701b2182fa862419..05908e512b0f2c01124737cf68df79c6c04518ee 100644
+index a314ff1363cb527fa7e1b366f9191939e9c7ca6e..d3d8c5ac59cee2ec24e91223e0c994016a4f9752 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2141,6 +2141,16 @@ public final class Bukkit {
+@@ -2143,6 +2143,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index fe5f6494fb0610dd11e59793701b2182fa862419..05908e512b0f2c01124737cf68df79c6
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 29e71b746adcec45657787bf38427027508b0043..f84c37ad591f4d0e4062889941791a3aeb7c5be5 100644
+index 610475aff60b7f19c4bedb932985c736fb890684..a8d3addae5b0ed261d6a27052ad4e54970de597c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1878,4 +1878,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1880,4 +1880,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
diff --git a/patches/api/0054-Fix-upstream-javadocs.patch b/patches/api/0054-Fix-upstream-javadocs.patch
index 9141a754dc..4562c30b86 100644
--- a/patches/api/0054-Fix-upstream-javadocs.patch
+++ b/patches/api/0054-Fix-upstream-javadocs.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadocs
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 05908e512b0f2c01124737cf68df79c6c04518ee..2ff65157d511108e2902838f37732742b186af6e 100644
+index d3d8c5ac59cee2ec24e91223e0c994016a4f9752..82757d3013e01a6bfbb685929955d3e7dad8508c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1332,6 +1332,8 @@ public final class Bukkit {
+@@ -1334,6 +1334,8 @@ public final class Bukkit {
  
      /**
       * Gets every player that has ever played on this server.
@@ -19,7 +19,7 @@ index 05908e512b0f2c01124737cf68df79c6c04518ee..2ff65157d511108e2902838f37732742
       * @return an array containing all previous players
       */
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f84c37ad591f4d0e4062889941791a3aeb7c5be5..d9566b18e6109db824cbc1732666771bf124adbf 100644
+index a8d3addae5b0ed261d6a27052ad4e54970de597c..3485db7548e93242f99977a236eb3bcebedfb964 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -510,13 +510,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -37,7 +37,7 @@ index f84c37ad591f4d0e4062889941791a3aeb7c5be5..d9566b18e6109db824cbc1732666771b
       */
      public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
  
-@@ -1127,6 +1124,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1129,6 +1126,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
      /**
       * Gets every player that has ever played on this server.
diff --git a/patches/api/0058-Basic-PlayerProfile-API.patch b/patches/api/0058-Basic-PlayerProfile-API.patch
index f5c412834d..16e4589015 100644
--- a/patches/api/0058-Basic-PlayerProfile-API.patch
+++ b/patches/api/0058-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 2ff65157d511108e2902838f37732742b186af6e..d5fd584c109c0a84a4259b10e7b43fae3a1da1ae 100644
+index 82757d3013e01a6bfbb685929955d3e7dad8508c..a6a792babe69712594c18f49542feb30ff591810 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2153,6 +2153,83 @@ public final class Bukkit {
+@@ -2155,6 +2155,83 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -409,10 +409,10 @@ index 2ff65157d511108e2902838f37732742b186af6e..d5fd584c109c0a84a4259b10e7b43fae
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d9566b18e6109db824cbc1732666771bf124adbf..fab39e4fc595c022da27e87e27bd168939e54381 100644
+index 3485db7548e93242f99977a236eb3bcebedfb964..bf1102b4481b8c9b9c4f5ba0c561556b75fea077 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1886,5 +1886,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1888,5 +1888,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/0077-Display-warning-on-deprecated-recipe-API.patch b/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch
index 48352336bf..3d2b357c11 100644
--- a/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch
+++ b/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch
@@ -10,10 +10,10 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index fde34da0f7a13dee06e479fd6c5350a69beb3c95..ad2ab6e97ccf6900d19f8bfbe08181d4c7743a99 100644
+index e57e600283702dd7fc60fa3baa1e1cc1b8574873..7be830ea0a3b24c5cdfb8e6ab62cb2ee506a4026 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -24,6 +24,7 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -26,6 +26,7 @@ public class ShapedRecipe implements Recipe, Keyed {
      public ShapedRecipe(@NotNull ItemStack result) {
          Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
          this.key = NamespacedKey.randomKey();
@@ -22,10 +22,10 @@ index fde34da0f7a13dee06e479fd6c5350a69beb3c95..ad2ab6e97ccf6900d19f8bfbe08181d4
      }
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index cc3f7cccfa06a92f3ca192cb88f30f8929c02dfd..75b47c608d0a902e4ea5f03c395667f47dec8980 100644
+index df4c52f1f0be2409c7506b09167bd58b5602fa7a..62675962d1b7882b953d2618aed1f363c046e97d 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -25,6 +25,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -27,6 +27,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
      public ShapelessRecipe(@NotNull ItemStack result) {
          Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
          this.key = NamespacedKey.randomKey();
diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/api/0091-Player.setPlayerProfile-API.patch
index a8fad2d70d..edc236ceb3 100644
--- a/patches/api/0091-Player.setPlayerProfile-API.patch
+++ b/patches/api/0091-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 d5fd584c109c0a84a4259b10e7b43fae3a1da1ae..a452adcbf8657c501ad92f4cb361b551992f128f 100644
+index a6a792babe69712594c18f49542feb30ff591810..ec1af46667d8590ea218370249286f86652f3ac4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1197,8 +1197,10 @@ public final class Bukkit {
+@@ -1199,8 +1199,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 d5fd584c109c0a84a4259b10e7b43fae3a1da1ae..a452adcbf8657c501ad92f4cb361b551
      public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
          return server.createPlayerProfile(uniqueId, name);
      }
-@@ -1209,8 +1211,10 @@ public final class Bukkit {
+@@ -1211,8 +1213,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 d5fd584c109c0a84a4259b10e7b43fae3a1da1ae..a452adcbf8657c501ad92f4cb361b551
      public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
          return server.createPlayerProfile(uniqueId);
      }
-@@ -1222,8 +1226,10 @@ public final class Bukkit {
+@@ -1224,8 +1228,10 @@ public final class Bukkit {
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the name is <code>null</code> or
       * blank
@@ -43,10 +43,10 @@ index d5fd584c109c0a84a4259b10e7b43fae3a1da1ae..a452adcbf8657c501ad92f4cb361b551
          return server.createPlayerProfile(name);
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index fab39e4fc595c022da27e87e27bd168939e54381..e90056341407f58ff6ce2d9b80c8f3f64464e650 100644
+index bf1102b4481b8c9b9c4f5ba0c561556b75fea077..8539bac19bf9ba1a66689a9af90e088a03f9c152 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1015,8 +1015,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1017,8 +1017,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
@@ -57,7 +57,7 @@ index fab39e4fc595c022da27e87e27bd168939e54381..e90056341407f58ff6ce2d9b80c8f3f6
      PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
  
      /**
-@@ -1025,8 +1027,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1027,8 +1029,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>
@@ -68,7 +68,7 @@ index fab39e4fc595c022da27e87e27bd168939e54381..e90056341407f58ff6ce2d9b80c8f3f6
      PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
  
      /**
-@@ -1036,8 +1040,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1038,8 +1042,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
diff --git a/patches/api/0155-Material-API-additions.patch b/patches/api/0155-Material-API-additions.patch
index 9f13508f04..bbda411f80 100644
--- a/patches/api/0155-Material-API-additions.patch
+++ b/patches/api/0155-Material-API-additions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 47d14a334c0f8d0918a2f08d5bf54f82370aaf44..666ed1075dad7c233c450f033d2309c748a2be26 100644
+index bcf746a611fbfa66b12b31a12710c423ba39d42c..cd09fa22e6322770bcb582ba00a384c5ca0fd8d8 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -109,6 +109,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -112,6 +112,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * An enum of all material IDs accepted by the official server and client
   */
@@ -16,7 +16,7 @@ index 47d14a334c0f8d0918a2f08d5bf54f82370aaf44..666ed1075dad7c233c450f033d2309c7
  public enum Material implements Keyed {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -4113,6 +4114,22 @@ public enum Material implements Keyed {
+@@ -4273,6 +4274,22 @@ public enum Material implements Keyed {
          }
      }
  
diff --git a/patches/api/0163-Make-the-default-permission-message-configurable.patch b/patches/api/0163-Make-the-default-permission-message-configurable.patch
index 780b707eab..2895285fe4 100644
--- a/patches/api/0163-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0163-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 303e539338383d0d7825b873611ca5843ee1c0a3..00295e256c0def25dd3e552ef67eea06ab01ad15 100644
+index 6567da9e9c89f1995b9c3544b4dd767d66e6f5f2..c59700bcec0938bd5a0f10c4e0d5e3e2c446d622 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2193,6 +2193,28 @@ public final class Bukkit {
+@@ -2195,6 +2195,28 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -38,10 +38,10 @@ index 303e539338383d0d7825b873611ca5843ee1c0a3..00295e256c0def25dd3e552ef67eea06
       * 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 b0e6446c0dc49088878d7ae453dc3eee8b346f4e..dc26cf95f1769da76dd4d768a0912c1f5346d83e 100644
+index c46cae77e6a1d3f01b08ff03407eb1a564d000de..7e51025404bdc64e5eff48423280ad53244c6631 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1905,6 +1905,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1907,6 +1907,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
diff --git a/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch
index 9517c3da01..90e6e08be5 100644
--- a/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch
@@ -9,10 +9,10 @@ Redirects some of upstream's APIs to these new methods to avoid
 usage of magic values and the deprecated RecipeChoice#getItemStack
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index ad2ab6e97ccf6900d19f8bfbe08181d4c7743a99..ecf8cd763ae600c11be6385ea6240e4d2c08abc9 100644
+index 7be830ea0a3b24c5cdfb8e6ab62cb2ee506a4026..baba8485587baab945add8bc91e91a1bfa27c84b 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -144,6 +144,13 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -146,6 +146,13 @@ public class ShapedRecipe implements Recipe, Keyed {
          return this;
      }
  
@@ -27,10 +27,10 @@ index ad2ab6e97ccf6900d19f8bfbe08181d4c7743a99..ecf8cd763ae600c11be6385ea6240e4d
       * Get a copy of the ingredients map.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 75b47c608d0a902e4ea5f03c395667f47dec8980..7485da0de3712619b8d89d0b21f60fe20dafad6b 100644
+index 62675962d1b7882b953d2618aed1f363c046e97d..61b3a1b1d03fe6cdacb82b07e6c7197f56b4a1b3 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -142,6 +142,40 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -144,6 +144,40 @@ public class ShapelessRecipe implements Recipe, Keyed {
          return this;
      }
  
@@ -71,7 +71,7 @@ index 75b47c608d0a902e4ea5f03c395667f47dec8980..7485da0de3712619b8d89d0b21f60fe2
      /**
       * Removes an ingredient from the list.
       *
-@@ -165,7 +199,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -167,7 +201,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
       */
      @NotNull
      public ShapelessRecipe removeIngredient(@NotNull Material ingredient) {
@@ -80,7 +80,7 @@ index 75b47c608d0a902e4ea5f03c395667f47dec8980..7485da0de3712619b8d89d0b21f60fe2
      }
  
      /**
-@@ -192,7 +226,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -194,7 +228,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
       */
      @NotNull
      public ShapelessRecipe removeIngredient(int count, @NotNull Material ingredient) {
diff --git a/patches/api/0175-Fix-Spigot-annotation-mistakes.patch b/patches/api/0175-Fix-Spigot-annotation-mistakes.patch
index e922e942d3..14eafe77a6 100644
--- a/patches/api/0175-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0175-Fix-Spigot-annotation-mistakes.patch
@@ -9,10 +9,10 @@ a ton of noise to plugin developers.
 These do not help plugin developers if they bring moise noise than value.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 00295e256c0def25dd3e552ef67eea06ab01ad15..940e93021aba7dade1558054deead5896d74d3c6 100644
+index c59700bcec0938bd5a0f10c4e0d5e3e2c446d622..9abb50fb10bb2fbd21d5f31e54b135416cae3433 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1198,10 +1198,8 @@ public final class Bukkit {
+@@ -1200,10 +1200,8 @@ public final class Bukkit {
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -24,7 +24,7 @@ index 00295e256c0def25dd3e552ef67eea06ab01ad15..940e93021aba7dade1558054deead589
      @NotNull
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
-@@ -1750,7 +1748,7 @@ public final class Bukkit {
+@@ -1752,7 +1750,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -79,10 +79,10 @@ index 57cb548683f7b2972c998afd34176952426f8b47..d4c87bfed81b2d73919705912f59fab0
          if (this.world == null) {
              return null;
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 666ed1075dad7c233c450f033d2309c748a2be26..6eb0b9ba2b7ad5faba31220483c424203802e1d3 100644
+index cd09fa22e6322770bcb582ba00a384c5ca0fd8d8..a7d36ef22724f0ce3add61ab314e09e6465077d4 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4143,11 +4143,11 @@ public enum Material implements Keyed {
+@@ -4303,11 +4303,11 @@ public enum Material implements Keyed {
      }
  
      /**
@@ -96,7 +96,7 @@ index 666ed1075dad7c233c450f033d2309c748a2be26..6eb0b9ba2b7ad5faba31220483c42420
      public boolean isLegacy() {
          return legacy;
      }
-@@ -4218,8 +4218,10 @@ public enum Material implements Keyed {
+@@ -4378,8 +4378,10 @@ public enum Material implements Keyed {
       * Gets the MaterialData class associated with this Material
       *
       * @return MaterialData associated with this Material
@@ -159,10 +159,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 dc26cf95f1769da76dd4d768a0912c1f5346d83e..8c608f9260acd8257b49f9befae510fa645886a8 100644
+index 7e51025404bdc64e5eff48423280ad53244c6631..60897ff659a468f80f6ddf554c8facb136ecb24b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -999,10 +999,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1001,10 +1001,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)
@@ -174,7 +174,7 @@ index dc26cf95f1769da76dd4d768a0912c1f5346d83e..8c608f9260acd8257b49f9befae510fa
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
-@@ -1468,7 +1466,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1470,7 +1468,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -552,10 +552,10 @@ index 0cc6e29a5af28e95f87f415d6b2424d4622a6f34..acba500393e1736e6081facac6ef9ab1
  
          /**
 diff --git a/src/main/java/org/bukkit/inventory/CookingRecipe.java b/src/main/java/org/bukkit/inventory/CookingRecipe.java
-index 6f251252aa96f202139103c657a81c71a0ffbfaf..e95ee930c4791c441c9b54b2c284f3da343eb376 100644
+index 571652ba8843a9493f1843523e24145baa958637..f7fa79393aef40027446b78bac8e9490cfafd8bc 100644
 --- a/src/main/java/org/bukkit/inventory/CookingRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/CookingRecipe.java
-@@ -66,7 +66,9 @@ public abstract class CookingRecipe<T extends CookingRecipe> implements Recipe,
+@@ -68,7 +68,9 @@ public abstract class CookingRecipe<T extends CookingRecipe> implements Recipe,
       * Get the input material.
       *
       * @return The input material.
@@ -757,10 +757,10 @@ index 5461f7fa75f5a065bb333b4a113640b5fe1e3825..c4d657727e508cb941320730a9d3aa54
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index ecf8cd763ae600c11be6385ea6240e4d2c08abc9..161e408bf90de7ca8c3ea418543d25ecccc35c48 100644
+index baba8485587baab945add8bc91e91a1bfa27c84b..038a82b865afee02380805bd1f3816149143c811 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -95,8 +95,10 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -97,8 +97,10 @@ public class ShapedRecipe implements Recipe, Keyed {
       * @param key The character that represents the ingredient in the shape.
       * @param ingredient The ingredient.
       * @return The changed recipe, so you can chain calls.
@@ -771,7 +771,7 @@ index ecf8cd763ae600c11be6385ea6240e4d2c08abc9..161e408bf90de7ca8c3ea418543d25ec
      public ShapedRecipe setIngredient(char key, @NotNull MaterialData ingredient) {
          return setIngredient(key, ingredient.getItemType(), ingredient.getData());
      }
-@@ -155,7 +157,9 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -157,7 +159,9 @@ public class ShapedRecipe implements Recipe, Keyed {
       * Get a copy of the ingredients map.
       *
       * @return The mapping of character to ingredients.
@@ -782,10 +782,10 @@ index ecf8cd763ae600c11be6385ea6240e4d2c08abc9..161e408bf90de7ca8c3ea418543d25ec
      public Map<Character, ItemStack> getIngredientMap() {
          HashMap<Character, ItemStack> result = new HashMap<Character, ItemStack>();
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3dc2e7acf8 100644
+index 61b3a1b1d03fe6cdacb82b07e6c7197f56b4a1b3..402eef14987f00d2a5fccc45f0b7e3b1c16706dc 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -54,8 +54,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -56,8 +56,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
       *
       * @param ingredient The ingredient to add.
       * @return The changed recipe, so you can chain calls.
@@ -796,7 +796,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d
      public ShapelessRecipe addIngredient(@NotNull MaterialData ingredient) {
          return addIngredient(1, ingredient);
      }
-@@ -91,8 +93,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -93,8 +95,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
       * @param count How many to add (can't be more than 9!)
       * @param ingredient The ingredient to add.
       * @return The changed recipe, so you can chain calls.
@@ -807,7 +807,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d
      public ShapelessRecipe addIngredient(int count, @NotNull MaterialData ingredient) {
          return addIngredient(count, ingredient.getItemType(), ingredient.getData());
      }
-@@ -209,8 +213,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -211,8 +215,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
       *
       * @param ingredient The ingredient to remove
       * @return The changed recipe.
@@ -818,7 +818,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d
      public ShapelessRecipe removeIngredient(@NotNull MaterialData ingredient) {
          return removeIngredient(ingredient.getItemType(), ingredient.getData());
      }
-@@ -237,8 +243,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -239,8 +245,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
       * @param count The number of copies to remove.
       * @param ingredient The ingredient to remove.
       * @return The changed recipe.
@@ -829,7 +829,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d
      public ShapelessRecipe removeIngredient(int count, @NotNull MaterialData ingredient) {
          return removeIngredient(count, ingredient.getItemType(), ingredient.getData());
      }
-@@ -299,7 +307,9 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -301,7 +309,9 @@ public class ShapelessRecipe implements Recipe, Keyed {
       * Get the list of ingredients used for this recipe.
       *
       * @return The input list
@@ -840,7 +840,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d
      public List<ItemStack> getIngredientList() {
          ArrayList<ItemStack> result = new ArrayList<ItemStack>(ingredients.size());
 diff --git a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
-index d8ef781d6b025790ce9d2a9782e6ef2a47cc8e62..09806e5f7f01028baad2985406c3c1a43be459f8 100644
+index 07c3dff4d6190ef388d9c1e1c36f67f00a3e8e66..aa5e7f37d20d6976f33e04876ae625ed0e5b2b41 100644
 --- a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
 @@ -57,7 +57,9 @@ public class StonecuttingRecipe implements Recipe, Keyed {
diff --git a/patches/api/0183-Expose-the-internal-current-tick.patch b/patches/api/0183-Expose-the-internal-current-tick.patch
index c8ae43d595..bc7b98793b 100644
--- a/patches/api/0183-Expose-the-internal-current-tick.patch
+++ b/patches/api/0183-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 940e93021aba7dade1558054deead5896d74d3c6..d3f784c0c68567ee94befa57e0be1cedc7d586cb 100644
+index 9abb50fb10bb2fbd21d5f31e54b135416cae3433..75be5b6c2f01fa794ed4d69082d34ab0a422e8cb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2289,6 +2289,10 @@ public final class Bukkit {
+@@ -2291,6 +2291,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 940e93021aba7dade1558054deead5896d74d3c6..d3f784c0c68567ee94befa57e0be1ced
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8c608f9260acd8257b49f9befae510fa645886a8..d092d43178c1795028c33518713a8156648c460b 100644
+index 60897ff659a468f80f6ddf554c8facb136ecb24b..2cd6826cb5d8e5b545644e063c0d67d68f2c1322 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1988,5 +1988,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1990,5 +1990,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/0189-Add-tick-times-API.patch b/patches/api/0189-Add-tick-times-API.patch
index 3f4f81a1a3..c86c5399ab 100644
--- a/patches/api/0189-Add-tick-times-API.patch
+++ b/patches/api/0189-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 d3f784c0c68567ee94befa57e0be1cedc7d586cb..dab845c22713c0a3ae044afaf16d7b72eeff8ea5 100644
+index 75be5b6c2f01fa794ed4d69082d34ab0a422e8cb..18acd00146e073cfd7912b05c87cdcb124a9ff9f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1961,6 +1961,25 @@ public final class Bukkit {
+@@ -1963,6 +1963,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
@@ -35,10 +35,10 @@ index d3f784c0c68567ee94befa57e0be1cedc7d586cb..dab845c22713c0a3ae044afaf16d7b72
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d092d43178c1795028c33518713a8156648c460b..13e4893049219ff1e50ede8df405561360ae4760 100644
+index 2cd6826cb5d8e5b545644e063c0d67d68f2c1322..38f9977e302322dc511214553bcd727ef08c14c5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1650,6 +1650,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1652,6 +1652,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      public double[] getTPS();
diff --git a/patches/api/0190-Expose-MinecraftServer-isRunning.patch b/patches/api/0190-Expose-MinecraftServer-isRunning.patch
index 7a9f4ee7d6..ff57b1d5fe 100644
--- a/patches/api/0190-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0190-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 dab845c22713c0a3ae044afaf16d7b72eeff8ea5..4771149c9fcee5e51c5313fffb105ad6f68a256a 100644
+index 18acd00146e073cfd7912b05c87cdcb124a9ff9f..51a43429e58fbebf8c95d23257cd9c84ce57b1aa 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2312,6 +2312,15 @@ public final class Bukkit {
+@@ -2314,6 +2314,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
@@ -26,10 +26,10 @@ index dab845c22713c0a3ae044afaf16d7b72eeff8ea5..4771149c9fcee5e51c5313fffb105ad6
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 13e4893049219ff1e50ede8df405561360ae4760..201cbb0d33fc25e90b7960894eb6a9e6ef0d107b 100644
+index 38f9977e302322dc511214553bcd727ef08c14c5..122ef60bcb1548713f2e355cb77eccbebcd17f04 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2010,5 +2010,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2012,5 +2012,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return Current tick
       */
      int getCurrentTick();
diff --git a/patches/api/0200-Add-Mob-Goal-API.patch b/patches/api/0200-Add-Mob-Goal-API.patch
index d4f8ce75de..f3f71f0bc5 100644
--- a/patches/api/0200-Add-Mob-Goal-API.patch
+++ b/patches/api/0200-Add-Mob-Goal-API.patch
@@ -523,10 +523,10 @@ index 0000000000000000000000000000000000000000..8fd399f791b45eb7fc62693ca954eea0
 +    @Deprecated 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 022a3de1bc7969a1db7395a910782bde1468758a..f3f8a6db7ee1b4ea1aaf6bc972fa02a8af5f3772 100644
+index f4897529322f57eaf0d26ce82307dcd785511af8..93a74792837e6dcff354e5f0afb7aacd0a19f7e1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2333,6 +2333,16 @@ public final class Bukkit {
+@@ -2335,6 +2335,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
@@ -544,10 +544,10 @@ index 022a3de1bc7969a1db7395a910782bde1468758a..f3f8a6db7ee1b4ea1aaf6bc972fa02a8
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 832b19712612fdbac5d2f472aab203b14f7e4a46..4f17bc607639bb3d20a1694ffb02d22d283348b3 100644
+index 97c2708b69ff01f9e7898ad7282016cac605bc79..cd3ce4155ff46d85d4c603a688dd96893400ed77 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2027,5 +2027,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2029,5 +2029,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/0220-Add-methods-to-get-translation-keys.patch b/patches/api/0220-Add-methods-to-get-translation-keys.patch
index 29e183af97..c9a54f742e 100644
--- a/patches/api/0220-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0220-Add-methods-to-get-translation-keys.patch
@@ -119,7 +119,7 @@ index 938c3217f92e6d3ef9a637269c469f8359af6347..ef49495909a37d718a87d5dfbcd644d4
  
      /**
 diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java
-index dddc450e1372409c513bbedc0acfc80d9f749333..38a1b02c006af766b0c10ee65e9fc28f5a922774 100644
+index 0a66077d152a3c89fa7a277663969767798eb100..b02490737409eb80a2d2fb275c9a60b6078a8133 100644
 --- a/src/main/java/org/bukkit/GameRule.java
 +++ b/src/main/java/org/bukkit/GameRule.java
 @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable;
@@ -131,7 +131,7 @@ index dddc450e1372409c513bbedc0acfc80d9f749333..38a1b02c006af766b0c10ee65e9fc28f
  
      private static Map<String, GameRule<?>> gameRules = new HashMap<>();
      // Boolean rules
-@@ -288,4 +288,11 @@ public final class GameRule<T> {
+@@ -314,4 +314,11 @@ public final class GameRule<T> {
      public static GameRule<?>[] values() {
          return gameRules.values().toArray(new GameRule<?>[gameRules.size()]);
      }
@@ -144,10 +144,10 @@ index dddc450e1372409c513bbedc0acfc80d9f749333..38a1b02c006af766b0c10ee65e9fc28f
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 6eb0b9ba2b7ad5faba31220483c424203802e1d3..a4c7ff53b7e12e9d3ca649782008a4ce26a33f89 100644
+index a7d36ef22724f0ce3add61ab314e09e6465077d4..4d496c7c088a75b79a25e7397b47600a8c104cf4 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -110,7 +110,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -113,7 +113,7 @@ import org.jetbrains.annotations.Nullable;
   * An enum of all material IDs accepted by the official server and client
   */
  @SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
@@ -156,7 +156,7 @@ index 6eb0b9ba2b7ad5faba31220483c424203802e1d3..a4c7ff53b7e12e9d3ca649782008a4ce
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
      STONE(22948),
-@@ -4128,6 +4128,23 @@ public enum Material implements Keyed {
+@@ -4288,6 +4288,23 @@ public enum Material implements Keyed {
          }
          return false;
      }
@@ -181,7 +181,7 @@ index 6eb0b9ba2b7ad5faba31220483c424203802e1d3..a4c7ff53b7e12e9d3ca649782008a4ce
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 7c74163031cd8b49b9fe98241356697fd06c54c5..b69e8210d6d7a534804af9ed1b877dab9d5bc139 100644
+index 5453b2ae459b2d5171ef7129c29891b721ee8e0b..b518720355d8a8dcd55cb755e4e1fa9fc3dfc52b 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -112,5 +112,34 @@ public interface UnsafeValues {
@@ -326,7 +326,7 @@ index 4d5f0837bd0e02a30c943d8969fb6b13452322e0..a39f9c078f42451bd122f3e3729d10ca
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index e4a1dac898bb7f93e57c1fa35d0c29f5d95dfa66..032a252688b6dbefb05a0d4f91791e102bbae0cd 100644
+index df9d315cfaf968527fc8bc26dadd88f64a408cde..50d9442ffafdfabd4904dafae7daaeadcedee75b 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
 @@ -20,7 +20,7 @@ import org.jetbrains.annotations.Contract;
@@ -338,7 +338,7 @@ index e4a1dac898bb7f93e57c1fa35d0c29f5d95dfa66..032a252688b6dbefb05a0d4f91791e10
  
      // These strings MUST match the strings in nms.EntityTypes and are case sensitive.
      /**
-@@ -424,4 +424,27 @@ public enum EntityType implements Keyed {
+@@ -425,4 +425,27 @@ public enum EntityType implements Keyed {
      public boolean isAlive() {
          return living;
      }
diff --git a/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch
index 1aebb14af4..aec446f2d9 100644
--- a/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0228-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 2d26f1fd3bbbe95e7a73bb5ebc7d85c9e066c1ee..f1e1efaebfd9fe4399ff9d23c76f7dde6419ff71 100644
+index 6d98664f2da191c2327e80b8212c1ad979f7d6ac..ceb8d207843df5ddc852d44928286648a652eedb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1228,6 +1228,27 @@ public final class Bukkit {
+@@ -1230,6 +1230,27 @@ public final class Bukkit {
          return server.getOfflinePlayer(name);
      }
  
@@ -37,10 +37,10 @@ index 2d26f1fd3bbbe95e7a73bb5ebc7d85c9e066c1ee..f1e1efaebfd9fe4399ff9d23c76f7dde
       * 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 634a7e38987bc18232c07e5f767b37b523f13920..50542df291d90a667af119fb9fcc3db2535ae6b5 100644
+index 936ebaf531a76cab12809cfa334e2b0d89e625c3..02b898d441c42771903d5839c3cde544b1a25778 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1023,6 +1023,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1025,6 +1025,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
diff --git a/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index b42db5d4db..e699063364 100644
--- a/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add API to get Material from Boats and Minecarts
 
 
 diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java
-index e5d5d2c944df1e9a81b38d3854fbe70c166588d1..3e458b96d5c15a78d3d411d5b88a716213588a94 100644
+index ebab99bd0c4bc6ca19ba92ece93a5f903b38f9b3..fbe0a946d821e479fd3097021058d95732ace1b3 100644
 --- a/src/main/java/org/bukkit/entity/Boat.java
 +++ b/src/main/java/org/bukkit/entity/Boat.java
-@@ -173,4 +173,14 @@ public interface Boat extends Vehicle {
+@@ -174,4 +174,14 @@ public interface Boat extends Vehicle {
          ON_LAND,
          IN_AIR;
      }
diff --git a/patches/api/0260-Added-Vanilla-Entity-Tags.patch b/patches/api/0260-Added-Vanilla-Entity-Tags.patch
index d7acec1bd1..83c95da0ff 100644
--- a/patches/api/0260-Added-Vanilla-Entity-Tags.patch
+++ b/patches/api/0260-Added-Vanilla-Entity-Tags.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added Vanilla Entity Tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 60e98f0eb8028fc9dfb73320b2939a33435174c1..92bb9bbfb9181e9aa9edfe39ddbbfa54dab14df0 100644
+index 15699ee58e06880a508689f761ecfdb77d44d182..be5bb4210a11154013e2fc80653bf467ebdaf15f 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -811,6 +811,44 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -839,6 +839,44 @@ public interface Tag<T extends Keyed> extends Keyed {
       * Vanilla tag representing entities which can be eaten by frogs.
       */
      Tag<EntityType> ENTITY_TYPES_FROG_FOOD = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("frog_food"), EntityType.class);
diff --git a/patches/api/0271-Cache-the-result-of-Material-isBlock.patch b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch
index b7c79e9f76..62e0c5fb00 100644
--- a/patches/api/0271-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache the result of Material#isBlock
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index a4c7ff53b7e12e9d3ca649782008a4ce26a33f89..90367a01199ad90f0f10b977e214585a6e1ecf8a 100644
+index 4d496c7c088a75b79a25e7397b47600a8c104cf4..b1214775680099c8255b45ed0285568572f12895 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4072,6 +4072,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -4232,6 +4232,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
      public final Class<?> data;
      private final boolean legacy;
      private final NamespacedKey key;
@@ -16,7 +16,7 @@ index a4c7ff53b7e12e9d3ca649782008a4ce26a33f89..90367a01199ad90f0f10b977e214585a
  
      private Material(final int id) {
          this(id, 64);
-@@ -4278,6 +4279,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -4438,6 +4439,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
       * @return true if this material is a block
       */
      public boolean isBlock() {
@@ -28,7 +28,7 @@ index a4c7ff53b7e12e9d3ca649782008a4ce26a33f89..90367a01199ad90f0f10b977e214585a
          switch (this) {
              //<editor-fold defaultstate="collapsed" desc="isBlock">
              case ACACIA_BUTTON:
-@@ -5394,6 +5400,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -5593,6 +5599,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
      static {
          for (Material material : values()) {
              BY_NAME.put(material.name(), material);
diff --git a/patches/api/0277-Item-Rarity-API.patch b/patches/api/0277-Item-Rarity-API.patch
index 11d8c94bf5..3e3fcac796 100644
--- a/patches/api/0277-Item-Rarity-API.patch
+++ b/patches/api/0277-Item-Rarity-API.patch
@@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 90367a01199ad90f0f10b977e214585a6e1ecf8a..f24f1d7a676f3b83ab05f655bd66b81b0069f88c 100644
+index b1214775680099c8255b45ed0285568572f12895..6fbbc3525574abd5189c9032f7d64dc55c0dfa80 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4146,6 +4146,17 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -4306,6 +4306,17 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
      public @NotNull String translationKey() {
          return Bukkit.getUnsafe().getTranslationKey(this);
      }
@@ -61,7 +61,7 @@ index 90367a01199ad90f0f10b977e214585a6e1ecf8a..f24f1d7a676f3b83ab05f655bd66b81b
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 0fe8efe3f5d16768dde497693c3f098dffbd1584..50397eecc867810ad6a89ce740814592082ad99e 100644
+index b359a7bff658c4b3ff569e78e0751dc07437bb48..bc8e86f83423a0abdfe3516076636b02192e7501 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -163,5 +163,22 @@ public interface UnsafeValues {
diff --git a/patches/api/0294-Add-basic-Datapack-API.patch b/patches/api/0294-Add-basic-Datapack-API.patch
index a1a8c84460..21e9e273b8 100644
--- a/patches/api/0294-Add-basic-Datapack-API.patch
+++ b/patches/api/0294-Add-basic-Datapack-API.patch
@@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index db44d88bf169f59a759be165094876497487d756..d8e301befb37b540bc246cf58988923b0ab23375 100644
+index 197cf8cdd3d51c3e01ec737981601f37764315c6..b0d2d45ad2394313be752e92bc594095bfc93120 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2387,6 +2387,14 @@ public final class Bukkit {
+@@ -2389,6 +2389,14 @@ public final class Bukkit {
      public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return server.getMobGoals();
      }
@@ -89,10 +89,10 @@ index db44d88bf169f59a759be165094876497487d756..d8e301befb37b540bc246cf58988923b
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 723057dcc769bd29acdb82561ee0126ed467579d..16f631fdde4b63e0ed3162486dba684697bdffa7 100644
+index 1a3b4f20c7126caf8a34040028f735083bf47150..a11d02cc17b1e9bea06ab61cd3ae21c3c41aaceb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2074,5 +2074,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2076,5 +2076,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
diff --git a/patches/api/0302-Attributes-API-for-item-defaults.patch b/patches/api/0302-Attributes-API-for-item-defaults.patch
index 0436e90167..fb2164214c 100644
--- a/patches/api/0302-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0302-Attributes-API-for-item-defaults.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index f24f1d7a676f3b83ab05f655bd66b81b0069f88c..163c3ed1974e50376b7c2b2805df283322d41777 100644
+index 6fbbc3525574abd5189c9032f7d64dc55c0dfa80..bdc51797e3e3c8ffb1db842e29ddb86beeec48ec 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4157,6 +4157,21 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -4317,6 +4317,21 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
      public io.papermc.paper.inventory.ItemRarity getItemRarity() {
          return Bukkit.getUnsafe().getItemRarity(this);
      }
@@ -31,7 +31,7 @@ index f24f1d7a676f3b83ab05f655bd66b81b0069f88c..163c3ed1974e50376b7c2b2805df2833
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 55e09755499cc49ecb9068fec2ff60c8258af587..d71e2ef9b9274bfcf8d9885d1583dcb310849c43 100644
+index 6f4e02065bcb4130f5a30de01f3adbe3513c1d70..4e3eac5f06a6ded0f152f1744fcebfeef6b48814 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -191,6 +191,18 @@ public interface UnsafeValues {
diff --git a/patches/api/0329-Get-entity-default-attributes.patch b/patches/api/0329-Get-entity-default-attributes.patch
index 595c3ab5a3..b4b4a952ea 100644
--- a/patches/api/0329-Get-entity-default-attributes.patch
+++ b/patches/api/0329-Get-entity-default-attributes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Get entity default attributes
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index d71e2ef9b9274bfcf8d9885d1583dcb310849c43..7bd7bdf756f780752a127a786077f69cd85e1551 100644
+index 4e3eac5f06a6ded0f152f1744fcebfeef6b48814..68b560af277d4913306fb1b9c88c2fadcd2f446a 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -209,5 +209,22 @@ public interface UnsafeValues {
@@ -32,10 +32,10 @@ index d71e2ef9b9274bfcf8d9885d1583dcb310849c43..7bd7bdf756f780752a127a786077f69c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 032a252688b6dbefb05a0d4f91791e102bbae0cd..4aa2d483b706fbf6ba0dc5126de74ee532e12382 100644
+index 50d9442ffafdfabd4904dafae7daaeadcedee75b..5a0c96875d9c3bd32b4649a3fccd43af1ccb195b 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -446,5 +446,24 @@ public enum EntityType implements Keyed, net.kyori.adventure.translation.Transla
+@@ -447,5 +447,24 @@ public enum EntityType implements Keyed, net.kyori.adventure.translation.Transla
          Preconditions.checkArgument(this != UNKNOWN, "UNKNOWN entities do not have translation keys");
          return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
      }
diff --git a/patches/api/0335-Add-isCollidable-methods-to-various-places.patch b/patches/api/0335-Add-isCollidable-methods-to-various-places.patch
index 8880574d51..4607f0597e 100644
--- a/patches/api/0335-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0335-Add-isCollidable-methods-to-various-places.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add isCollidable methods to various places
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 163c3ed1974e50376b7c2b2805df283322d41777..cb00e050cd5fff3a037a32ac34e02eeea3827357 100644
+index bdc51797e3e3c8ffb1db842e29ddb86beeec48ec..56459876a7736bd3a015e0aba511313997f9ec65 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4172,6 +4172,16 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -4332,6 +4332,16 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
      public Multimap<Attribute, AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
          return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot);
      }
@@ -26,7 +26,7 @@ index 163c3ed1974e50376b7c2b2805df283322d41777..cb00e050cd5fff3a037a32ac34e02eee
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 7bd7bdf756f780752a127a786077f69cd85e1551..057a4f1a374fcc240998c6ac3fe52d22389458c3 100644
+index 68b560af277d4913306fb1b9c88c2fadcd2f446a..9fd64aa7f2487b07fe0a6873bd57a0ed483499a3 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -226,5 +226,14 @@ public interface UnsafeValues {
diff --git a/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch
index c09dcdba13..5ced65d4c1 100644
--- a/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0341-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 d8e301befb37b540bc246cf58988923b0ab23375..77e824f6071782def8865fc178e2f064f109cebb 100644
+index b0d2d45ad2394313be752e92bc594095bfc93120..85dc2bf97175207bcc169d5d7e0d86dae39aecf2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1905,6 +1905,24 @@ public final class Bukkit {
+@@ -1907,6 +1907,24 @@ public final class Bukkit {
          return server.createChunkData(world);
      }
  
@@ -34,10 +34,10 @@ index d8e301befb37b540bc246cf58988923b0ab23375..77e824f6071782def8865fc178e2f064
       * 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 16f631fdde4b63e0ed3162486dba684697bdffa7..a7e1d81a8a5e14f556d6b462dfba7f2e49f06f5f 100644
+index a11d02cc17b1e9bea06ab61cd3ae21c3c41aaceb..c07eef17aac9140e1f461aa20e3a90fcb3f4ae74 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1600,6 +1600,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1602,6 +1602,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
  
diff --git a/patches/api/0360-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0360-API-for-creating-command-sender-which-forwards-feedb.patch
index 95101a7000..03afc95f0f 100644
--- a/patches/api/0360-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0360-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 77e824f6071782def8865fc178e2f064f109cebb..1b52cb7d8b894ee73be5754ed44236de01d7d0c6 100644
+index 85dc2bf97175207bcc169d5d7e0d86dae39aecf2..1934a4521a43ad14beacf0c56e5914e35da8bc59 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1413,6 +1413,20 @@ public final class Bukkit {
+@@ -1415,6 +1415,20 @@ public final class Bukkit {
          return server.getConsoleSender();
      }
  
@@ -30,10 +30,10 @@ index 77e824f6071782def8865fc178e2f064f109cebb..1b52cb7d8b894ee73be5754ed44236de
       * 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 a7e1d81a8a5e14f556d6b462dfba7f2e49f06f5f..6d056cee2fb727db9fbcc0ee98a7c800a8981ad6 100644
+index c07eef17aac9140e1f461aa20e3a90fcb3f4ae74..23063ebcf36dd4f02ad4670839295064c95e3aec 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1179,6 +1179,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1181,6 +1181,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ConsoleCommandSender getConsoleSender();
  
diff --git a/patches/api/0363-Add-GameEvent-tags.patch b/patches/api/0363-Add-GameEvent-tags.patch
index a3687657c0..97de65fa11 100644
--- a/patches/api/0363-Add-GameEvent-tags.patch
+++ b/patches/api/0363-Add-GameEvent-tags.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add GameEvent tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 92bb9bbfb9181e9aa9edfe39ddbbfa54dab14df0..d999dae63e3796ce268b281d61b148dacacb3bad 100644
+index be5bb4210a11154013e2fc80653bf467ebdaf15f..d34f0481b3f27591f089dce5673dbe2feae358f5 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -848,6 +848,18 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -876,6 +876,18 @@ public interface Tag<T extends Keyed> extends Keyed {
       */
      @Deprecated(forRemoval = true)
      Tag<EntityType> SKELETONS = ENTITY_TYPES_SKELETONS;
diff --git a/patches/api/0367-Custom-Potion-Mixes.patch b/patches/api/0367-Custom-Potion-Mixes.patch
index 260c044149..b8679717f4 100644
--- a/patches/api/0367-Custom-Potion-Mixes.patch
+++ b/patches/api/0367-Custom-Potion-Mixes.patch
@@ -102,10 +102,10 @@ index 0000000000000000000000000000000000000000..cb6d93526b637946aec311bef103ad30
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 1b52cb7d8b894ee73be5754ed44236de01d7d0c6..840aaf9e8fc828b5a7ea02252038c6524680f2e0 100644
+index 1934a4521a43ad14beacf0c56e5914e35da8bc59..41ea6212b52359927bd5c944c886ef32322b9a08 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2427,6 +2427,15 @@ public final class Bukkit {
+@@ -2429,6 +2429,15 @@ public final class Bukkit {
      public static io.papermc.paper.datapack.DatapackManager getDatapackManager() {
          return server.getDatapackManager();
      }
@@ -122,10 +122,10 @@ index 1b52cb7d8b894ee73be5754ed44236de01d7d0c6..840aaf9e8fc828b5a7ea02252038c652
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6d056cee2fb727db9fbcc0ee98a7c800a8981ad6..da5cab4246bd253fcc4e4d9574bdae1867ebb5ab 100644
+index 23063ebcf36dd4f02ad4670839295064c95e3aec..fe50eb0820b99ce5ad8fb8c53ced08709aa4caef 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2108,5 +2108,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2110,5 +2110,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      io.papermc.paper.datapack.DatapackManager getDatapackManager();
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index 830a5584ed..a432b81696 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98a13ea6c5
+index 0000000000000000000000000000000000000000..40d1dcd4a0870cf002ee6d0309ce667f49a89d35
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,138 @@
@@ -43,7 +43,7 @@ index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98
 +dependencies {
 +    implementation(project(":paper-api"))
 +    implementation("jline:jline:2.12.1")
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.17.0") {
++    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") {
 +        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
 +    }
 +    implementation("org.ow2.asm:asm:9.3")
@@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98
 +    testImplementation("org.hamcrest:hamcrest-library:1.3")
 +}
 +
-+val craftbukkitPackageVersion = "1_19_R1" // Paper
++val craftbukkitPackageVersion = "1_19_R2" // Paper
 +tasks.jar {
 +    archiveClassifier.set("dev")
 +
@@ -172,17 +172,17 @@ index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..0000000000000000000000000000000000000000
+index 30e4978569bcda9e38a326b8fcd9953e1e319c21..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,623 +0,0 @@
+@@ -1,629 +0,0 @@
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 -    <modelVersion>4.0.0</modelVersion>
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.19.2-R0.1-SNAPSHOT</version>
+-    <version>1.19.3-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
@@ -198,7 +198,7 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000
 -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -        <api.version>unknown</api.version>
 -        <bt.name>git</bt.name>
--        <minecraft_version>1_19_R1</minecraft_version>
+-        <minecraft_version>1_19_R2</minecraft_version>
 -        <maven.compiler.source>17</maven.compiler.source>
 -        <maven.compiler.target>17</maven.compiler.target>
 -    </properties>
@@ -233,7 +233,7 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.logging.log4j</groupId>
 -            <artifactId>log4j-iostreams</artifactId>
--            <version>2.17.0</version>
+-            <version>2.19.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -246,13 +246,13 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.github.oshi</groupId>
 -            <artifactId>oshi-core</artifactId>
--            <version>5.8.5</version>
+-            <version>6.2.2</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>authlib</artifactId>
--            <version>3.11.49</version>
+-            <version>3.16.29</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -270,13 +270,13 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>javabridge</artifactId>
--            <version>1.2.24</version>
+-            <version>2.0.25</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>logging</artifactId>
--            <version>1.0.0</version>
+-            <version>1.1.1</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -288,81 +288,81 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-buffer</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-codec</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-common</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-handler</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-resolver</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport-classes-epoll</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport-native-epoll</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <classifier>linux-x86_64</classifier>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport-native-epoll</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <classifier>linux-aarch_64</classifier>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport-native-unix-common</artifactId>
--            <version>4.1.77.Final</version>
+-            <version>4.1.82.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>it.unimi.dsi</groupId>
 -            <artifactId>fastutil</artifactId>
--            <version>8.5.6</version>
+-            <version>8.5.9</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>net.java.dev.jna</groupId>
 -            <artifactId>jna</artifactId>
--            <version>5.10.0</version>
+-            <version>5.12.1</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>net.java.dev.jna</groupId>
 -            <artifactId>jna-platform</artifactId>
--            <version>5.10.0</version>
+-            <version>5.12.1</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -380,19 +380,25 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.logging.log4j</groupId>
 -            <artifactId>log4j-core</artifactId>
--            <version>2.17.0</version>
+-            <version>2.19.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.logging.log4j</groupId>
--            <artifactId>log4j-slf4j18-impl</artifactId>
--            <version>2.17.0</version>
+-            <artifactId>log4j-slf4j2-impl</artifactId>
+-            <version>2.19.0</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.joml</groupId>
+-            <artifactId>joml</artifactId>
+-            <version>1.10.5</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.slf4j</groupId>
 -            <artifactId>slf4j-api</artifactId>
--            <version>1.8.0-beta4</version>
+-            <version>2.0.1</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- deprecated API depend -->
diff --git a/patches/server/0002-Remap-fixes.patch b/patches/unapplied/server/0002-Remap-fixes.patch
index 2b81da438a..2b81da438a 100644
--- a/patches/server/0002-Remap-fixes.patch
+++ b/patches/unapplied/server/0002-Remap-fixes.patch
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/unapplied/server/0003-Build-system-changes.patch
index f6a18e7a7a..f6a18e7a7a 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/unapplied/server/0003-Build-system-changes.patch
diff --git a/patches/server/0004-Paper-config-files.patch b/patches/unapplied/server/0004-Paper-config-files.patch
index d5fff4fb10..d5fff4fb10 100644
--- a/patches/server/0004-Paper-config-files.patch
+++ b/patches/unapplied/server/0004-Paper-config-files.patch
diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/unapplied/server/0005-MC-Dev-fixes.patch
index d67b4c8561..543ee77384 100644
--- a/patches/server/0005-MC-Dev-fixes.patch
+++ b/patches/unapplied/server/0005-MC-Dev-fixes.patch
@@ -169,7 +169,7 @@ index cd9f94b98f9b7072ed7ca1becd779132dfc1dd12..80a3c56fb5e73c09c542b17aac952fb6
              MultiPackResourceManager resourcemanager = new MultiPackResourceManager(PackType.SERVER_DATA, immutablelist);
  
 diff --git a/src/main/java/net/minecraft/server/level/Ticket.java b/src/main/java/net/minecraft/server/level/Ticket.java
-index 062da1bddd9704f5fbc46e974e13e60cd500bbe2..ffc43e5d3d0563c9e9c171064511b2c65ddf67e1 100644
+index 2f66abf62d303342f5fe614fb3e35e7844497ffc..b346fa94b23d81da7da073f71dd12e672e0f079c 100644
 --- a/src/main/java/net/minecraft/server/level/Ticket.java
 +++ b/src/main/java/net/minecraft/server/level/Ticket.java
 @@ -21,7 +21,7 @@ public final class Ticket<T> implements Comparable<Ticket<?>> {
@@ -195,7 +195,7 @@ index d0f6eb3981a171c0f34870cb0472599d6cca9642..d1b2ba24ef54e01c6249c3b2ca16e80f
  
      public static <T> SortedArraySet<T> create(Comparator<T> comparator) {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
-index 8760e4199a1c8ae1a784f885923616f3740fe120..bb2be6eea7a0cff4cc70bd43738b1ce213e43558 100644
+index b789a156fa7fb01844323f4a967aef4e1f0667c3..157c5f2d2738a9ed15949b97d176977905ada14c 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
 @@ -31,7 +31,7 @@ public class PoiSection {
diff --git a/patches/server/0006-ConcurrentUtil.patch b/patches/unapplied/server/0006-ConcurrentUtil.patch
index c2bb4af335..c2bb4af335 100644
--- a/patches/server/0006-ConcurrentUtil.patch
+++ b/patches/unapplied/server/0006-ConcurrentUtil.patch
diff --git a/patches/server/0007-CB-fixes.patch b/patches/unapplied/server/0007-CB-fixes.patch
index e0daaa9d40..a5ad0e79f0 100644
--- a/patches/server/0007-CB-fixes.patch
+++ b/patches/unapplied/server/0007-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 bbdde701a16480b0b4b29e8fb6b5b5d987db0ce3..aa396df025115c7fd866cbc63a44c2c17abfde84 100644
+index 61f1da79bbd0428c4d99f62974c06183230864b6..a3c602f1a1b2dbc6bbb32bffa8745dc71cf20872 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -293,7 +293,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0008-MC-Utils.patch b/patches/unapplied/server/0008-MC-Utils.patch
index 37b08320b2..38d11e8622 100644
--- a/patches/server/0008-MC-Utils.patch
+++ b/patches/unapplied/server/0008-MC-Utils.patch
@@ -6635,7 +6635,7 @@ index 9fdfeab462e5f5c5e09c5fee2dfe1fca89330086..18d56618a1e8ff5ba408523f620333db
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9001040060383cff5a51028d652315467c7d51ec..e283e8383a52c74cebd16fa7642a5e3993b2ed1a 100644
+index c7c212fb231f86dd17efb4134976f1ec1d10630b..d2958d4c897d93f81ab4faea2c67783c2f0de37f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0009-Adventure.patch b/patches/unapplied/server/0009-Adventure.patch
index 9eb3e8c9fe..9eb3e8c9fe 100644
--- a/patches/server/0009-Adventure.patch
+++ b/patches/unapplied/server/0009-Adventure.patch
diff --git a/patches/server/0010-Paper-command.patch b/patches/unapplied/server/0010-Paper-command.patch
index a1cbd38e7e..a1cbd38e7e 100644
--- a/patches/server/0010-Paper-command.patch
+++ b/patches/unapplied/server/0010-Paper-command.patch
diff --git a/patches/server/0011-Paper-Metrics.patch b/patches/unapplied/server/0011-Paper-Metrics.patch
index 37974e62f8..d15b306441 100644
--- a/patches/server/0011-Paper-Metrics.patch
+++ b/patches/unapplied/server/0011-Paper-Metrics.patch
@@ -690,7 +690,7 @@ index 0000000000000000000000000000000000000000..5a19e30a9b7e65a70f68a429b8ca741f
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 393e465b0bac55d407f2ec66d7b11ed0537c9641..408eff59b081ace53bf435947df17e2fe75bfd5e 100644
+index 8f29bb843fc456384f7b4e216afca5018fb7f794..f4a6a6addbba65b3415320977048aeba0eadba63 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -192,6 +192,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0012-Timings-v2.patch b/patches/unapplied/server/0012-Timings-v2.patch
index 3ae8a82b4f..727ba711e8 100644
--- a/patches/server/0012-Timings-v2.patch
+++ b/patches/unapplied/server/0012-Timings-v2.patch
@@ -695,7 +695,7 @@ index 0000000000000000000000000000000000000000..0fda52841b5e1643efeda92106124998
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/commands/CommandFunction.java b/src/main/java/net/minecraft/commands/CommandFunction.java
-index eb434d46add6960dba026a03ec3c582a4277bfbd..04adaa6f393be8c3dfa13f371e6bc51082d1d1be 100644
+index 3ceeddf4c2898172d24db9ee1bab8d6b17e36128..8273ee1c5e513f02c9743ee38c9b7cf700e2ecad 100644
 --- a/src/main/java/net/minecraft/commands/CommandFunction.java
 +++ b/src/main/java/net/minecraft/commands/CommandFunction.java
 @@ -16,6 +16,15 @@ import net.minecraft.server.ServerFunctionManager;
@@ -729,7 +729,7 @@ index 13421daa96b4ba302581f36abcd730952713d8cd..049e64c355d5f064009b1107ad15d28c
                      } catch (Exception exception) {
                          if (listener.shouldPropagateHandlingExceptions()) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e4220f14a5ebf43dd3491fc8649c2be5238c5798..53be6189d3fa6a65a09996683913fbbf5133dcb7 100644
+index 77cb412656e741fdb7e002011e3a99ac304118cb..2b2b71f3963e66fa0d2683b10581b1a38c774549 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -177,7 +177,7 @@ import org.bukkit.event.player.AsyncPlayerChatPreviewEvent;
@@ -997,7 +997,7 @@ index f4a6a6addbba65b3415320977048aeba0eadba63..c905602d23cdf3af1de7ab4419f11856
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 1fbe1b6de925f71763f79fe3d2371b70a8650f25..2a9e5fb8164f79b0f9c1cb5497216e51f9df3454 100644
+index 8c6ca0acde4cb266a844a1670296ac327e3382dc..44f12777f115ca4d465bc603e1e23932e102efb2 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,8 +1,10 @@
@@ -1054,7 +1054,7 @@ index 1fbe1b6de925f71763f79fe3d2371b70a8650f25..2a9e5fb8164f79b0f9c1cb5497216e51
  
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 1a8c5ce3ecce9cbbc8496ea3882b18c297964e33..8c99e9d1cc1abf5a425846eb4edd52bf38aa2f75 100644
+index 85238e1bcb2a7ac8f824f10409ee5a4bc7e6c002..0bf02ffba51e0dda6d01972c3f8c834c42d72512 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -414,13 +414,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -1146,7 +1146,7 @@ index 1a8c5ce3ecce9cbbc8496ea3882b18c297964e33..8c99e9d1cc1abf5a425846eb4edd52bf
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b2f79a0c9caa6783816afc36531c94378e832cb7..99d44faab5b5da244fdc170c73d73723c174c8fd 100644
+index f5ed23104c781098e64850b32963d13c1a611b96..3049d732ce3df71a4755ee9160d4f3fae052d1b6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,6 +1,8 @@
@@ -1262,7 +1262,7 @@ index b2f79a0c9caa6783816afc36531c94378e832cb7..99d44faab5b5da244fdc170c73d73723
                  this.entityManager.saveAll();
              } else {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 93d02b5de0721e3c5903e80bbf8b3b56ec3ab45d..4e7db441f68019d6e5d3359605b76bc4b258e87e 100644
+index f1441c9fde9d736d4c053073a88a7a79222f5c5c..2f2d92bfda1713c7454e73cb2d2e77f69184a2d4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -342,7 +342,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1309,7 +1309,7 @@ index 93d02b5de0721e3c5903e80bbf8b3b56ec3ab45d..4e7db441f68019d6e5d3359605b76bc4
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3710f544a491a837b973daedc2dfa51357b70b56..e7fcb402e3d4e0707a28505a9fb6642764034e23 100644
+index 8246a78e4e01ee24db88660351bc0f27a6f320aa..5f85d48fbd0ce34c21acec4849ad3efcc73c7210 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1425,7 +1425,7 @@ index cdf8020194f2ec1fe7b65b22c8e1f5b1c23eaefa..2db27f5e3e3c1bb0502c055f78c4a81e
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e283e8383a52c74cebd16fa7642a5e3993b2ed1a..8c2d76c27c784536c3b573bf4ae4f47c2c3c4b6b 100644
+index d2958d4c897d93f81ab4faea2c67783c2f0de37f..4cbd068bbb19eec3a702bc9067ac4f106ddf00e1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -140,7 +140,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1588,7 +1588,7 @@ index dec38e58e30c84887e9d29436c0f76c70c0a627d..be08224c8107aab3e9a3645a20977dd1
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index bcd0287d99eeba2b3534b4a298dc4b79b293ec58..b322d9b7bd9e107a9adf995b6c4db4ff0af05fc1 100644
+index 41dda06ac8d9adc263936bc417d35b62a8801565..1c6f51c227a0b6da81eeb817f996789645a547db 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -680,6 +680,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1608,7 +1608,7 @@ index bcd0287d99eeba2b3534b4a298dc4b79b293ec58..b322d9b7bd9e107a9adf995b6c4db4ff
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 98ba88896c73651591b8ad8e070868fb443ae999..864e2e0355a5fb8c1d4a5b0896ba299faf9ea534 100644
+index e1558691dc23ad812358e3890020fdc7d6d7c28b..6c844a826892c5f31d5afb9ead56d4cff3ab5968 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -507,13 +507,10 @@ public class ChunkSerializer {
@@ -2035,7 +2035,7 @@ index e52ef47b783785dc214746b678e7b549aea9a274..3d90b3426873a3528af14f7f1ab0adae
          this.value = value;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 56a3dc9dcbd2229c60aa64e2d4c0ed147539a5ef..e309a589e6ce76294187c906820a88367da25305 100644
+index ede9c2d8e98fd42a936045e82b3e2c174f7bac0b..a3b303c2593b3f06b40ec827592a349431d0aaf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -222,6 +222,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0013-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0013-Rewrite-dataconverter-system.patch
index eb71ed8fe3..49b2d11b8f 100644
--- a/patches/server/0013-Rewrite-dataconverter-system.patch
+++ b/patches/unapplied/server/0013-Rewrite-dataconverter-system.patch
@@ -22656,7 +22656,7 @@ index 0000000000000000000000000000000000000000..967ad1186cbc81a76a4958ea99d4eff3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
-index c56946f86565ad1ac41bb7b655c113f648d2f539..9730ee10042e02741383c8153eb3b7b7103f80e0 100644
+index 6902a90ebee993a972404d83ec8c781438351639..aa6d4996e1b9fce21ebf184eefb9d7a92d2a340b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 @@ -78,7 +78,7 @@ public class ChunkStorage implements AutoCloseable {
@@ -22700,7 +22700,7 @@ index dae66dd5dbebc7fd8fc331b1f5f06ec461667830..0ede151943109e81f66875340261d77f
  
      public static int getVersion(CompoundTag chunkNbt) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index 8a4750dd8f604062c4ea452f7b97b05a0c8d583a..a0b61647e5a7e5989aed52522bc9a43bc487421c 100644
+index 6701d07886325e33f45ac894bfaa1c5b91afad9d..5631345dee84001be1053fbf92def683be7a97f5 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 @@ -142,7 +142,14 @@ public class SectionStorage<R> implements AutoCloseable {
diff --git a/patches/server/0014-Starlight.patch b/patches/unapplied/server/0014-Starlight.patch
index 94568e6b0b..94568e6b0b 100644
--- a/patches/server/0014-Starlight.patch
+++ b/patches/unapplied/server/0014-Starlight.patch
diff --git a/patches/server/0015-Not-implemeneted.patch b/patches/unapplied/server/0015-Not-implemeneted.patch
index 3f8aab22dd..3f8aab22dd 100644
--- a/patches/server/0015-Not-implemeneted.patch
+++ b/patches/unapplied/server/0015-Not-implemeneted.patch
diff --git a/patches/server/0016-Rewrite-chunk-system.patch b/patches/unapplied/server/0016-Rewrite-chunk-system.patch
index 39e3cc4393..39e3cc4393 100644
--- a/patches/server/0016-Rewrite-chunk-system.patch
+++ b/patches/unapplied/server/0016-Rewrite-chunk-system.patch
diff --git a/patches/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 06b4a4b177..06b4a4b177 100644
--- a/patches/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch
index 7d405a11d6..7d405a11d6 100644
--- a/patches/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch
+++ b/patches/unapplied/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0019-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0019-Configurable-baby-zombie-movement-speed.patch
index e0d10bc34b..e0d10bc34b 100644
--- a/patches/server/0019-Configurable-baby-zombie-movement-speed.patch
+++ b/patches/unapplied/server/0019-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0020-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0020-Configurable-fishing-time-ranges.patch
index 71d66591ff..71d66591ff 100644
--- a/patches/server/0020-Configurable-fishing-time-ranges.patch
+++ b/patches/unapplied/server/0020-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
index 621e6370ae..eb521c2fe8 100644
--- a/patches/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
+++ b/patches/unapplied/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow nerfed mobs to jump and take water damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 738c54ce0a0fb7fee6b584a6d96a8b74931222e5..38d3749104742f63f1f4f4c9595e83a4fa445cd1 100644
+index c3357f65d3c5cec3446326b8a68750ee2cc27b9a..ecb86bb87468cdef07e47df9308e6548cf987fe4 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -110,6 +110,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch
index a88ee8f743..236f40666c 100644
--- a/patches/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/patches/unapplied/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable despawn distances for living entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 38d3749104742f63f1f4f4c9595e83a4fa445cd1..ce04fa5ae8c539fd6f6aa7648a4cdce6b680463e 100644
+index ecb86bb87468cdef07e47df9308e6548cf987fe4..a27082368913e5c6dc926bd197f3b135a633f30d 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -794,14 +794,14 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0023-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0023-Allow-for-toggling-of-spawn-chunks.patch
index 69db9e2246..69db9e2246 100644
--- a/patches/server/0023-Allow-for-toggling-of-spawn-chunks.patch
+++ b/patches/unapplied/server/0023-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 687d0b627a..687d0b627a 100644
--- a/patches/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/unapplied/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 268c394466..af99d15ea1 100644
--- a/patches/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/unapplied/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 317cd6f68c2368b2f70dfb809db3e418de040f05..4d7ea3b3b8fb00b2b02c79d90a067c2f32b46988 100644
+index 0d2114be30df99c5b50f82def97b0a44e797e573..2c78c2aebedef02fe66fe0c352d586b80f66144d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1426,7 +1426,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0026-Implement-Paper-VersionChecker.patch b/patches/unapplied/server/0026-Implement-Paper-VersionChecker.patch
index c85f87504b..93ac62a9ca 100644
--- a/patches/server/0026-Implement-Paper-VersionChecker.patch
+++ b/patches/unapplied/server/0026-Implement-Paper-VersionChecker.patch
@@ -140,7 +140,7 @@ index 0000000000000000000000000000000000000000..351159bbdb0c8045f4983f54dee34430
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c379064ac439d17e641ba09c30e2e7df78ca2623..3efc8fbf22d7ae4c642348468a3af959e49cd640 100644
+index a3b303c2593b3f06b40ec827592a349431d0aaf9..53eb440f1e2f9f9bbf2e67027414a3756d70cb6a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -426,6 +426,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0027-Add-version-history-to-version-command.patch b/patches/unapplied/server/0027-Add-version-history-to-version-command.patch
index 11da12b0bc..7814724b0b 100644
--- a/patches/server/0027-Add-version-history-to-version-command.patch
+++ b/patches/unapplied/server/0027-Add-version-history-to-version-command.patch
@@ -201,7 +201,7 @@ index 0000000000000000000000000000000000000000..aac3f66cb23d260729c2a48d8710a9de
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index fa1ab9974859c75075f3090e36e0de58dda3e8e6..4dc5a5888f0180e1490597e43956e8e80981f8b9 100644
+index 48745f950a35ead81abb3f4cb56f4a3397c74cac..528bf80bdd786b13b3c46eaf922bf6870865f040 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -194,6 +194,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0028-Player-affects-spawning-API.patch b/patches/unapplied/server/0028-Player-affects-spawning-API.patch
index 0ea8273b46..22eee128c7 100644
--- a/patches/server/0028-Player-affects-spawning-API.patch
+++ b/patches/unapplied/server/0028-Player-affects-spawning-API.patch
@@ -21,7 +21,7 @@ index 5c3b11f738c1ea19981cc878aa6c2323497391a0..6fd874a83a248e6a7d427d18d11fc608
      public static Predicate<Entity> withinDistance(double x, double y, double z, double max) {
          double d4 = max * max;
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 7e9954dc290e7ee069cceb45a744bb2c9a8b7f17..ae35b7119f06f751b1d3e51f4d516c5fe61d9445 100644
+index a27082368913e5c6dc926bd197f3b135a633f30d..d315d9e0e6724e210924ec5814545e8c52ba2d8b 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -790,7 +790,7 @@ public abstract class Mob extends LivingEntity {
@@ -73,7 +73,7 @@ index 1b48576beca178af14bfab297bd427b5f5bdaf42..d3ca0706e8dc3160d2100d23788dd3d5
                              entityzombie.finalizeSpawn(worldserver, this.level.getCurrentDifficultyAt(entityzombie.blockPosition()), MobSpawnType.REINFORCEMENT, (SpawnGroupData) null, (CompoundTag) null);
                              worldserver.addFreshEntityWithPassengers(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0232baa005e2839317d7ac2d64c88fb93bc29e5e..08b0b7b9146f58c4eb263d5ce1fee1b08d43fafe 100644
+index 1883c6a4a6a58b25913eaed40786ea67785bad37..4751fea5e7319600422c4fb3e40026a36db85a6a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -184,6 +184,9 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0029-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0029-Further-improve-server-tick-loop.patch
index e6f977211f..2c1c8c05cc 100644
--- a/patches/server/0029-Further-improve-server-tick-loop.patch
+++ b/patches/unapplied/server/0029-Further-improve-server-tick-loop.patch
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1d4b3f02ebf918bf669647635bf236ca6094c0c7..a7e58261bc54f1177045f094678e85d00b054435 100644
+index 2c78c2aebedef02fe66fe0c352d586b80f66144d..0955b4e0ee33a26c5bfee744242cdc24aebccb20 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -270,7 +270,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0030-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0030-Only-refresh-abilities-if-needed.patch
index c1fff86ca3..c1fff86ca3 100644
--- a/patches/server/0030-Only-refresh-abilities-if-needed.patch
+++ b/patches/unapplied/server/0030-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0031-Entity-Origin-API.patch b/patches/unapplied/server/0031-Entity-Origin-API.patch
index 5e1fdf91d4..2d267332ef 100644
--- a/patches/server/0031-Entity-Origin-API.patch
+++ b/patches/unapplied/server/0031-Entity-Origin-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7c709be5d43bcd45064c79e84d5b2fff0b3d0cfe..e5fcabaaf600eabab2192e12c3c0ecce3fbecf31 100644
+index 0d49f73d779b9e44c20ba923d5390acdb4bc81d4..3693c34e8a68b9a7c480b655dedc2230182e6bd9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2235,6 +2235,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -94,7 +94,7 @@ index 1a2ee5824c6af6b548e7006d583b73f4eba0f64a..ab2671c21f2f44973fb2507b178ac8e1
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
              CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being loaded");
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index bd357c3e6fcbd82f3c53ecc8dab46aa5d3708bc2..6c4be7da19d0d61f35942558d438587853231aaa 100644
+index ba5f365cc0ae9773e63ff58ad0a8f8bb4087889a..9ef526b3da1185f32257b8fb2fa79ff281855713 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -337,6 +337,14 @@ public class FallingBlockEntity extends Entity {
@@ -113,7 +113,7 @@ index bd357c3e6fcbd82f3c53ecc8dab46aa5d3708bc2..6c4be7da19d0d61f35942558d4385878
  
      public void setHurtsEntities(float fallHurtAmount, int fallHurtMax) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 2d4a990da2402a6c24c03e8be7e518e33db99c8f..10f8b5ff56e4c1d8300835e045abdce719a99343 100644
+index 54a8548e8d3ddee049d3fed41332c94e368ba2c4..7a2ec239cd59b95dfd87ab1164d17bad23c4e558 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -120,6 +120,14 @@ public class PrimedTnt extends Entity {
diff --git a/patches/server/0032-Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/0032-Prevent-tile-entity-and-entity-crashes.patch
index f4079a3868..43723eef11 100644
--- a/patches/server/0032-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/unapplied/server/0032-Prevent-tile-entity-and-entity-crashes.patch
@@ -44,7 +44,7 @@ index be08224c8107aab3e9a3645a20977dd14bfff782..c518704386f14cd033307dd976455c35
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 4c931b6eaec6f97927077423d186afb9de4ca73f..f8854de81036878886d706b8bf3bfea1e6b8505f 100644
+index 9f5f7510e7a28471088c44fa9b1f94c374b2d29e..f9980a781f02e10c1c96deaa39cfecbf4deedff9 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1186,11 +1186,11 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0033-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0033-Configurable-top-of-nether-void-damage.patch
index 73dd8ccba4..73dd8ccba4 100644
--- a/patches/server/0033-Configurable-top-of-nether-void-damage.patch
+++ b/patches/unapplied/server/0033-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0034-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0034-Check-online-mode-before-converting-and-renaming-pla.patch
index 06f27ae774..06f27ae774 100644
--- a/patches/server/0034-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/unapplied/server/0034-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0035-Always-tick-falling-blocks.patch b/patches/unapplied/server/0035-Always-tick-falling-blocks.patch
index 39f37a0fd0..39f37a0fd0 100644
--- a/patches/server/0035-Always-tick-falling-blocks.patch
+++ b/patches/unapplied/server/0035-Always-tick-falling-blocks.patch
diff --git a/patches/server/0036-Configurable-end-credits.patch b/patches/unapplied/server/0036-Configurable-end-credits.patch
index 007435653d..f9bd0f14c2 100644
--- a/patches/server/0036-Configurable-end-credits.patch
+++ b/patches/unapplied/server/0036-Configurable-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5aad3da061d391d1003bdcca95dd4f7e5c0e5ea8..301f78d1f9a0eae05096de071bda7def3a45f648 100644
+index d7e66a9669c67bf7d619bf69dc49daed42b3e83a..54dc00f521e7f7b4cb86b2653ac1d0058dcbb03b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -989,6 +989,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0037-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0037-Fix-lag-from-explosions-processing-dead-entities.patch
index 3a8886ecac..3a8886ecac 100644
--- a/patches/server/0037-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/unapplied/server/0037-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0038-Optimize-explosions.patch b/patches/unapplied/server/0038-Optimize-explosions.patch
index 41f7ebc370..f50ea33ab4 100644
--- a/patches/server/0038-Optimize-explosions.patch
+++ b/patches/unapplied/server/0038-Optimize-explosions.patch
@@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f24b2ea3932c660710f5b38e50b45f40b18e98ea..c0b8daca75feec011423ba4b4ef5900558bc4d92 100644
+index 0955b4e0ee33a26c5bfee744242cdc24aebccb20..093ac159fcc34de9901395ad9450372efdf7cb5b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1389,6 +1389,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0039-Disable-explosion-knockback.patch b/patches/unapplied/server/0039-Disable-explosion-knockback.patch
index 72708a7e53..a7ec35e293 100644
--- a/patches/server/0039-Disable-explosion-knockback.patch
+++ b/patches/unapplied/server/0039-Disable-explosion-knockback.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bffaa7397e931b7b15a1780989e69aae8b29345f..87b8a9bb1493d4ff048f0283151cfc5c8ea7d7ef 100644
+index 4cbd068bbb19eec3a702bc9067ac4f106ddf00e1..1738512d977f60c4021c01a5fce642f62d7e4c74 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1399,6 +1399,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0040-Disable-thunder.patch b/patches/unapplied/server/0040-Disable-thunder.patch
index 326c236157..901c8c9ffc 100644
--- a/patches/server/0040-Disable-thunder.patch
+++ b/patches/unapplied/server/0040-Disable-thunder.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c58a204d9959b0836c3d9e5025b7c63d8cf0549c..fa2b27a3876af959868fab9a1852302a87f43380 100644
+index 3693c34e8a68b9a7c480b655dedc2230182e6bd9..290e28c8cc3d020d11842ccfd09b23fb0fc2cba2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -692,7 +692,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0041-Disable-ice-and-snow.patch b/patches/unapplied/server/0041-Disable-ice-and-snow.patch
index f80eeaf912..59b02ccec3 100644
--- a/patches/server/0041-Disable-ice-and-snow.patch
+++ b/patches/unapplied/server/0041-Disable-ice-and-snow.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fa2b27a3876af959868fab9a1852302a87f43380..e235531d694e3e904042f2d42641c1ffbecfd5a3 100644
+index 290e28c8cc3d020d11842ccfd09b23fb0fc2cba2..29e432e9bea9da307c96d42d9b45d1c3a3161fa1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -716,7 +716,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0042-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0042-Configurable-mob-spawner-tick-rate.patch
index b33478a7a0..17d95bf5cd 100644
--- a/patches/server/0042-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/unapplied/server/0042-Configurable-mob-spawner-tick-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable mob spawner tick rate
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index c5b9b19763fd944b4f31c6d3c9b71d372f8403cf..e5b56a85d76d1417dda2d14b1b03850bbb070f4c 100644
+index b0ac72a69e13f2376aa4c66d9a1f5a01b480785c..02ee392c810d96d05f5ad27b1d75fa06dd28ee4c 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -42,6 +42,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/0043-Implement-PlayerLocaleChangeEvent.patch
index bb7a817a8d..bb7a817a8d 100644
--- a/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/unapplied/server/0043-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0044-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0044-Add-BeaconEffectEvent.patch
index 4c04a07cd0..4c04a07cd0 100644
--- a/patches/server/0044-Add-BeaconEffectEvent.patch
+++ b/patches/unapplied/server/0044-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0045-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0045-Configurable-container-update-tick-rate.patch
index f5d80072e5..fe331bd5f1 100644
--- a/patches/server/0045-Configurable-container-update-tick-rate.patch
+++ b/patches/unapplied/server/0045-Configurable-container-update-tick-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 54f585f12890c665a097845acfe13108691f12b6..2ffce1200abe7ab7b50a187069e63392c0b3bfdd 100644
+index 0590fb50330b5387a25e7fc7139e04586999efc6..3cea2ceb5d30329aa84f6659330eea075387fe18 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -228,6 +228,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0046-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0046-Use-UserCache-for-player-heads.patch
index 21457dbd7f..21457dbd7f 100644
--- a/patches/server/0046-Use-UserCache-for-player-heads.patch
+++ b/patches/unapplied/server/0046-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0047-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0047-Disable-spigot-tick-limiters.patch
index d7fe02ccde..d7fe02ccde 100644
--- a/patches/server/0047-Disable-spigot-tick-limiters.patch
+++ b/patches/unapplied/server/0047-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0048-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0048-Add-PlayerInitialSpawnEvent.patch
index e6d179d22c..e6d179d22c 100644
--- a/patches/server/0048-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/unapplied/server/0048-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0049-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0049-Configurable-Disabling-Cat-Chest-Detection.patch
index 85180f4352..85180f4352 100644
--- a/patches/server/0049-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/unapplied/server/0049-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0050-Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/0050-Ensure-commands-are-not-ran-async.patch
index 2d55ba5e0f..dc621abc5a 100644
--- a/patches/server/0050-Ensure-commands-are-not-ran-async.patch
+++ b/patches/unapplied/server/0050-Ensure-commands-are-not-ran-async.patch
@@ -21,7 +21,7 @@ character.
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 22c095539425a6667b8e7f5c5f0a8ff2e87adfb5..e21a6961bab606036440f2a6bd90998b4129ae10 100644
+index 1742efe86fe2017e58513f9a63e4b63579327f04..2be965faaed8ca25fc01d6ca1f496f7e41e6b7a0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2038,7 +2038,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -107,7 +107,7 @@ index 58f3ee6c47313b5c3b093a03b1b759e9fb0207ee..524338428265f27aa33774a23b53c242
              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 3be63b51511fd12f295e1f07549f281246ee2dc0..94ec829c549dac568a94c3262d9de026ff9d9a39 100644
+index 3be63b51511fd12f295e1f07549f281246ee2dc0..55c9d229356e3eb75419f7630cfafdd8f883a5e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -502,7 +502,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
index a83c2278d3..a83c2278d3 100644
--- a/patches/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/unapplied/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0052-Expose-server-CommandMap.patch b/patches/unapplied/server/0052-Expose-server-CommandMap.patch
index cf79a898e2..cf79a898e2 100644
--- a/patches/server/0052-Expose-server-CommandMap.patch
+++ b/patches/unapplied/server/0052-Expose-server-CommandMap.patch
diff --git a/patches/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 72602b87ec..72602b87ec 100644
--- a/patches/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/unapplied/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0054-Ensure-inv-drag-is-in-bounds.patch b/patches/unapplied/server/0054-Ensure-inv-drag-is-in-bounds.patch
index da2779ebd5..da2779ebd5 100644
--- a/patches/server/0054-Ensure-inv-drag-is-in-bounds.patch
+++ b/patches/unapplied/server/0054-Ensure-inv-drag-is-in-bounds.patch
diff --git a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0055-Player-Tab-List-and-Title-APIs.patch
index c530b1515a..621fe540af 100644
--- a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/unapplied/server/0055-Player-Tab-List-and-Title-APIs.patch
@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
          // 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 94ec829c549dac568a94c3262d9de026ff9d9a39..6f5248febd3f84f2f5bc83806cbb9953600b71b6 100644
+index 55c9d229356e3eb75419f7630cfafdd8f883a5e0..a4452324892c37c92e8e0c7cee1fdeda50e9d81b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0056-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0056-Add-configurable-portal-search-radius.patch
index 81ae47cd1a..81ae47cd1a 100644
--- a/patches/server/0056-Add-configurable-portal-search-radius.patch
+++ b/patches/unapplied/server/0056-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0057-Add-velocity-warnings.patch b/patches/unapplied/server/0057-Add-velocity-warnings.patch
index 6d36cf0c55..6d36cf0c55 100644
--- a/patches/server/0057-Add-velocity-warnings.patch
+++ b/patches/unapplied/server/0057-Add-velocity-warnings.patch
diff --git a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0058-Configurable-inter-world-teleportation-safety.patch
index 154500b60e..c4403cd8d8 100644
--- a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/unapplied/server/0058-Configurable-inter-world-teleportation-safety.patch
@@ -16,7 +16,7 @@ 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 6f5248febd3f84f2f5bc83806cbb9953600b71b6..342cd3c6ffdcf46f0329e072fae446c5e9665e33 100644
+index a4452324892c37c92e8e0c7cee1fdeda50e9d81b..60850848e76d656d7b4e885c79dfe992108c8ad5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1129,7 +1129,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0059-Add-exception-reporting-event.patch b/patches/unapplied/server/0059-Add-exception-reporting-event.patch
index e90ea3836a..e90ea3836a 100644
--- a/patches/server/0059-Add-exception-reporting-event.patch
+++ b/patches/unapplied/server/0059-Add-exception-reporting-event.patch
diff --git a/patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 3d801ecb90..3d801ecb90 100644
--- a/patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/patches/unapplied/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0061-Disable-Scoreboards-for-non-players-by-default.patch
index 3394f19cea..46585ba5c2 100644
--- a/patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/unapplied/server/0061-Disable-Scoreboards-for-non-players-by-default.patch
@@ -23,7 +23,7 @@ index dc29c677e21a71b5ba1a48c7aea8acadc2689c77..70275d1db39c9809a5fc93cebb49beb3
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1d0f6aec5b34208c6bbda23789238b3a27c33c4c..f513e9abb929fbabe12e40bb56af708745ea1ad9 100644
+index 1738512d977f60c4021c01a5fce642f62d7e4c74..17426b43a16887653a63c34128aa97785a23796c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -823,6 +823,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 4b1d9fd2cb..4b1d9fd2cb 100644
--- a/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/unapplied/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0063-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0063-Chunk-Save-Reattempt.patch
index 66fe0ef951..e8fab11cda 100644
--- a/patches/server/0063-Chunk-Save-Reattempt.patch
+++ b/patches/unapplied/server/0063-Chunk-Save-Reattempt.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 8adebb8408cc22ae7e9e89721645e5dd27a41cd8..038e2177182c94baa4af24f9111cf155ec342dfe 100644
+index aa8972fd1a1fade05d60ab69efb8ff24f344508a..ddcc212ba83d9365adb842b3d3ced64e3d7dd155 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -275,7 +275,7 @@ public class RegionFile implements AutoCloseable {
diff --git a/patches/server/0064-Complete-resource-pack-API.patch b/patches/unapplied/server/0064-Complete-resource-pack-API.patch
index cac7d1f1fb..662284faa9 100644
--- a/patches/server/0064-Complete-resource-pack-API.patch
+++ b/patches/unapplied/server/0064-Complete-resource-pack-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e21a6961bab606036440f2a6bd90998b4129ae10..9f0a5b950a022aa2a3d3d60837fdb9023f041a9b 100644
+index 2be965faaed8ca25fc01d6ca1f496f7e41e6b7a0..5443c0008ae3bb0264dbfc1b2bb3921de306c1dd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1768,8 +1768,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -23,7 +23,7 @@ index e21a6961bab606036440f2a6bd90998b4129ae10..9f0a5b950a022aa2a3d3d60837fdb902
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 342cd3c6ffdcf46f0329e072fae446c5e9665e33..307c76b2d06b748304d28d6634e86bb91f3ded67 100644
+index 60850848e76d656d7b4e885c79dfe992108c8ad5..15257f9236d0c32c1c74a15ce4e7decf4d9f2f91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -150,6 +150,7 @@ import org.bukkit.plugin.Plugin;
diff --git a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0065-Default-loading-permissions.yml-before-plugins.patch
index 5e279dbea1..5e279dbea1 100644
--- a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/unapplied/server/0065-Default-loading-permissions.yml-before-plugins.patch
diff --git a/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0066-Allow-Reloading-of-Custom-Permissions.patch
index 4271b0655d..4271b0655d 100644
--- a/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/unapplied/server/0066-Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/0067-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0067-Remove-Metadata-on-reload.patch
index 7e465a2091..7e465a2091 100644
--- a/patches/server/0067-Remove-Metadata-on-reload.patch
+++ b/patches/unapplied/server/0067-Remove-Metadata-on-reload.patch
diff --git a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0068-Handle-Item-Meta-Inconsistencies.patch
index c87023e427..5d25a8c8cd 100644
--- a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/unapplied/server/0068-Handle-Item-Meta-Inconsistencies.patch
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index e937186aaf819a77c80beeb9e08413a1f781c13a..0e19f49ca2496b1c42d27289bcea15d26993ca85 100644
+index 1b83577ec8e78e20051f20a336e5cf3e7836c079..28a8ad5f42a5ba2e2a9d4c9a04a7add621b28e82 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -151,6 +151,23 @@ public final class ItemStack {
diff --git a/patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 9544e6114a..0c639a46e3 100644
--- a/patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/unapplied/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 27c31a9e926f919c7edc8fc0cdd7fba70616d60c..7cd802be238cedf166174a61e816d9d4b29b87d2 100644
+index 0e3c8edf0891e815a67020bb094866fd47102d67..62cb9dff53d980399913c913893fca2c1110d184 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -311,7 +311,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0070-Add-World-Util-Methods.patch b/patches/unapplied/server/0070-Add-World-Util-Methods.patch
index da13541bad..8ac7076ce6 100644
--- a/patches/server/0070-Add-World-Util-Methods.patch
+++ b/patches/unapplied/server/0070-Add-World-Util-Methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e235531d694e3e904042f2d42641c1ffbecfd5a3..d935fbdbee8b20f0efa09438b7d4c4a0da93abcc 100644
+index 29e432e9bea9da307c96d42d9b45d1c3a3161fa1..d0e069e2dd950f2fe0d51594ceddcbbe44458acd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -216,7 +216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0071-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0071-Custom-replacement-for-eaten-items.patch
index 62f3354374..992a82e46a 100644
--- a/patches/server/0071-Custom-replacement-for-eaten-items.patch
+++ b/patches/unapplied/server/0071-Custom-replacement-for-eaten-items.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f513e9abb929fbabe12e40bb56af708745ea1ad9..d038c65e8a3d4a0000465e9d3ac7c4915b1b1015 100644
+index 17426b43a16887653a63c34128aa97785a23796c..c276190251c152f343de74d9c9b4028e10532ae1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3614,10 +3614,11 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index a32c66067a..7a57f61816 100644
--- a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/unapplied/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d038c65e8a3d4a0000465e9d3ac7c4915b1b1015..2cf58d6e086c1d6cc86ed689eb0d1cdc89b69477 100644
+index c276190251c152f343de74d9c9b4028e10532ae1..766711e4d32ceebf9d94e39f9bcd14ff0371ad06 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -784,7 +784,13 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0073-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0073-Use-a-Shared-Random-for-Entities.patch
index d8ba52e49b..76f363ea62 100644
--- a/patches/server/0073-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/unapplied/server/0073-Use-a-Shared-Random-for-Entities.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e28ccb5651a793775166d51859620882ee54b641..233c8950816521be5a9d099c29c99d0a421d30e4 100644
+index 70275d1db39c9809a5fc93cebb49beb32d616476..dd5e9dc310f30c008f0c8c60ac4305160261bad9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -159,6 +159,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch
index 150405cc49..24b3b297c3 100644
--- a/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/unapplied/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d935fbdbee8b20f0efa09438b7d4c4a0da93abcc..0116fcc8de2b6bd1783db56f1062c9b590a65c34 100644
+index d0e069e2dd950f2fe0d51594ceddcbbe44458acd..5f3c21172dbb9a4a0cb8aa0bffcb17bc357ef04e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -696,7 +696,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 07f2005801..ad6a7953ec 100644
--- a/patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/unapplied/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
@@ -54,7 +54,7 @@ index 0e787d877901dfcea714b0e14e9fc4358ee30bbe..41e61e6c128f22224665af3f07cd11d6
      public abstract BlockState setBlockState(BlockPos pos, BlockState state, boolean moved);
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
-index a78bf00d4559dd99869d93ec78b3525d24331925..b7856c420f346ac4923afa66a9f8276490f27e82 100644
+index 2eb92dde607d7c8968cb07c6f3c24e1c45e9990f..908f71721daf4305692f424d7712cbfdddddae83 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
 @@ -55,6 +55,12 @@ public class EmptyLevelChunk extends LevelChunk {
@@ -88,7 +88,7 @@ index ac5dff35e2df23b8790bbe65c40acc6a3c77e6ac..8ffc206a858864d277ff94de7c66ffdb
      @Override
      public FluidState getFluidState(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 20c9eada6f051ecdd5e45e625d7e6289d406a2f8..5244a0a85d80963493d9106dd2674b1701c1919c 100644
+index ea2176501dfa773a1114f5db4e6dbe4c2d2c7abe..0a08287d3b0471b01ee38eb62f92f542da35c07d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -342,12 +342,29 @@ public class LevelChunk extends ChunkAccess {
@@ -138,7 +138,7 @@ index dddae1e226d8f58cdcfc597e25d4228cd3245cb4..ae37e97e52557b48f129cc02eeea3953
      private short tickingFluidCount;
      public final PalettedContainer<BlockState> states;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-index 040c6092ceed4c693a7a056c0d1a49d3d2242b19..13b62e8e6569c154547bc0d5626488c5b0839f20 100644
+index 0b67858f8d6689b34816f9556f3424af512a7401..c24b4c6a560aab2df07783b3481981deb8571a50 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
 @@ -94,14 +94,18 @@ public class ProtoChunk extends ChunkAccess {
diff --git a/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 8d12218f4b..909bfbff37 100644
--- a/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/unapplied/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
 Saves on some object allocation and processing when no plugin listens to this
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c0b8daca75feec011423ba4b4ef5900558bc4d92..7dce9f0355c74828f40b07276c34e352132a2549 100644
+index 093ac159fcc34de9901395ad9450372efdf7cb5b..c5e3f7f0623731c02e4625971fc82acbc834f51a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1350,6 +1350,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index c0b8daca75feec011423ba4b4ef5900558bc4d92..7dce9f0355c74828f40b07276c34e352
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 51603dcbe81301557757152404c33fc91e21dc1a..81d24e082ad8be36db40c0ab62db3386401aa821 100644
+index 5f3c21172dbb9a4a0cb8aa0bffcb17bc357ef04e..1cfd73068455b1108a74156e9715061d2dca231f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch
index 67b27958eb..59ceda0f86 100644
--- a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/unapplied/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 81d24e082ad8be36db40c0ab62db3386401aa821..6ec90ab4ff94c103682df9b66917e897cf420f33 100644
+index 1cfd73068455b1108a74156e9715061d2dca231f..b255f8bd65006240153cb607f65e277f8a560b75 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2245,6 +2245,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0078-Configurable-Chunk-Inhabited-Time.patch
index 913007c7d1..34b3c0a6c3 100644
--- a/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/unapplied/server/0078-Configurable-Chunk-Inhabited-Time.patch
@@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 5244a0a85d80963493d9106dd2674b1701c1919c..5cd8755dc8db2f1fdb32d2db3a5a137ca7cad3c7 100644
+index 0a08287d3b0471b01ee38eb62f92f542da35c07d..3a613d3fb6240a504724ba42b9aadaa0881b3ac1 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -327,6 +327,13 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0079-EntityPathfindEvent.patch b/patches/unapplied/server/0079-EntityPathfindEvent.patch
index 4e0de3f713..4e0de3f713 100644
--- a/patches/server/0079-EntityPathfindEvent.patch
+++ b/patches/unapplied/server/0079-EntityPathfindEvent.patch
diff --git a/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch
index cecec7b06e..cecec7b06e 100644
--- a/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/unapplied/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0081-Do-not-load-chunks-for-Pathfinding.patch
index f2b3dffd68..f2b3dffd68 100644
--- a/patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/unapplied/server/0081-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0082-Add-PlayerUseUnknownEntityEvent.patch
index 65c61e8d27..e2deda5e78 100644
--- a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/server/0082-Add-PlayerUseUnknownEntityEvent.patch
@@ -22,7 +22,7 @@ index 8834ed411a7db86b4d2b88183a1315317107d719..c45b5ab6776f3ac79f856c3a6467c510
      static final ServerboundInteractPacket.Action ATTACK_ACTION = new ServerboundInteractPacket.Action() {
          @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2f8a25e95dac5f61b5cc592200dbf6d76c00f5cd..5189a74fd224e50b7a0ca8df91aa06a57e7f1c02 100644
+index 5443c0008ae3bb0264dbfc1b2bb3921de306c1dd..65bd9005b722db154842978d359e0a2277bbb8b2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2644,8 +2644,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/0083-Configurable-Grass-Spread-Tick-Rate.patch
index 50a9c78703..50a9c78703 100644
--- a/patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/patches/unapplied/server/0083-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 29f5f1ebcd..830d4a395d 100644
--- a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/unapplied/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b232df5fd870b75dc616dffcf76b15409fb6fdbe..937c4ad3acd69ee77d89c5f32480994d0b1ce5c9 100644
+index b255f8bd65006240153cb607f65e277f8a560b75..67c4b724b6b799c02ee4c5034d3472e44cb591fa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1476,6 +1476,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0085-Optimize-DataBits.patch b/patches/unapplied/server/0085-Optimize-DataBits.patch
index 8686b1aff9..8686b1aff9 100644
--- a/patches/server/0085-Optimize-DataBits.patch
+++ b/patches/unapplied/server/0085-Optimize-DataBits.patch
diff --git a/patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 7ef4294205..7ef4294205 100644
--- a/patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/unapplied/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0087-Configurable-Player-Collision.patch b/patches/unapplied/server/0087-Configurable-Player-Collision.patch
index 00970b35e0..6ebfa88df0 100644
--- a/patches/server/0087-Configurable-Player-Collision.patch
+++ b/patches/unapplied/server/0087-Configurable-Player-Collision.patch
@@ -18,7 +18,7 @@ index 1294b38262505b0d54089e428df9b363219de1f0..ee37ec0de1ca969144824427ae42b0c8
              buf.writeComponent(this.playerPrefix);
              buf.writeComponent(this.playerSuffix);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7c389a37b9bac59f0ad3bbe1eae9c9f9b4bf014d..3b364c36f4c572e7f139997ef214bca8a8368e56 100644
+index c5e3f7f0623731c02e4625971fc82acbc834f51a..17ad0051afaaa0e201782228628c691b75b6cebc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -580,6 +580,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -43,7 +43,7 @@ index 7c389a37b9bac59f0ad3bbe1eae9c9f9b4bf014d..3b364c36f4c572e7f139997ef214bca8
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index dfb53366a0b36b6a4cc43c66837f98fc372c6d2e..0d0b04775dc36c1749d8f19f5c8d2b9dd9bb5a1e 100644
+index 1357b444cf2efbd7f6a1918709b9743d230f1fd5..afbb45f2ee55f193e30c19bc20edc42434f16784 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -94,6 +94,7 @@ import net.minecraft.world.level.storage.PlayerDataStorage;
diff --git a/patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 9cc30eaeda..9cc30eaeda 100644
--- a/patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0089-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0089-Configurable-RCON-IP-address.patch
index df8934d585..df8934d585 100644
--- a/patches/server/0089-Configurable-RCON-IP-address.patch
+++ b/patches/unapplied/server/0089-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch
index dbd8280cac..09c9989119 100644
--- a/patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8dc6fbbdfaecf0eb38a876d87d77f111541f766d..707a7fc783973d4806e10f59eb6202e408991223 100644
+index 766711e4d32ceebf9d94e39f9bcd14ff0371ad06..a0d6273a8a5613ee732c3dbb6eff46ecf42b5f4a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1250,10 +1250,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0091-Add-ability-to-configure-frosted_ice-properties.patch
index 8e938c31ad..8e938c31ad 100644
--- a/patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/unapplied/server/0091-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0092-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0092-remove-null-possibility-for-getServer-singleton.patch
index 0a85e191ad..c6d47257eb 100644
--- a/patches/server/0092-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/unapplied/server/0092-remove-null-possibility-for-getServer-singleton.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9965bbe95da1dcb17fbb953fb7a7c9a59d593f85..0fbbdad1d4a33c9feb77ae9592db92efb747c12f 100644
+index 17ad0051afaaa0e201782228628c691b75b6cebc..e24bd9c2be84dd11bf109e65ea4e1e577fe647ca 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -181,6 +181,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 9ffad19e05..d5fa2b9a2e 100644
--- a/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/unapplied/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 38f91c6f1ca2827122b1ae1fde94bc888638ba0f..4d96a196511621d56507cfb35923bd5270f83716 100644
+index 67c4b724b6b799c02ee4c5034d3472e44cb591fa..ec2d94e7b34b4384c5c37265869e6ddb15d6e6eb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2266,6 +2266,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -25,7 +25,7 @@ index 38f91c6f1ca2827122b1ae1fde94bc888638ba0f..4d96a196511621d56507cfb35923bd52
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 08b0b7b9146f58c4eb263d5ce1fee1b08d43fafe..1e3ac1d2cb5adf4c0fa3b703f2ecdc32cd8ce240 100644
+index 4751fea5e7319600422c4fb3e40026a36db85a6a..845e52baf57492cfb0eb20318c84585e30001f0b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -763,6 +763,14 @@ public abstract class Player extends LivingEntity {
@@ -44,7 +44,7 @@ index 08b0b7b9146f58c4eb263d5ce1fee1b08d43fafe..1e3ac1d2cb5adf4c0fa3b703f2ecdc32
              return entityitem;
          }
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 3527d40102d512d0e276edc969ea3c189aa34ec2..913fabc7f42c05ccec6501247a5e8d1d481756ee 100644
+index b8d33dc1dc31fb2bcde0d74504f3972b0cc28f17..7254e7a42c58737cfc04f09aaca2fe1ebeec6d08 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -63,6 +63,7 @@ public class MapItemSavedData extends SavedData {
diff --git a/patches/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch
index 4268501a01..4268501a01 100644
--- a/patches/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/unapplied/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch
diff --git a/patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index c233fb2657..c233fb2657 100644
--- a/patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/unapplied/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0096-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0096-System-property-for-disabling-watchdoge.patch
index 65be04b57b..65be04b57b 100644
--- a/patches/server/0096-System-property-for-disabling-watchdoge.patch
+++ b/patches/unapplied/server/0096-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0097-Async-GameProfileCache-saving.patch b/patches/unapplied/server/0097-Async-GameProfileCache-saving.patch
index 7a9b7d0bed..7a9b7d0bed 100644
--- a/patches/server/0097-Async-GameProfileCache-saving.patch
+++ b/patches/unapplied/server/0097-Async-GameProfileCache-saving.patch
diff --git a/patches/server/0098-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0098-Optional-TNT-doesn-t-move-in-water.patch
index 3cb11be6b8..f7f84dc56d 100644
--- a/patches/server/0098-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/unapplied/server/0098-Optional-TNT-doesn-t-move-in-water.patch
@@ -18,7 +18,7 @@ index 8b3ca38f029b8918f02c51995e4359cbbf741c76..d6f34adbdf45bbef4a39e629dd7cb6d7
      public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
          this.trackedPlayers = trackedPlayers;
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 10f8b5ff56e4c1d8300835e045abdce719a99343..8101f358975b35b5a2dafbade3d14a910e408fa2 100644
+index 7a2ec239cd59b95dfd87ab1164d17bad23c4e558..65f0aa076dbfc4cd72d14ec485d1edf5533d825e 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -97,6 +97,27 @@ public class PrimedTnt extends Entity {
diff --git a/patches/server/0099-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0099-Faster-redstone-torch-rapid-clock-removal.patch
index afe95620ee..afe95620ee 100644
--- a/patches/server/0099-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/unapplied/server/0099-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0100-Add-server-name-parameter.patch b/patches/unapplied/server/0100-Add-server-name-parameter.patch
index abd91cd6fa..abd91cd6fa 100644
--- a/patches/server/0100-Add-server-name-parameter.patch
+++ b/patches/unapplied/server/0100-Add-server-name-parameter.patch
diff --git a/patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/unapplied/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
index bc7d89b3b1..bc7d89b3b1 100644
--- a/patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
+++ b/patches/unapplied/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
diff --git a/patches/server/0102-Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/0102-Fix-Old-Sign-Conversion.patch
index d223b39ccf..d223b39ccf 100644
--- a/patches/server/0102-Fix-Old-Sign-Conversion.patch
+++ b/patches/unapplied/server/0102-Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0103-Avoid-blocking-on-Network-Manager-creation.patch
index 4c0273aeef..4c0273aeef 100644
--- a/patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/unapplied/server/0103-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index e542d272fa..1e05976371 100644
--- a/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/unapplied/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
 
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 2249beff3200c5dab1e81bd3d10f2c3bf1e7dbc9..3295fd4bca58cf8feeff2fcefa514a5ec89310f9 100644
+index 225e15d686675e21969c4210fa38fef58d920355..5288aec173549a982e42aeeccf7f5f394080955d 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -98,6 +98,7 @@ public class GameProfileCache {
diff --git a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0105-Add-setting-for-proxy-online-mode-status.patch
index bd273b8189..774e8cb2a1 100644
--- a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/unapplied/server/0105-Add-setting-for-proxy-online-mode-status.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add setting for proxy online mode status
 TODO: Add isProxyOnlineMode check to Metrics
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 3295fd4bca58cf8feeff2fcefa514a5ec89310f9..376845f5a25a348e76193fac5c047b0ba2fb080f 100644
+index 5288aec173549a982e42aeeccf7f5f394080955d..58e923f4ef1980bc7fff1e3b3fcdaad8c4eded53 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -98,7 +98,8 @@ public class GameProfileCache {
diff --git a/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0106-Optimise-BlockState-s-hashCode-equals.patch
index 53db895e2e..53db895e2e 100644
--- a/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/unapplied/server/0106-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0107-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0107-Configurable-packet-in-spam-threshold.patch
index 7059a874f8..cd270f2cbd 100644
--- a/patches/server/0107-Configurable-packet-in-spam-threshold.patch
+++ b/patches/unapplied/server/0107-Configurable-packet-in-spam-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b86f742c4a7500f0bb241d5c07a077aa1be1c7e5..c94a736dbf02c2ba34e74e73b6cc3780238f0ede 100644
+index 65bd9005b722db154842978d359e0a2277bbb8b2..3978ba09a5e29aaf9e48d5e4f800b1027181a4ad 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1611,13 +1611,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0108-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0108-Configurable-flying-kick-messages.patch
index b4c5d977eb..db9a9cd97a 100644
--- a/patches/server/0108-Configurable-flying-kick-messages.patch
+++ b/patches/unapplied/server/0108-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c94a736dbf02c2ba34e74e73b6cc3780238f0ede..75bc0d9e8ec46d1fcfd6d5886d5ab03537e575d2 100644
+index 3978ba09a5e29aaf9e48d5e4f800b1027181a4ad..e032a9f72aa5d55daa9c680734e45e3dda13ca9b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -358,7 +358,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/unapplied/server/0109-Add-EntityZapEvent.patch
index c713a5e65f..c713a5e65f 100644
--- a/patches/server/0109-Add-EntityZapEvent.patch
+++ b/patches/unapplied/server/0109-Add-EntityZapEvent.patch
diff --git a/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/unapplied/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 9fc8ffaeaf..f7ef378ecd 100644
--- a/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/patches/unapplied/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 6c4be7da19d0d61f35942558d438587853231aaa..18d81e8e8f387a7fb531652cb78c61a9bd5ae600 100644
+index 9ef526b3da1185f32257b8fb2fa79ff281855713..108c9ea0eb4a7f381042bfe0203ac40a9c4f27a7 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -316,6 +316,18 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0111-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0111-Cache-user-authenticator-threads.patch
index 389ea5bb4e..389ea5bb4e 100644
--- a/patches/server/0111-Cache-user-authenticator-threads.patch
+++ b/patches/unapplied/server/0111-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0112-Allow-Reloading-of-Command-Aliases.patch
index 54b2ffe5a7..54b2ffe5a7 100644
--- a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/server/0112-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0113-Add-source-to-PlayerExpChangeEvent.patch
index 09c8255560..09c8255560 100644
--- a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/server/0113-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0114-Add-ProjectileCollideEvent.patch
index 8c5308cbe4..affd54446b 100644
--- a/patches/server/0114-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/server/0114-Add-ProjectileCollideEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 7cd802be238cedf166174a61e816d9d4b29b87d2..7f1f4813ac007fbf79e8ba254075c015fe15e3a1 100644
+index 62cb9dff53d980399913c913893fca2c1110d184..da92f324322f4fb18f9aa72c4298ffc8ab040953 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -226,6 +226,17 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
index 50b980ec70..50b980ec70 100644
--- a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/unapplied/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
index da22f581ab..da22f581ab 100644
--- a/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/unapplied/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0117-Bound-Treasure-Maps-to-World-Border.patch
index 154a31efb9..154a31efb9 100644
--- a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/unapplied/server/0117-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0118-Configurable-Cartographer-Treasure-Maps.patch
index 25ad0e6acc..25ad0e6acc 100644
--- a/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/unapplied/server/0118-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0119-Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/0119-Optimize-ItemStack.isEmpty.patch
index cb004037bf..51afc65b61 100644
--- a/patches/server/0119-Optimize-ItemStack.isEmpty.patch
+++ b/patches/unapplied/server/0119-Optimize-ItemStack.isEmpty.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0e19f49ca2496b1c42d27289bcea15d26993ca85..c0959edaef2bc0ebcfa482cd120855c23d83f2b8 100644
+index 28a8ad5f42a5ba2e2a9d4c9a04a7add621b28e82..7b61f9c45b9e23562bd5cf448df319ba9e1e091a 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -245,7 +245,7 @@ public final class ItemStack {
diff --git a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 59fc5fcbf3..59fc5fcbf3 100644
--- a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/unapplied/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0121-String-based-Action-Bar-API.patch b/patches/unapplied/server/0121-String-based-Action-Bar-API.patch
index 916142b45d..636afb03f0 100644
--- a/patches/server/0121-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/server/0121-String-based-Action-Bar-API.patch
@@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // 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 4b7e5996b8b49d96f14cbd0d2167a0a09b47f4ec..843764d27c490e94bcf2becdafb15e5f1a68bc92 100644
+index 1e1deab4d8be5523a55daf072d7e12b08d36b560..87c8e494aa374b8bfb8b8432723783b00ba94763 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -355,6 +355,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0122-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0122-Properly-fix-item-duplication-bug.patch
index 6a86bb31ec..f3c65cef8f 100644
--- a/patches/server/0122-Properly-fix-item-duplication-bug.patch
+++ b/patches/unapplied/server/0122-Properly-fix-item-duplication-bug.patch
@@ -19,7 +19,7 @@ index 3cea2ceb5d30329aa84f6659330eea075387fe18..0fded4890038de77781c27565fa3c8fe
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75bc0d9e8ec46d1fcfd6d5886d5ab03537e575d2..9df3561fca35b1649de1545e924bd96ec5f80089 100644
+index e032a9f72aa5d55daa9c680734e45e3dda13ca9b..6282cebfa3786c9ac72fcebeee1b8c4cdf5d7238 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3283,7 +3283,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0123-Firework-API-s.patch b/patches/unapplied/server/0123-Firework-API-s.patch
index e34f57affe..e34f57affe 100644
--- a/patches/server/0123-Firework-API-s.patch
+++ b/patches/unapplied/server/0123-Firework-API-s.patch
diff --git a/patches/server/0124-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0124-PlayerTeleportEndGatewayEvent.patch
index 378f2e4756..378f2e4756 100644
--- a/patches/server/0124-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0124-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
index 4ec316d03a..4ec316d03a 100644
--- a/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0126-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0126-Enforce-Sync-Player-Saves.patch
index db22ab7995..ba14b9257f 100644
--- a/patches/server/0126-Enforce-Sync-Player-Saves.patch
+++ b/patches/unapplied/server/0126-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0d0b04775dc36c1749d8f19f5c8d2b9dd9bb5a1e..730f30b6ee5230cde784b7f0a2b20699968f7e15 100644
+index afbb45f2ee55f193e30c19bc20edc42434f16784..51add7e60fbd9eebbddc4893de044edc35854409 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1042,11 +1042,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch
index a291c07317..a291c07317 100644
--- a/patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/patches/unapplied/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 9efb14a80f..18d06d1c48 100644
--- a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -131,7 +131,7 @@ index 63b57d47d7dbb7a8a655b1447241e20c67a3f9c2..0c19aa68dc444373bf1a9bd3b349d12d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 37076ea1f07108db37dd67f5f7d4466534994a9f..3e2dd4a1fb1e2a99da88d392457d92eb9087c430 100644
+index a0d6273a8a5613ee732c3dbb6eff46ecf42b5f4a..a42983b4d7dbd360bbe4206dcf6aa95375ef9b2b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1726,7 +1726,8 @@ public abstract class LivingEntity extends Entity {
@@ -197,7 +197,7 @@ index fe660bbaa4113fb2ffa1ea2f10e4e1e674fbb86d..bb6063ae7f4438916306ce876057f748
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index e6a6b0a298e69ce975eac413723f068aaef72ec0..1709126f0853edc6bece6f31d7c65a5f8955683a 100644
+index 127aab56eef67d7f02f5c3de80d8f445ba70e7db..6eada8313e468e4ea851094976ac98c11710fb45 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -647,7 +647,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -232,7 +232,7 @@ index 33d1a6b31afec4dbeb00dcabf50c5840852102d6..25cd8a4101cf44955d95924c9794c238
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index b9a0fc52460ce0c50deea25112dee20c977e99c5..d7cb3d8b37f225ee4796246aa907da1092fa9a0d 100644
+index 9bc9307966b77e34cb091fc895db3d3a66f7be82..e594cf4b8084b7448c29208a2070e766e391713d 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -186,7 +186,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
diff --git a/patches/server/0129-Cap-Entity-Collisions.patch b/patches/unapplied/server/0129-Cap-Entity-Collisions.patch
index 53b175e41e..2087d46233 100644
--- a/patches/server/0129-Cap-Entity-Collisions.patch
+++ b/patches/unapplied/server/0129-Cap-Entity-Collisions.patch
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b4d96dfc68788a4eae2197a0f2615de213d5ca8b..6e1b53317c4107f907e551a9baeaf64909f6de87 100644
+index 86fa079f9f1f958ed586c966467d26a44e09b11c..58256b341aa15e946abef464453c0ffcaf55b372 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -379,6 +379,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,7 +24,7 @@ index b4d96dfc68788a4eae2197a0f2615de213d5ca8b..6e1b53317c4107f907e551a9baeaf649
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3e2dd4a1fb1e2a99da88d392457d92eb9087c430..2e006451768f08998dfae3999f28429ef0b491af 100644
+index a42983b4d7dbd360bbe4206dcf6aa95375ef9b2b..6295c89211ba86c10009775f4d399f597d240fd0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3289,8 +3289,11 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch
index eacad1fb97..eacad1fb97 100644
--- a/patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/unapplied/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0131-Do-not-let-armorstands-drown.patch b/patches/unapplied/server/0131-Do-not-let-armorstands-drown.patch
index a248b55fa2..a248b55fa2 100644
--- a/patches/server/0131-Do-not-let-armorstands-drown.patch
+++ b/patches/unapplied/server/0131-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
index 8b06614a56..6bbd4f97f5 100644
--- a/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/unapplied/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f1d4a7a9e74adc18e18b2df960794ec8c05ce340..37a3c1bd60dbd0e0069120d4f48a17cfbc82dca1 100644
+index f438056c74dd24142bd94b505160711d0f94a5d5..f852c1315cf9dcba56f5877063254d4c608abd61 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -221,6 +221,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -64,7 +64,7 @@ index f1d4a7a9e74adc18e18b2df960794ec8c05ce340..37a3c1bd60dbd0e0069120d4f48a17cf
          if (flag) {
              try {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index acb3d75f0777eab5aa117679d2328c22f46cf823..5820dbb6d2129e2f99207e39c3ed9e661610f491 100644
+index 51add7e60fbd9eebbddc4893de044edc35854409..dbc8f0b962371902fc5e84f1171046d794eb1367 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1153,8 +1153,15 @@ public abstract class PlayerList {
diff --git a/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index eeb2705be0..098f636914 100644
--- a/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/unapplied/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -32,7 +32,7 @@ index 6282cebfa3786c9ac72fcebeee1b8c4cdf5d7238..5a8008b507b93768526184ddaca170bc
              case RELEASE_SHIFT_KEY:
                  this.player.setShiftKeyDown(false);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d0ba75522bcbc6d09e3cc562b27d8cbbe1d7d5ac..b66dda94eb89aa3180cb36d8657d9a786e3f72b8 100644
+index 845e52baf57492cfb0eb20318c84585e30001f0b..d68ad0bc89565d207f46b106bacce8e6efc890dc 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -588,7 +588,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
index 0282c2af43..0282c2af43 100644
--- a/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch
index fd8abc7880..d80489d57d 100644
--- a/patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/unapplied/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -112,7 +112,7 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f95534b0e6745b8c52351246693da36764ad47b3..3bd4b16da49a730326f5b9039649eb59e3043bd0 100644
+index f852c1315cf9dcba56f5877063254d4c608abd61..b404a222e741064185269a42a102d3e4c1f481d7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -156,7 +156,7 @@ import org.slf4j.Logger;
@@ -171,7 +171,7 @@ index f95534b0e6745b8c52351246693da36764ad47b3..3bd4b16da49a730326f5b9039649eb59
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6c856dee201d84285283504aad8cf959e88b1c52..ed3662f2d237fc6a11cb3f6a2e476dc014ba4586 100644
+index f3c65b5f4a0cc3bc0004cc6f8cc974a87a1123bb..bada827fe2a8a58d029d9459bf576d598e4a196f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -103,6 +103,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -222,7 +222,7 @@ index 6c856dee201d84285283504aad8cf959e88b1c52..ed3662f2d237fc6a11cb3f6a2e476dc0
          System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
          System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5820dbb6d2129e2f99207e39c3ed9e661610f491..f86d3dfcc19f6f9383d21044f61aa5246cf1f9e5 100644
+index dbc8f0b962371902fc5e84f1171046d794eb1367..4f47a48aad54bec10fa8d79be2e6401cd8166591 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -160,8 +160,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch
index d5c14819e2..d5c14819e2 100644
--- a/patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/unapplied/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0137-Item-canEntityPickup.patch b/patches/unapplied/server/0137-Item-canEntityPickup.patch
index 07b208cc78..b7c9497739 100644
--- a/patches/server/0137-Item-canEntityPickup.patch
+++ b/patches/unapplied/server/0137-Item-canEntityPickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 0b056e65b2efe0f96a6beecfc41709bfa18983ca..6d0d194aaababd91a26dffc07f547d60eadd098e 100644
+index d315d9e0e6724e210924ec5814545e8c52ba2d8b..4f3d3bb811ea767bbcc4327eeefcdc6d58ed5230 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -635,6 +635,11 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 6e987d76ed..6e987d76ed 100644
--- a/patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/unapplied/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0139-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0139-PlayerAttemptPickupItemEvent.patch
index deec8f3a7d..deec8f3a7d 100644
--- a/patches/server/0139-PlayerAttemptPickupItemEvent.patch
+++ b/patches/unapplied/server/0139-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index b2385e0d42..dd092f4eee 100644
--- a/patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/unapplied/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch
@@ -37,7 +37,7 @@ index 168ab805ecc48dd55db90eb7fe1c56fda3f2776c..336a26733b5bf73455f8ec10347c1e08
      private static final DateTimeFormatter FILENAME_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss", Locale.ROOT);
      public static TimeSource.NanoTimeSource timeSource = System::nanoTime;
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 376845f5a25a348e76193fac5c047b0ba2fb080f..2a0cf0a8a79c09566c598197fc6f8c447d4bbd72 100644
+index 58e923f4ef1980bc7fff1e3b3fcdaad8c4eded53..4038bb76339d43f18770624bd7fecc79b8d7f2a9 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -181,7 +181,7 @@ public class GameProfileCache {
@@ -63,7 +63,7 @@ index 0c7e29b589ab106013d979a20edc415b4b32a677..c5d5d90d10b30f30d1262367b3d75df4
                          Property property = Iterables.getFirst(profilex.getProperties().get("textures"), (Property)null);
                          if (property == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
-index 2d49bd6f3f017d43dfaa23cedf35040b64bcdcf8..9edc5e73819e0b55372f77c5e292eece74d837c7 100644
+index 3030c153725415802f68c144e0b577d919307058..3e40d47f504248cd7caeef6b841a8aa6f1976170 100644
 --- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 +++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 @@ -121,7 +121,7 @@ public final class CraftPlayerProfile implements PlayerProfile {
diff --git a/patches/server/0141-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0141-Add-UnknownCommandEvent.patch
index 6ce95d0001..6ce95d0001 100644
--- a/patches/server/0141-Add-UnknownCommandEvent.patch
+++ b/patches/unapplied/server/0141-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0142-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0142-Basic-PlayerProfile-API.patch
index 3d07dffe7d..3d07dffe7d 100644
--- a/patches/server/0142-Basic-PlayerProfile-API.patch
+++ b/patches/unapplied/server/0142-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0143-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0143-Shoulder-Entities-Release-API.patch
index 50587a494b..a3d3d1608d 100644
--- a/patches/server/0143-Shoulder-Entities-Release-API.patch
+++ b/patches/unapplied/server/0143-Shoulder-Entities-Release-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 07a8abb714a9dfd470ab0486c336e3b58ea927a1..d4e3649f4d66545842a7f8cd3dabad39d185046e 100644
+index d68ad0bc89565d207f46b106bacce8e6efc890dc..2fd52878415fca31d053d8d83a53748e8743e352 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2036,20 +2036,44 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0144-Profile-Lookup-Events.patch b/patches/unapplied/server/0144-Profile-Lookup-Events.patch
index a9a4210f19..a9a4210f19 100644
--- a/patches/server/0144-Profile-Lookup-Events.patch
+++ b/patches/unapplied/server/0144-Profile-Lookup-Events.patch
diff --git a/patches/server/0145-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0145-Block-player-logins-during-server-shutdown.patch
index 7078c56d25..7078c56d25 100644
--- a/patches/server/0145-Block-player-logins-during-server-shutdown.patch
+++ b/patches/unapplied/server/0145-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0146-Entity-fromMobSpawner.patch b/patches/unapplied/server/0146-Entity-fromMobSpawner.patch
index 4429a09763..6d7a58942f 100644
--- a/patches/server/0146-Entity-fromMobSpawner.patch
+++ b/patches/unapplied/server/0146-Entity-fromMobSpawner.patch
@@ -37,7 +37,7 @@ index 58256b341aa15e946abef464453c0ffcaf55b372..36beb42ccdb348c91020502f935b3a15
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index e5b56a85d76d1417dda2d14b1b03850bbb070f4c..5304b0455b070006922e1b5471e9c0ababc58aa2 100644
+index 02ee392c810d96d05f5ad27b1d75fa06dd28ee4c..d09d586fd649f5b13c1515a8b0f869c1d6033cce 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -159,6 +159,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0147-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0147-Improve-the-Saddle-API-for-Horses.patch
index ccd3b7baf4..ccd3b7baf4 100644
--- a/patches/server/0147-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/unapplied/server/0147-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0148-Implement-ensureServerConversions-API.patch b/patches/unapplied/server/0148-Implement-ensureServerConversions-API.patch
index f98e7f543c..f98e7f543c 100644
--- a/patches/server/0148-Implement-ensureServerConversions-API.patch
+++ b/patches/unapplied/server/0148-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0149-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0149-Implement-getI18NDisplayName.patch
index 7011d8a566..7011d8a566 100644
--- a/patches/server/0149-Implement-getI18NDisplayName.patch
+++ b/patches/unapplied/server/0149-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0150-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0150-ProfileWhitelistVerifyEvent.patch
index 150f0aa174..3443af2779 100644
--- a/patches/server/0150-ProfileWhitelistVerifyEvent.patch
+++ b/patches/unapplied/server/0150-ProfileWhitelistVerifyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 07a6b3e74600489f1076a73b3f02ad95891b22e7..808fd17a60c63ef96e702b0ffc9801f58bd0bde2 100644
+index 4f47a48aad54bec10fa8d79be2e6401cd8166591..4dcc44b925ac261aaa2f4ee84e321d6c8852e835 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -621,9 +621,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0151-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0151-Fix-this-stupid-bullshit.patch
index d4534629d8..d4534629d8 100644
--- a/patches/server/0151-Fix-this-stupid-bullshit.patch
+++ b/patches/unapplied/server/0151-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0152-LivingEntity-setKiller.patch b/patches/unapplied/server/0152-LivingEntity-setKiller.patch
index 910efbf638..910efbf638 100644
--- a/patches/server/0152-LivingEntity-setKiller.patch
+++ b/patches/unapplied/server/0152-LivingEntity-setKiller.patch
diff --git a/patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 884de65442..884de65442 100644
--- a/patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/unapplied/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index c47d4472ba..15e9c22822 100644
--- a/patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/unapplied/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 5304b0455b070006922e1b5471e9c0ababc58aa2..ac767d107ea0d856f3f8caccfe6f79b14e933005 100644
+index d09d586fd649f5b13c1515a8b0f869c1d6033cce..796e3bde04a118076ea004b0d58fd25641a7611e 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -160,6 +160,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch
index 16938cef68..16938cef68 100644
--- a/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/unapplied/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 24e5ff4f30..24e5ff4f30 100644
--- a/patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/unapplied/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/0157-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0157-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 5afb9562c0..5afb9562c0 100644
--- a/patches/server/0157-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/unapplied/server/0157-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0158-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0158-Add-PlayerJumpEvent.patch
index c861a5386c..cd95c754d9 100644
--- a/patches/server/0158-Add-PlayerJumpEvent.patch
+++ b/patches/unapplied/server/0158-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f8955429ec4cfe778de77a7db5fef624c20e4318..32c4383cfb4cab6329d7046c48daf3050fa027c6 100644
+index 5a8008b507b93768526184ddaca170bccb67f92a..4f677103cdbda994355924ebeb822009a97345cd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1293,7 +1293,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0159-handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/0159-handle-ServerboundKeepAlivePacket-async.patch
index bb33ae2596..9af5e6da46 100644
--- a/patches/server/0159-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/unapplied/server/0159-handle-ServerboundKeepAlivePacket-async.patch
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 32c4383cfb4cab6329d7046c48daf3050fa027c6..c4f1ded84ec1ed152faeb835a3f50b7e31356655 100644
+index 4f677103cdbda994355924ebeb822009a97345cd..66668dbd2a26f566b3a965921de25a1998fbcd53 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3242,14 +3242,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0160-Expose-client-protocol-version-and-virtual-host.patch
index 8d6805f9b5..8d6805f9b5 100644
--- a/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/server/0160-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/server/0161-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0161-revert-serverside-behavior-of-keepalives.patch
index 8736164bf2..425fb975b0 100644
--- a/patches/server/0161-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/unapplied/server/0161-revert-serverside-behavior-of-keepalives.patch
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c4f1ded84ec1ed152faeb835a3f50b7e31356655..e40eeb5e04d96fb55283ded82cea0a5539a2fad5 100644
+index 66668dbd2a26f566b3a965921de25a1998fbcd53..f1e3955625e3ae3e4b47cd53d3af7ec70892add6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -256,7 +256,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index edadd2cc60..6b46f91298 100644
--- a/patches/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/unapplied/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d4e3649f4d66545842a7f8cd3dabad39d185046e..b07b9949b144981a8c461fc68bf3c296fd278572 100644
+index 2fd52878415fca31d053d8d83a53748e8743e352..0dc19e4701b35e94e94f07d261b3dbbdf9567d7b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1246,7 +1246,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0163-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0163-Add-PlayerArmorChangeEvent.patch
index cb61894887..3cd03ac998 100644
--- a/patches/server/0163-Add-PlayerArmorChangeEvent.patch
+++ b/patches/unapplied/server/0163-Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2e006451768f08998dfae3999f28429ef0b491af..b1ad2db0b3e0f5b287621e8096fb5fc7dd5ce32d 100644
+index 6295c89211ba86c10009775f4d399f597d240fd0..e49803f36ffea3329a67542882ee58e4762a08e5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch
index b778301bcf..b778301bcf 100644
--- a/patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/unapplied/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 9eb1924bd9..9eb1924bd9 100644
--- a/patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/unapplied/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
index 537d6aebf6..537d6aebf6 100644
--- a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/unapplied/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch
index c2d8befb3f..c2d8befb3f 100644
--- a/patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0168-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0168-AsyncTabCompleteEvent.patch
index c55d2a5b56..f9b2c3eb16 100644
--- a/patches/server/0168-AsyncTabCompleteEvent.patch
+++ b/patches/unapplied/server/0168-AsyncTabCompleteEvent.patch
@@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent
 Co-authored-by: Aikar <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e40eeb5e04d96fb55283ded82cea0a5539a2fad5..90bd5c1a010a3a9d24328e5c719053603e206626 100644
+index f1e3955625e3ae3e4b47cd53d3af7ec70892add6..b7d700c85d3a8c92e6c3cdd3d266f20f90fb8da8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -784,12 +784,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0169-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0169-PlayerPickupExperienceEvent.patch
index f59d0999a5..4076248476 100644
--- a/patches/server/0169-PlayerPickupExperienceEvent.patch
+++ b/patches/unapplied/server/0169-PlayerPickupExperienceEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 16a1a005f2dda30cf804bf51638383ef3bfeb43e..80f4dfdbc410aa3346897e2ca63272a081712b6e 100644
+index 0c19aa68dc444373bf1a9bd3b349d12df7d8dd9d..2fead19c1c4b04f94999887b196ceaee025edd99 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -303,7 +303,7 @@ public class ExperienceOrb extends Entity {
diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0170-Ability-to-apply-mending-to-XP-API.patch
index 53b9326bd8..53b9326bd8 100644
--- a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/unapplied/server/0170-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0171-PlayerNaturallySpawnCreaturesEvent.patch
index 8e24b34515..1a31656ac4 100644
--- a/patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/unapplied/server/0171-PlayerNaturallySpawnCreaturesEvent.patch
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index eda47a2c2a26fcf3434af140e1436395b2506cb0..ea9f536efd4c76b421f6e02f93f16fae115840d8 100644
+index f69a4df520760fe9e849eb61512f410b82d7a034..236e0f8cc271d1ca1a2cb64e333d59de1cb953ea 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -680,7 +680,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -40,7 +40,7 @@ index eda47a2c2a26fcf3434af140e1436395b2506cb0..ea9f536efd4c76b421f6e02f93f16fae
  
              return true;
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index b3cff10fece84839fe85feb297fafbcd4a02d838..70077d3f359944e2df29198ae156be477ebc278d 100644
+index e63c655a9c65f0408c3d025ee4619a7923685b3c..302667d7b6dca8528e7107255feaeb6d6f837cf3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -714,6 +714,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -60,7 +60,7 @@ index b3cff10fece84839fe85feb297fafbcd4a02d838..70077d3f359944e2df29198ae156be47
  
              while (iterator1.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 776d2b38f284e13ec9a7dd67a538626817c79887..91f258aa1d4b888b1e1c604ce5f1cf0d755adb9d 100644
+index 0fded4890038de77781c27565fa3c8fe60e50aac..81a0407256a3a37e8ccb136e7fd602d95106c590 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0172-Add-setPlayerProfile-API-for-Skulls.patch
index dfcc8c3751..dfcc8c3751 100644
--- a/patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/unapplied/server/0172-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0173-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0173-PreCreatureSpawnEvent.patch
index 3ad4668bab..0de1d52b9d 100644
--- a/patches/server/0173-PreCreatureSpawnEvent.patch
+++ b/patches/unapplied/server/0173-PreCreatureSpawnEvent.patch
@@ -97,7 +97,7 @@ index 25cd8a4101cf44955d95924c9794c238ddde2901..f957c0aca36b7228ac3a33ca04c948b1
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index ac767d107ea0d856f3f8caccfe6f79b14e933005..c41c1fa8085f502363c8273cd9fce1cf1743fe71 100644
+index 796e3bde04a118076ea004b0d58fd25641a7611e..2022224d2c5da60687474c5666e2bac207bf3f59 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -124,6 +124,27 @@ public abstract class BaseSpawner {
@@ -129,7 +129,7 @@ index ac767d107ea0d856f3f8caccfe6f79b14e933005..c41c1fa8085f502363c8273cd9fce1cf
                          Entity entity = EntityType.loadEntityRecursive(nbttagcompound, world, (entity1) -> {
                              entity1.moveTo(d0, d1, d2, entity1.getYRot(), entity1.getXRot());
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index c6ba7427b53398ddc8f0c942a810fad6e24561b4..c41390f5b9260bcfb843460904e1315695a1a972 100644
+index 287ea1d056556e106a23987eb9f1b42e81ce6262..6bc6c827a96e3fb7d7d9ca15e866d428d31a3e1f 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -212,7 +212,13 @@ public final class NaturalSpawner {
diff --git a/patches/server/0174-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0174-Fill-Profile-Property-Events.patch
index 30643d081c..30643d081c 100644
--- a/patches/server/0174-Fill-Profile-Property-Events.patch
+++ b/patches/unapplied/server/0174-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0175-PlayerAdvancementCriterionGrantEvent.patch
index 04f350388d..04f350388d 100644
--- a/patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/unapplied/server/0175-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0176-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0176-Add-ArmorStand-Item-Meta.patch
index e8f6a478fb..e8f6a478fb 100644
--- a/patches/server/0176-Add-ArmorStand-Item-Meta.patch
+++ b/patches/unapplied/server/0176-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0177-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0177-Extend-Player-Interact-cancellation.patch
index ef330b35a9..ef330b35a9 100644
--- a/patches/server/0177-Extend-Player-Interact-cancellation.patch
+++ b/patches/unapplied/server/0177-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0178-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0178-Tameable-getOwnerUniqueId-API.patch
index 7fca628e8a..7fca628e8a 100644
--- a/patches/server/0178-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/unapplied/server/0178-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index dd76c430fe..e080fddae5 100644
--- a/patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/patches/unapplied/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b07b9949b144981a8c461fc68bf3c296fd278572..b8cddd5616522a6b0fd8d70620f3c3fffbf003dc 100644
+index 0dc19e4701b35e94e94f07d261b3dbbdf9567d7b..35fa3a714c1a0fad5f0ed6149b4a248deb02e213 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1253,6 +1253,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0180-Disable-Explicit-Network-Manager-Flushing.patch
index 86058a3dc6..86058a3dc6 100644
--- a/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/unapplied/server/0180-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0181-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0181-Implement-extended-PaperServerListPingEvent.patch
index fa4ddb2052..efaa0d4e06 100644
--- a/patches/server/0181-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/server/0181-Implement-extended-PaperServerListPingEvent.patch
@@ -190,7 +190,7 @@ index 67455a5ba75c9b816213e44d6872c5ddf8e27e98..23efad80934930beadf15e65781551d4
  
      public ClientboundStatusResponsePacket(ServerStatus metadata) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3bd4b16da49a730326f5b9039649eb59e3043bd0..d65423b8d7b69db79de05587efba13008602f743 100644
+index b404a222e741064185269a42a102d3e4c1f481d7..3509785412395aec7d316fcf37d58fb7cb1a9e5f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2,6 +2,9 @@ package net.minecraft.server;
@@ -213,7 +213,7 @@ index 3bd4b16da49a730326f5b9039649eb59e3043bd0..d65423b8d7b69db79de05587efba1300
  
                  for (int k = 0; k < agameprofile.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-index a426adfba3fccf1815177e0b8065684c9497ef45..29a22da1b94d51300481c071aa16bfd8cd02178f 100644
+index 3d187753790d31cdf1ec0351f2003128f0efce34..f90eb6c50208879c4a2d5ad7e4181c06d38076f8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 @@ -46,6 +46,8 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
diff --git a/patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 44dac4a12a..44dac4a12a 100644
--- a/patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/unapplied/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0183-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0183-Player.setPlayerProfile-API.patch
index cdbe80140a..cdbe80140a 100644
--- a/patches/server/0183-Player.setPlayerProfile-API.patch
+++ b/patches/unapplied/server/0183-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0184-getPlayerUniqueId-API.patch b/patches/unapplied/server/0184-getPlayerUniqueId-API.patch
index 9a49d54845..8ce616d2f4 100644
--- a/patches/server/0184-getPlayerUniqueId-API.patch
+++ b/patches/unapplied/server/0184-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ca6bb66e8ba1e17f025b82091910ca223185ad3b..a60b93a15d5cf80745eb114b393465ff1c53f444 100644
+index bbf9550e7a7c78e961160ef09466e5f962172b6c..10070e017f6d8845e2533cd4bee8e9c37178d77d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1708,6 +1708,25 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0185-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0185-Improved-Async-Task-Scheduler.patch
index b62fddc7b9..b62fddc7b9 100644
--- a/patches/server/0185-Improved-Async-Task-Scheduler.patch
+++ b/patches/unapplied/server/0185-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0186-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0186-Make-legacy-ping-handler-more-reliable.patch
index 438fb37f34..438fb37f34 100644
--- a/patches/server/0186-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/unapplied/server/0186-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch
index d65878827c..d65878827c 100644
--- a/patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/unapplied/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0188-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0188-Flag-to-disable-the-channel-limit.patch
index 3573578067..1c3bff4d26 100644
--- a/patches/server/0188-Flag-to-disable-the-channel-limit.patch
+++ b/patches/unapplied/server/0188-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aadc01662c07ab99466babc8f5ed5b3bef2c1a8e..cf967ce377aab7fd00bd096d68ef0b66697817bf 100644
+index 88f12c573ed26dbf83f61679bbee4f0fbf566a08..98741b2595ef9946e190dd8af4a4c07103e383b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -173,6 +173,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0189-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0189-Add-openSign-method-to-HumanEntity.patch
index 184a121d22..184a121d22 100644
--- a/patches/server/0189-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/unapplied/server/0189-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0190-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0190-Configurable-sprint-interruption-on-attack.patch
index 5f5e0d01bf..966545435d 100644
--- a/patches/server/0190-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/unapplied/server/0190-Configurable-sprint-interruption-on-attack.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b8cddd5616522a6b0fd8d70620f3c3fffbf003dc..25c3164c9ad3c43d866069fcccb579a282b1ab78 100644
+index 35fa3a714c1a0fad5f0ed6149b4a248deb02e213..0a5eafd628f720737288e0f6933204c156ad5267 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1302,7 +1302,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 1dffd9f0c4..49c39c6d56 100644
--- a/patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/unapplied/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 90bd5c1a010a3a9d24328e5c719053603e206626..116dee1f1f9c489e6f85a8fa3b7f36267109d720 100644
+index b7d700c85d3a8c92e6c3cdd3d266f20f90fb8da8..f148e990bd66a9d8fec3210865386243a19c1a3e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3256,9 +3256,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0192-EndermanEscapeEvent.patch b/patches/unapplied/server/0192-EndermanEscapeEvent.patch
index 3fff4f9bad..3fff4f9bad 100644
--- a/patches/server/0192-EndermanEscapeEvent.patch
+++ b/patches/unapplied/server/0192-EndermanEscapeEvent.patch
diff --git a/patches/server/0193-Enderman.teleportRandomly.patch b/patches/unapplied/server/0193-Enderman.teleportRandomly.patch
index aafeea74bb..aafeea74bb 100644
--- a/patches/server/0193-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/server/0193-Enderman.teleportRandomly.patch
diff --git a/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0194-Block-Enderpearl-Travel-Exploit.patch
index 96e6dfad97..96e6dfad97 100644
--- a/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/unapplied/server/0194-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch
index 64e817258b..54c60bea39 100644
--- a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c3d323595a2714c8274fddfbdddec3ea19fc0373..dcf611bf64eaf9156ece3a7d18cb42548c534ed8 100644
+index abfbbab15c83bd09e62525442aea1a2ef2d2a085..0bd670cb37614dfb09c1a81c9fa7526a7b16cac0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1597,12 +1597,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -34,7 +34,7 @@ index c3d323595a2714c8274fddfbdddec3ea19fc0373..dcf611bf64eaf9156ece3a7d18cb4254
  
              if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a75f4a1ecfe2790d727f5dda792c5ab4bb45554e..fee71f001933f9320daa865db433f3b5855278fa 100644
+index 2636ef8f827b30315693f1b406debcdea0716170..aa0b71fe6de57a6f537737ab458a4deb76576c95 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1809,11 +1809,17 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index b9c45b572d..b9c45b572d 100644
--- a/patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/patches/unapplied/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0197-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0197-EndermanAttackPlayerEvent.patch
index 6a1eef464f..6a1eef464f 100644
--- a/patches/server/0197-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/server/0197-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0198-WitchConsumePotionEvent.patch b/patches/unapplied/server/0198-WitchConsumePotionEvent.patch
index f054a8dd3c..f054a8dd3c 100644
--- a/patches/server/0198-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/server/0198-WitchConsumePotionEvent.patch
diff --git a/patches/server/0199-WitchThrowPotionEvent.patch b/patches/unapplied/server/0199-WitchThrowPotionEvent.patch
index 86ba404bc1..86ba404bc1 100644
--- a/patches/server/0199-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/server/0199-WitchThrowPotionEvent.patch
diff --git a/patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 9bfc81d04d..9bfc81d04d 100644
--- a/patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/unapplied/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0201-WitchReadyPotionEvent.patch b/patches/unapplied/server/0201-WitchReadyPotionEvent.patch
index 99ac9dce10..99ac9dce10 100644
--- a/patches/server/0201-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/server/0201-WitchReadyPotionEvent.patch
diff --git a/patches/server/0202-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0202-ItemStack-getMaxItemUseDuration.patch
index 285c3b0db7..285c3b0db7 100644
--- a/patches/server/0202-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/server/0202-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0203-Implement-EntityTeleportEndGatewayEvent.patch
index b1a4699bbc..235d5638a6 100644
--- a/patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0203-Implement-EntityTeleportEndGatewayEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
 
 
 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 8a65d379a67630967d07d97fdc528838453763a9..befd35b0edf4a76b119f711f8536369a02abc1ba 100644
+index 575e9ced37b6b865de342d305af2c5762ae6fcb9..9bb730b489006c7baaaf55194ef796ff20771dd3 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
 @@ -224,9 +224,20 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
diff --git a/patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 6f7b7cd31b..6f7b7cd31b 100644
--- a/patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/unapplied/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0205-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0205-Fix-CraftEntity-hashCode.patch
index c57f31a94e..c57f31a94e 100644
--- a/patches/server/0205-Fix-CraftEntity-hashCode.patch
+++ b/patches/unapplied/server/0205-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch
index 40dce864c6..40dce864c6 100644
--- a/patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/unapplied/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0207-Print-Error-details-when-failing-to-save-player-data.patch
index fda33feee1..fda33feee1 100644
--- a/patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/unapplied/server/0207-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0208-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0208-Make-shield-blocking-delay-configurable.patch
index 7908d769f8..3fa42aca8e 100644
--- a/patches/server/0208-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/server/0208-Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b1ad2db0b3e0f5b287621e8096fb5fc7dd5ce32d..dee8ae99220c84b969be18dd7e1ef05ce088b937 100644
+index e49803f36ffea3329a67542882ee58e4762a08e5..bc90eb2e644916f73f02d94de1dcc9f3f7307390 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3726,12 +3726,24 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0209-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0209-Improve-EntityShootBowEvent.patch
index 32ba3a6420..32ba3a6420 100644
--- a/patches/server/0209-Improve-EntityShootBowEvent.patch
+++ b/patches/unapplied/server/0209-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0210-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0210-PlayerReadyArrowEvent.patch
index ccaaa2610b..1e81d62290 100644
--- a/patches/server/0210-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/server/0210-PlayerReadyArrowEvent.patch
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 25c3164c9ad3c43d866069fcccb579a282b1ab78..6059bec9cafd69d622491222b67bc7ff78e13d7a 100644
+index 0a5eafd628f720737288e0f6933204c156ad5267..df899b3280c484dbeeebda4edfedcac3c4b4dae7 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2254,6 +2254,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch b/patches/unapplied/server/0211-Implement-EntityKnockbackByEntityEvent.patch
index 8fffb8f4b8..0b62961eb9 100644
--- a/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/unapplied/server/0211-Implement-EntityKnockbackByEntityEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dee8ae99220c84b969be18dd7e1ef05ce088b937..30983979f3501c693c7d1f96c47d9cfa1eaa243a 100644
+index bc90eb2e644916f73f02d94de1dcc9f3f7307390..cc7cf6a8b610c72b72ba128c086df61371f59c25 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1456,7 +1456,7 @@ public abstract class LivingEntity extends Entity {
@@ -56,7 +56,7 @@ index dee8ae99220c84b969be18dd7e1ef05ce088b937..30983979f3501c693c7d1f96c47d9cfa
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index f0123009b27a763cee6761c46ecae354d3e54d65..8fdba296673def1e8f69d48c35b07e355a74c9a3 100644
+index 4f3d3bb811ea767bbcc4327eeefcdc6d58ed5230..debc0cd9a71002878c0f68409b936e14c4a4dfda 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1579,7 +1579,7 @@ public abstract class Mob extends LivingEntity {
@@ -82,7 +82,7 @@ index 3380b95e0eff5a6b1b683b8233b8991eb817b638..de8485df1c23e903ff0721fdb682b98d
              serverLevel.playSound((Player)null, goat, this.getImpactSound.apply(goat), SoundSource.HOSTILE, 1.0F, 1.0F);
          } else if (this.hasRammedHornBreakingBlock(serverLevel, goat)) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 6059bec9cafd69d622491222b67bc7ff78e13d7a..702a5e524127f9655279a24b54b8d4248dec460e 100644
+index df899b3280c484dbeeebda4edfedcac3c4b4dae7..f230038801ec9535670c25ed6fd9e3e0ed29c483 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1296,7 +1296,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0212-Expand-Explosions-API.patch b/patches/unapplied/server/0212-Expand-Explosions-API.patch
index f503a30fbc..a4381db1a7 100644
--- a/patches/server/0212-Expand-Explosions-API.patch
+++ b/patches/unapplied/server/0212-Expand-Explosions-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fee71f001933f9320daa865db433f3b5855278fa..339baff7014e98cbe03806d9a689ec09e0b30a47 100644
+index aa0b71fe6de57a6f537737ab458a4deb76576c95..8d895c727987af82941c6519324262d7cb25ecd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -703,6 +703,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch
index d429d4ce3a..d429d4ce3a 100644
--- a/patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/unapplied/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0214-RangedEntity-API.patch b/patches/unapplied/server/0214-RangedEntity-API.patch
index 94da937638..94da937638 100644
--- a/patches/server/0214-RangedEntity-API.patch
+++ b/patches/unapplied/server/0214-RangedEntity-API.patch
diff --git a/patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch
index e2cb389ce5..e2cb389ce5 100644
--- a/patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/unapplied/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0216-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0216-Implement-World.getEntity-UUID-API.patch
index 7f510f70db..283a3037ec 100644
--- a/patches/server/0216-Implement-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/server/0216-Implement-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 339baff7014e98cbe03806d9a689ec09e0b30a47..9849c255ed68309da27ba2c9156c50e89c29d498 100644
+index 8d895c727987af82941c6519324262d7cb25ecd9..0f15340a7757dd22c689649a4019a0991da33b2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1037,6 +1037,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0217-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0217-InventoryCloseEvent-Reason-API.patch
index 436b32ccd4..500bed535a 100644
--- a/patches/server/0217-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/server/0217-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index eea1a5c22b6aebf1ff9f5746d1fd0c247ee2631d..54ec2d33bf0306e5d4f6be99a3d9b37c93b26aec 100644
+index 0bd670cb37614dfb09c1a81c9fa7526a7b16cac0..9a17624d684394ee956848fe9f36750d5962c980 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1270,7 +1270,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -75,7 +75,7 @@ index 81a0407256a3a37e8ccb136e7fd602d95106c590..bc0c4c2284d08ca88d4664bb39c744b3
          this.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 116dee1f1f9c489e6f85a8fa3b7f36267109d720..ea2f283634c8794bda3e531a20f39f8a17e3e41c 100644
+index f148e990bd66a9d8fec3210865386243a19c1a3e..cc8f3a37313f54ec6ce6d73fc5cd1afd34464017 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -219,6 +219,7 @@ import org.bukkit.event.inventory.ClickType;
@@ -117,7 +117,7 @@ index 4dcc44b925ac261aaa2f4ee84e321d6c8852e835..a462b33a35bf2e5ea9492eb37ac68983
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName())));
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 702a5e524127f9655279a24b54b8d4248dec460e..2520ba136cf17392120f6187a73015f438c302f1 100644
+index f230038801ec9535670c25ed6fd9e3e0ed29c483..cd27f30ededed40a7238b17e08d7d564767a9dab 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -271,7 +271,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0218-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0218-Vex-get-setSummoner-API.patch
index b39cab89d2..b39cab89d2 100644
--- a/patches/server/0218-Vex-get-setSummoner-API.patch
+++ b/patches/unapplied/server/0218-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 4879efd0d6..214862b01b 100644
--- a/patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/unapplied/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ea2f283634c8794bda3e531a20f39f8a17e3e41c..a517eb45cd06c130cbfe6ff6565825c492079287 100644
+index cc8f3a37313f54ec6ce6d73fc5cd1afd34464017..4fd16cc84b9edbadbbc073494656aa1fadb0c275 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2667,6 +2667,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 93bf1ca349..93bf1ca349 100644
--- a/patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/unapplied/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0221-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0221-add-more-information-to-Entity.toString.patch
index b0b5b79695..b0b5b79695 100644
--- a/patches/server/0221-add-more-information-to-Entity.toString.patch
+++ b/patches/unapplied/server/0221-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/unapplied/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index bd1e314930..fd8d0683cf 100644
--- a/patches/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/patches/unapplied/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 3efc8fbf22d7ae4c642348468a3af959e49cd640..4d67e962e81d086f20624ee2ab9e921f9cd020e7 100644
+index 53eb440f1e2f9f9bbf2e67027414a3756d70cb6a..5cdf80e2a521bc665c9ff4474b91a2d683aa0eb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -431,6 +431,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0223-EnderDragon-Events.patch b/patches/unapplied/server/0223-EnderDragon-Events.patch
index 6368f8e07f..6368f8e07f 100644
--- a/patches/server/0223-EnderDragon-Events.patch
+++ b/patches/unapplied/server/0223-EnderDragon-Events.patch
diff --git a/patches/server/0224-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0224-PlayerElytraBoostEvent.patch
index fde7853fad..fde7853fad 100644
--- a/patches/server/0224-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/server/0224-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0225-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch
index 1eed95db4f..1eed95db4f 100644
--- a/patches/server/0225-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0226-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch
index c8ba260207..c8ba260207 100644
--- a/patches/server/0226-Improve-BlockPosition-inlining.patch
+++ b/patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 24e507e580..6c4d2fa91a 100644
--- a/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index ed698f3e3f9ed6003fe621c5f6f7e3a151a1a559..9897dbb03c343e1e1842f7ca6bc9b99b95d0b8be 100644
+index 4398a33df4e0f0e9d28c51af3d48e41d957d7c9e..3488c882c654a2cb7a470ed84066bcc0bbbbf9c4 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -336,6 +336,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0228-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch
index cd8b1d5888..bf49c67b97 100644
--- a/patches/server/0228-Vanished-players-don-t-have-rights.patch
+++ b/patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index f550686d1ae45a9ecb406e999d02dba0cf022c58..273e1a6f4fd117e98732c66d9b168cab1d588127 100644
+index 920825af18be4719d2057f164016cae95e22847b..7f787cd1fcdc71091973441844db6b7499417587 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -211,7 +211,14 @@ public abstract class Projectile extends Entity {
diff --git a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch
index 7d29dc99e7..7d29dc99e7 100644
--- a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0230-SkeletonHorse-Additions.patch b/patches/unapplied/server/0230-SkeletonHorse-Additions.patch
index 04e88ec3a1..db419cd39a 100644
--- a/patches/server/0230-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/server/0230-SkeletonHorse-Additions.patch
@@ -32,7 +32,7 @@ index 43e481377ba1596e740eacefd21d9664b7807883..8fa4fb61d4a14b4cba6cef1b6633f9d2
  
          this.horse.setTrap(false);
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 33dd11d1a710d04d4bad0cc403a75086f98ec301..d124d06edc2261477019111c38bb8f816c5affe3 100644
+index abd74c6502e07857e0f64c5f99534b68975acd69..e994db4f81bb94b2e5e8e142e01c05e90a09fa26 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
 @@ -105,6 +105,28 @@ public interface EntityGetter {
diff --git a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch
index bb60be7331..bb60be7331 100644
--- a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0232-Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch
index 646e0ab722..646e0ab722 100644
--- a/patches/server/0232-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0233-AnvilDamageEvent.patch b/patches/unapplied/server/0233-AnvilDamageEvent.patch
index c20941bfde..c20941bfde 100644
--- a/patches/server/0233-AnvilDamageEvent.patch
+++ b/patches/unapplied/server/0233-AnvilDamageEvent.patch
diff --git a/patches/server/0234-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0234-Add-TNTPrimeEvent.patch
index 805a9b3806..805a9b3806 100644
--- a/patches/server/0234-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/server/0234-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
index c211462524..51c37d3ccc 100644
--- a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a517eb45cd06c130cbfe6ff6565825c492079287..3b8fd0b7f9a5d215119c6507e1af3068c7f543a2 100644
+index 4fd16cc84b9edbadbbc073494656aa1fadb0c275..c50d2b797be6a69bb632a7e88bf353d0a134e676 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -262,6 +262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0236-Fix-NBT-type-issues.patch b/patches/unapplied/server/0236-Fix-NBT-type-issues.patch
index b8f7a3afbb..b8f7a3afbb 100644
--- a/patches/server/0236-Fix-NBT-type-issues.patch
+++ b/patches/unapplied/server/0236-Fix-NBT-type-issues.patch
diff --git a/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch
index 88a7a7fd0c..88a7a7fd0c 100644
--- a/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 0bde8a3c50..3b2452178e 100644
--- a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -8,7 +8,7 @@ Add -Ddebug.entities=true to your JVM flags to gain more information
 1.17: Needs to be reworked for new entity storage system
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 33e20bb8c7addbcf77b38abd837ca096880fc244..8b93af04aca46f59bed826e66ad9ee21cda38199 100644
+index 236e0f8cc271d1ca1a2cb64e333d59de1cb953ea..2b14841c23c9d9f4a6fe82fb2779cd5ff79a96f6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -884,6 +884,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -29,7 +29,7 @@ index 33e20bb8c7addbcf77b38abd837ca096880fc244..8b93af04aca46f59bed826e66ad9ee21
  
      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 65cf330708b4667fd60fdb1094df5a808ae5c2f2..efc2db1b27e9ac4b1094b7e529c198a94d05b164 100644
+index 9a17624d684394ee956848fe9f36750d5962c980..672f74f89a643ef82d391c521ca45a2beb51a46e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -216,6 +216,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -72,7 +72,7 @@ index 65cf330708b4667fd60fdb1094df5a808ae5c2f2..efc2db1b27e9ac4b1094b7e529c198a9
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2e988d59404c52cd9c290b96d21f886573cda0fa..0e632f9eabd0d55a4eaacff54abaf637660528dd 100644
+index f67480cc4ff05d23a16b63dbe986d0d96739496b..f174af45cd593d8f74205472e25db081b5289ee9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -235,6 +235,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
index 672248547f..3818082b90 100644
--- a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d65423b8d7b69db79de05587efba13008602f743..afce3acc552df092636b205964e06b399b7db8e2 100644
+index 3509785412395aec7d316fcf37d58fb7cb1a9e5f..25aac194eb486a5b8707aa0a655fd8259ad7409c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1044,6 +1044,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -21,7 +21,7 @@ index d65423b8d7b69db79de05587efba13008602f743..afce3acc552df092636b205964e06b39
              long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
              lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index ed3662f2d237fc6a11cb3f6a2e476dc014ba4586..0944d339c76b09f183b3a1e191955300fc24cd97 100644
+index bada827fe2a8a58d029d9459bf576d598e4a196f..a7fab8d6d3291933516e686f0f23c9057397bcf6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -202,6 +202,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -33,7 +33,7 @@ index ed3662f2d237fc6a11cb3f6a2e476dc014ba4586..0944d339c76b09f183b3a1e191955300
          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 a60b93a15d5cf80745eb114b393465ff1c53f444..cf9f10a61f87130a4a58c09edce7ef14fbc6ae30 100644
+index 10070e017f6d8845e2533cd4bee8e9c37178d77d..d1f73e325f53c838a6761c0d0f66fd32a887dc51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -911,6 +911,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
index af29490ae2..ea3476605c 100644
--- a/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a99d6938d912a169ac329ba09f5a6becd072a94e..ffa3f9d147a0113d7b8cbf185ca751ed159576c2 100644
+index a462b33a35bf2e5ea9492eb37ac689830abd392a..b71d20841285350d0dfad8d59537f9fcc7a7e44c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -624,7 +624,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch
index a36e37c417..21b566507c 100644
--- a/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 0944d339c76b09f183b3a1e191955300fc24cd97..b23905e5d2d1e8300c710df2aeb370fd4af8ac76 100644
+index a7fab8d6d3291933516e686f0f23c9057397bcf6..8dc6aef7f8b9950d889770bf62bd672be9f12f74 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -74,7 +74,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 005af7afb2..005af7afb2 100644
--- a/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0243-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch
index 3fe5135a6b..3fe5135a6b 100644
--- a/patches/server/0243-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index 765c83db85..765c83db85 100644
--- a/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0245-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0245-Slime-Pathfinder-Events.patch
index e6984e42ea..e6984e42ea 100644
--- a/patches/server/0245-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/server/0245-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
index 05e4b14d22..05e4b14d22 100644
--- a/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0247-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch
index f069170285..f069170285 100644
--- a/patches/server/0247-Optimize-CraftBlockData-Creation.patch
+++ b/patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0248-Optimize-MappedRegistry.patch b/patches/unapplied/server/0248-Optimize-MappedRegistry.patch
index 70684ff905..70684ff905 100644
--- a/patches/server/0248-Optimize-MappedRegistry.patch
+++ b/patches/unapplied/server/0248-Optimize-MappedRegistry.patch
diff --git a/patches/server/0249-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch
index 2f3dcd5f86..2f3dcd5f86 100644
--- a/patches/server/0249-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0250-Add-More-Creeper-API.patch b/patches/unapplied/server/0250-Add-More-Creeper-API.patch
index 701306ca69..701306ca69 100644
--- a/patches/server/0250-Add-More-Creeper-API.patch
+++ b/patches/unapplied/server/0250-Add-More-Creeper-API.patch
diff --git a/patches/server/0251-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch
index 533e72fb45..533e72fb45 100644
--- a/patches/server/0251-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 2761673c5a..1c79a299ae 100644
--- a/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9849c255ed68309da27ba2c9156c50e89c29d498..b067ac26973ac487cc3386ecda2bfd8def2d8bbf 100644
+index 0f15340a7757dd22c689649a4019a0991da33b2e..92f6f332cc11ec4b7a10ff61b5a034ab80854940 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -392,7 +392,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
index e65b5a68ca..a3a0146b7b 100644
--- a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 4c5ed3de410c740bcaca37d84b153af6a482bf89..e9e1b9e4f487acad02e871c002f3d099c87766fb 100644
+index b19850ae31f6c796cb3491dd5070d28e0ffd242c..30a5484d0209e7b99e81b70f654f525103471eb8 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
 @@ -510,6 +510,18 @@ public final class MCUtil {
@@ -28,7 +28,7 @@ index 4c5ed3de410c740bcaca37d84b153af6a482bf89..e9e1b9e4f487acad02e871c002f3d099
          switch (enumDirection) {
              case DOWN:
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 30983979f3501c693c7d1f96c47d9cfa1eaa243a..28a49c15c078b7afe1d3c9693c548f6a7b1d2f0a 100644
+index cc7cf6a8b610c72b72ba128c086df61371f59c25..9c3bda51dda1a9acbc2ea53250c7aec64a3aaf03 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3747,6 +3747,23 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0254-Expose-attack-cooldown-methods-for-Player.patch
index 83097c5d73..83097c5d73 100644
--- a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/unapplied/server/0254-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0255-Improve-death-events.patch b/patches/unapplied/server/0255-Improve-death-events.patch
index c39412941c..e1e1c1eea0 100644
--- a/patches/server/0255-Improve-death-events.patch
+++ b/patches/unapplied/server/0255-Improve-death-events.patch
@@ -74,7 +74,7 @@ index bc0c4c2284d08ca88d4664bb39c744b36a607dcd..6fa11d19b0a9858448fb22624c1d1a2f
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 28a49c15c078b7afe1d3c9693c548f6a7b1d2f0a..1189ddcab5011d34a66356cde561fe7e2cecbfdd 100644
+index 9c3bda51dda1a9acbc2ea53250c7aec64a3aaf03..4291de1b9d6634bfdb2f6fda51426a32057f081e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity {
@@ -224,7 +224,7 @@ index 28a49c15c078b7afe1d3c9693c548f6a7b1d2f0a..1189ddcab5011d34a66356cde561fe7e
      // CraftBukkit start
      public int getExpReward() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 5a5edb8c9aab363e326f02e804e4877ff7836dd1..67f0c29d75ffbd8b234ce9b9c8e297ef6a15840c 100644
+index debc0cd9a71002878c0f68409b936e14c4a4dfda..836f42126eca9bc2c8e41940ecac18a0e0123818 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1018,7 +1018,13 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
index e03ccbcd5a..aa9442422d 100644
--- a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index c0959edaef2bc0ebcfa482cd120855c23d83f2b8..4b41d2dd00c1b206c1419ba767a3474947664e53 100644
+index 7b61f9c45b9e23562bd5cf448df319ba9e1e091a..b4fbe1f393e2c348bc0120bf6c55d57d61011787 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -360,6 +360,7 @@ public final class ItemStack {
diff --git a/patches/server/0257-Mob-Pathfinding-API.patch b/patches/unapplied/server/0257-Mob-Pathfinding-API.patch
index 0b246afe7a..0b246afe7a 100644
--- a/patches/server/0257-Mob-Pathfinding-API.patch
+++ b/patches/unapplied/server/0257-Mob-Pathfinding-API.patch
diff --git a/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/unapplied/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 4ae690f9d8..4ae690f9d8 100644
--- a/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/patches/unapplied/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 8e59eff59d..8e59eff59d 100644
--- a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/unapplied/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 12a3938c2d..12a3938c2d 100644
--- a/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/patches/unapplied/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 7ae2338341..38583279c2 100644
--- a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/unapplied/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 08340299538f1adacddc6d5022482a5307c06f78..ac5fa1d9e4e8f9057e3c3780fda3660bb7795295 100644
+index 6bc6c827a96e3fb7d7d9ca15e866d428d31a3e1f..243ed4b0fbc11b23883aa653e6efc31310c250f1 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -169,9 +169,9 @@ public final class NaturalSpawner {
diff --git a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
index ef1f41e68e..ef1f41e68e 100644
--- a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/unapplied/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 7e49a60f5f..f411144934 100644
--- a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index e9e1b9e4f487acad02e871c002f3d099c87766fb..e63dc33250831428c2cef34e02238600231fb815 100644
+index 30a5484d0209e7b99e81b70f654f525103471eb8..dacb00c7cb2702ae8e9c6be61ca08e41bd6009e4 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
 @@ -14,6 +14,8 @@ import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
diff --git a/patches/server/0264-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0264-Honor-EntityAgeable.ageLock.patch
index 3c2db99373..3c2db99373 100644
--- a/patches/server/0264-Honor-EntityAgeable.ageLock.patch
+++ b/patches/unapplied/server/0264-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0265-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0265-Configurable-connection-throttle-kick-message.patch
index 9f8db0014f..9f8db0014f 100644
--- a/patches/server/0265-Configurable-connection-throttle-kick-message.patch
+++ b/patches/unapplied/server/0265-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/0266-Hook-into-CB-plugin-rewrites.patch
index c458f5e277..c458f5e277 100644
--- a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/unapplied/server/0266-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0267-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0267-PreSpawnerSpawnEvent.patch
index a6c42252d0..9330973872 100644
--- a/patches/server/0267-PreSpawnerSpawnEvent.patch
+++ b/patches/unapplied/server/0267-PreSpawnerSpawnEvent.patch
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index c41c1fa8085f502363c8273cd9fce1cf1743fe71..92e3bb8b59d79cbe79fa55a7db443bd7a1957914 100644
+index 2022224d2c5da60687474c5666e2bac207bf3f59..9a02dbecd02ffac91a3cb66d988125454b39caf6 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -130,11 +130,11 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch
index 4d7cddef82..f45d260379 100644
--- a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1189ddcab5011d34a66356cde561fe7e2cecbfdd..8155421080761734c519042e1c24dd2e765d6e75 100644
+index 4291de1b9d6634bfdb2f6fda51426a32057f081e..09c8da5da1557e09af3350b3ac95fc204c590065 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
diff --git a/patches/server/0269-Add-sun-related-API.patch b/patches/unapplied/server/0269-Add-sun-related-API.patch
index 50417ae96e..50417ae96e 100644
--- a/patches/server/0269-Add-sun-related-API.patch
+++ b/patches/unapplied/server/0269-Add-sun-related-API.patch
diff --git a/patches/server/0270-Turtle-API.patch b/patches/unapplied/server/0270-Turtle-API.patch
index bf750a83cb..bf750a83cb 100644
--- a/patches/server/0270-Turtle-API.patch
+++ b/patches/unapplied/server/0270-Turtle-API.patch
diff --git a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
index 862c5c74ca..862c5c74ca 100644
--- a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/unapplied/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/unapplied/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index b766300549..06567d4f8c 100644
--- a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/patches/unapplied/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
 other worlds.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 273e1a6f4fd117e98732c66d9b168cab1d588127..2dfe2e655026e6da1f548779ab3b455a6e42fb0c 100644
+index 7f787cd1fcdc71091973441844db6b7499417587..9379e887af9c15119bbb158dec88a016e649fb7c 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -57,6 +57,18 @@ public abstract class Projectile extends Entity {
diff --git a/patches/server/0273-Add-more-Witch-API.patch b/patches/unapplied/server/0273-Add-more-Witch-API.patch
index 2eba0c4889..2eba0c4889 100644
--- a/patches/server/0273-Add-more-Witch-API.patch
+++ b/patches/unapplied/server/0273-Add-more-Witch-API.patch
diff --git a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
index ec62c27d6f..ec62c27d6f 100644
--- a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/unapplied/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
index bbb6841159..04fb67c054 100644
--- a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/unapplied/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3b8fd0b7f9a5d215119c6507e1af3068c7f543a2..17e5ec6bba89c2769a6c20358b0f01824877497c 100644
+index c50d2b797be6a69bb632a7e88bf353d0a134e676..ed2af4174191dc7f167e8f44edf8f9a894cbc398 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -571,9 +571,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0276-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0276-Reset-players-airTicks-on-respawn.patch
index 62d4f9200f..62d4f9200f 100644
--- a/patches/server/0276-Reset-players-airTicks-on-respawn.patch
+++ b/patches/unapplied/server/0276-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index c4f99ad87b..c4f99ad87b 100644
--- a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/unapplied/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 84393327d5..84393327d5 100644
--- a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/unapplied/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0279-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0279-Optimize-World-Time-Updates.patch
index 0f02b1a821..30c8495667 100644
--- a/patches/server/0279-Optimize-World-Time-Updates.patch
+++ b/patches/unapplied/server/0279-Optimize-World-Time-Updates.patch
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5e1a0ab40d9d03844c6e0b962bb15d3b4b40d229..44b70cef867093979e5481bee4d60676bdca6d47 100644
+index 6afa9ab5cb864ff286341582d6d70648d8a86efb..1dcc7d93038cd0be45ba871c23225395e4751df4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1372,12 +1372,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0280-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0280-Restore-custom-InventoryHolder-support.patch
index 8fd7137855..8fd7137855 100644
--- a/patches/server/0280-Restore-custom-InventoryHolder-support.patch
+++ b/patches/unapplied/server/0280-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/0281-Use-Vanilla-Minecart-Speeds.patch
index 9fde4a8e53..9fde4a8e53 100644
--- a/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/unapplied/server/0281-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0282-Fix-SpongeAbsortEvent-handling.patch
index a527364310..a527364310 100644
--- a/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/unapplied/server/0282-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
index c43ce48361..3781801e9a 100644
--- a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/unapplied/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index 53717a4a2bfd841346c00b5f854899e23661122c..3fadf6b46cc722ad81cf810c0761cf71
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 17e5ec6bba89c2769a6c20358b0f01824877497c..c53fdcba6308e0c0283459f950388d981ccdfe2d 100644
+index ed2af4174191dc7f167e8f44edf8f9a894cbc398..4a9c4799ec25820b8ecf6c7e44675b95ba02734c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1675,6 +1675,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0284-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0284-Make-the-default-permission-message-configurable.patch
index fd099d736c..5228e4227a 100644
--- a/patches/server/0284-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/server/0284-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index 1e9105cf5ab2ff0ee847fafd00b41e1bd47f1d9e..65ee888280f917ccd11146505b738951
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cf9f10a61f87130a4a58c09edce7ef14fbc6ae30..dd7eebe8397764206e07809293f1b8ca4e8f205c 100644
+index d1f73e325f53c838a6761c0d0f66fd32a887dc51..6a893d44ee85d53ce131ba6c35bbb8c8bfe87b0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2622,6 +2622,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/0285-Prevent-rayTrace-from-loading-chunks.patch
index dd9d69d953..dd9d69d953 100644
--- a/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/unapplied/server/0285-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0286-Handle-Large-Packets-disconnecting-client.patch
index 96018c7949..96018c7949 100644
--- a/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/unapplied/server/0286-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0287-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0287-force-entity-dismount-during-teleportation.patch
index ccd19976ed..d8490cbd46 100644
--- a/patches/server/0287-force-entity-dismount-during-teleportation.patch
+++ b/patches/unapplied/server/0287-force-entity-dismount-during-teleportation.patch
@@ -93,7 +93,7 @@ index f174af45cd593d8f74205472e25db081b5289ee9..fb67f1d76d683694db13b29bab1d6960
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8155421080761734c519042e1c24dd2e765d6e75..4e490415e31fcd1a5d780a085ac916cbfc54bb12 100644
+index 09c8da5da1557e09af3350b3ac95fc204c590065..b601cfb1795334e284f3396f2175b8b716458ac0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3407,9 +3407,15 @@ public abstract class LivingEntity extends Entity {
@@ -114,7 +114,7 @@ index 8155421080761734c519042e1c24dd2e765d6e75..4e490415e31fcd1a5d780a085ac916cb
              this.dismountVehicle(entity);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2520ba136cf17392120f6187a73015f438c302f1..d308c671ec1c4440777bccf1609ceca6670b98a8 100644
+index cd27f30ededed40a7238b17e08d7d564767a9dab..bd1da2cf2c6717d26b4bba0a1a96e0bbb89cc22e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1160,7 +1160,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0288-Add-more-Zombie-API.patch b/patches/unapplied/server/0288-Add-more-Zombie-API.patch
index d38fe5bc58..d38fe5bc58 100644
--- a/patches/server/0288-Add-more-Zombie-API.patch
+++ b/patches/unapplied/server/0288-Add-more-Zombie-API.patch
diff --git a/patches/server/0289-Book-Size-Limits.patch b/patches/unapplied/server/0289-Book-Size-Limits.patch
index 406e5f0f43..93b2919b83 100644
--- a/patches/server/0289-Book-Size-Limits.patch
+++ b/patches/unapplied/server/0289-Book-Size-Limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c53fdcba6308e0c0283459f950388d981ccdfe2d..61a0cee760d058e382c2756096a5acce050d9f9d 100644
+index 4a9c4799ec25820b8ecf6c7e44675b95ba02734c..d372d019e714a040d5ae05ed8653b4541717cd61 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1124,6 +1124,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0290-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0290-Add-PlayerConnectionCloseEvent.patch
index 131d6663d3..131d6663d3 100644
--- a/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/unapplied/server/0290-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/0291-Prevent-Enderman-from-loading-chunks.patch
index 0eadb94123..0eadb94123 100644
--- a/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/unapplied/server/0291-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 7dc332cd8a..4f6ffef384 100644
--- a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/unapplied/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 135e61ffa69a56e7c5edcd9e2066334abf963340..e8ca0d8612e132fac5533b7672d0fccbf1bc9e24 100644
+index c9aae32186b72723e879ffab50d73ade5a665a64..2f6fbceac68e173f3ba3d887407e44b22bfbc5de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -230,6 +230,7 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 135e61ffa69a56e7c5edcd9e2066334abf963340..e8ca0d8612e132fac5533b7672d0fccb
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ffa3f9d147a0113d7b8cbf185ca751ed159576c2..97f045ee1af5479b2befe2e03f082933cfe91007 100644
+index b71d20841285350d0dfad8d59537f9fcc7a7e44c..4da6c770ff4953b81c4694c665d453ca7d3e532b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -179,6 +179,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 645c55b945..645c55b945 100644
--- a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/unapplied/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
index 485c11dffb..485c11dffb 100644
--- a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/unapplied/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0295-BlockDestroyEvent.patch b/patches/unapplied/server/0295-BlockDestroyEvent.patch
index f4735fc41c..f4735fc41c 100644
--- a/patches/server/0295-BlockDestroyEvent.patch
+++ b/patches/unapplied/server/0295-BlockDestroyEvent.patch
diff --git a/patches/server/0296-Async-command-map-building.patch b/patches/unapplied/server/0296-Async-command-map-building.patch
index 0e9bd3560b..70212cf994 100644
--- a/patches/server/0296-Async-command-map-building.patch
+++ b/patches/unapplied/server/0296-Async-command-map-building.patch
@@ -53,7 +53,7 @@ index 2bf67468a6c745bc6243c65210477ba129bfcb07..c4315531f93f4ed68b4621157b025728
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 44b70cef867093979e5481bee4d60676bdca6d47..acc9f22a1284cea2e29f3616598f8388f0a0e6f6 100644
+index 1dcc7d93038cd0be45ba871c23225395e4751df4..ddd7f78314275e054a1437b633458d8564ef28ca 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -889,6 +889,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0297-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0297-Implement-Brigadier-Mojang-API.patch
index c0e409b6dd..c0e409b6dd 100644
--- a/patches/server/0297-Implement-Brigadier-Mojang-API.patch
+++ b/patches/unapplied/server/0297-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/unapplied/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 903ba48692..903ba48692 100644
--- a/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/patches/unapplied/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0299-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0299-Limit-Client-Sign-length-more.patch
index f357b73ac8..6ed7b8a95c 100644
--- a/patches/server/0299-Limit-Client-Sign-length-more.patch
+++ b/patches/unapplied/server/0299-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ac5f70ee86cc5a01b046e8e610434742448e3919..1c1ba459535296e029a8d39a5f78d60eb29cdb71 100644
+index c959941b6ba5d9ed8e6ce88ff3902afc4c97d139..20f67746bd0ab2008a7d433abe6b312cd9b13932 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -296,6 +296,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/unapplied/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 0d3af0b6f8..0d3af0b6f8 100644
--- a/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/unapplied/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index fc38f34b89..fc38f34b89 100644
--- a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
index bcaddcfede..bcaddcfede 100644
--- a/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/unapplied/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 687e67e5e9..687e67e5e9 100644
--- a/patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/unapplied/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0304-Entity-getEntitySpawnReason.patch b/patches/unapplied/server/0304-Entity-getEntitySpawnReason.patch
index e4dd8652e6..80d66b4ac6 100644
--- a/patches/server/0304-Entity-getEntitySpawnReason.patch
+++ b/patches/unapplied/server/0304-Entity-getEntitySpawnReason.patch
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 57dbe97d4d4f98811616d12570bf2fc2ba91a3a0..0ba8f25d7f54ec2ed9e15a3cf7016464741c0de0 100644
+index 672f74f89a643ef82d391c521ca45a2beb51a46e..6337d159d2ad0daa70361ee6bad5fc3eb62fa8d3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1250,6 +1250,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -93,7 +93,7 @@ index fb67f1d76d683694db13b29bab1d69606b414950..d83fc656e70612bbfa93f5ef2cc11611
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 92e3bb8b59d79cbe79fa55a7db443bd7a1957914..c24c6fb1badf7d2764ef6cd76c0368297af84afc 100644
+index 9a02dbecd02ffac91a3cb66d988125454b39caf6..67046bad0cfcc8c12bc17edb35b527fc987dddf7 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -181,6 +181,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0305-Properly-resend-entities.patch b/patches/unapplied/server/0305-Properly-resend-entities.patch
index eff903a1db..efe71eb8b7 100644
--- a/patches/server/0305-Properly-resend-entities.patch
+++ b/patches/unapplied/server/0305-Properly-resend-entities.patch
@@ -34,7 +34,7 @@ index 3e17f6131bf590d7c4a16b79c1c145cb4f565bc9..bf838c097aeb79fbe82c0b6cdf3315ac
              this.packedItems = tracker.packDirty();
          }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b6034a7f6748a87669326e1bcfde351757e88234..2077f0cea1735e33243f0d63156cb4b0a8bacc22 100644
+index 2b14841c23c9d9f4a6fe82fb2779cd5ff79a96f6..6089512fbae4254f8c8c5266373e2539f479918b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1194,5 +1194,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -98,7 +98,7 @@ index d6f34adbdf45bbef4a39e629dd7cb6d7fcb5db0f..286a14aafe2e8b4662515165ede8a748
          this.broadcast.accept(packet);
          if (this.entity instanceof ServerPlayer) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1c1ba459535296e029a8d39a5f78d60eb29cdb71..838b867c5e7e8730a200a53687e7470087df9fce 100644
+index 20f67746bd0ab2008a7d433abe6b312cd9b13932..48c2451c1a5ffe3ff8eb6748693b2743a9aad4da 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2721,7 +2721,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0306-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0306-Fire-event-on-GS4-query.patch
index 445725e8b8..445725e8b8 100644
--- a/patches/server/0306-Fire-event-on-GS4-query.patch
+++ b/patches/unapplied/server/0306-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0307-Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0307-Implement-PlayerPostRespawnEvent.patch
index b769a9c729..b769a9c729 100644
--- a/patches/server/0307-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/server/0307-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0308-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/0308-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 94aa72db11..94aa72db11 100644
--- a/patches/server/0308-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/unapplied/server/0308-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0309-Server-Tick-Events.patch b/patches/unapplied/server/0309-Server-Tick-Events.patch
index 427db9a827..427db9a827 100644
--- a/patches/server/0309-Server-Tick-Events.patch
+++ b/patches/unapplied/server/0309-Server-Tick-Events.patch
diff --git a/patches/server/0310-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0310-PlayerDeathEvent-getItemsToKeep.patch
index fd0bc56beb..fd0bc56beb 100644
--- a/patches/server/0310-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/unapplied/server/0310-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0311-Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/0311-Optimize-Captured-TileEntity-Lookup.patch
index c261c77a3b..c261c77a3b 100644
--- a/patches/server/0311-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/unapplied/server/0311-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0312-Add-Heightmap-API.patch b/patches/unapplied/server/0312-Add-Heightmap-API.patch
index f22ab03c27..f22ab03c27 100644
--- a/patches/server/0312-Add-Heightmap-API.patch
+++ b/patches/unapplied/server/0312-Add-Heightmap-API.patch
diff --git a/patches/server/0313-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0313-Mob-Spawner-API-Enhancements.patch
index 047eae4251..047eae4251 100644
--- a/patches/server/0313-Mob-Spawner-API-Enhancements.patch
+++ b/patches/unapplied/server/0313-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0314-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0314-Fix-CB-call-to-changed-postToMainThread-method.patch
index 1b53a26930..21c5b1f89f 100644
--- a/patches/server/0314-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/unapplied/server/0314-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/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9f60c0786b4676726036ca56906663698d26aaea..4ebae3246e3866bbdfa17e43bd0252d637885052 100644
+index 48c2451c1a5ffe3ff8eb6748693b2743a9aad4da..34a961446cd9a940c540fa3cb9d008b2d3ff232e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -519,7 +519,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0315-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0315-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 8f80e7c151..8f80e7c151 100644
--- a/patches/server/0315-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/unapplied/server/0315-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0316-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0316-Implement-CraftBlockSoundGroup.patch
index a62be7b054..a62be7b054 100644
--- a/patches/server/0316-Implement-CraftBlockSoundGroup.patch
+++ b/patches/unapplied/server/0316-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0317-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/0317-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 6dc25bd2e7..ba2c05f5e1 100644
--- a/patches/server/0317-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/unapplied/server/0317-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -64,7 +64,7 @@ index 412380f4bfe8a2d50090904124242e8b2c7bfa1b..1a21f7e590aaeca131256dd7079b9546
          // CraftBukkit start
          // this.updateMobSpawningFlags();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0ba8f25d7f54ec2ed9e15a3cf7016464741c0de0..0c5065ac62d8a708f70282e765277866834169bc 100644
+index 6337d159d2ad0daa70361ee6bad5fc3eb62fa8d3..72d3af43afd1b71d92a4d0673795835c6a3a07d0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -64,6 +64,7 @@ import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
diff --git a/patches/server/0318-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0318-Allow-Saving-of-Oversized-Chunks.patch
index d1923d7fc8..4cc72c5383 100644
--- a/patches/server/0318-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/unapplied/server/0318-Allow-Saving-of-Oversized-Chunks.patch
@@ -33,7 +33,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 038e2177182c94baa4af24f9111cf155ec342dfe..330fb8e6565a5c0490af0c5ca0e7355d81a82e58 100644
+index ddcc212ba83d9365adb842b3d3ced64e3d7dd155..584985272a02eb5b61a22cf2404fbd97a55a3358 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -18,8 +18,12 @@ import java.nio.file.LinkOption;
diff --git a/patches/server/0319-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0319-Expose-the-internal-current-tick.patch
index d6b0866c02..d6b0866c02 100644
--- a/patches/server/0319-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/server/0319-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0320-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/0320-Fix-World-isChunkGenerated-calls.patch
index 8ddbdd16bb..5a9b56c31d 100644
--- a/patches/server/0320-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/unapplied/server/0320-Fix-World-isChunkGenerated-calls.patch
@@ -8,7 +8,7 @@ This patch also adds a chunk status cache on region files (note that
 its only purpose is to cache the status on DISK)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b6034a7f6748a87669326e1bcfde351757e88234..b13111521e7ffc9fc3cbcf22d6aff7b18560e469 100644
+index 6089512fbae4254f8c8c5266373e2539f479918b..fc50e8a4ae4fd7328276300b585f7b0924e7531f 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -659,9 +659,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -93,7 +93,7 @@ index b6034a7f6748a87669326e1bcfde351757e88234..b13111521e7ffc9fc3cbcf22d6aff7b1
          // Spigot start
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 330fb8e6565a5c0490af0c5ca0e7355d81a82e58..861a25a15f1aab20e3245b6d5cdad5d23bdfd6d0 100644
+index 584985272a02eb5b61a22cf2404fbd97a55a3358..cda87a66fe80bf910f629c64e36c1fecbad81d77 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -51,6 +51,30 @@ public class RegionFile implements AutoCloseable {
diff --git a/patches/server/0321-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0321-Show-blockstate-location-if-we-failed-to-read-it.patch
index f593178909..f593178909 100644
--- a/patches/server/0321-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/unapplied/server/0321-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0322-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0322-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 38648d8e26..c07ef44529 100644
--- a/patches/server/0322-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/unapplied/server/0322-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 96a3e97b509839e265dc83a7961ed0bd2c9d74f8..3b8ea490e7b8bd1a6df624e4eb5c7edccaeb800f 100644
+index 243ed4b0fbc11b23883aa653e6efc31310c250f1..2d39b7204a5d3967e2fbbd288eb5ff6bf4e324ce 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -87,6 +87,13 @@ public final class NaturalSpawner {
diff --git a/patches/server/0323-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0323-Configurable-projectile-relative-velocity.patch
index c2d8580ed1..c2d8580ed1 100644
--- a/patches/server/0323-Configurable-projectile-relative-velocity.patch
+++ b/patches/unapplied/server/0323-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0324-offset-item-frame-ticking.patch b/patches/unapplied/server/0324-offset-item-frame-ticking.patch
index d20777b4c1..d20777b4c1 100644
--- a/patches/server/0324-offset-item-frame-ticking.patch
+++ b/patches/unapplied/server/0324-offset-item-frame-ticking.patch
diff --git a/patches/server/0325-Fix-MC-158900.patch b/patches/unapplied/server/0325-Fix-MC-158900.patch
index 99ce9bf5b1..99ce9bf5b1 100644
--- a/patches/server/0325-Fix-MC-158900.patch
+++ b/patches/unapplied/server/0325-Fix-MC-158900.patch
diff --git a/patches/server/0326-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0326-Prevent-consuming-the-wrong-itemstack.patch
index 299ef07206..2a5cf6dd78 100644
--- a/patches/server/0326-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/unapplied/server/0326-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4e490415e31fcd1a5d780a085ac916cbfc54bb12..b85b98aaa1148c23232a633447c815003373c7c3 100644
+index b601cfb1795334e284f3396f2175b8b716458ac0..35b5671e3bf0b14a073431095bf464f9ebfae843 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3624,9 +3624,14 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0327-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0327-Dont-send-unnecessary-sign-update.patch
index 9b8336fe3f..8e44002424 100644
--- a/patches/server/0327-Dont-send-unnecessary-sign-update.patch
+++ b/patches/unapplied/server/0327-Dont-send-unnecessary-sign-update.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont send unnecessary sign update
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 399372cdb9d4ed2fc7bbe7d52742be7271e6744f..c91768eb4f238eb59a3e451dc8c3d299f9712b30 100644
+index 34a961446cd9a940c540fa3cb9d008b2d3ff232e..c40da6e0f5da3a6663aba74720c530713b94650b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3342,6 +3342,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0328-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0328-Add-option-to-disable-pillager-patrols.patch
index 65d645b929..65d645b929 100644
--- a/patches/server/0328-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/unapplied/server/0328-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0329-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/0329-Flat-bedrock-generator-settings.patch
index ea7148d934..ea7148d934 100644
--- a/patches/server/0329-Flat-bedrock-generator-settings.patch
+++ b/patches/unapplied/server/0329-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0330-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0330-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index ea3c47b7b2..ea3c47b7b2 100644
--- a/patches/server/0330-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/unapplied/server/0330-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0331-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/0331-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 44844fef0d..44844fef0d 100644
--- a/patches/server/0331-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/unapplied/server/0331-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0332-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0332-Duplicate-UUID-Resolve-Option.patch
index 830567f338..65e9a0f3b4 100644
--- a/patches/server/0332-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/unapplied/server/0332-Duplicate-UUID-Resolve-Option.patch
@@ -56,7 +56,7 @@ index 0dc94dec1317b3f86d38074c6cbe41ab828cab1d..0e45a340ae534caf676b7f9d0adcbcee
  
      public static void onChunkHolderCreate(final ServerLevel level, final ChunkHolder holder) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b13111521e7ffc9fc3cbcf22d6aff7b18560e469..d97e017289783cd8795e055616dd5931bb6147cd 100644
+index fc50e8a4ae4fd7328276300b585f7b0924e7531f..48cc42222c5c7fb91e440028f847c51dc5517fce 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -522,6 +522,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0333-Optimize-Hoppers.patch b/patches/unapplied/server/0333-Optimize-Hoppers.patch
index 616c99c65a..03b9c5e950 100644
--- a/patches/server/0333-Optimize-Hoppers.patch
+++ b/patches/unapplied/server/0333-Optimize-Hoppers.patch
@@ -25,7 +25,7 @@ index 1a21f7e590aaeca131256dd7079b9546710ca9ad..eeb794d96ac8cbe36b788d390e638192
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 4b41d2dd00c1b206c1419ba767a3474947664e53..5e0852c4656813272a7ee6cb9c2331410c1b7739 100644
+index b4fbe1f393e2c348bc0120bf6c55d57d61011787..2650deb381bae30593128fc003c042f42110802c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -625,11 +625,12 @@ public final class ItemStack {
diff --git a/patches/server/0334-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0334-PlayerDeathEvent-shouldDropExperience.patch
index d97c9ef24c..9bd7a18bef 100644
--- a/patches/server/0334-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/server/0334-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e56a6bdcc62f7d82447440ad20e72678a2d6852e..9cae5379d60c8d20ae6966850f7f13640742f9b7 100644
+index 7609ab90b8c870876bbaf927df635e2579abbdb7..fc05217186d0af6cb758a189f4287ac812625cd4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -896,7 +896,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch
index 0724ac87d3..0724ac87d3 100644
--- a/patches/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/unapplied/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 71f28eb22f..71f28eb22f 100644
--- a/patches/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/unapplied/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch
index 7018c6fabf..da583926f5 100644
--- a/patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/unapplied/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate
 Should help if something dumb happens
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index e59910540458ca912efea64d9f7cd212d63d110a..f4bf0ecde863f1795d764d8cc8d6525af02356ea 100644
+index d0b7533b8ed16f062a4ed2f1389b79c3d0929fe1..648719a58e62105064ac6b51c6f5e7867ff0b7a9 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -92,6 +92,18 @@ public class ChunkSerializer {
@@ -38,7 +38,7 @@ index e59910540458ca912efea64d9f7cd212d63d110a..f4bf0ecde863f1795d764d8cc8d6525a
          if (!Objects.equals(chunkPos, chunkcoordintpair1)) {
              ChunkSerializer.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", new Object[]{chunkPos, chunkPos, chunkcoordintpair1});
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
-index f2539f2aab4086bc6772db9985ca9f75ff6a7c71..aa915195d4aab3e931a92bf844f6dc18a0a59b9e 100644
+index c3305cb49741523724ff7b3c9254a0df2cf3d6c6..e276b2ceddbb269ef9a8625f26cc1847ded3862a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 @@ -178,6 +178,13 @@ public class ChunkStorage implements AutoCloseable {
diff --git a/patches/server/0338-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/0338-Optimise-EntityGetter-getPlayerByUUID.patch
index 379285a1a0..379285a1a0 100644
--- a/patches/server/0338-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/unapplied/server/0338-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0339-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0339-Fix-items-not-falling-correctly.patch
index 559c7d740b..559c7d740b 100644
--- a/patches/server/0339-Fix-items-not-falling-correctly.patch
+++ b/patches/unapplied/server/0339-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0340-Lag-compensate-eating.patch b/patches/unapplied/server/0340-Lag-compensate-eating.patch
index 7a36d29de2..aa9f516739 100644
--- a/patches/server/0340-Lag-compensate-eating.patch
+++ b/patches/unapplied/server/0340-Lag-compensate-eating.patch
@@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b85b98aaa1148c23232a633447c815003373c7c3..345b2d91cd7ac1746fb70bf28b596cce6746a693 100644
+index 35b5671e3bf0b14a073431095bf464f9ebfae843..9e76df6ac643eb7696a11c0c3bfc45a82e0e0ce4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3567,6 +3567,11 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0341-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0341-Optimize-call-to-getFluid-for-explosions.patch
index 952f1fc45d..952f1fc45d 100644
--- a/patches/server/0341-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/unapplied/server/0341-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 448854642c..448854642c 100644
--- a/patches/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/unapplied/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0343-Add-effect-to-block-break-naturally.patch b/patches/unapplied/server/0343-Add-effect-to-block-break-naturally.patch
index b911824bb1..b911824bb1 100644
--- a/patches/server/0343-Add-effect-to-block-break-naturally.patch
+++ b/patches/unapplied/server/0343-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0344-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0344-Entity-Activation-Range-2.0.patch
index eca25da847..eca25da847 100644
--- a/patches/server/0344-Entity-Activation-Range-2.0.patch
+++ b/patches/unapplied/server/0344-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0345-Increase-Light-Queue-Size.patch b/patches/unapplied/server/0345-Increase-Light-Queue-Size.patch
index 7a7ea902da..7a7ea902da 100644
--- a/patches/server/0345-Increase-Light-Queue-Size.patch
+++ b/patches/unapplied/server/0345-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0346-Anti-Xray.patch b/patches/unapplied/server/0346-Anti-Xray.patch
index b0a5dc6558..b0a5dc6558 100644
--- a/patches/server/0346-Anti-Xray.patch
+++ b/patches/unapplied/server/0346-Anti-Xray.patch
diff --git a/patches/server/0347-Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/0347-Implement-alternative-item-despawn-rate.patch
index db8d53f699..db8d53f699 100644
--- a/patches/server/0347-Implement-alternative-item-despawn-rate.patch
+++ b/patches/unapplied/server/0347-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0348-Tracking-Range-Improvements.patch b/patches/unapplied/server/0348-Tracking-Range-Improvements.patch
index 5c7541eb0c..5c60cc1077 100644
--- a/patches/server/0348-Tracking-Range-Improvements.patch
+++ b/patches/unapplied/server/0348-Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7c4eded1135e50f2ffea069de7bcd77bd80d0ac1..ec352a1916bea3893173375cfeaf84fc1c3cc52a 100644
+index 63d480e7c50bed3d5b00b09f789522ff9ea18776..1fe0e34df2f837515acfba9bbddeb3717d41fe80 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1285,6 +1285,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0349-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0349-Fix-items-vanishing-through-end-portal.patch
index cb858bcbf0..cb858bcbf0 100644
--- a/patches/server/0349-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/unapplied/server/0349-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0350-implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/0350-implement-optional-per-player-mob-spawns.patch
index 966c7b42be..7e992d4477 100644
--- a/patches/server/0350-implement-optional-per-player-mob-spawns.patch
+++ b/patches/unapplied/server/0350-implement-optional-per-player-mob-spawns.patch
@@ -252,7 +252,7 @@ index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdc
 +    }
 +} 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b3dc360658ec7449c063e7f50b11fd188c5768a0..6a08bd2b13a2c9dcc47a469607d0dd8ff79c0328 100644
+index 1fe0e34df2f837515acfba9bbddeb3717d41fe80..6250615dbdb58e8d4e3937b2152b41751122dd56 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -145,6 +145,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -338,7 +338,7 @@ index b3dc360658ec7449c063e7f50b11fd188c5768a0..6a08bd2b13a2c9dcc47a469607d0dd8f
          double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8);
          double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8);
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 3a2cacbbba15d48428147842590851a57b3f3df7..8b8c8970e1d478edc3a0231556bf92f8263392c1 100644
+index 302667d7b6dca8528e7107255feaeb6d6f837cf3..46dfb4df27226263c7adacc13d0c99c422f90ac6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -692,7 +692,18 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index a662ea4a03..a662ea4a03 100644
--- a/patches/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/unapplied/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index cad8b3acb6..691681e731 100644
--- a/patches/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/unapplied/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 8b8c8970e1d478edc3a0231556bf92f8263392c1..800dc1f2f5ef6026704e17583421f7b54d2ac631 100644
+index 46dfb4df27226263c7adacc13d0c99c422f90ac6..78c009d0345fdcfc1a0ec719f3b25028524a284d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -420,6 +420,12 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0353-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0353-Add-debug-for-sync-chunk-loads.patch
index 20706f23c6..258cd8f0ea 100644
--- a/patches/server/0353-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/unapplied/server/0353-Add-debug-for-sync-chunk-loads.patch
@@ -308,7 +308,7 @@ index 0000000000000000000000000000000000000000..a73e35e7c71c1337c2846010b3ccd687
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 800dc1f2f5ef6026704e17583421f7b54d2ac631..8a20fa6d1c357f6d9787032c31dd0d0f80bd74be 100644
+index 78c009d0345fdcfc1a0ec719f3b25028524a284d..f0ab91b93dabd0c77a8537e40c8b504200b261fd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -444,6 +444,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -320,7 +320,7 @@ index 800dc1f2f5ef6026704e17583421f7b54d2ac631..8a20fa6d1c357f6d9787032c31dd0d0f
              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 7aaa8e7bfc2a949346dc760a5ff1231f80d410d5..9abe233a02b6e5fdeda7a602223188897df5a2e4 100644
+index 1133928654269d3b9b794513b39526fe0accc3c3..d30885b0b85d78a312c142460e5d342fdbeada79 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -421,6 +421,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0354-Remove-garbage-Java-version-check.patch b/patches/unapplied/server/0354-Remove-garbage-Java-version-check.patch
index f2867bfa7d..f2867bfa7d 100644
--- a/patches/server/0354-Remove-garbage-Java-version-check.patch
+++ b/patches/unapplied/server/0354-Remove-garbage-Java-version-check.patch
diff --git a/patches/server/0355-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0355-Add-ThrownEggHatchEvent.patch
index c026427598..c026427598 100644
--- a/patches/server/0355-Add-ThrownEggHatchEvent.patch
+++ b/patches/unapplied/server/0355-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0356-Entity-Jump-API.patch b/patches/unapplied/server/0356-Entity-Jump-API.patch
index 8864fa36b1..b1f8ebb90a 100644
--- a/patches/server/0356-Entity-Jump-API.patch
+++ b/patches/unapplied/server/0356-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 345b2d91cd7ac1746fb70bf28b596cce6746a693..24a16dbfc0852a566dd527639974fcba44bd43fe 100644
+index 9e76df6ac643eb7696a11c0c3bfc45a82e0e0ce4..fc498652272cb4990668b3ac05d5aa1f0b627a67 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3243,8 +3243,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 33a214747c..33a214747c 100644
--- a/patches/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/unapplied/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0358-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0358-Make-the-GUI-graph-fancier.patch
index b97ce20f84..b97ce20f84 100644
--- a/patches/server/0358-Make-the-GUI-graph-fancier.patch
+++ b/patches/unapplied/server/0358-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0359-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0359-add-hand-to-BlockMultiPlaceEvent.patch
index 7f64696d43..7f64696d43 100644
--- a/patches/server/0359-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/unapplied/server/0359-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0360-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0360-Validate-tripwire-hook-placement-before-update.patch
index fd8a74807c..fd8a74807c 100644
--- a/patches/server/0360-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/unapplied/server/0360-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index f058d157d0..f058d157d0 100644
--- a/patches/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/unapplied/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0362-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0362-Configurable-chance-of-villager-zombie-infection.patch
index 1b328d76e2..59ae31aad7 100644
--- a/patches/server/0362-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/unapplied/server/0362-Configurable-chance-of-villager-zombie-infection.patch
@@ -8,7 +8,7 @@ This allows you to solve an issue in vanilla behavior where:
 * On normal difficulty they will have a 50% of getting infected or dying.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 1ff02c66fcc291b6ccc456673ad4c6c09d47d69e..b2b396dd7c5face635595d527f132e0787ef7e26 100644
+index a8caf1a776deea8684d37406af11ab72c114b07d..473782e8b6a760aec492fa28270a7eb05a484e78 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -450,10 +450,14 @@ public class Zombie extends Monster {
diff --git a/patches/server/0363-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0363-Optimise-Chunk-getFluid.patch
index 8ddb1788ee..d28aa20cc0 100644
--- a/patches/server/0363-Optimise-Chunk-getFluid.patch
+++ b/patches/unapplied/server/0363-Optimise-Chunk-getFluid.patch
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index fb42b212805c8ea9ae5be8b2a515a37ecda28535..6b24417b73d42bbb92425e61d166ebf619277d3b 100644
+index afc443f36b26e9493fa0a530891b2edd7f3f6703..797d9d0d81f026479dda1ab4d72793025272a0f7 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -427,18 +427,20 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 08bc7193a2..08bc7193a2 100644
--- a/patches/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/unapplied/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0365-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0365-Add-tick-times-API-and-mspt-command.patch
index c5d896f42e..c5d896f42e 100644
--- a/patches/server/0365-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/unapplied/server/0365-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0366-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0366-Expose-MinecraftServer-isRunning.patch
index 93c72072f6..93c72072f6 100644
--- a/patches/server/0366-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/server/0366-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch
index baa4b0de1d..8da2eed2ce 100644
--- a/patches/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4d67e962e81d086f20624ee2ab9e921f9cd020e7..be1e6c050a4d80f330bb4a5ea5f79da3aefb9510 100644
+index 5cdf80e2a521bc665c9ff4474b91a2d683aa0eb8..b38b2b3855583b26d7ed2ede041a73cf14cbe81c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -436,6 +436,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 3a8c274b7e..7f71a88704 100644
--- a/patches/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/unapplied/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f2808d62c15c586dff0313e6d27ef92d45f66dc7..db351747830079d13cabd0010e8906a5e5aa4e96 100644
+index ef03173f9399c6047985e4ed85ce6ef480d75cdf..d13785144365bf69c072213a2672d408a3f0be5f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -231,6 +231,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 39cd7d2d6a..39cd7d2d6a 100644
--- a/patches/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/unapplied/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index f1689b175c..f1689b175c 100644
--- a/patches/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/unapplied/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 2456aafcff..2456aafcff 100644
--- a/patches/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/unapplied/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0372-Don-t-tick-dead-players.patch b/patches/unapplied/server/0372-Don-t-tick-dead-players.patch
index b5386f7c8d..abaee20fe7 100644
--- a/patches/server/0372-Don-t-tick-dead-players.patch
+++ b/patches/unapplied/server/0372-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index db351747830079d13cabd0010e8906a5e5aa4e96..8e4dff97dba9f8e1395113bed8f91b0cbb70b354 100644
+index d13785144365bf69c072213a2672d408a3f0be5f..1a34d1b75698960cd48f2632cafdca5f52e10d49 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -653,7 +653,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 83aebd18e6..9229c28766 100644
--- a/patches/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/unapplied/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d308c671ec1c4440777bccf1609ceca6670b98a8..0960e5ecc25fad3eb46a871c2749dd176b812460 100644
+index bd1da2cf2c6717d26b4bba0a1a96e0bbb89cc22e..8f9a5589e430c31de29d23d6c27757dd33e8bb86 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1172,7 +1172,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0374-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0374-Optimize-Collision-to-not-load-chunks.patch
index 1e82b8229e..1e82b8229e 100644
--- a/patches/server/0374-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/unapplied/server/0374-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0375-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0375-Don-t-move-existing-players-to-world-spawn.patch
index a74a4163a7..a74a4163a7 100644
--- a/patches/server/0375-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/unapplied/server/0375-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index fc6f22c473..fc6f22c473 100644
--- a/patches/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/unapplied/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0377-Improved-Watchdog-Support.patch b/patches/unapplied/server/0377-Improved-Watchdog-Support.patch
index b019cbe10e..42375eb822 100644
--- a/patches/server/0377-Improved-Watchdog-Support.patch
+++ b/patches/unapplied/server/0377-Improved-Watchdog-Support.patch
@@ -282,7 +282,7 @@ index 55985d21fd89a753e0e10004bb01295655ac43d3..89d45ae9b2856aaed265d7333ba2e69a
  
          // Paper start - Remove from collideRule team if needed
 diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
-index 6fefa619299d3202158490630d62c16aef71e831..7a4ade1a4190bf4fbb048919ae2be230f7b80fff 100644
+index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb8941238bfa 100644
 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
 +++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
 @@ -152,6 +152,7 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler
@@ -306,7 +306,7 @@ index 7e03e88dc7196d757ffcc6cdc2ca15c96abcc2a0..cff803e60a7592fc55fc4a76e39f2254
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level.getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 6b24417b73d42bbb92425e61d166ebf619277d3b..7e1f0c9f760d6f5cfb0138542252c8469534e152 100644
+index 797d9d0d81f026479dda1ab4d72793025272a0f7..b2d06181ad76b1db2abb1ddca075f4ec6dab55dc 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1220,6 +1220,7 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0378-Optimize-Pathfinding.patch b/patches/unapplied/server/0378-Optimize-Pathfinding.patch
index 92e26303d9..92e26303d9 100644
--- a/patches/server/0378-Optimize-Pathfinding.patch
+++ b/patches/unapplied/server/0378-Optimize-Pathfinding.patch
diff --git a/patches/server/0379-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0379-Reduce-Either-Optional-allocation.patch
index eb7237e52a..eb7237e52a 100644
--- a/patches/server/0379-Reduce-Either-Optional-allocation.patch
+++ b/patches/unapplied/server/0379-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch
index 7848f60c2c..7848f60c2c 100644
--- a/patches/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/unapplied/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0381-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0381-Prevent-opening-inventories-when-frozen.patch
index 0be8769b5a..0be8769b5a 100644
--- a/patches/server/0381-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/unapplied/server/0381-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch
index b6c845eef7..44e34f7cfe 100644
--- a/patches/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/unapplied/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 24a16dbfc0852a566dd527639974fcba44bd43fe..5c6ed31e0fa8b089c3962326f2a4973fa83701ac 100644
+index fc498652272cb4990668b3ac05d5aa1f0b627a67..67c3e02bf4ee61237a7d0ea72e7bb0260af159e9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3340,10 +3340,24 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0383-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0383-Implement-Player-Client-Options-API.patch
index 5bdae6f55a..5bdae6f55a 100644
--- a/patches/server/0383-Implement-Player-Client-Options-API.patch
+++ b/patches/unapplied/server/0383-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 1b01295738..1b01295738 100644
--- a/patches/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/unapplied/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 870ed9cafb..f2a58fb581 100644
--- a/patches/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/unapplied/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -31,7 +31,7 @@ delays anymore.
 public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 80009022bc7b9d3414b2af3a3b21192def243405..7e11a85cb826deedcf9aa22b849ced2c1240e64a 100644
+index 9fbdb834559df0da45ea4a61eb3963fa8e371af3..1bf18259505997c39e7880abf49e583cc763beb1 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1024,6 +1024,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0386-Load-Chunks-for-Login-Asynchronously.patch b/patches/unapplied/server/0386-Load-Chunks-for-Login-Asynchronously.patch
index f4b0211b06..f4b0211b06 100644
--- a/patches/server/0386-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/unapplied/server/0386-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 1dbc8c834f..1dbc8c834f 100644
--- a/patches/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/unapplied/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch
index 90feeaf645..5e4a101415 100644
--- a/patches/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/unapplied/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8de0a71566d2b095e74c8f8cf15dfac26a5a31c2..d6071df933506bf3d55fc827483b33ecc5174834 100644
+index 67c3e02bf4ee61237a7d0ea72e7bb0260af159e9..df3aad08242b40fca5be719ae9fb13bc1c2e8091 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2115,7 +2115,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 032b44ebcd..032b44ebcd 100644
--- a/patches/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/unapplied/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0390-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0390-Add-phantom-creative-and-insomniac-controls.patch
index 66b47ed30d..307c92bd32 100644
--- a/patches/server/0390-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/unapplied/server/0390-Add-phantom-creative-and-insomniac-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom creative and insomniac controls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index b91a61be7c4829fce0ff8da290eab580e20bb78d..22f36cd3df49160f1b6668befdd05c2268edaa49 100644
+index 6fd874a83a248e6a7d427d18d11fc608544662c5..302676ef78ed5b3b7fc1b04851447ca72eed10c0 100644
 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
 +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
 @@ -27,6 +27,7 @@ public final class EntitySelector {
diff --git a/patches/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 060d4e8c3d..2d059506de 100644
--- a/patches/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/unapplied/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -80,7 +80,7 @@ index 58a8bbda3ddff1ed561d9035d45176c6ca689115..32623f90a5bc4fb6fe99897c682ef4f5
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d6071df933506bf3d55fc827483b33ecc5174834..03194c5acd46f6014f0a1d964d079b114f86c951 100644
+index df3aad08242b40fca5be719ae9fb13bc1c2e8091..a337ce97a31998a63e7c329ac94cad9a5f783a5c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1646,9 +1646,9 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0392-Villager-Restocks-API.patch b/patches/unapplied/server/0392-Villager-Restocks-API.patch
index 0808988af9..0808988af9 100644
--- a/patches/server/0392-Villager-Restocks-API.patch
+++ b/patches/unapplied/server/0392-Villager-Restocks-API.patch
diff --git a/patches/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch
index a84ea8c5a4..69c20e6f3b 100644
--- a/patches/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/unapplied/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fe722106e20e199eb914a09f8dbc1409e27f1d69..77cc62cc942687a40371741904525301a4ed5240 100644
+index 2a75c77ac51b620098f5cc49a8a6bebafdfc06a1..6c17ae02e3c076b738037454afb7ea08f0f0e79e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -967,7 +967,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0394-Expose-game-version.patch b/patches/unapplied/server/0394-Expose-game-version.patch
index 0d2ba75f07..0d2ba75f07 100644
--- a/patches/server/0394-Expose-game-version.patch
+++ b/patches/unapplied/server/0394-Expose-game-version.patch
diff --git a/patches/server/0395-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0395-Optimize-Voxel-Shape-Merging.patch
index 7bfe849396..7bfe849396 100644
--- a/patches/server/0395-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/unapplied/server/0395-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 6e0cb176e9..6e0cb176e9 100644
--- a/patches/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/unapplied/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0397-misc-debugging-dumps.patch b/patches/unapplied/server/0397-misc-debugging-dumps.patch
index 758bcb8e94..758bcb8e94 100644
--- a/patches/server/0397-misc-debugging-dumps.patch
+++ b/patches/unapplied/server/0397-misc-debugging-dumps.patch
diff --git a/patches/server/0398-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0398-Prevent-teleporting-dead-entities.patch
index bce03a0bd0..4addbfad39 100644
--- a/patches/server/0398-Prevent-teleporting-dead-entities.patch
+++ b/patches/unapplied/server/0398-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 77cc62cc942687a40371741904525301a4ed5240..bbed54d5a0e3c363614d694950688f8edc02841d 100644
+index 6c17ae02e3c076b738037454afb7ea08f0f0e79e..8c8ccd61fb1592a9274e54ed6e06ec7737e942e0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1632,6 +1632,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index b0738b0ecd..246cea7f87 100644
--- a/patches/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/unapplied/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -473,7 +473,7 @@ index 65231daec99d36d9ad3c1ca8561b6dbc49efde10..6df4d02020a14d17d9c5b1971bb5640b
          }
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 593ea68037b467797aeeaee331a0349f7d57d800..bbedcdb71a326b3286805d0081e71c54a4312622 100644
+index 8bc8b6013ea5803e091cf3534130b72278b9c29e..dca0c978b30962d4216dc443d7d105e54a29ae1b 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -62,13 +62,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0400-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0400-Implement-Mob-Goal-API.patch
index e8c80476f1..e8c80476f1 100644
--- a/patches/server/0400-Implement-Mob-Goal-API.patch
+++ b/patches/unapplied/server/0400-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0401-Add-villager-reputation-API.patch b/patches/unapplied/server/0401-Add-villager-reputation-API.patch
index 0d5199af29..0d5199af29 100644
--- a/patches/server/0401-Add-villager-reputation-API.patch
+++ b/patches/unapplied/server/0401-Add-villager-reputation-API.patch
diff --git a/patches/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch
index 206989dbdd..206989dbdd 100644
--- a/patches/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/unapplied/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0403-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0403-ExperienceOrbMergeEvent.patch
index bfca9b565e..bfca9b565e 100644
--- a/patches/server/0403-ExperienceOrbMergeEvent.patch
+++ b/patches/unapplied/server/0403-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0404-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0404-Fix-PotionEffect-ignores-icon-flag.patch
index 7dcb2191c0..7dcb2191c0 100644
--- a/patches/server/0404-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/unapplied/server/0404-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0405-Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/0405-Optimize-brigadier-child-sorting-performance.patch
index 3651f34b15..3651f34b15 100644
--- a/patches/server/0405-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/unapplied/server/0405-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0406-Potential-bed-API.patch b/patches/unapplied/server/0406-Potential-bed-API.patch
index 633d9baf8a..633d9baf8a 100644
--- a/patches/server/0406-Potential-bed-API.patch
+++ b/patches/unapplied/server/0406-Potential-bed-API.patch
diff --git a/patches/server/0407-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0407-Wait-for-Async-Tasks-during-shutdown.patch
index f8854a8a4e..f8854a8a4e 100644
--- a/patches/server/0407-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/unapplied/server/0407-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index 94dbb79f58..94dbb79f58 100644
--- a/patches/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/unapplied/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index aa4924fef9..aa4924fef9 100644
--- a/patches/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/unapplied/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch
index 1a92be0a01..1a92be0a01 100644
--- a/patches/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/patches/unapplied/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index cb28946d0e..578741a729 100644
--- a/patches/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/unapplied/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -18,7 +18,7 @@ index 3167f5c6be39757e3cc42cbb17ab0cf13a2fe470..3768a71491ef7836b9739bdaec7a077c
      private static long encode(double value) {
          return Mth.lfloor(value * 4096.0D);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7e11a85cb826deedcf9aa22b849ced2c1240e64a..97f58099f310b1c6fe8f9a1c8247fb0648d5277b 100644
+index 1bf18259505997c39e7880abf49e583cc763beb1..2651e6d22658beea7247a93a6c73f99f1d258752 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1302,9 +1302,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0412-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0412-Ensure-safe-gateway-teleport.patch
index b466eeb164..b466eeb164 100644
--- a/patches/server/0412-Ensure-safe-gateway-teleport.patch
+++ b/patches/unapplied/server/0412-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0413-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0413-Add-option-for-console-having-all-permissions.patch
index d1e3317d94..d1e3317d94 100644
--- a/patches/server/0413-Add-option-for-console-having-all-permissions.patch
+++ b/patches/unapplied/server/0413-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index 77ad74e89b..f34e3c3ef7 100644
--- a/patches/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/unapplied/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -42,7 +42,7 @@ index 2ba3bb4e5670ece798a8882801a856d82851c00a..a61f55ed1fbe5aac5289014cb95cb695
          this.newChunkHolder = newChunkHolder; // Paper - rewrite chunk system
          this.chunkToSaveHistory = null;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 999a675dd42c37b27e40d1a32b77641188b8d432..63536642f005b6936734397e2347c504084f3f6c 100644
+index 2651e6d22658beea7247a93a6c73f99f1d258752..c68be481bbedbe347651f73741bf378a501e450e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -152,12 +152,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -262,7 +262,7 @@ index d3c3db919e9b0507e8543313d9028394e5163673..52cba8f68d274cce106304aef1249a95
  
      public String getDebugStatus() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 8a20fa6d1c357f6d9787032c31dd0d0f80bd74be..67bcda3e1d343b59dd1842f5eb982a71859d4d7b 100644
+index f0ab91b93dabd0c77a8537e40c8b504200b261fd..324a99ea21bccdf27c15248ae2811048efaa2595 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -657,6 +657,37 @@ public class ServerChunkCache extends ChunkSource {
@@ -333,7 +333,7 @@ index 8a20fa6d1c357f6d9787032c31dd0d0f80bd74be..67bcda3e1d343b59dd1842f5eb982a71
                      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 84edbb30158b8ea7771b6fb33a660d9229e6b4a5..83d05b2546fe54485daede323a0f6343b62d278a 100644
+index 7ad1d2cd3b2d4b1f9b21f0de5ddbf2626aea0310..61904f4d3160d83f87d66fd9f86acf54ab31adc6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
index e77a5566d5..63fed4027e 100644
--- a/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/unapplied/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 63536642f005b6936734397e2347c504084f3f6c..ed6e0a186dba26bee5ebcc02120c24ecb38d6892 100644
+index c68be481bbedbe347651f73741bf378a501e450e..f337b380c443016fc593dc768e32b751b7c7aa96 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -66,6 +66,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
diff --git a/patches/server/0416-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0416-Fix-villager-trading-demand-MC-163962.patch
index fb5e330854..fb5e330854 100644
--- a/patches/server/0416-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/unapplied/server/0416-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0417-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0417-Maps-shouldn-t-load-chunks.patch
index 3ab19f357a..3ab19f357a 100644
--- a/patches/server/0417-Maps-shouldn-t-load-chunks.patch
+++ b/patches/unapplied/server/0417-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 9ed5e37d35..9ed5e37d35 100644
--- a/patches/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/unapplied/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 1cafad18f3..1cafad18f3 100644
--- a/patches/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/unapplied/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch
index dcc303244a..5c7d480a24 100644
--- a/patches/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/unapplied/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -66,7 +66,7 @@ index 29755807fdb6c30e31c0ec2bbf33bed9afd5d478..8d73893100884c08aa552ff41c2a07a3
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
-index dda0b32a4989bbead35a2219a969a30ba0e975b0..7c59d44a3bafdc65f453d77ff3e25cffb742ad6c 100644
+index 1bcaed2abd1118804a362d6852e4a29d3064aa14..4b61602a1d2d6817272e02cfd282ac5dabbd976d 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 @@ -285,7 +285,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
diff --git a/patches/server/0421-Fix-sand-duping.patch b/patches/unapplied/server/0421-Fix-sand-duping.patch
index 4e10fc3dae..4e10fc3dae 100644
--- a/patches/server/0421-Fix-sand-duping.patch
+++ b/patches/unapplied/server/0421-Fix-sand-duping.patch
diff --git a/patches/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch
index 94b8d07c3a..94b8d07c3a 100644
--- a/patches/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/unapplied/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch
index ba844e85b3..67c1208b0d 100644
--- a/patches/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/unapplied/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bbed54d5a0e3c363614d694950688f8edc02841d..30a69fa8f8266909fe98bea7ea781789c74bf50b 100644
+index 8c8ccd61fb1592a9274e54ed6e06ec7737e942e0..10efc010cf5c43d3e009972c1f5ee7c4083d21f8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1446,6 +1446,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0424-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0424-Inventory-getHolder-method-without-block-snapshot.patch
index 9ed9fe0826..9ed9fe0826 100644
--- a/patches/server/0424-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/unapplied/server/0424-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0425-Improve-Arrow-API.patch b/patches/unapplied/server/0425-Improve-Arrow-API.patch
index 47bb897a5a..47bb897a5a 100644
--- a/patches/server/0425-Improve-Arrow-API.patch
+++ b/patches/unapplied/server/0425-Improve-Arrow-API.patch
diff --git a/patches/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 8c4d05e3c5..7c4e7cafb8 100644
--- a/patches/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/unapplied/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 939eb9fee9d856ace268f89081e6a9777a452a8a..8df02b4fb9df21ce8185dd9a22235c13eb42463f 100644
+index 10efc010cf5c43d3e009972c1f5ee7c4083d21f8..496fdfcf3e6a80f9f2f073105bc2819ce127c8ef 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3229,9 +3229,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0427-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0427-Hide-sync-chunk-writes-behind-flag.patch
index 1d9e0f2b56..1d9e0f2b56 100644
--- a/patches/server/0427-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/unapplied/server/0427-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0428-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0428-Add-permission-for-command-blocks.patch
index 211e5736a2..52ec404d66 100644
--- a/patches/server/0428-Add-permission-for-command-blocks.patch
+++ b/patches/unapplied/server/0428-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index af00442931f9f6cf878bd61137c2f29fc7c8d0b1..431ff490760f54be76847c7b370dbbb4
                  return false;
              } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b7865696d9b939791b0315ab2a231e2dc5872de8..02b6cf65f6abedfd4933e4e64d254f190e061301 100644
+index 496fdfcf3e6a80f9f2f073105bc2819ce127c8ef..033c1038ccc5f4c340f853a89a72aeadbf15922e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -878,7 +878,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch
index 6f30642b95..6f30642b95 100644
--- a/patches/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/unapplied/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 0cc2b96c65..629abccc39 100644
--- a/patches/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/unapplied/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -76,7 +76,7 @@ index e3a62579067209c447f2fdcb76b2a11e489a376b..a8e18a168e8288ebea95bacd61a38039
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 83d05b2546fe54485daede323a0f6343b62d278a..d8c77533a44e316693535ea66fe6ae7f4994de5f 100644
+index 61904f4d3160d83f87d66fd9f86acf54ab31adc6..c32f09e993ef25876373a34d148b0452ea03bcf0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1129,7 +1129,7 @@ public class ServerPlayer extends Player {
@@ -89,7 +89,7 @@ index 83d05b2546fe54485daede323a0f6343b62d278a..d8c77533a44e316693535ea66fe6ae7f
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d47cec95660d7754921d06f7316cc6ab4ab6016a..3526e4f179b36d1ab61488e4b9c2404d5754c258 100644
+index 033c1038ccc5f4c340f853a89a72aeadbf15922e..f6012bf8134f0606710511150dd296a1d677334d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3499,7 +3499,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0431-Paper-dumpitem-command.patch b/patches/unapplied/server/0431-Paper-dumpitem-command.patch
index 77cf770637..77cf770637 100644
--- a/patches/server/0431-Paper-dumpitem-command.patch
+++ b/patches/unapplied/server/0431-Paper-dumpitem-command.patch
diff --git a/patches/server/0432-Don-t-allow-null-UUID-s-for-chat.patch b/patches/unapplied/server/0432-Don-t-allow-null-UUID-s-for-chat.patch
index 9c92814826..9c92814826 100644
--- a/patches/server/0432-Don-t-allow-null-UUID-s-for-chat.patch
+++ b/patches/unapplied/server/0432-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0433-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0433-Improve-Legacy-Component-serialization-size.patch
index 866302739f..866302739f 100644
--- a/patches/server/0433-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/unapplied/server/0433-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0434-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0434-Optimize-Bit-Operations-by-inlining.patch
index c1cce4278a..c1cce4278a 100644
--- a/patches/server/0434-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/unapplied/server/0434-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 966d383561..fd149d8f21 100644
--- a/patches/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/unapplied/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -44,7 +44,7 @@ index 4c6c9aa8b3305f5ab4f7b8d356e860da169fb1db..2aab13270af76bcc1b62787e9910d23d
          this.printSaveWarning = false;
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c3703933598ee96d856a18dcc0932061959c9791..20a08c79d4577d0eb36ab413b36811c828f4f084 100644
+index 298012beaf6f587a05d230b7208325ea8c3ad811..f19bfe6d6d4d915876cea3e6ef792639300fced1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -282,8 +282,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0436-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0436-incremental-chunk-and-player-saving.patch
index 7eb63906a5..7eb63906a5 100644
--- a/patches/server/0436-incremental-chunk-and-player-saving.patch
+++ b/patches/unapplied/server/0436-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch
index c13f70aec1..c13f70aec1 100644
--- a/patches/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/unapplied/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0438-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0438-Support-old-UUID-format-for-NBT.patch
index 04f6394d7a..04f6394d7a 100644
--- a/patches/server/0438-Support-old-UUID-format-for-NBT.patch
+++ b/patches/unapplied/server/0438-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0439-Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/0439-Clean-up-duplicated-GameProfile-Properties.patch
index 25554ddf57..25554ddf57 100644
--- a/patches/server/0439-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/unapplied/server/0439-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0440-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0440-Convert-legacy-attributes-in-Item-Meta.patch
index b949a9e873..b949a9e873 100644
--- a/patches/server/0440-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/unapplied/server/0440-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0441-Remove-some-streams-from-structures.patch b/patches/unapplied/server/0441-Remove-some-streams-from-structures.patch
index d535ed9e91..d535ed9e91 100644
--- a/patches/server/0441-Remove-some-streams-from-structures.patch
+++ b/patches/unapplied/server/0441-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0442-Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/0442-Remove-streams-from-classes-related-villager-gossip.patch
index 6ae0f1a026..6ae0f1a026 100644
--- a/patches/server/0442-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/unapplied/server/0442-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0443-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0443-Support-components-in-ItemMeta.patch
index 05ab3c1898..05ab3c1898 100644
--- a/patches/server/0443-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/server/0443-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/unapplied/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
index 68a10afd43..68a10afd43 100644
--- a/patches/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
+++ b/patches/unapplied/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0445-Add-entity-liquid-API.patch b/patches/unapplied/server/0445-Add-entity-liquid-API.patch
index 0a8b551c42..0a8b551c42 100644
--- a/patches/server/0445-Add-entity-liquid-API.patch
+++ b/patches/unapplied/server/0445-Add-entity-liquid-API.patch
diff --git a/patches/server/0446-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0446-Update-itemstack-legacy-name-and-lore.patch
index b354241c07..49dc09d429 100644
--- a/patches/server/0446-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/unapplied/server/0446-Update-itemstack-legacy-name-and-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 5e0852c4656813272a7ee6cb9c2331410c1b7739..cbcc90cffe38ea249cd0de4b0a90adc2a3ddeb0b 100644
+index 2650deb381bae30593128fc003c042f42110802c..85dead69d41ca10ad76fdab13da8548d359142b0 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -166,6 +166,44 @@ public final class ItemStack {
diff --git a/patches/server/0447-Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/0447-Spawn-player-in-correct-world-on-login.patch
index 4bab29fec6..4bab29fec6 100644
--- a/patches/server/0447-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/unapplied/server/0447-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0448-Add-PrepareResultEvent.patch b/patches/unapplied/server/0448-Add-PrepareResultEvent.patch
index 89497733ce..89497733ce 100644
--- a/patches/server/0448-Add-PrepareResultEvent.patch
+++ b/patches/unapplied/server/0448-Add-PrepareResultEvent.patch
diff --git a/patches/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 278a3ba951..bb00d0c79c 100644
--- a/patches/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/unapplied/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 908d1c840301bfbd8aaed571e7cae7d1c16b5c19..8271a130fb14894259a4beb095627bd9f60bc48c 100644
+index a337ce97a31998a63e7c329ac94cad9a5f783a5c..9c5421b9aa35c5f90a51ed097e68c5143054e966 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3446,7 +3446,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0450-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0450-Optimize-NetworkManager-Exception-Handling.patch
index 3ae0daa7d1..3ae0daa7d1 100644
--- a/patches/server/0450-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/unapplied/server/0450-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/unapplied/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch
index 0763953dd5..0763953dd5 100644
--- a/patches/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/patches/unapplied/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0452-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0452-Fix-arrows-never-despawning-MC-125757.patch
index 5597e70116..5597e70116 100644
--- a/patches/server/0452-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/unapplied/server/0452-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch
index 12e1413e81..12e1413e81 100644
--- a/patches/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/unapplied/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0454-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0454-Fix-SPIGOT-5989.patch
index 075f2a20e1..075f2a20e1 100644
--- a/patches/server/0454-Fix-SPIGOT-5989.patch
+++ b/patches/unapplied/server/0454-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index c7303d0b5c..c7303d0b5c 100644
--- a/patches/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/unapplied/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 5010bc5bf1..5010bc5bf1 100644
--- a/patches/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/unapplied/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index da7194a954..da7194a954 100644
--- a/patches/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/unapplied/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/unapplied/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index 2ba58a89b9..9ebf6d1aa9 100644
--- a/patches/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/unapplied/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 20a08c79d4577d0eb36ab413b36811c828f4f084..fabd0ef0bef97bc7f14d6fae18028cca0709d3a6 100644
+index f19bfe6d6d4d915876cea3e6ef792639300fced1..643b682db12560fc3409ede861a4e0aea8fc5360 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2134,6 +2134,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0459-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0459-Fix-some-rails-connecting-improperly.patch
index f612612b1c..f612612b1c 100644
--- a/patches/server/0459-Fix-some-rails-connecting-improperly.patch
+++ b/patches/unapplied/server/0459-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index be48fd5ae2..be48fd5ae2 100644
--- a/patches/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/unapplied/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch
index efa8bf5dc9..8e90d25da9 100644
--- a/patches/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/unapplied/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch
@@ -9,7 +9,7 @@ the game, immediately stop the server to prevent data corruption.
 You can override this functionality at your own peril.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 3c61be19c65b2da9283b2aba2b4e66f84bac6e1c..31e552e1b4c3a6931a61a88a75965a0427d6de8d 100644
+index 89c367f542aee35ba9f596d678bfeb5412c1697d..4236cf65b893bc21d2597010a2f9745fc0e107a4 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -126,9 +126,22 @@ public class ChunkSerializer {
diff --git a/patches/server/0462-Brand-support.patch b/patches/unapplied/server/0462-Brand-support.patch
index a4020275ce..8e0ba7f0be 100644
--- a/patches/server/0462-Brand-support.patch
+++ b/patches/unapplied/server/0462-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3526e4f179b36d1ab61488e4b9c2404d5754c258..35362ffc16eb8ed070d001ab3ca9037f78519a77 100644
+index f6012bf8134f0606710511150dd296a1d677334d..6e7d909bd87a1732e99c68d2baf57042d7e930fe 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -298,6 +298,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0463-Add-setMaxPlayers-API.patch b/patches/unapplied/server/0463-Add-setMaxPlayers-API.patch
index 8f770a4f2f..8f770a4f2f 100644
--- a/patches/server/0463-Add-setMaxPlayers-API.patch
+++ b/patches/unapplied/server/0463-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch
index 148284b3a9..148284b3a9 100644
--- a/patches/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/unapplied/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0465-Don-t-require-FACING-data.patch b/patches/unapplied/server/0465-Don-t-require-FACING-data.patch
index fd2ab14906..fd2ab14906 100644
--- a/patches/server/0465-Don-t-require-FACING-data.patch
+++ b/patches/unapplied/server/0465-Don-t-require-FACING-data.patch
diff --git a/patches/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index a2d4345443..a2d4345443 100644
--- a/patches/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/unapplied/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0467-Add-moon-phase-API.patch b/patches/unapplied/server/0467-Add-moon-phase-API.patch
index c400ce80c7..c400ce80c7 100644
--- a/patches/server/0467-Add-moon-phase-API.patch
+++ b/patches/unapplied/server/0467-Add-moon-phase-API.patch
diff --git a/patches/server/0468-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0468-Prevent-headless-pistons-from-being-created.patch
index b31a2a9b3a..b31a2a9b3a 100644
--- a/patches/server/0468-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/unapplied/server/0468-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0469-Add-BellRingEvent.patch b/patches/unapplied/server/0469-Add-BellRingEvent.patch
index 6b5fdae03d..cd1aafe4c3 100644
--- a/patches/server/0469-Add-BellRingEvent.patch
+++ b/patches/unapplied/server/0469-Add-BellRingEvent.patch
@@ -7,7 +7,7 @@ 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/net/minecraft/world/level/block/BellBlock.java b/src/main/java/net/minecraft/world/level/block/BellBlock.java
-index a4da6418c17e145333aa5efe427826ba53293e4d..3dfbc517e8867029b9821ec605dffb1ae476260a 100644
+index 8ccf71bddb2637a9e468e3d958665bbd58c37647..8878d8882d7aee4d44ad8339daff180812912649 100644
 --- a/src/main/java/net/minecraft/world/level/block/BellBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BellBlock.java
 @@ -3,6 +3,7 @@ package net.minecraft.world.level.block;
diff --git a/patches/server/0470-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0470-Add-zombie-targets-turtle-egg-config.patch
index da7839967c..47e5d7f8eb 100644
--- a/patches/server/0470-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/unapplied/server/0470-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index b2b396dd7c5face635595d527f132e0787ef7e26..15783f8c8a65820aa5a643bbd4866b1eb6bf980a 100644
+index 473782e8b6a760aec492fa28270a7eb05a484e78..d5633a869819b26376c01d38e08763457e3b7b68 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -107,7 +107,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0471-Buffer-joins-to-world.patch b/patches/unapplied/server/0471-Buffer-joins-to-world.patch
index 667f473468..667f473468 100644
--- a/patches/server/0471-Buffer-joins-to-world.patch
+++ b/patches/unapplied/server/0471-Buffer-joins-to-world.patch
diff --git a/patches/server/0472-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/0472-Eigencraft-redstone-implementation.patch
index eb06202d36..eb06202d36 100644
--- a/patches/server/0472-Eigencraft-redstone-implementation.patch
+++ b/patches/unapplied/server/0472-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch
index f25496d6a9..f25496d6a9 100644
--- a/patches/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/unapplied/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch
index 29df4d3231..377bf7e435 100644
--- a/patches/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/unapplied/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index cbcc90cffe38ea249cd0de4b0a90adc2a3ddeb0b..b4ad1610d30396be344a04f5f3a565ae2b8f2265 100644
+index 85dead69d41ca10ad76fdab13da8548d359142b0..0bd7b64bd1c468221d3354494527b456bc02437a 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -431,7 +431,7 @@ public final class ItemStack {
@@ -104,7 +104,7 @@ index b2ab7749e3ddf124d5ef97271a76dc875a650771..97b0e820d353e8ab4ca9d9e2efd0a881
      @Deprecated
      public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) {
 diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-index 768c39b265437641721d669d6aa85b3db49e5422..3414f3190e1a760c602613e82e551e797c3aa575 100644
+index 4d9023d1baa06802ab97af4be2739c13dee4f9b9..0ef049f0fac81312bee4f0e0c14dc3e74b09d272 100644
 --- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java
 +++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
 @@ -10,6 +10,7 @@ import net.minecraft.server.level.ServerLevel;
diff --git a/patches/server/0475-Fix-CraftTeam-null-check.patch b/patches/unapplied/server/0475-Fix-CraftTeam-null-check.patch
index fc8ca37076..fc8ca37076 100644
--- a/patches/server/0475-Fix-CraftTeam-null-check.patch
+++ b/patches/unapplied/server/0475-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0476-Add-more-Evoker-API.patch b/patches/unapplied/server/0476-Add-more-Evoker-API.patch
index 0fce1f166a..0fce1f166a 100644
--- a/patches/server/0476-Add-more-Evoker-API.patch
+++ b/patches/unapplied/server/0476-Add-more-Evoker-API.patch
diff --git a/patches/server/0477-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0477-Add-methods-to-get-translation-keys.patch
index 1b21cce4a5..7b0740446b 100644
--- a/patches/server/0477-Add-methods-to-get-translation-keys.patch
+++ b/patches/unapplied/server/0477-Add-methods-to-get-translation-keys.patch
@@ -46,7 +46,7 @@ index a859a675b4bc543e139358223cc92ad5eee3ddb5..31a22f26070059e5379730c1940ff1c5
  
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index be1e6c050a4d80f330bb4a5ea5f79da3aefb9510..cb5cfcfc1a1ad5d4c0c07f187c8e36c4fc63248c 100644
+index b38b2b3855583b26d7ed2ede041a73cf14cbe81c..8b0090ba3359c68aa98c0cf74e0dc0b3e9143577 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -483,6 +483,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch
index 238466b430..238466b430 100644
--- a/patches/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/unapplied/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0479-Cache-block-data-strings.patch b/patches/unapplied/server/0479-Cache-block-data-strings.patch
index 9602336b1d..9602336b1d 100644
--- a/patches/server/0479-Cache-block-data-strings.patch
+++ b/patches/unapplied/server/0479-Cache-block-data-strings.patch
diff --git a/patches/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 9fd7a379f2..b6308e9346 100644
--- a/patches/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/unapplied/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index da6a0171bd63ac68635de1c23fc9eafa732503bd..214771e661ca3303af167fda3b623d83f0f63055 100644
+index 6e7d909bd87a1732e99c68d2baf57042d7e930fe..434dc5ab5f02e66918f150c2db1d3cd35d58eece 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -760,7 +760,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -57,7 +57,7 @@ index 1582da75f92aed598c1c076af7b94af7ab48d10a..5a43e57d2e2146d324685808cfe98017
          this.setYRot(yaw);
          this.setXRot(pitch);
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 763b4049060b294345ef8a796c0f5b52575d644c..8d403b4a6db98cc5c3851d5f2c485560cf8b412f 100644
+index 2e28bbd75c689ab5a004f0a2de4a89cde7a807ec..572982353530663825ab2d576c3277197a5715a3 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -163,6 +163,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0481-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0481-Add-additional-open-container-api-to-HumanEntity.patch
index 1c28c3f9cd..1c28c3f9cd 100644
--- a/patches/server/0481-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/unapplied/server/0481-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 602cc3a878..602cc3a878 100644
--- a/patches/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/unapplied/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch
index 23e7d37604..23e7d37604 100644
--- a/patches/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/unapplied/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index ecd5d521bb..6e3cfc1242 100644
--- a/patches/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -21,7 +21,7 @@ index 5a43e57d2e2146d324685808cfe980178bde03a2..c99798ea88f7f6dd6db6c80666171e75
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index cb5cfcfc1a1ad5d4c0c07f187c8e36c4fc63248c..bcb61aefa3e42d4a1fd3d97116802197fe94ae21 100644
+index 8b0090ba3359c68aa98c0cf74e0dc0b3e9143577..78ea9d70d44cbf2a51172c5cd394c9ff17981961 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -507,6 +507,10 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0485-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0485-Lazily-track-plugin-scoreboards-by-default.patch
index bb0fe1c990..bb0fe1c990 100644
--- a/patches/server/0485-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/unapplied/server/0485-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0486-Entity-isTicking.patch b/patches/unapplied/server/0486-Entity-isTicking.patch
index a6c62cfaaf..a6c62cfaaf 100644
--- a/patches/server/0486-Entity-isTicking.patch
+++ b/patches/unapplied/server/0486-Entity-isTicking.patch
diff --git a/patches/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 194bd602ce..194bd602ce 100644
--- a/patches/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/unapplied/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch
index 5b3dba224c..5b3dba224c 100644
--- a/patches/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/unapplied/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 31cde5ee93..31cde5ee93 100644
--- a/patches/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/unapplied/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0490-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0490-Fix-for-large-move-vectors-crashing-server.patch
index ab6165f75a..48aaeeea92 100644
--- a/patches/server/0490-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/unapplied/server/0490-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 214771e661ca3303af167fda3b623d83f0f63055..3d7d23a02e4aceb95ec36fbca9d02294f08c5780 100644
+index 434dc5ab5f02e66918f150c2db1d3cd35d58eece..3387fdf7e7345827dae63815de19b38a79f8ed4f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -575,9 +575,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0491-Optimise-getType-calls.patch b/patches/unapplied/server/0491-Optimise-getType-calls.patch
index 9d9946c038..9d9946c038 100644
--- a/patches/server/0491-Optimise-getType-calls.patch
+++ b/patches/unapplied/server/0491-Optimise-getType-calls.patch
diff --git a/patches/server/0492-Villager-resetOffers.patch b/patches/unapplied/server/0492-Villager-resetOffers.patch
index 7448270230..7448270230 100644
--- a/patches/server/0492-Villager-resetOffers.patch
+++ b/patches/unapplied/server/0492-Villager-resetOffers.patch
diff --git a/patches/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/unapplied/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch
index 43999ba919..43999ba919 100644
--- a/patches/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/patches/unapplied/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0494-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0494-Retain-block-place-order-when-capturing-blockstates.patch
index 1f80e72f9b..1f80e72f9b 100644
--- a/patches/server/0494-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/unapplied/server/0494-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch
index a6a02f3817..a6a02f3817 100644
--- a/patches/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/unapplied/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0496-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0496-Fix-item-locations-dropped-from-campfires.patch
index df944d4a66..df944d4a66 100644
--- a/patches/server/0496-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/unapplied/server/0496-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0497-Player-elytra-boost-API.patch b/patches/unapplied/server/0497-Player-elytra-boost-API.patch
index 03f8a6d9ca..03f8a6d9ca 100644
--- a/patches/server/0497-Player-elytra-boost-API.patch
+++ b/patches/unapplied/server/0497-Player-elytra-boost-API.patch
diff --git a/patches/server/0498-Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/0498-Fixed-TileEntityBell-memory-leak.patch
index 09d0b77f4a..09d0b77f4a 100644
--- a/patches/server/0498-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/unapplied/server/0498-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index f48528d0b5..f48528d0b5 100644
--- a/patches/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/unapplied/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0500-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0500-Add-getOfflinePlayerIfCached-String.patch
index 9095c21d9b..9095c21d9b 100644
--- a/patches/server/0500-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/server/0500-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0501-Add-ignore-discounts-API.patch b/patches/unapplied/server/0501-Add-ignore-discounts-API.patch
index b1916987d7..b1916987d7 100644
--- a/patches/server/0501-Add-ignore-discounts-API.patch
+++ b/patches/unapplied/server/0501-Add-ignore-discounts-API.patch
diff --git a/patches/server/0502-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0502-Toggle-for-removing-existing-dragon.patch
index 157073f779..157073f779 100644
--- a/patches/server/0502-Toggle-for-removing-existing-dragon.patch
+++ b/patches/unapplied/server/0502-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0503-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0503-Fix-client-lag-on-advancement-loading.patch
index 11fb3e8d77..f81a2f02d3 100644
--- a/patches/server/0503-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/unapplied/server/0503-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index bcb61aefa3e42d4a1fd3d97116802197fe94ae21..5656b0380c8a74084f5ff366c09419171b66f172 100644
+index 78ea9d70d44cbf2a51172c5cd394c9ff17981961..2fdaf6661644c8601f310ae79d9f59920a2f3996 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -345,7 +345,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0504-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0504-Item-no-age-no-player-pickup.patch
index 13b456555a..13b456555a 100644
--- a/patches/server/0504-Item-no-age-no-player-pickup.patch
+++ b/patches/unapplied/server/0504-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 91c966567f..91c966567f 100644
--- a/patches/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/unapplied/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0506-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0506-Beacon-API-custom-effect-ranges.patch
index f462f881de..f462f881de 100644
--- a/patches/server/0506-Beacon-API-custom-effect-ranges.patch
+++ b/patches/unapplied/server/0506-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0507-Add-API-for-quit-reason.patch b/patches/unapplied/server/0507-Add-API-for-quit-reason.patch
index f868950487..6033f3d712 100644
--- a/patches/server/0507-Add-API-for-quit-reason.patch
+++ b/patches/unapplied/server/0507-Add-API-for-quit-reason.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 22e2e314a4bb1b22758130d4e9065f9b87b0116e..de1fdb93e0e3acd58429b042629df8c00bfb65ad 100644
+index 3ae55dd6441b2dfdb67eb2f24ecf885bab89e7a6..f76ee2131c35a9dbf7ad9d086b51c9644b0a2462 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -170,12 +170,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -25,7 +25,7 @@ index 22e2e314a4bb1b22758130d4e9065f9b87b0116e..de1fdb93e0e3acd58429b042629df8c0
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          ConnectionProtocol enumprotocol = this.getCurrentProtocol();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b39bb4b5a1612dac7d495f22e5ab3ec5fb00a058..c841cfba25d6f448fec929b3ca9653775d3e0ac9 100644
+index b41fddf5225b9d7cccf73b91dd0c14897c990346..67cf1cd5f3a83a52dca54781670dcfe0cf2a89c2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -266,6 +266,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index b39bb4b5a1612dac7d495f22e5ab3ec5fb00a058..c841cfba25d6f448fec929b3ca965377
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, @Nullable ProfilePublicKey publicKey) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile, publicKey);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d7d23a02e4aceb95ec36fbca9d02294f08c5780..8e12c4d4b54c2f0a265dc627d7981282fc6fda6e 100644
+index 3387fdf7e7345827dae63815de19b38a79f8ed4f..d0f80dadb4e2dade8122c945bafe05ff7adf42a0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -515,6 +515,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch
index a5adffed4f..a5adffed4f 100644
--- a/patches/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/unapplied/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0509-Expose-world-spawn-angle.patch b/patches/unapplied/server/0509-Expose-world-spawn-angle.patch
index ba5db7a0c6..ba5db7a0c6 100644
--- a/patches/server/0509-Expose-world-spawn-angle.patch
+++ b/patches/unapplied/server/0509-Expose-world-spawn-angle.patch
diff --git a/patches/server/0510-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0510-Add-Destroy-Speed-API.patch
index a2b7640fee..a2b7640fee 100644
--- a/patches/server/0510-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/server/0510-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 5f7722ab04..5f7722ab04 100644
--- a/patches/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/unapplied/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0512-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0512-Add-LivingEntity-clearActiveItem.patch
index 79ee2b2a08..79ee2b2a08 100644
--- a/patches/server/0512-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/unapplied/server/0512-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0513-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0513-Add-PlayerItemCooldownEvent.patch
index 751841d117..751841d117 100644
--- a/patches/server/0513-Add-PlayerItemCooldownEvent.patch
+++ b/patches/unapplied/server/0513-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0514-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0514-Significantly-improve-performance-of-the-end-generat.patch
index c223e5c115..c223e5c115 100644
--- a/patches/server/0514-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/unapplied/server/0514-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0515-More-lightning-API.patch b/patches/unapplied/server/0515-More-lightning-API.patch
index f3cc50d6cc..f3cc50d6cc 100644
--- a/patches/server/0515-More-lightning-API.patch
+++ b/patches/unapplied/server/0515-More-lightning-API.patch
diff --git a/patches/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch
index 4b6afc8021..0c836e07f2 100644
--- a/patches/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/unapplied/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -45,7 +45,7 @@ index 302676ef78ed5b3b7fc1b04851447ca72eed10c0..a00c3d96f2fc7131d1f4afa7af4e41ac
              } else if (entity.level.isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8271a130fb14894259a4beb095627bd9f60bc48c..75c76534e326255bbf432b6fe7ce2b9819846f06 100644
+index 9c5421b9aa35c5f90a51ed097e68c5143054e966..a01a6a2c869a973eb044fdb2084f151954599075 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3368,7 +3368,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0517-Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/0517-Added-missing-default-perms-for-commands.patch
index ddaf0c6aec..ddaf0c6aec 100644
--- a/patches/server/0517-Added-missing-default-perms-for-commands.patch
+++ b/patches/unapplied/server/0517-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0518-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0518-Add-PlayerShearBlockEvent.patch
index ad60c8efb4..ad60c8efb4 100644
--- a/patches/server/0518-Add-PlayerShearBlockEvent.patch
+++ b/patches/unapplied/server/0518-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0519-Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/0519-Fix-curing-zombie-villager-discount-exploit.patch
index c6cb27bebe..c6cb27bebe 100644
--- a/patches/server/0519-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/unapplied/server/0519-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0520-Limit-recipe-packets.patch b/patches/unapplied/server/0520-Limit-recipe-packets.patch
index f8fd1bff8d..17632f4fd2 100644
--- a/patches/server/0520-Limit-recipe-packets.patch
+++ b/patches/unapplied/server/0520-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 83b98097f8664123448ad852ef94a4ff999b9d4f..d4454ecd2b67c1162a99b65af85b801a48471f86 100644
+index d0f80dadb4e2dade8122c945bafe05ff7adf42a0..e36b50f7467d14eaf0fb29e6c5ece87de9db085a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -263,6 +263,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0521-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0521-Fix-CraftSound-backwards-compatibility.patch
index 60e8ef1e6b..60e8ef1e6b 100644
--- a/patches/server/0521-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/unapplied/server/0521-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0522-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0522-Player-Chunk-Load-Unload-Events.patch
index 5d27e96dbb..5d27e96dbb 100644
--- a/patches/server/0522-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/server/0522-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0523-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0523-Optimize-Dynamic-get-Missing-Keys.patch
index 5a4efe035c..5a4efe035c 100644
--- a/patches/server/0523-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/unapplied/server/0523-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0524-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0524-Expose-LivingEntity-hurt-direction.patch
index d321dde1d3..d321dde1d3 100644
--- a/patches/server/0524-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/server/0524-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 50d1f220a7..50d1f220a7 100644
--- a/patches/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index a66e8fc14d..a66e8fc14d 100644
--- a/patches/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/unapplied/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 339a34391b..339a34391b 100644
--- a/patches/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/unapplied/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0528-Implement-TargetHitEvent.patch b/patches/unapplied/server/0528-Implement-TargetHitEvent.patch
index 78722933d9..78722933d9 100644
--- a/patches/server/0528-Implement-TargetHitEvent.patch
+++ b/patches/unapplied/server/0528-Implement-TargetHitEvent.patch
diff --git a/patches/server/0529-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0529-MC-4-Fix-item-position-desync.patch
index 0e16eea060..0e16eea060 100644
--- a/patches/server/0529-MC-4-Fix-item-position-desync.patch
+++ b/patches/unapplied/server/0529-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0530-Additional-Block-Material-API-s.patch b/patches/unapplied/server/0530-Additional-Block-Material-API-s.patch
index e93239aae5..e93239aae5 100644
--- a/patches/server/0530-Additional-Block-Material-API-s.patch
+++ b/patches/unapplied/server/0530-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0531-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0531-Fix-harming-potion-dupe.patch
index d131d6c979..d131d6c979 100644
--- a/patches/server/0531-Fix-harming-potion-dupe.patch
+++ b/patches/unapplied/server/0531-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index b68431ed82..b68431ed82 100644
--- a/patches/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/unapplied/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0533-Cache-burn-durations.patch b/patches/unapplied/server/0533-Cache-burn-durations.patch
index 35387cbe57..35387cbe57 100644
--- a/patches/server/0533-Cache-burn-durations.patch
+++ b/patches/unapplied/server/0533-Cache-burn-durations.patch
diff --git a/patches/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index b11735c5d7..6d66e59fe4 100644
--- a/patches/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/unapplied/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
 
 
 diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-index b518c5d18c2d3486382ed4e59941b155d5534014..6df94a75b7c4c2593598088d84cf0a4a57e3fd99 100644
+index d222d9932af4b23af5d182259143d2d7f27675c5..a6c8833102a89ffacc817343285343ec4f8fa9bf 100644
 --- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
 +++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
 @@ -61,7 +61,7 @@ public class SpawnEggItem extends Item {
diff --git a/patches/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch
index 8967f3f735..7f8fe4769a 100644
--- a/patches/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/unapplied/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch
@@ -12,7 +12,7 @@ requesting the world.
 Track spigot issue to see when fixed: https://hub.spigotmc.org/jira/browse/SPIGOT-6181
 
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 913fabc7f42c05ccec6501247a5e8d1d481756ee..4acbcafc158cf11af51d9518ba5b83aaa75f52a1 100644
+index 7254e7a42c58737cfc04f09aaca2fe1ebeec6d08..2a7c4b70f3d4442b33fa3d005da0da5da9756e83 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -15,6 +15,8 @@ import net.minecraft.core.BlockPos;
diff --git a/patches/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0537-Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/0537-Fix-interact-event-not-being-called-in-adventure.patch
index 8cd15192dc..138b9c9df1 100644
--- a/patches/server/0537-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/unapplied/server/0537-Fix-interact-event-not-being-called-in-adventure.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 32227020d0cba1aba3ec0fcda5f4b4cd4b1ce394..c0cca7442d3bb7df393088d66c5962bcda78e609 100644
+index e36b50f7467d14eaf0fb29e6c5ece87de9db085a..4083f437704e586bfc1cf1e321f0b44febf7c44b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1852,7 +1852,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0538-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0538-Zombie-API-breaking-doors.patch
index 0b6d0327e3..0b6d0327e3 100644
--- a/patches/server/0538-Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/server/0538-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0539-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0539-Fix-nerfed-slime-when-splitting.patch
index 726d362dff..726d362dff 100644
--- a/patches/server/0539-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/unapplied/server/0539-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0540-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0540-Add-EntityLoadCrossbowEvent.patch
index 6ffab47e6e..6ffab47e6e 100644
--- a/patches/server/0540-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/server/0540-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0541-Guardian-beam-workaround.patch b/patches/unapplied/server/0541-Guardian-beam-workaround.patch
index fa66573d2b..fa66573d2b 100644
--- a/patches/server/0541-Guardian-beam-workaround.patch
+++ b/patches/unapplied/server/0541-Guardian-beam-workaround.patch
diff --git a/patches/server/0542-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0542-Added-WorldGameRuleChangeEvent.patch
index e31546e7aa..d30f6720de 100644
--- a/patches/server/0542-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/server/0542-Added-WorldGameRuleChangeEvent.patch
@@ -18,7 +18,7 @@ index 1b66c33a55a9516269c80f5052fb103418b11367..745b8724b7536a5b2c2c94ae8fd703ea
          return t0.getCommandResult();
      }
 diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index 800325a544bb9f228ccbeb0a52d7f380a8c6083e..3c93bfeb94168f832904a8462ae23b06e81e080d 100644
+index 17f8a46622b97b94e4b5da4c2c303e09a1162c21..392ab42d3c4fa6ef1815279a02b1fce236f725fa 100644
 --- a/src/main/java/net/minecraft/world/level/GameRules.java
 +++ b/src/main/java/net/minecraft/world/level/GameRules.java
 @@ -262,10 +262,10 @@ public class GameRules {
@@ -64,7 +64,7 @@ index 800325a544bb9f228ccbeb0a52d7f380a8c6083e..3c93bfeb94168f832904a8462ae23b06
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 37c7eb9357d897e1d5aefd355460d6fe76762d9d..55f07a9675f4a1fde183f2009b46a4a09a8fb1c7 100644
+index ca768eea4f4ad7196f6f595516683b28372de71a..9bc547020f56ddbb766d31f27081a59f75ea2c1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1793,8 +1793,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0543-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0543-Added-ServerResourcesReloadedEvent.patch
index da8dfb50f4..da8dfb50f4 100644
--- a/patches/server/0543-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/0543-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch
index 8227b41958..45af88e50c 100644
--- a/patches/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/unapplied/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -18,7 +18,7 @@ index 60064770f08cbee19eeb43bf7c144b6eefbc4888..c2a26b91d9065fdb52a1ded6c3295093
              LocalDate localdate = LocalDate.now();
              int i = localdate.get(ChronoField.DAY_OF_MONTH);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 15783f8c8a65820aa5a643bbd4866b1eb6bf980a..e4bd194998b14fa4f6212ec978afc8dc7921bb9f 100644
+index d5633a869819b26376c01d38e08763457e3b7b68..a1a24982163023c3a75267366cc6a0d53401c094 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -508,7 +508,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0545-Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0545-Implemented-BlockFailedDispenseEvent.patch
index 19ca380c40..19ca380c40 100644
--- a/patches/server/0545-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/server/0545-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0546-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0546-Added-PlayerLecternPageChangeEvent.patch
index d8fd03b1c7..d8fd03b1c7 100644
--- a/patches/server/0546-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/server/0546-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0547-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0547-Added-PlayerLoomPatternSelectEvent.patch
index a99d30af29..a99d30af29 100644
--- a/patches/server/0547-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/server/0547-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0548-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0548-Configurable-door-breaking-difficulty.patch
index 3d6697b7af..3d6697b7af 100644
--- a/patches/server/0548-Configurable-door-breaking-difficulty.patch
+++ b/patches/unapplied/server/0548-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0549-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0549-Empty-commands-shall-not-be-dispatched.patch
index 1c382dc0f6..1c382dc0f6 100644
--- a/patches/server/0549-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/unapplied/server/0549-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0550-Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/0550-Implement-API-to-expose-exact-interaction-point.patch
index a7f9d15f9f..a7f9d15f9f 100644
--- a/patches/server/0550-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/unapplied/server/0550-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0551-Remove-stale-POIs.patch b/patches/unapplied/server/0551-Remove-stale-POIs.patch
index 84d3bba9ae..84d3bba9ae 100644
--- a/patches/server/0551-Remove-stale-POIs.patch
+++ b/patches/unapplied/server/0551-Remove-stale-POIs.patch
diff --git a/patches/server/0552-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0552-Fix-villager-boat-exploit.patch
index c63ef19c4b..c63ef19c4b 100644
--- a/patches/server/0552-Fix-villager-boat-exploit.patch
+++ b/patches/unapplied/server/0552-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0553-Add-sendOpLevel-API.patch b/patches/unapplied/server/0553-Add-sendOpLevel-API.patch
index 3229761ac8..3229761ac8 100644
--- a/patches/server/0553-Add-sendOpLevel-API.patch
+++ b/patches/unapplied/server/0553-Add-sendOpLevel-API.patch
diff --git a/patches/server/0554-Add-PaperRegistry.patch b/patches/unapplied/server/0554-Add-PaperRegistry.patch
index 0b33804e74..e3ec55a71b 100644
--- a/patches/server/0554-Add-PaperRegistry.patch
+++ b/patches/unapplied/server/0554-Add-PaperRegistry.patch
@@ -205,7 +205,7 @@ index 17e0425a520bd95074bf34c262c36c5603266ea7..f05f5d13f23599dbb95a7062ebbb4133
              // Paper start
              if (Thread.currentThread() != this.serverThread) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 5656b0380c8a74084f5ff366c09419171b66f172..bd6a65a15e581e0f342d7dd9572651fa21ce3961 100644
+index 2fdaf6661644c8601f310ae79d9f59920a2f3996..55301058555e0062aa349ff91cdd11c4be49ec55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -517,6 +517,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0555-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0555-Add-StructuresLocateEvent.patch
index f7bf54d7de..f7bf54d7de 100644
--- a/patches/server/0555-Add-StructuresLocateEvent.patch
+++ b/patches/unapplied/server/0555-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0556-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0556-Collision-option-for-requiring-a-player-participant.patch
index def70b66b5..def70b66b5 100644
--- a/patches/server/0556-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/unapplied/server/0556-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 1af8b9fb5e..1af8b9fb5e 100644
--- a/patches/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/unapplied/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch
index b83b5915fd..b83b5915fd 100644
--- a/patches/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0559-Make-schedule-command-per-world.patch b/patches/unapplied/server/0559-Make-schedule-command-per-world.patch
index 60f5d1fc66..60f5d1fc66 100644
--- a/patches/server/0559-Make-schedule-command-per-world.patch
+++ b/patches/unapplied/server/0559-Make-schedule-command-per-world.patch
diff --git a/patches/server/0560-Configurable-max-leash-distance.patch b/patches/unapplied/server/0560-Configurable-max-leash-distance.patch
index ba76f79b7f..ba76f79b7f 100644
--- a/patches/server/0560-Configurable-max-leash-distance.patch
+++ b/patches/unapplied/server/0560-Configurable-max-leash-distance.patch
diff --git a/patches/server/0561-Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/0561-Implement-BlockPreDispenseEvent.patch
index 14852682e6..14852682e6 100644
--- a/patches/server/0561-Implement-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/server/0561-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 2f90dea41c..2f90dea41c 100644
--- a/patches/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch
index caffaecf90..caffaecf90 100644
--- a/patches/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/unapplied/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch
index 1c6497d193..1c6497d193 100644
--- a/patches/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 134418ef42..fc222ef2b8 100644
--- a/patches/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/unapplied/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 2ae973d77d0b088cf7dc7a2338b8b7461e585dca..513bfbd0775ee0a880a031baaaf1bfe1f3788dc3 100644
+index b9db51b07ba3b867d80a48e5106c2b38ea0b72ee..965dd5564d64c094ffc1347621a45d50c6c5f1e3 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1248,12 +1248,15 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0566-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0566-Reset-shield-blocking-on-dimension-change.patch
index f15ef83553..6fdfb3f1c2 100644
--- a/patches/server/0566-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/unapplied/server/0566-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 826dcafaf65cef8bbff4f231f71305e851de0902..becbe9c488577e1acea8ae1dac9792f4a25c2c66 100644
+index e74d4523caa4d2d4b33e22145f7b2dcb63dba9fc..781bad6dd4279eddeaa2d55eaf513ef725729d26 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1166,6 +1166,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0567-add-DragonEggFormEvent.patch b/patches/unapplied/server/0567-add-DragonEggFormEvent.patch
index 40273bbb47..40273bbb47 100644
--- a/patches/server/0567-add-DragonEggFormEvent.patch
+++ b/patches/unapplied/server/0567-add-DragonEggFormEvent.patch
diff --git a/patches/server/0568-EntityMoveEvent.patch b/patches/unapplied/server/0568-EntityMoveEvent.patch
index 17db772399..ebc7d0fc79 100644
--- a/patches/server/0568-EntityMoveEvent.patch
+++ b/patches/unapplied/server/0568-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index f05f5d13f23599dbb95a7062ebbb41334ec21f14..2f8026fffde9976e28d3263cbc4296a5
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0a0727b5c6900bd7299a0caf1e1125d809880423..44dc48d663e384161cd2a2b3de5464ee4b068dbf 100644
+index 1bb87c81c57a8d28712ff82b8211b7cc2e32c2a6..38b2b6b1a3068abd6432d866fe582935d144fb89 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -217,6 +217,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index 0a0727b5c6900bd7299a0caf1e1125d809880423..44dc48d663e384161cd2a2b3de5464ee
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0896cbe04be6a5471088c321296506415fccbed6..cc930b8a22b3e3540b9fb24c6eaa329895c075cb 100644
+index a01a6a2c869a973eb044fdb2084f151954599075..39d3fecfa120aaae98237417b7ea0e9123085183 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3306,6 +3306,20 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch
index 35840c7090..35840c7090 100644
--- a/patches/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/unapplied/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0570-Inline-shift-direction-fields.patch b/patches/unapplied/server/0570-Inline-shift-direction-fields.patch
index d4353368a2..d4353368a2 100644
--- a/patches/server/0570-Inline-shift-direction-fields.patch
+++ b/patches/unapplied/server/0570-Inline-shift-direction-fields.patch
diff --git a/patches/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch
index 9dc2ff3234..9dc2ff3234 100644
--- a/patches/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0573-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0573-living-entity-allow-attribute-registration.patch
index 8db0430432..65829db430 100644
--- a/patches/server/0573-living-entity-allow-attribute-registration.patch
+++ b/patches/unapplied/server/0573-living-entity-allow-attribute-registration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] living entity allow attribute registration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index 4d2c02a1e1b4a8fad12894a7439ec7e53a67d97a..c770ee21b7b699522941f6a1584d532001c04082 100644
+index bd078de8ed93d7325ad204789c765c689f8df939..692524a69d43dcf52ae1b0f7f593fc53f3878137 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 @@ -132,4 +132,12 @@ public class AttributeMap {
diff --git a/patches/server/0574-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0574-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0574-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/unapplied/server/0574-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/unapplied/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0576-Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/0576-Add-support-for-hex-color-codes-in-console.patch
index fdaea8bb39..fdaea8bb39 100644
--- a/patches/server/0576-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/unapplied/server/0576-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0577-Expose-Tracked-Players.patch b/patches/unapplied/server/0577-Expose-Tracked-Players.patch
index 262b409f53..262b409f53 100644
--- a/patches/server/0577-Expose-Tracked-Players.patch
+++ b/patches/unapplied/server/0577-Expose-Tracked-Players.patch
diff --git a/patches/server/0578-Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/0578-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0578-Remove-streams-from-SensorNearest.patch
+++ b/patches/unapplied/server/0578-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..e013e32526 100644
--- a/patches/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/unapplied/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0580-Improve-ServerGUI.patch b/patches/unapplied/server/0580-Improve-ServerGUI.patch
index e573bd2f58..e573bd2f58 100644
--- a/patches/server/0580-Improve-ServerGUI.patch
+++ b/patches/unapplied/server/0580-Improve-ServerGUI.patch
diff --git a/patches/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/unapplied/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0582-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0582-fix-converting-txt-to-json-file.patch
index 02db61ed0b..02db61ed0b 100644
--- a/patches/server/0582-fix-converting-txt-to-json-file.patch
+++ b/patches/unapplied/server/0582-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0583-Add-worldborder-events.patch b/patches/unapplied/server/0583-Add-worldborder-events.patch
index af0cf2d370..af0cf2d370 100644
--- a/patches/server/0583-Add-worldborder-events.patch
+++ b/patches/unapplied/server/0583-Add-worldborder-events.patch
diff --git a/patches/server/0584-added-PlayerNameEntityEvent.patch b/patches/unapplied/server/0584-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0584-added-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/server/0584-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0585-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0585-Prevent-grindstones-from-overstacking-items.patch
index 1faefdeb01..1faefdeb01 100644
--- a/patches/server/0585-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/unapplied/server/0585-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0586-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0586-Add-recipe-to-cook-events.patch
index 61023ab91c..61023ab91c 100644
--- a/patches/server/0586-Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/server/0586-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0587-Add-Block-isValidTool.patch b/patches/unapplied/server/0587-Add-Block-isValidTool.patch
index 95bf6c3432..95bf6c3432 100644
--- a/patches/server/0587-Add-Block-isValidTool.patch
+++ b/patches/unapplied/server/0587-Add-Block-isValidTool.patch
diff --git a/patches/server/0588-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0588-Allow-using-signs-inside-spawn-protection.patch
index e2dfe62f54..d08ec6896b 100644
--- a/patches/server/0588-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/unapplied/server/0588-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c0cca7442d3bb7df393088d66c5962bcda78e609..6c64270b9d87ae3d08400ddd4effa689ce58070f 100644
+index 4083f437704e586bfc1cf1e321f0b44febf7c44b..bdd268acc850f92b27ff6035ee577f16894608a7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1844,7 +1844,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0589-Expand-world-key-API.patch b/patches/unapplied/server/0589-Expand-world-key-API.patch
index f4537dd863..82098b9936 100644
--- a/patches/server/0589-Expand-world-key-API.patch
+++ b/patches/unapplied/server/0589-Expand-world-key-API.patch
@@ -67,7 +67,7 @@ index 462ffe647b11185001a08b09e74773b8831a3b46..e90ef57567928fdfd08fd16ce84503b0
          // Check if a World already exists with the UID.
          if (this.getWorld(world.getUID()) != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index bd6a65a15e581e0f342d7dd9572651fa21ce3961..45cf2df36af20e36ba8026f94e5598d1b5583d4b 100644
+index 55301058555e0062aa349ff91cdd11c4be49ec55..2f00fa822e72b38ad2f15ed84ffa1f3998667177 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -522,6 +522,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0590-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0590-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0590-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/unapplied/server/0590-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0591-Item-Rarity-API.patch b/patches/unapplied/server/0591-Item-Rarity-API.patch
index 68c2da6fd7..2eb7a72cb1 100644
--- a/patches/server/0591-Item-Rarity-API.patch
+++ b/patches/unapplied/server/0591-Item-Rarity-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Item Rarity API
 public net.minecraft.world.item.Item rarity
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 45cf2df36af20e36ba8026f94e5598d1b5583d4b..cef2946c0fc5e52896635396dea4153b61da612e 100644
+index 2f00fa822e72b38ad2f15ed84ffa1f3998667177..1f511696a21bee2ada502b5f0389368f25c45e5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -527,6 +527,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 7ad8f56595..2898008081 100644
--- a/patches/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/unapplied/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
@@ -31,7 +31,7 @@ index fdefccfa07227f315259f636076e36a120c72917..7e9f2a128639c1b80c008f1203a4a41b
          if (t0 != null) {
              worldserver.addFreshEntityWithPassengers(t0, spawnReason);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index dc1762ad344bf49fda4c891f38ef20639f353a45..9162f3e5752a7bee825e7ae21e9fb950cf4eb644 100644
+index e594cf4b8084b7448c29208a2070e766e391713d..d6c583d668abdc9302ccedba42b9b4e2f6180c56 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -59,7 +59,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
diff --git a/patches/server/0593-copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/0593-copy-TESign-isEditable-from-snapshots.patch
index 766607080f..766607080f 100644
--- a/patches/server/0593-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/unapplied/server/0593-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0594-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0594-Drop-carried-item-when-player-has-disconnected.patch
index 82e12eaa72..82e12eaa72 100644
--- a/patches/server/0594-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/unapplied/server/0594-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0595-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0595-forced-whitelist-use-configurable-kick-message.patch
index 788882418e..788882418e 100644
--- a/patches/server/0595-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/unapplied/server/0595-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 661e62955f..6ffd76bfc4 100644
--- a/patches/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/unapplied/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6c64270b9d87ae3d08400ddd4effa689ce58070f..63649e0d5547d1b904a6605868dfad52214c7b3c 100644
+index bdd268acc850f92b27ff6035ee577f16894608a7..6e04920319740d31111d17800bb0e577cda8627f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1294,7 +1294,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0597-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0597-Entity-load-save-limit-per-chunk.patch
index a9ae2842db..a9ae2842db 100644
--- a/patches/server/0597-Entity-load-save-limit-per-chunk.patch
+++ b/patches/unapplied/server/0597-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0598-Expose-protocol-version.patch b/patches/unapplied/server/0598-Expose-protocol-version.patch
index a86638c110..5f05bd2005 100644
--- a/patches/server/0598-Expose-protocol-version.patch
+++ b/patches/unapplied/server/0598-Expose-protocol-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index cef2946c0fc5e52896635396dea4153b61da612e..a01c4790d56bfae3f8dd4b4e8c54b9725d92b410 100644
+index 1f511696a21bee2ada502b5f0389368f25c45e5a..69ea448975077a1c254185925987bcd9599d252a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -541,6 +541,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch
index 591a6921f3..591a6921f3 100644
--- a/patches/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/unapplied/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 555a3729a6..0b0b417b58 100644
--- a/patches/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/unapplied/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 427326d1795bd5262ac96bfeb30de0e02c48e04e..901075b2a494efa54c4468336f2aa85ef31a0d64 100644
+index 39d3fecfa120aaae98237417b7ea0e9123085183..d8aee7c5980055d32960aa1af80fcf4353481b88 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3789,6 +3789,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0601-Add-bypass-host-check.patch b/patches/unapplied/server/0601-Add-bypass-host-check.patch
index 5774eba2ed..5774eba2ed 100644
--- a/patches/server/0601-Add-bypass-host-check.patch
+++ b/patches/unapplied/server/0601-Add-bypass-host-check.patch
diff --git a/patches/server/0602-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0602-Set-area-affect-cloud-rotation.patch
index 08e992b45c..08e992b45c 100644
--- a/patches/server/0602-Set-area-affect-cloud-rotation.patch
+++ b/patches/unapplied/server/0602-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0603-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0603-add-isDeeplySleeping-to-HumanEntity.patch
index 23d24c3698..23d24c3698 100644
--- a/patches/server/0603-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/server/0603-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch
index 0c37516dd7..0c37516dd7 100644
--- a/patches/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0606-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0606-fix-PigZombieAngerEvent-cancellation.patch
index df4e7b0b17..df4e7b0b17 100644
--- a/patches/server/0606-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/unapplied/server/0606-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/unapplied/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/unapplied/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch
index 3840306aa1..e331fd28df 100644
--- a/patches/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/unapplied/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 63649e0d5547d1b904a6605868dfad52214c7b3c..917aa2bd63db9a63c75267564d0c3602b0f01392 100644
+index 6e04920319740d31111d17800bb0e577cda8627f..27b3a9476e4c1d75d19f1e6f52ee98140bfa73dd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2054,6 +2054,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0609-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0609-Added-PlayerDeepSleepEvent.patch
index b7989ecad1..7813956e8c 100644
--- a/patches/server/0609-Added-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/0609-Added-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0960e5ecc25fad3eb46a871c2749dd176b812460..a6bd94ed379ef1ab0ffe71183aef3cf3061fd092 100644
+index 8f9a5589e430c31de29d23d6c27757dd33e8bb86..350d6a987fcebde60154e8ffde9372490090075d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -254,6 +254,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0610-More-World-API.patch b/patches/unapplied/server/0610-More-World-API.patch
index fbd013415f..d46322280d 100644
--- a/patches/server/0610-More-World-API.patch
+++ b/patches/unapplied/server/0610-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 55f07a9675f4a1fde183f2009b46a4a09a8fb1c7..888090b2548fb23089dcd05e9de2b1f09dc5876a 100644
+index 9bc547020f56ddbb766d31f27081a59f75ea2c1a..c801ba30f7d5fc891adc3dad7ee8e2d78e7ac359 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2035,6 +2035,65 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0611-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0611-Added-PlayerBedFailEnterEvent.patch
index ad6eaeb223..ad6eaeb223 100644
--- a/patches/server/0611-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/0611-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0612-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0612-Implement-methods-to-convert-between-Component-and-B.patch
index 41ed1d375d..41ed1d375d 100644
--- a/patches/server/0612-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/unapplied/server/0612-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index ad7a356e26..ad7a356e26 100644
--- a/patches/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/unapplied/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0614-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0614-Introduce-beacon-activation-deactivation-events.patch
index 53321c5633..53321c5633 100644
--- a/patches/server/0614-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/server/0614-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 02b477915e..4819d08133 100644
--- a/patches/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/unapplied/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 405ea7deeb1033d45f9bd14be3d5305d2ba3522f..542ab2799681e711e7330794693ade5bd3fda554 100644
+index 27b3a9476e4c1d75d19f1e6f52ee98140bfa73dd..c326ce013828a68d5edc14efeabce3464475daa9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2895,7 +2895,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0616-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0616-Add-Channel-initialization-listeners.patch
index e31fd9557a..e31fd9557a 100644
--- a/patches/server/0616-Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/0616-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch
index e31efa98f9..e31efa98f9 100644
--- a/patches/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/unapplied/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0618-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0618-Add-more-WanderingTrader-API.patch
index 65d351d6df..a541485c99 100644
--- a/patches/server/0618-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/0618-Add-more-WanderingTrader-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more WanderingTrader API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index abb2c5c4ac481c7529aa29322babb1929235e15a..86e1ba898d6b92735258419fa74352e5116226dc 100644
+index d6c583d668abdc9302ccedba42b9b4e2f6180c56..8a4107067938f7ca990a7edd1e271d57cfdb0545 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -56,6 +56,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
diff --git a/patches/server/0619-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0619-Add-EntityBlockStorage-clearEntities.patch
index 2bd0ddfa38..2bd0ddfa38 100644
--- a/patches/server/0619-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/0619-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 4169ad0754..4169ad0754 100644
--- a/patches/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 472212e61a..472212e61a 100644
--- a/patches/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0622-Inventory-close.patch b/patches/unapplied/server/0622-Inventory-close.patch
index e7f478324a..e7f478324a 100644
--- a/patches/server/0622-Inventory-close.patch
+++ b/patches/unapplied/server/0622-Inventory-close.patch
diff --git a/patches/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 764fc2b16c..764fc2b16c 100644
--- a/patches/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0624-Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/0624-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0624-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/unapplied/server/0624-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0625-Add-basic-Datapack-API.patch b/patches/unapplied/server/0625-Add-basic-Datapack-API.patch
index f241afe9c5..f241afe9c5 100644
--- a/patches/server/0625-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/0625-Add-basic-Datapack-API.patch
diff --git a/patches/server/0626-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0626-Add-environment-variable-to-disable-server-gui.patch
index 49bb358278..49bb358278 100644
--- a/patches/server/0626-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/0626-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0627-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0627-additions-to-PlayerGameModeChangeEvent.patch
index 03838f2d6c..e9c6ccf855 100644
--- a/patches/server/0627-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/server/0627-additions-to-PlayerGameModeChangeEvent.patch
@@ -126,7 +126,7 @@ index 32746dfbc2fdfc150583676b1bf0762398b76d75..1ad1f958a9b6e1bc21f1c505aa7ea549
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 542ab2799681e711e7330794693ade5bd3fda554..cf5aac0c7bb719246b49a0ee08148141a381a16a 100644
+index c326ce013828a68d5edc14efeabce3464475daa9..83a044061f77260a67023839b99915bd3abd8448 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2904,7 +2904,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0628-ItemStack-repair-check-API.patch b/patches/unapplied/server/0628-ItemStack-repair-check-API.patch
index 4a0ab9cc96..9cec6dcbee 100644
--- a/patches/server/0628-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/server/0628-ItemStack-repair-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index a01c4790d56bfae3f8dd4b4e8c54b9725d92b410..ec896bd1ce2b0fb101dcf3316a9981c92fbebcea 100644
+index 69ea448975077a1c254185925987bcd9599d252a..ec779868f37c1e8b22cd195fb458ed55fbb3aeb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -542,6 +542,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0629-More-Enchantment-API.patch b/patches/unapplied/server/0629-More-Enchantment-API.patch
index e5ae60be71..e5ae60be71 100644
--- a/patches/server/0629-More-Enchantment-API.patch
+++ b/patches/unapplied/server/0629-More-Enchantment-API.patch
diff --git a/patches/server/0630-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0630-Move-range-check-for-block-placing-up.patch
index 063490f935..582c587f8b 100644
--- a/patches/server/0630-Move-range-check-for-block-placing-up.patch
+++ b/patches/unapplied/server/0630-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cf5aac0c7bb719246b49a0ee08148141a381a16a..3fcd92c408258a60de049437478f6dab010f1fb1 100644
+index 83a044061f77260a67023839b99915bd3abd8448..4296b7b0c2e0ec3f9737b93a436e7d425d0ee0af 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1830,6 +1830,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0631-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0631-Fix-and-optimise-world-force-upgrading.patch
index 4c808317dd..4c808317dd 100644
--- a/patches/server/0631-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/unapplied/server/0631-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0632-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0632-Add-Mob-lookAt-API.patch
index 2179be5193..2179be5193 100644
--- a/patches/server/0632-Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/server/0632-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0633-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0633-Add-Unix-domain-socket-support.patch
index 6eae147cc8..6eae147cc8 100644
--- a/patches/server/0633-Add-Unix-domain-socket-support.patch
+++ b/patches/unapplied/server/0633-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0634-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0634-Add-EntityInsideBlockEvent.patch
index 712e15581a..712e15581a 100644
--- a/patches/server/0634-Add-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/server/0634-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0635-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0635-Attributes-API-for-item-defaults.patch
index 9a1775d18c..3e1c85c9cc 100644
--- a/patches/server/0635-Attributes-API-for-item-defaults.patch
+++ b/patches/unapplied/server/0635-Attributes-API-for-item-defaults.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ec896bd1ce2b0fb101dcf3316a9981c92fbebcea..4a2903d8cb7523abba2efd7024662d0d56871a43 100644
+index ec779868f37c1e8b22cd195fb458ed55fbb3aeb7..6b2df5d9aa2c7a7be0d18816cfddf381b71bbe36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -550,6 +550,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch
index 4e815fe346..4e815fe346 100644
--- a/patches/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0637-More-Lidded-Block-API.patch b/patches/unapplied/server/0637-More-Lidded-Block-API.patch
index 135fd68698..135fd68698 100644
--- a/patches/server/0637-More-Lidded-Block-API.patch
+++ b/patches/unapplied/server/0637-More-Lidded-Block-API.patch
diff --git a/patches/server/0638-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0638-Limit-item-frame-cursors-on-maps.patch
index 4e2cd3bfa2..d4916fb1f4 100644
--- a/patches/server/0638-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/unapplied/server/0638-Limit-item-frame-cursors-on-maps.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit item frame cursors on maps
 
 
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 4acbcafc158cf11af51d9518ba5b83aaa75f52a1..67b88da702b780f79c0496cb17f1e6f1f8dd6c2b 100644
+index 2a7c4b70f3d4442b33fa3d005da0da5da9756e83..ed96f092febd5a589b4d94368d6921ac0a71f7d6 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -295,8 +295,12 @@ public class MapItemSavedData extends SavedData {
diff --git a/patches/server/0639-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0639-Add-PlayerKickEvent-causes.patch
index 7303e3383d..ba52268ac5 100644
--- a/patches/server/0639-Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/server/0639-Add-PlayerKickEvent-causes.patch
@@ -57,7 +57,7 @@ index 65637a33ba171a4b598f70cd943d24b0ee44a69f..57a9146bf2dee7a60aab16716e25348f
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1ac8490d9a935a1816147363fb35fc12dbbb72fc..c809098218b7676bf9609f53129957361b36776a 100644
+index 4296b7b0c2e0ec3f9737b93a436e7d425d0ee0af..db43e6c4673a4f679132869b7cb22911cb015ee2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -369,7 +369,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0640-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0640-Add-PufferFishStateChangeEvent.patch
index e15126884a..e15126884a 100644
--- a/patches/server/0640-Add-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/server/0640-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index d66d11a86d..d66d11a86d 100644
--- a/patches/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/unapplied/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 4fd0ff61f2..4fd0ff61f2 100644
--- a/patches/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/unapplied/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0643-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0643-Add-option-to-fix-items-merging-through-walls.patch
index 0c6f1b92fc..0c6f1b92fc 100644
--- a/patches/server/0643-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/unapplied/server/0643-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0644-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0644-Add-BellRevealRaiderEvent.patch
index 416490bb3d..416490bb3d 100644
--- a/patches/server/0644-Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/server/0644-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0645-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0645-Fix-invulnerable-end-crystals.patch
index e5ce326afa..e5ce326afa 100644
--- a/patches/server/0645-Fix-invulnerable-end-crystals.patch
+++ b/patches/unapplied/server/0645-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0646-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0646-Add-ElderGuardianAppearanceEvent.patch
index 13c35cf8b6..13c35cf8b6 100644
--- a/patches/server/0646-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/server/0646-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0647-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0647-Fix-dangerous-end-portal-logic.patch
index 380c43c234..380c43c234 100644
--- a/patches/server/0647-Fix-dangerous-end-portal-logic.patch
+++ b/patches/unapplied/server/0647-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index c46f8fbb65..c46f8fbb65 100644
--- a/patches/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/unapplied/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0649-Make-item-validations-configurable.patch b/patches/unapplied/server/0649-Make-item-validations-configurable.patch
index d079cc7ed2..d079cc7ed2 100644
--- a/patches/server/0649-Make-item-validations-configurable.patch
+++ b/patches/unapplied/server/0649-Make-item-validations-configurable.patch
diff --git a/patches/server/0650-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0650-Line-Of-Sight-Changes.patch
index 926a8563ca..941f8ed350 100644
--- a/patches/server/0650-Line-Of-Sight-Changes.patch
+++ b/patches/unapplied/server/0650-Line-Of-Sight-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 901075b2a494efa54c4468336f2aa85ef31a0d64..aeb1d0559e58d6839aa9fcfc899f5ad7ba33e891 100644
+index d8aee7c5980055d32960aa1af80fcf4353481b88..7f0107757c03126b54104f8446577ef417de52fe 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3517,7 +3517,8 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0651-add-per-world-spawn-limits.patch b/patches/unapplied/server/0651-add-per-world-spawn-limits.patch
index 5d59715b0d..5d59715b0d 100644
--- a/patches/server/0651-add-per-world-spawn-limits.patch
+++ b/patches/unapplied/server/0651-add-per-world-spawn-limits.patch
diff --git a/patches/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/unapplied/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 56f02dad6e..56f02dad6e 100644
--- a/patches/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/unapplied/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0653-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0653-Add-more-LimitedRegion-API.patch
index e9e7611f99..e9e7611f99 100644
--- a/patches/server/0653-Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/server/0653-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch
index d9e8222524..082bf083be 100644
--- a/patches/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/unapplied/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -18,7 +18,7 @@ index f033a1a2bb3e44d30107bf1494b315cdc0c94b56..5bbc8f5f1f5c66ae6d1128d87fb7dde0
  
                  this.awardStat(Stats.DROP);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a6bd94ed379ef1ab0ffe71183aef3cf3061fd092..92a5aadef076cb905962dab86f32d4ff253fef93 100644
+index 350d6a987fcebde60154e8ffde9372490090075d..e44351546f25421c959e091d0831197621553b41 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -723,6 +723,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0655-Missing-Entity-Behavior-API.patch b/patches/unapplied/server/0655-Missing-Entity-Behavior-API.patch
index 08374e3a0f..08374e3a0f 100644
--- a/patches/server/0655-Missing-Entity-Behavior-API.patch
+++ b/patches/unapplied/server/0655-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 3ef312f324..79fad9c132 100644
--- a/patches/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/unapplied/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1673082e5badbc0f3057b11544fb39be0ed84a44..8d41767c0bbd55c3c3f291fee8ba92622c3cc881 100644
+index db43e6c4673a4f679132869b7cb22911cb015ee2..cda39f4ba09e5c9aabf68bd2df4f593554201ff9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1213,7 +1213,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 863796fe03..863796fe03 100644
--- a/patches/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/unapplied/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch
index 104ecc47b6..104ecc47b6 100644
--- a/patches/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/unapplied/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0659-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0659-Fix-commands-from-signs-not-firing-command-events.patch
index 67844b2f67..67844b2f67 100644
--- a/patches/server/0659-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/unapplied/server/0659-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0660-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0660-Adds-PlayerArmSwingEvent.patch
index 933614f011..9276ee0939 100644
--- a/patches/server/0660-Adds-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/server/0660-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8d41767c0bbd55c3c3f291fee8ba92622c3cc881..42f525b6e7bccca420abccfc2da80ead20966559 100644
+index cda39f4ba09e5c9aabf68bd2df4f593554201ff9..20fdebcabbeb008b3e412d471fd6b471d99d0614 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2631,7 +2631,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch
index 0d770eaae9..7f901f87c1 100644
--- a/patches/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/unapplied/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index 5bbc8f5f1f5c66ae6d1128d87fb7dde0b546387e..e505fa3a6f90efec32e408a08a31295a
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 42f525b6e7bccca420abccfc2da80ead20966559..ff31434e372693f6cf3d6a94815abd2ceb76f2d0 100644
+index 20fdebcabbeb008b3e412d471fd6b471d99d0614..1a2446afabce39a488d680f66c5e5b581863b4ae 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -522,7 +522,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0662-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0662-Add-config-for-mobs-immune-to-default-effects.patch
index 5f83ae240c..9a5036a4d1 100644
--- a/patches/server/0662-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/unapplied/server/0662-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 914fa03592e006c86c35c4ef1f3879130ad6ee00..cba73b4bf817a164726863aecada7c05c5975591 100644
+index 7f0107757c03126b54104f8446577ef417de52fe..530b94a864536f4bfd3c5250a2ffe40069b5bac2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1153,7 +1153,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0663-Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/0663-Fix-incorrect-message-for-outdated-client.patch
index 6248137f08..6248137f08 100644
--- a/patches/server/0663-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/unapplied/server/0663-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0664-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0664-Don-t-apply-cramming-damage-to-players.patch
index 99755d10d8..99755d10d8 100644
--- a/patches/server/0664-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/unapplied/server/0664-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 30867e6cf9..30867e6cf9 100644
--- a/patches/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/unapplied/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 43cef84f6f..43cef84f6f 100644
--- a/patches/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/unapplied/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0667-Stinger-API.patch b/patches/unapplied/server/0667-Stinger-API.patch
index 6de82a2e8a..6de82a2e8a 100644
--- a/patches/server/0667-Stinger-API.patch
+++ b/patches/unapplied/server/0667-Stinger-API.patch
diff --git a/patches/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 3f1afe6bf8..3f1afe6bf8 100644
--- a/patches/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/unapplied/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0669-Add-System.out-err-catcher.patch b/patches/unapplied/server/0669-Add-System.out-err-catcher.patch
index 9c4386581a..9c4386581a 100644
--- a/patches/server/0669-Add-System.out-err-catcher.patch
+++ b/patches/unapplied/server/0669-Add-System.out-err-catcher.patch
diff --git a/patches/server/0670-Fix-test-not-bootstrapping.patch b/patches/unapplied/server/0670-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0670-Fix-test-not-bootstrapping.patch
+++ b/patches/unapplied/server/0670-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0672-Improve-boat-collision-performance.patch b/patches/unapplied/server/0672-Improve-boat-collision-performance.patch
index d2d89fa7a9..4fa9e978df 100644
--- a/patches/server/0672-Improve-boat-collision-performance.patch
+++ b/patches/unapplied/server/0672-Improve-boat-collision-performance.patch
@@ -17,7 +17,7 @@ index 0773447354542925826369625f21e26aa30ebff4..adb1c48f42157fb127be4fd9f0a6f378
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cba73b4bf817a164726863aecada7c05c5975591..327dc44770656932879ffe58d9bbacb6ca3d0713 100644
+index 530b94a864536f4bfd3c5250a2ffe40069b5bac2..8b377ca58a0e4d11701a831c5f976e61f642f8a8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1341,7 +1341,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch
index 6a5b1cb883..ab586e72f9 100644
--- a/patches/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/unapplied/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ff31434e372693f6cf3d6a94815abd2ceb76f2d0..847011d143efb3f3af815d87dcc9c923d95a43c7 100644
+index 1a2446afabce39a488d680f66c5e5b581863b4ae..131577917ef0420f6b75a3cfa896ba4306ded3e7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -438,7 +438,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch
index b14eca2ac6..b14eca2ac6 100644
--- a/patches/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/unapplied/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0675-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0675-Add-PlayerSetSpawnEvent.patch
index 15f6f425ed..15f6f425ed 100644
--- a/patches/server/0675-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/server/0675-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch
index b4a083a5f7..b4a083a5f7 100644
--- a/patches/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/unapplied/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0677-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0677-Optimize-entity-tracker-passenger-checks.patch
index 463446a38b..463446a38b 100644
--- a/patches/server/0677-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/unapplied/server/0677-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0678-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0678-Config-option-for-Piglins-guarding-chests.patch
index 33c177ef52..33c177ef52 100644
--- a/patches/server/0678-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/unapplied/server/0678-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0679-Added-EntityDamageItemEvent.patch b/patches/unapplied/server/0679-Added-EntityDamageItemEvent.patch
index ec43bd00c9..569af38f9d 100644
--- a/patches/server/0679-Added-EntityDamageItemEvent.patch
+++ b/patches/unapplied/server/0679-Added-EntityDamageItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added EntityDamageItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index b4ad1610d30396be344a04f5f3a565ae2b8f2265..5c987e863a6ef257caebf8321fa3048dfc7a93c5 100644
+index 0bd7b64bd1c468221d3354494527b456bc02437a..8ed905d4ef43e2314c64758d0ed075cb969a075c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -547,7 +547,7 @@ public final class ItemStack {
diff --git a/patches/server/0680-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0680-Optimize-indirect-passenger-iteration.patch
index 6688b1a3b1..6688b1a3b1 100644
--- a/patches/server/0680-Optimize-indirect-passenger-iteration.patch
+++ b/patches/unapplied/server/0680-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/unapplied/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch
index 6b5cd596c4..6b5cd596c4 100644
--- a/patches/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/unapplied/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0682-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0682-Configurable-item-frame-map-cursor-update-interval.patch
index 1c23124230..1c23124230 100644
--- a/patches/server/0682-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/unapplied/server/0682-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0683-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0683-Make-EntityUnleashEvent-cancellable.patch
index 77152eb4db..d2f86ad28c 100644
--- a/patches/server/0683-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/unapplied/server/0683-Make-EntityUnleashEvent-cancellable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make EntityUnleashEvent cancellable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 513bfbd0775ee0a880a031baaaf1bfe1f3788dc3..b9685fa96bb59b4b080ffd0ac53e4c5581aaeb8b 100644
+index 965dd5564d64c094ffc1347621a45d50c6c5f1e3..147ec41ae4a3b9e9ad495ab4309c9f7306122749 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1488,7 +1488,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0684-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0684-Clear-bucket-NBT-after-dispense.patch
index 52e26f4674..52e26f4674 100644
--- a/patches/server/0684-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/unapplied/server/0684-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0685-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0685-Change-EnderEye-target-without-changing-other-things.patch
index ce9dc32309..ce9dc32309 100644
--- a/patches/server/0685-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/server/0685-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0686-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0686-Add-BlockBreakBlockEvent.patch
index a69de03ab7..a69de03ab7 100644
--- a/patches/server/0686-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/server/0686-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/unapplied/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0688-More-CommandBlock-API.patch b/patches/unapplied/server/0688-More-CommandBlock-API.patch
index 3cbd2436d3..3cbd2436d3 100644
--- a/patches/server/0688-More-CommandBlock-API.patch
+++ b/patches/unapplied/server/0688-More-CommandBlock-API.patch
diff --git a/patches/server/0689-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0689-Add-missing-team-sidebar-display-slots.patch
index 2a7dbde0e6..2a7dbde0e6 100644
--- a/patches/server/0689-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/server/0689-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0690-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0690-Add-back-EntityPortalExitEvent.patch
index 8f5abe7571..8f5abe7571 100644
--- a/patches/server/0690-Add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/server/0690-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch
index b6b9a157da..b6b9a157da 100644
--- a/patches/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0692-Get-entity-default-attributes.patch b/patches/unapplied/server/0692-Get-entity-default-attributes.patch
index 9da876b3a8..5d86f86083 100644
--- a/patches/server/0692-Get-entity-default-attributes.patch
+++ b/patches/unapplied/server/0692-Get-entity-default-attributes.patch
@@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..cf9d28ea97d93cec05c9fb768d59e283
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4a2903d8cb7523abba2efd7024662d0d56871a43..6f4f95b000efb1270eda94d218e628b50921a272 100644
+index 6b2df5d9aa2c7a7be0d18816cfddf381b71bbe36..7b4a0df8bf6b10699a9ef7ea5b1165ef79655a0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -567,6 +567,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0693-Left-handed-API.patch b/patches/unapplied/server/0693-Left-handed-API.patch
index 3b4077b54a..3b4077b54a 100644
--- a/patches/server/0693-Left-handed-API.patch
+++ b/patches/unapplied/server/0693-Left-handed-API.patch
diff --git a/patches/server/0694-Add-more-advancement-API.patch b/patches/unapplied/server/0694-Add-more-advancement-API.patch
index ea8714f80d..ea8714f80d 100644
--- a/patches/server/0694-Add-more-advancement-API.patch
+++ b/patches/unapplied/server/0694-Add-more-advancement-API.patch
diff --git a/patches/server/0695-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0695-Add-ItemFactory-getSpawnEgg-API.patch
index a0deed1bb0..a0deed1bb0 100644
--- a/patches/server/0695-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/unapplied/server/0695-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0696-Add-critical-damage-API.patch b/patches/unapplied/server/0696-Add-critical-damage-API.patch
index dcd4bfe384..cd683c4c04 100644
--- a/patches/server/0696-Add-critical-damage-API.patch
+++ b/patches/unapplied/server/0696-Add-critical-damage-API.patch
@@ -29,7 +29,7 @@ index 752f9f11227a47b7bed675b93e95af89c6732f63..67bce77093dcc126098731047447da20
      public static DamageSource sting(LivingEntity attacker) {
          return new EntityDamageSource("sting", attacker);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 92a5aadef076cb905962dab86f32d4ff253fef93..5451b1d61ae2ee4fa461c2a334bfe8f794868030 100644
+index e44351546f25421c959e091d0831197621553b41..860636642707e09f76d01ee566b5ceab6512159f 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1274,7 +1274,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0697-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0697-Fix-issues-with-mob-conversion.patch
index 69feb4b3a4..69feb4b3a4 100644
--- a/patches/server/0697-Fix-issues-with-mob-conversion.patch
+++ b/patches/unapplied/server/0697-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0698-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0698-Add-isCollidable-methods-to-various-places.patch
index 0d6b6950ca..98a23cf0fd 100644
--- a/patches/server/0698-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/unapplied/server/0698-Add-isCollidable-methods-to-various-places.patch
@@ -39,7 +39,7 @@ index 7b9e943b391c061782fccd2b8d705ceec8db50fe..966ac60daebb7bb211ab8096fc0c5f33
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 6f4f95b000efb1270eda94d218e628b50921a272..7b6231f7696fa949c657e05a1d35d0d7e482284e 100644
+index 7b4a0df8bf6b10699a9ef7ea5b1165ef79655a0e..8d1212436f3a70986dae9868e80fa5b7fe893541 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -579,6 +579,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0699-Goat-ram-API.patch b/patches/unapplied/server/0699-Goat-ram-API.patch
index c9eca7cb7e..c9eca7cb7e 100644
--- a/patches/server/0699-Goat-ram-API.patch
+++ b/patches/unapplied/server/0699-Goat-ram-API.patch
diff --git a/patches/server/0700-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0700-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0700-Add-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/server/0700-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0701-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0701-Add-Raw-Byte-Entity-Serialization.patch
index 6243e98b09..6243e98b09 100644
--- a/patches/server/0701-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/server/0701-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0702-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0702-Vanilla-command-permission-fixes.patch
index 44a7db13ec..44a7db13ec 100644
--- a/patches/server/0702-Vanilla-command-permission-fixes.patch
+++ b/patches/unapplied/server/0702-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 1c3003e28f..1c3003e28f 100644
--- a/patches/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/unapplied/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0704-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0704-Fix-GameProfileCache-concurrency.patch
index 8c22da1dde..8c22da1dde 100644
--- a/patches/server/0704-Fix-GameProfileCache-concurrency.patch
+++ b/patches/unapplied/server/0704-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0705-Log-when-the-async-catcher-is-tripped.patch b/patches/unapplied/server/0705-Log-when-the-async-catcher-is-tripped.patch
index b2c6aee8dc..b2c6aee8dc 100644
--- a/patches/server/0705-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/unapplied/server/0705-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 081ae6f3dc..18e367f038 100644
--- a/patches/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/unapplied/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -265,7 +265,7 @@ index 0000000000000000000000000000000000000000..2e02d94e2903c48f6d08e743c1cf8bad
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 25256c422a3274ed75c9a9cd20fbbb709c8b298e..edd32b6d5a96a6fffe641a23c27921e6dcf37a54 100644
+index b031dece541d2765f9488a5ffcb0d339c38ccc9e..21941af701eab308f87ca64b2801c55444814acb 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -191,6 +191,16 @@ public final class NaturalSpawner {
diff --git a/patches/server/0707-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0707-Sanitize-ResourceLocation-error-logging.patch
index c2ff3a02e4..c2ff3a02e4 100644
--- a/patches/server/0707-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/unapplied/server/0707-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0708-Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/0708-Allow-controlled-flushing-for-network-manager.patch
index d5db3bb706..d5db3bb706 100644
--- a/patches/server/0708-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/unapplied/server/0708-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0709-Optimise-general-POI-access.patch b/patches/unapplied/server/0709-Optimise-general-POI-access.patch
index e80bb92689..5587bc9aea 100644
--- a/patches/server/0709-Optimise-general-POI-access.patch
+++ b/patches/unapplied/server/0709-Optimise-general-POI-access.patch
@@ -974,7 +974,7 @@ index e921e3cce8c746e28d73e1a7e67a7efe656ec09f..8241320f5f01d0b093024ca27f6d8bdb
      private boolean isValid;
      public final Optional<PoiSection> noAllocateOptional = Optional.of(this); // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index 27f766fc72d779cff1b5a88a79961aa7ef91b11f..2d208f1b85193497027c4d04ab9e8cb16fed9b47 100644
+index c396076bfb1d41cc0f8248d6f3aa4fc3f7d1c998..d783072bc964e45c308197e6f79874eb4a09f871 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 @@ -71,11 +71,11 @@ public class SectionStorage<R> extends RegionFileStorage implements AutoCloseabl
diff --git a/patches/server/0710-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0710-Optimise-chunk-tick-iteration.patch
index bbcb493d0c..d571907ab6 100644
--- a/patches/server/0710-Optimise-chunk-tick-iteration.patch
+++ b/patches/unapplied/server/0710-Optimise-chunk-tick-iteration.patch
@@ -72,7 +72,7 @@ index a61f55ed1fbe5aac5289014cb95cb6950b4c77fa..e11ec87e8007979a1c6932b414bcd70c
              int i = 0;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index a488c33ce546cd29b30fcff9748869c20fc835aa..d91dbffab2c541bd3ca5542026f1a000f9b114d3 100644
+index f337b380c443016fc593dc768e32b751b7c7aa96..f2a8a1a47080cd3c62ece108d34f05cf48973472 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -110,6 +110,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
@@ -93,7 +93,7 @@ index a488c33ce546cd29b30fcff9748869c20fc835aa..d91dbffab2c541bd3ca5542026f1a000
      // Paper - rewrite chunk system
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index a05e8d136dfeb41fb6008cba4d3b4abcddbd9557..4e73960a77165a959e989249fd25a7c5376e50bb 100644
+index 998c333c0b7064e9077c2b30d6b36623ffc419c7..ef9ae57072e1b558c1a4a81b71196832ce974505 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -47,6 +47,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp
diff --git a/patches/server/0711-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0711-Execute-chunk-tasks-mid-tick.patch
index ea510bfa23..ea510bfa23 100644
--- a/patches/server/0711-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/unapplied/server/0711-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 65fc9468d8..65fc9468d8 100644
--- a/patches/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/unapplied/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch
index 6cf6b743b6..6cf6b743b6 100644
--- a/patches/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/unapplied/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0714-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0714-Detail-more-information-in-watchdog-dumps.patch
index e5e0e3edcb..e5e0e3edcb 100644
--- a/patches/server/0714-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/unapplied/server/0714-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0715-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0715-Manually-inline-methods-in-BlockPosition.patch
index f8ac951367..f8ac951367 100644
--- a/patches/server/0715-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/unapplied/server/0715-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0716-Distance-manager-tick-timings.patch b/patches/unapplied/server/0716-Distance-manager-tick-timings.patch
index f596bd6dea..f596bd6dea 100644
--- a/patches/server/0716-Distance-manager-tick-timings.patch
+++ b/patches/unapplied/server/0716-Distance-manager-tick-timings.patch
diff --git a/patches/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e2e0d713f0..e2e0d713f0 100644
--- a/patches/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/unapplied/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 9f57ee0138..9f57ee0138 100644
--- a/patches/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/unapplied/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0719-Add-packet-limiter-config.patch b/patches/unapplied/server/0719-Add-packet-limiter-config.patch
index ae0b03d36f..b300d4feee 100644
--- a/patches/server/0719-Add-packet-limiter-config.patch
+++ b/patches/unapplied/server/0719-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 489ab7c7a66969501e60fbd44c16ba4cdc180d46..28e91d015cf0034cd7ca952440fd4f915c34d489 100644
+index 31dee6fbf50db4b1fe779a8ad67ac771ac7148b7..c3abb615ab3be179a53fc6de8085df7b6a854a0b 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -154,6 +154,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/unapplied/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch
index 3b4219d344..3b4219d344 100644
--- a/patches/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/unapplied/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 112bd2a090..82eb44e066 100644
--- a/patches/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/unapplied/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
@@ -8,7 +8,7 @@ Lighting is purged on update anyways, so let's not add more
 into the conversion process
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
-index 84ad2f6dfe33d747453365656c1a0114ea6d2a54..6e9af1401918995e3c268eea7d4a74af94707242 100644
+index 6289858d54a6affd504533b1a280718a01446ebb..5a425be023d77f0370d102dfb52427147849ac1a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 @@ -51,6 +51,7 @@ public class ChunkStorage implements AutoCloseable {
diff --git a/patches/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 8565ca71fe..72fc653534 100644
--- a/patches/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/unapplied/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch
@@ -22,7 +22,7 @@ With this change I could get all 200 on at 0ms ping.
 So in general this patch should reduce Netty I/O thread load.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 44ea29c42d660cc92481a78990b5cdb7a23ef2a9..be97d38f45046a7f6d2337d879651f04cf9ff825 100644
+index 2aba72cd7a87b8b999cfbc7a2e7a58ea95717c19..4ff563d903633f181e1268daa77f250cfec204a0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -804,7 +804,24 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch
index e16e510297..e16e510297 100644
--- a/patches/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/unapplied/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0724-Time-scoreboard-search.patch b/patches/unapplied/server/0724-Time-scoreboard-search.patch
index abfffa772e..abfffa772e 100644
--- a/patches/server/0724-Time-scoreboard-search.patch
+++ b/patches/unapplied/server/0724-Time-scoreboard-search.patch
diff --git a/patches/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch
index cb24315567..cb24315567 100644
--- a/patches/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/unapplied/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0726-Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/0726-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0726-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/unapplied/server/0726-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0727-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0727-Oprimise-map-impl-for-tracked-players.patch
index 26977cfb0b..3276261701 100644
--- a/patches/server/0727-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/unapplied/server/0727-Oprimise-map-impl-for-tracked-players.patch
@@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d91dbffab2c541bd3ca5542026f1a000f9b114d3..b93d98b8ce576508b051a904e83cb4d19b87017b 100644
+index f2a8a1a47080cd3c62ece108d34f05cf48973472..315fec3941d71ee29c8f2fdc864c227bde54a0ca 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1360,7 +1360,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch
index bb523f58c5..bb523f58c5 100644
--- a/patches/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/unapplied/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0729-Optimise-random-block-ticking.patch b/patches/unapplied/server/0729-Optimise-random-block-ticking.patch
index 503e12f650..503e12f650 100644
--- a/patches/server/0729-Optimise-random-block-ticking.patch
+++ b/patches/unapplied/server/0729-Optimise-random-block-ticking.patch
diff --git a/patches/server/0730-Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/0730-Optimise-non-flush-packet-sending.patch
index 96cf3ab27b..ad457141ff 100644
--- a/patches/server/0730-Optimise-non-flush-packet-sending.patch
+++ b/patches/unapplied/server/0730-Optimise-non-flush-packet-sending.patch
@@ -20,7 +20,7 @@ up on this optimisation before he came along.
 Locally this patch drops the entity tracker tick by a full 1.5x.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 28e91d015cf0034cd7ca952440fd4f915c34d489..08b74302e99e596a99f142856ae33ee29a9b1b77 100644
+index c3abb615ab3be179a53fc6de8085df7b6a854a0b..2bc49ccf7eb2f1f3f956da365340e958dbb076a7 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -46,6 +46,8 @@ import org.slf4j.Logger;
diff --git a/patches/server/0731-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0731-Optimise-nearby-player-lookups.patch
index b274fbcd07..b274fbcd07 100644
--- a/patches/server/0731-Optimise-nearby-player-lookups.patch
+++ b/patches/unapplied/server/0731-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0732-Remove-streams-for-villager-AI.patch b/patches/unapplied/server/0732-Remove-streams-for-villager-AI.patch
index 7493d3ad6b..7493d3ad6b 100644
--- a/patches/server/0732-Remove-streams-for-villager-AI.patch
+++ b/patches/unapplied/server/0732-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0733-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0733-Use-Velocity-compression-and-cipher-natives.patch
index 2d537af7f4..2d537af7f4 100644
--- a/patches/server/0733-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/unapplied/server/0733-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index c69b1c2d8f..c69b1c2d8f 100644
--- a/patches/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/unapplied/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0735-Async-catch-modifications-to-critical-entity-state.patch b/patches/unapplied/server/0735-Async-catch-modifications-to-critical-entity-state.patch
index 94d6bcf59c..38f61896e0 100644
--- a/patches/server/0735-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/unapplied/server/0735-Async-catch-modifications-to-critical-entity-state.patch
@@ -8,7 +8,7 @@ Now in 1.17, this state is _even more_ critical than it was before,
 so these must exist to catch stupid plugins.
 
 diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
-index 21e1d86bd287c5e90db43c9c0247d6b7ee1425ae..8d2143dc2a4a20c585e84cfd3c218d8b5a95e165 100644
+index 038abf2ac104ceecaab11b10d466ea69ec86623e..a77985b2dd7137d8eea03909403fc08e89376d73 100644
 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 @@ -77,6 +77,7 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
diff --git a/patches/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch
index efa00b82a4..efa00b82a4 100644
--- a/patches/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/unapplied/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 8138bbd8b7..8138bbd8b7 100644
--- a/patches/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/unapplied/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0738-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0738-Check-requirement-before-suggesting-root-nodes.patch
index d824c5f2af..d824c5f2af 100644
--- a/patches/server/0738-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/unapplied/server/0738-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index fbc13dfc7d..900fc0f6cf 100644
--- a/patches/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/unapplied/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 847011d143efb3f3af815d87dcc9c923d95a43c7..f9e2392e705a0168b9dc359313e68cbca08b2d3a 100644
+index 131577917ef0420f6b75a3cfa896ba4306ded3e7..eab752600a2711a73516fa029b8eca17d52fde3c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -847,6 +847,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 8bc6527cd8..8bc6527cd8 100644
--- a/patches/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/unapplied/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0741-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0741-Ensure-valid-vehicle-status.patch
index 914ee7494b..914ee7494b 100644
--- a/patches/server/0741-Ensure-valid-vehicle-status.patch
+++ b/patches/unapplied/server/0741-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0742-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0742-Prevent-softlocked-end-exit-portal-generation.patch
index 2286afa5f2..2286afa5f2 100644
--- a/patches/server/0742-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/unapplied/server/0742-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/unapplied/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0744-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0744-Don-t-log-debug-logging-being-disabled.patch
index 83460a961a..83460a961a 100644
--- a/patches/server/0744-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/unapplied/server/0744-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0745-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0745-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0745-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/unapplied/server/0745-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0746-Preserve-overstacked-loot.patch b/patches/unapplied/server/0746-Preserve-overstacked-loot.patch
index e39eb87bbc..e39eb87bbc 100644
--- a/patches/server/0746-Preserve-overstacked-loot.patch
+++ b/patches/unapplied/server/0746-Preserve-overstacked-loot.patch
diff --git a/patches/server/0747-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0747-Update-head-rotation-in-missing-places.patch
index 416e9b0fff..416e9b0fff 100644
--- a/patches/server/0747-Update-head-rotation-in-missing-places.patch
+++ b/patches/unapplied/server/0747-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0748-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0748-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0748-prevent-unintended-light-block-manipulation.patch
+++ b/patches/unapplied/server/0748-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0749-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0749-Fix-CraftCriteria-defaults-map.patch
index 65eeffccea..65eeffccea 100644
--- a/patches/server/0749-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/unapplied/server/0749-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0750-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0750-Fix-upstreams-block-state-factories.patch
index 7bd43e5ec1..7bd43e5ec1 100644
--- a/patches/server/0750-Fix-upstreams-block-state-factories.patch
+++ b/patches/unapplied/server/0750-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0751-Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/0751-Add-config-option-for-logging-player-ip-addresses.patch
index 579b30b346..579b30b346 100644
--- a/patches/server/0751-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/unapplied/server/0751-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0752-Configurable-feature-seeds.patch b/patches/unapplied/server/0752-Configurable-feature-seeds.patch
index 76bc5d0b98..76bc5d0b98 100644
--- a/patches/server/0752-Configurable-feature-seeds.patch
+++ b/patches/unapplied/server/0752-Configurable-feature-seeds.patch
diff --git a/patches/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 54bf3f7028..54bf3f7028 100644
--- a/patches/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/unapplied/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0754-Add-root-admin-user-detection.patch b/patches/unapplied/server/0754-Add-root-admin-user-detection.patch
index a15ee81921..a15ee81921 100644
--- a/patches/server/0754-Add-root-admin-user-detection.patch
+++ b/patches/unapplied/server/0754-Add-root-admin-user-detection.patch
diff --git a/patches/server/0755-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0755-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0755-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/unapplied/server/0755-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0756-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0756-don-t-attempt-to-teleport-dead-entities.patch
index 2ba22b78e7..2ba22b78e7 100644
--- a/patches/server/0756-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/unapplied/server/0756-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch
index d912af4b12..72489b8a6a 100644
--- a/patches/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/unapplied/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 327dc44770656932879ffe58d9bbacb6ca3d0713..49718f6fbdd4ffe38afe4b5001d9de69097976f4 100644
+index 8b377ca58a0e4d11701a831c5f976e61f642f8a8..2aefacac58212d9ba76cf449455241d9c1fd36db 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2651,14 +2651,27 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch
index 49bc5d68f8..49bc5d68f8 100644
--- a/patches/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/unapplied/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index be1ba0eb32..2b0620b8d6 100644
--- a/patches/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/unapplied/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch
@@ -8,7 +8,7 @@ Chunks not marked as lit will always go through the light engine,
 so they should always have their block sources parsed.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 0254b71ab9af6d74640aa5dc0533afa386e5f57f..34e351e04ac57e47e3cea671c61cc01d17983b77 100644
+index 6e39c2c1556f41140b92064a6fa3a38427504aee..577eefd0990b0d6ae237dd685976975d3532d7fa 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -325,16 +325,33 @@ public class ChunkSerializer {
diff --git a/patches/server/0760-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0760-Fix-removing-recipes-from-RecipeIterator.patch
index 6b05db044c..6b05db044c 100644
--- a/patches/server/0760-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/unapplied/server/0760-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 33e70220d1..1403f86eff 100644
--- a/patches/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/unapplied/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent sending oversized item data in equipment and metadata
 
 
 diff --git a/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java b/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java
-index 0c79613597e9ed1fbeeb36e9cb60a70bbda17bb9..79593d42ef881aa96eab7ea1e50683fa48ff4896 100644
+index dc6773ac18bc36ac69e7debf15315776033702ee..adaac498f3277e645d615775d8ca8d055d6d6652 100644
 --- a/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java
 +++ b/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java
 @@ -38,7 +38,7 @@ public class EntityDataSerializers {
@@ -34,7 +34,7 @@ index 523a4963b644cec57c7338cdda72b5e17247f49a..715b49e5e00231e7bd4270534039d520
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 49718f6fbdd4ffe38afe4b5001d9de69097976f4..8a393cc4165c2aec51dcb26f7447dcc796528241 100644
+index 2aefacac58212d9ba76cf449455241d9c1fd36db..1074ce38a92231bf6c08b1b8e4332dec7b1e04e9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3137,7 +3137,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0762-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0762-Hide-unnecessary-itemmeta-from-clients.patch
index 50e17c3dd9..69a4e5bc16 100644
--- a/patches/server/0762-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/unapplied/server/0762-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index 715b49e5e00231e7bd4270534039d520b6549c72..036d7478c477ce1e794b8311d94f47c4
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f9e2392e705a0168b9dc359313e68cbca08b2d3a..2db7071d80a2d288d864ae32f250435d63b5ac45 100644
+index eab752600a2711a73516fa029b8eca17d52fde3c..3ba1af93aabbaa635aae60977abe1ed3f1474044 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2817,8 +2817,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -33,7 +33,7 @@ index f9e2392e705a0168b9dc359313e68cbca08b2d3a..2db7071d80a2d288d864ae32f250435d
                              }
                          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8a393cc4165c2aec51dcb26f7447dcc796528241..8bf7d54cbdbc1dc2ec0482855d7f531b2dc648be 100644
+index 1074ce38a92231bf6c08b1b8e4332dec7b1e04e9..6b01f56aadda10a89796f2b017d0fca3e10dfd98 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3139,7 +3139,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0763-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0763-Fix-Spigot-growth-modifiers.patch
index 19101d5d5c..19101d5d5c 100644
--- a/patches/server/0763-Fix-Spigot-growth-modifiers.patch
+++ b/patches/unapplied/server/0763-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/unapplied/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0765-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0765-Add-PlayerItemFrameChangeEvent.patch
index f9ce7fc78c..f9ce7fc78c 100644
--- a/patches/server/0765-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/unapplied/server/0765-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0766-Add-player-health-update-API.patch b/patches/unapplied/server/0766-Add-player-health-update-API.patch
index f1b7503350..f1b7503350 100644
--- a/patches/server/0766-Add-player-health-update-API.patch
+++ b/patches/unapplied/server/0766-Add-player-health-update-API.patch
diff --git a/patches/server/0767-Optimize-HashMapPalette.patch b/patches/unapplied/server/0767-Optimize-HashMapPalette.patch
index 52a28a4fd3..52a28a4fd3 100644
--- a/patches/server/0767-Optimize-HashMapPalette.patch
+++ b/patches/unapplied/server/0767-Optimize-HashMapPalette.patch
diff --git a/patches/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch
index 5f4bbbd767..5f4bbbd767 100644
--- a/patches/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/unapplied/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 4053b40c49..7a1080497f 100644
--- a/patches/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/unapplied/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1471,7 +1471,7 @@ index 56d94c94fb0d4dc468bb5d69be655ddd5c6b5360..d7d396ad73866a97cd9f63b34ad8c587
  
      List<VoxelShape> getEntityCollisions(@Nullable Entity entity, AABB box);
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index c0817ef8927f00e2fd3fbf3289f8041fcb494049..3f458ddd4dc04ed28510a212be76bb19e7f6a61e 100644
+index e994db4f81bb94b2e5e8e142e01c05e90a09fa26..87beea39636b641dc5b46c2755a00285b7671ac5 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
 @@ -49,7 +49,7 @@ public interface EntityGetter {
diff --git a/patches/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch
index 3637b95a07..8596577e59 100644
--- a/patches/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/unapplied/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2db7071d80a2d288d864ae32f250435d63b5ac45..1962550a1d8ca5302025438d95e1e50eeb3e2f68 100644
+index 3ba1af93aabbaa635aae60977abe1ed3f1474044..d4a9c03c557c14069a0227363c61c36977f3eae7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -655,7 +655,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index ffb998758e..ffb998758e 100644
--- a/patches/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/unapplied/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0772-Update-Log4j.patch b/patches/unapplied/server/0772-Update-Log4j.patch
index a37693cff0..a37693cff0 100644
--- a/patches/server/0772-Update-Log4j.patch
+++ b/patches/unapplied/server/0772-Update-Log4j.patch
diff --git a/patches/server/0773-Add-more-Campfire-API.patch b/patches/unapplied/server/0773-Add-more-Campfire-API.patch
index 5381096620..5381096620 100644
--- a/patches/server/0773-Add-more-Campfire-API.patch
+++ b/patches/unapplied/server/0773-Add-more-Campfire-API.patch
diff --git a/patches/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index b7ed484259..c5bfc50ff7 100644
--- a/patches/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/unapplied/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
@@ -8,7 +8,7 @@ This ensures at least a valid version of the chunk exists
 on disk, even if outdated
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 8ff8855c5267379b3a5f5d8baa4a275ffee2c4bf..fc3442b4c7e1f22080fe6bf36d4fade162d6709e 100644
+index 9bae47f99336c377beb72c4b50b7f01cb4db15da..dcfe090c269d4cbcc2eb1b6f85392848bb34656c 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -1004,6 +1004,9 @@ public class RegionFile implements AutoCloseable {
diff --git a/patches/server/0775-Fix-tripwire-state-inconsistency.patch b/patches/unapplied/server/0775-Fix-tripwire-state-inconsistency.patch
index eba71d4136..eba71d4136 100644
--- a/patches/server/0775-Fix-tripwire-state-inconsistency.patch
+++ b/patches/unapplied/server/0775-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/unapplied/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch
index 1f9012a293..1f9012a293 100644
--- a/patches/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/unapplied/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0777-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0777-Forward-CraftEntity-in-teleport-command.patch
index 4c29f6a838..4c29f6a838 100644
--- a/patches/server/0777-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/unapplied/server/0777-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0778-Improve-scoreboard-entries.patch b/patches/unapplied/server/0778-Improve-scoreboard-entries.patch
index 2a65cbf36c..2a65cbf36c 100644
--- a/patches/server/0778-Improve-scoreboard-entries.patch
+++ b/patches/unapplied/server/0778-Improve-scoreboard-entries.patch
diff --git a/patches/server/0779-Entity-powdered-snow-API.patch b/patches/unapplied/server/0779-Entity-powdered-snow-API.patch
index a49f65775c..a49f65775c 100644
--- a/patches/server/0779-Entity-powdered-snow-API.patch
+++ b/patches/unapplied/server/0779-Entity-powdered-snow-API.patch
diff --git a/patches/server/0780-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0780-Add-API-for-item-entity-health.patch
index 8375a2aaa5..8375a2aaa5 100644
--- a/patches/server/0780-Add-API-for-item-entity-health.patch
+++ b/patches/unapplied/server/0780-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch
index 4e3235ade3..4e3235ade3 100644
--- a/patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/unapplied/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0782-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0782-Configurable-max-block-light-for-monster-spawning.patch
index baf913d352..baf913d352 100644
--- a/patches/server/0782-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/unapplied/server/0782-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 698fbc2d5e..698fbc2d5e 100644
--- a/patches/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/unapplied/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch
index 768bf70b1f..768bf70b1f 100644
--- a/patches/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/unapplied/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/unapplied/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0786-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0786-Fix-bees-aging-inside-hives.patch
index 2be01a557c..2be01a557c 100644
--- a/patches/server/0786-Fix-bees-aging-inside-hives.patch
+++ b/patches/unapplied/server/0786-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0787-Bucketable-API.patch b/patches/unapplied/server/0787-Bucketable-API.patch
index ff1194970a..ff1194970a 100644
--- a/patches/server/0787-Bucketable-API.patch
+++ b/patches/unapplied/server/0787-Bucketable-API.patch
diff --git a/patches/server/0788-Validate-usernames.patch b/patches/unapplied/server/0788-Validate-usernames.patch
index 114e581a31..114e581a31 100644
--- a/patches/server/0788-Validate-usernames.patch
+++ b/patches/unapplied/server/0788-Validate-usernames.patch
diff --git a/patches/server/0789-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0789-Make-water-animal-spawn-height-configurable.patch
index dea45f0b70..dea45f0b70 100644
--- a/patches/server/0789-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/unapplied/server/0789-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 63a0b01416..69fe5912b1 100644
--- a/patches/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/unapplied/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -18,7 +18,7 @@ index 75651db840072806bb4ef15c4de370fdf6b46c05..2699381f72ff00bb0a9711e3b286e820
                  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 ed3f27e605a6d9454953a6fd8b0e784b1b89acf3..94961c271b4fc1b8b2b6c4d35e9c2ac685ac3268 100644
+index 6a264ba85ca10f34ccda5287f8c2c4d492413ae9..74440a86dd163d5d624b483a5a8b2b993d53e2fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1212,7 +1212,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch
index de155852d0..de155852d0 100644
--- a/patches/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/unapplied/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/unapplied/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0793-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0793-Multiple-Entries-with-Scoreboards.patch
index b644176ac9..b644176ac9 100644
--- a/patches/server/0793-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/unapplied/server/0793-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0794-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0794-Reset-placed-block-on-exception.patch
index 3881c0d6de..3881c0d6de 100644
--- a/patches/server/0794-Reset-placed-block-on-exception.patch
+++ b/patches/unapplied/server/0794-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0795-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0795-Add-configurable-height-for-slime-spawn.patch
index a05bae35ee..a05bae35ee 100644
--- a/patches/server/0795-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/unapplied/server/0795-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 068c0bd9fe..068c0bd9fe 100644
--- a/patches/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0797-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0797-Fix-xp-reward-for-baby-zombies.patch
index a9cae82e96..e5cc876754 100644
--- a/patches/server/0797-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/unapplied/server/0797-Fix-xp-reward-for-baby-zombies.patch
@@ -9,7 +9,7 @@ so this resets it after each call to
 Zombie#getExperienceReward
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index c5b6236c58485351fb2866197b55d2c8809105c7..dc9402e343d3bc0b0d38e3a7834521a976f89c39 100644
+index bbaf3e5d29814ce49de68be63411517de3fd320f..e0e16d3b4ba0afc3cfc66b93ecf5f889599f48dd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -173,11 +173,16 @@ public class Zombie extends Monster {
diff --git a/patches/server/0798-Kick-on-main-for-illegal-chat.patch b/patches/unapplied/server/0798-Kick-on-main-for-illegal-chat.patch
index 565db94e11..57f7fe897f 100644
--- a/patches/server/0798-Kick-on-main-for-illegal-chat.patch
+++ b/patches/unapplied/server/0798-Kick-on-main-for-illegal-chat.patch
@@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1962550a1d8ca5302025438d95e1e50eeb3e2f68..f138aef5182724aaa87d526172cacb9cc248006f 100644
+index d4a9c03c557c14069a0227363c61c36977f3eae7..913ef8c087aea0dbb1e9cd7bcbfd4c2397cb301f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2175,7 +2175,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0799-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0799-Multi-Block-Change-API-Implementation.patch
index 30c5c1fc43..30c5c1fc43 100644
--- a/patches/server/0799-Multi-Block-Change-API-Implementation.patch
+++ b/patches/unapplied/server/0799-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0800-Fix-NotePlayEvent.patch b/patches/unapplied/server/0800-Fix-NotePlayEvent.patch
index f870090c76..f870090c76 100644
--- a/patches/server/0800-Fix-NotePlayEvent.patch
+++ b/patches/unapplied/server/0800-Fix-NotePlayEvent.patch
diff --git a/patches/server/0801-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0801-Freeze-Tick-Lock-API.patch
index 0c279ca9c2..0c279ca9c2 100644
--- a/patches/server/0801-Freeze-Tick-Lock-API.patch
+++ b/patches/unapplied/server/0801-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0802-Dolphin-API.patch b/patches/unapplied/server/0802-Dolphin-API.patch
index 7b62597b9e..7b62597b9e 100644
--- a/patches/server/0802-Dolphin-API.patch
+++ b/patches/unapplied/server/0802-Dolphin-API.patch
diff --git a/patches/server/0803-More-PotionEffectType-API.patch b/patches/unapplied/server/0803-More-PotionEffectType-API.patch
index 5d8c4415d3..5d8c4415d3 100644
--- a/patches/server/0803-More-PotionEffectType-API.patch
+++ b/patches/unapplied/server/0803-More-PotionEffectType-API.patch
diff --git a/patches/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 02ee15a8e1..02ee15a8e1 100644
--- a/patches/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/unapplied/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch
index ea80c8f423..72e18036d6 100644
--- a/patches/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/unapplied/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 94961c271b4fc1b8b2b6c4d35e9c2ac685ac3268..cabcddbf3f3db301a0827767b1f8917d011b8ae7 100644
+index 74440a86dd163d5d624b483a5a8b2b993d53e2fb..9ff71bff0d67a46a4e1317daa918809136885a66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1990,6 +1990,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0806-Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/0806-Add-missing-structure-set-seed-configs.patch
index e5ee2d2e6e..e5ee2d2e6e 100644
--- a/patches/server/0806-Add-missing-structure-set-seed-configs.patch
+++ b/patches/unapplied/server/0806-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0807-Implement-regenerateChunk.patch b/patches/unapplied/server/0807-Implement-regenerateChunk.patch
index b37120e7aa..b37120e7aa 100644
--- a/patches/server/0807-Implement-regenerateChunk.patch
+++ b/patches/unapplied/server/0807-Implement-regenerateChunk.patch
diff --git a/patches/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch
index c6754ee3e6..cbc7d7ec3b 100644
--- a/patches/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/unapplied/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch
@@ -20,7 +20,7 @@ index 00d31df5ba7e147b4b969a89cfc2b5088a988169..62d6c5b7590ff4faef5d8c7a8be03155
                                  }
                                  return InteractionResult.FAIL;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 5c987e863a6ef257caebf8321fa3048dfc7a93c5..67626e7faa4d0854d31b41c0a702edbeb6ce4270 100644
+index 8ed905d4ef43e2314c64758d0ed075cb969a075c..0611db371b013738a88e5a6c61623a77ea15652e 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -337,7 +337,7 @@ public final class ItemStack {
diff --git a/patches/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 68fab906bc..98cfb96a13 100644
--- a/patches/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/unapplied/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ 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 cabcddbf3f3db301a0827767b1f8917d011b8ae7..08b171f08313da411a6ab036851b4435963477f4 100644
+index 9ff71bff0d67a46a4e1317daa918809136885a66..1c2c848edcd95f1d187d9036852b08887fdbf311 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2164,6 +2164,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0810-Add-GameEvent-tags.patch b/patches/unapplied/server/0810-Add-GameEvent-tags.patch
index ee6eeb562d..f7ebc617b1 100644
--- a/patches/server/0810-Add-GameEvent-tags.patch
+++ b/patches/unapplied/server/0810-Add-GameEvent-tags.patch
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 08b171f08313da411a6ab036851b4435963477f4..07fab4c97e0a873b2a81ad9fd3a3f97cbb6a92f3 100644
+index 1c2c848edcd95f1d187d9036852b08887fdbf311..049ce463c8da4f0730edf5a03439685eb547433e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2575,6 +2575,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index b4cc8be55d..b4cc8be55d 100644
--- a/patches/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/unapplied/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0812-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0812-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0812-Furnace-RecipesUsed-API.patch
+++ b/patches/unapplied/server/0812-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0813-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0813-Configurable-sculk-sensor-listener-range.patch
index 4a7b42cb63..4a7b42cb63 100644
--- a/patches/server/0813-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/unapplied/server/0813-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0814-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/0814-Add-missing-block-data-mins-and-maxes.patch
index 83ba5f6bc1..83ba5f6bc1 100644
--- a/patches/server/0814-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/unapplied/server/0814-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 1b7232e838..1b7232e838 100644
--- a/patches/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/unapplied/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0816-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0816-Put-world-into-worldlist-before-initing-the-world.patch
index cb8234093b..c134a0186b 100644
--- a/patches/server/0816-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/unapplied/server/0816-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,7 +23,7 @@ index 8ac653bbf61015a38343d54f1009c1d935833546..b3e272bf7329a17094850e2fac9ee0c6
  
              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 07fab4c97e0a873b2a81ad9fd3a3f97cbb6a92f3..d577623aef69a0b93946301a6500e9009b9b4ab6 100644
+index 049ce463c8da4f0730edf5a03439685eb547433e..793eae3ab4d144b90ad01099a2c0e90afc53a641 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1241,10 +1241,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0817-Fix-Entity-Position-Desync.patch b/patches/unapplied/server/0817-Fix-Entity-Position-Desync.patch
index 497ef1b0d3..497ef1b0d3 100644
--- a/patches/server/0817-Fix-Entity-Position-Desync.patch
+++ b/patches/unapplied/server/0817-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0818-Custom-Potion-Mixes.patch b/patches/unapplied/server/0818-Custom-Potion-Mixes.patch
index ecd6b788a4..8dc7e8dad6 100644
--- a/patches/server/0818-Custom-Potion-Mixes.patch
+++ b/patches/unapplied/server/0818-Custom-Potion-Mixes.patch
@@ -164,7 +164,7 @@ index 3d688e334c7287f41460bd866bfd1155e8bb55d2..55006724ccec9f3de828ec18693728e9
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d577623aef69a0b93946301a6500e9009b9b4ab6..5522f9ef3416c666447b466c6aecc2b6e37dd5a5 100644
+index 793eae3ab4d144b90ad01099a2c0e90afc53a641..f26ef8db95292a73e99b0cbb2c25128087ff9346 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -285,6 +285,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0819-Fix-Fluid-tags-isTagged-method.patch b/patches/unapplied/server/0819-Fix-Fluid-tags-isTagged-method.patch
index b683c49c88..c772a627d9 100644
--- a/patches/server/0819-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/unapplied/server/0819-Fix-Fluid-tags-isTagged-method.patch
@@ -18,7 +18,7 @@ index 89cb1ec575c0f58e9934d98b056621348dbbe27a..cdd474e9b0363641839a66d3e61fec46
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index d0c3b2582aba507dce69eb91d6c0803a4bb6ea06..747a6bfdf5555d82a07e55e600ae59d8172704bf 100644
+index 2f71e549c5c3f7e8ebfd10a7b0c8601fcc1d9c49..f833213ce3aceffa7771e55659987e126e28cf50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -206,7 +206,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0820-Force-close-world-loading-screen.patch b/patches/unapplied/server/0820-Force-close-world-loading-screen.patch
index 39175a5fa9..39175a5fa9 100644
--- a/patches/server/0820-Force-close-world-loading-screen.patch
+++ b/patches/unapplied/server/0820-Force-close-world-loading-screen.patch
diff --git a/patches/server/0821-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0821-Fix-falling-block-spawn-methods.patch
index bda70a2684..27b804ce28 100644
--- a/patches/server/0821-Fix-falling-block-spawn-methods.patch
+++ b/patches/unapplied/server/0821-Fix-falling-block-spawn-methods.patch
@@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index d1fca0e3227b5f37c11367548be362f5a49b6a71..5628940cd3c3566c5db2beda506d4f20b6e3cbae 100644
+index 11ee6a2b264b570b61facec5625f6257259432bd..4f7fa1d7b7f90c8326011f58825b4cca0da152bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -566,7 +566,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0822-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0822-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0822-Expose-furnace-minecart-push-values.patch
+++ b/patches/unapplied/server/0822-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index c025095487..c025095487 100644
--- a/patches/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/unapplied/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0824-More-Projectile-API.patch b/patches/unapplied/server/0824-More-Projectile-API.patch
index 9a64f36f82..9a64f36f82 100644
--- a/patches/server/0824-More-Projectile-API.patch
+++ b/patches/unapplied/server/0824-More-Projectile-API.patch
diff --git a/patches/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch
index ae8f7dbdb2..ae8f7dbdb2 100644
--- a/patches/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/unapplied/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index e445bd19dc..0d7894a11f 100644
--- a/patches/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/unapplied/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f138aef5182724aaa87d526172cacb9cc248006f..c29e3d867a4a4ed30a075c07cfafc58d21b6e709 100644
+index 913ef8c087aea0dbb1e9cd7bcbfd4c2397cb301f..cf5ef052a262a910ed5348ba83ccf9274450a030 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -585,6 +585,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0827-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0827-Implement-getComputedBiome-API.patch
index b6a274bb77..3653f116c2 100644
--- a/patches/server/0827-Implement-getComputedBiome-API.patch
+++ b/patches/unapplied/server/0827-Implement-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ 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 5628940cd3c3566c5db2beda506d4f20b6e3cbae..6445c2e4c97860e1c98f5263188d309cf55936f0 100644
+index 4f7fa1d7b7f90c8326011f58825b4cca0da152bc..d5cc47eb1fd1ea9a0638827483b03165f6a7e10c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -211,6 +211,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0828-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0828-Make-some-itemstacks-nonnull.patch
index e2cba95fe4..e2cba95fe4 100644
--- a/patches/server/0828-Make-some-itemstacks-nonnull.patch
+++ b/patches/unapplied/server/0828-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/unapplied/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
index fe6855e900..fe6855e900 100644
--- a/patches/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
+++ b/patches/unapplied/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0830-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0830-Implement-enchantWithLevels-API.patch
index 92dab8814e..92dab8814e 100644
--- a/patches/server/0830-Implement-enchantWithLevels-API.patch
+++ b/patches/unapplied/server/0830-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0831-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0831-Fix-saving-in-unloadWorld.patch
index 295a67bcb6..57b7aaeaf9 100644
--- a/patches/server/0831-Fix-saving-in-unloadWorld.patch
+++ b/patches/unapplied/server/0831-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ 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 5522f9ef3416c666447b466c6aecc2b6e37dd5a5..962d3fb3479047f798f6392d7f4e1983ee6d001e 100644
+index f26ef8db95292a73e99b0cbb2c25128087ff9346..acb82138d7b375dc7ef1e02e63a60c8d420995eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1289,7 +1289,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0832-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0832-Buffer-OOB-setBlock-calls.patch
index 62e5606e17..62e5606e17 100644
--- a/patches/server/0832-Buffer-OOB-setBlock-calls.patch
+++ b/patches/unapplied/server/0832-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0833-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0833-Add-TameableDeathMessageEvent.patch
index 8bbbaffa2c..8bbbaffa2c 100644
--- a/patches/server/0833-Add-TameableDeathMessageEvent.patch
+++ b/patches/unapplied/server/0833-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 148ebd96e8..148ebd96e8 100644
--- a/patches/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/unapplied/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 69f3bac97a..69f3bac97a 100644
--- a/patches/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/unapplied/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch
index ed69a224f1..ed69a224f1 100644
--- a/patches/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/unapplied/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0837-Guard-against-invalid-entity-positions.patch b/patches/unapplied/server/0837-Guard-against-invalid-entity-positions.patch
index 79d45fd9ba..79d45fd9ba 100644
--- a/patches/server/0837-Guard-against-invalid-entity-positions.patch
+++ b/patches/unapplied/server/0837-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0838-cache-resource-keys.patch b/patches/unapplied/server/0838-cache-resource-keys.patch
index 4234b8673f..4234b8673f 100644
--- a/patches/server/0838-cache-resource-keys.patch
+++ b/patches/unapplied/server/0838-cache-resource-keys.patch
diff --git a/patches/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/unapplied/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 8dde383d5e..8dde383d5e 100644
--- a/patches/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/unapplied/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 9ef13e101f..9ef13e101f 100644
--- a/patches/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/unapplied/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/unapplied/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index 55e32b5b6d..55e32b5b6d 100644
--- a/patches/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/unapplied/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0842-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0842-Prevent-tile-entity-copies-loading-chunks.patch
index afc63fb49b..efde8a8da3 100644
--- a/patches/server/0842-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/unapplied/server/0842-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c29e3d867a4a4ed30a075c07cfafc58d21b6e709..e2860b34354d374bc02f874eae5436d3d0c9a84e 100644
+index cf5ef052a262a910ed5348ba83ccf9274450a030..e783dbe494b85928d67a0490a664e4b7dbef832c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3412,7 +3412,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 73130dbdc1..73130dbdc1 100644
--- a/patches/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/unapplied/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/unapplied/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 951baf9062..951baf9062 100644
--- a/patches/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/unapplied/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/unapplied/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch
index 63a579eb9e..c48bca0b63 100644
--- a/patches/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/unapplied/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index c399aaeee89e12a7da4e054acd877fe033676dfd..ff3eced0e20c39b825586897ee2fed01
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e2860b34354d374bc02f874eae5436d3d0c9a84e..86e0853ac450bdd9a5478a6edb8ebc490133066c 100644
+index e783dbe494b85928d67a0490a664e4b7dbef832c..7ef7a9203f6376cd13e6a9803dd01522d217f700 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3008,7 +3008,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -31,7 +31,7 @@ index e2860b34354d374bc02f874eae5436d3d0c9a84e..86e0853ac450bdd9a5478a6edb8ebc49
                  }
                  break;
 diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index 3c93bfeb94168f832904a8462ae23b06e81e080d..468c635d31cfa8051666bbefce8df4b448e9ed93 100644
+index 392ab42d3c4fa6ef1815279a02b1fce236f725fa..2c500cfdd594e24b039d698bced1f9f9537722e3 100644
 --- a/src/main/java/net/minecraft/world/level/GameRules.java
 +++ b/src/main/java/net/minecraft/world/level/GameRules.java
 @@ -51,7 +51,7 @@ public class GameRules {
diff --git a/patches/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index fff84c5a62..7016bfb7cb 100644
--- a/patches/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/unapplied/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add pre-unbreaking amount to PlayerItemDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 67626e7faa4d0854d31b41c0a702edbeb6ce4270..c18a0bc94d0210396046f4475e49a739088593f3 100644
+index 0611db371b013738a88e5a6c61623a77ea15652e..6eda115b5cd3312123784e758b59973e0a55773c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -563,10 +563,11 @@ public final class ItemStack {
diff --git a/patches/server/0847-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0847-WorldCreator-keepSpawnLoaded.patch
index 7e5a1f094b..091473ac19 100644
--- a/patches/server/0847-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/unapplied/server/0847-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ 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 962d3fb3479047f798f6392d7f4e1983ee6d001e..252139711a2bf63449e03c5593a81f2f7ed3e7c9 100644
+index acb82138d7b375dc7ef1e02e63a60c8d420995eb..0f3156c2dd1884bc5952708636ec559307bb61ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1248,6 +1248,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/unapplied/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch
index d33dabf6c9..d33dabf6c9 100644
--- a/patches/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch
+++ b/patches/unapplied/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 86b9af2f3b..86b9af2f3b 100644
--- a/patches/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/unapplied/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 8eacb2217e..8eacb2217e 100644
--- a/patches/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/unapplied/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch
index c0fcd53f55..c0fcd53f55 100644
--- a/patches/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/unapplied/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch
index aef5bd0551..aef5bd0551 100644
--- a/patches/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/unapplied/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0853-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0853-Add-PlayerStopUsingItemEvent.patch
index e707eaac32..7480a44cc6 100644
--- a/patches/server/0853-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/unapplied/server/0853-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 38a07f42c339d57f96ec4ff502c810f8367a5c11..2dc3c151192d755e5e518ada9e79c9eb378423c7 100644
+index 655253c267925a704e55abe23f1142c15ecb8d2e..5463b2fd9fdb8c979baa49479e3dbd7eb2d6dda7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3949,6 +3949,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0854-FallingBlock-auto-expire-setting.patch b/patches/unapplied/server/0854-FallingBlock-auto-expire-setting.patch
index 59902948f9..59902948f9 100644
--- a/patches/server/0854-FallingBlock-auto-expire-setting.patch
+++ b/patches/unapplied/server/0854-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0855-Don-t-tick-markers.patch b/patches/unapplied/server/0855-Don-t-tick-markers.patch
index c9c696b68a..c9c696b68a 100644
--- a/patches/server/0855-Don-t-tick-markers.patch
+++ b/patches/unapplied/server/0855-Don-t-tick-markers.patch
diff --git a/patches/server/0856-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0856-Do-not-accept-invalid-client-settings.patch
index 4f7fd70440..ab175a55c1 100644
--- a/patches/server/0856-Do-not-accept-invalid-client-settings.patch
+++ b/patches/unapplied/server/0856-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 86e0853ac450bdd9a5478a6edb8ebc490133066c..a630bc98e5cfb82c1a706214344c4d73d9fc6c1a 100644
+index 7ef7a9203f6376cd13e6a9803dd01522d217f700..7a46f1148216102dc02b9a3e74b9113cb285a89d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3591,6 +3591,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0857-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0857-Add-support-for-Proxy-Protocol.patch
index 031bd56593..031bd56593 100644
--- a/patches/server/0857-Add-support-for-Proxy-Protocol.patch
+++ b/patches/unapplied/server/0857-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch
index b11ce011a5..b11ce011a5 100644
--- a/patches/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/unapplied/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/unapplied/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0860-Sanitize-Sent-BlockEntity-NBT.patch b/patches/unapplied/server/0860-Sanitize-Sent-BlockEntity-NBT.patch
index fb3c8b1818..fb3c8b1818 100644
--- a/patches/server/0860-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/unapplied/server/0860-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0861-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0861-Prevent-entity-loading-causing-async-lookups.patch
index dffa5fc768..dffa5fc768 100644
--- a/patches/server/0861-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/unapplied/server/0861-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0862-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0862-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0862-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/unapplied/server/0862-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0863-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0863-Throw-exception-on-world-create-while-being-ticked.patch
index 01dcadbd3d..06f8f3032b 100644
--- a/patches/server/0863-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/unapplied/server/0863-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,7 +45,7 @@ index 300f6af9e01ce966ca03110c444139f1ae7e691c..5113e04bae5b1a1944b3e80889d99859
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 252139711a2bf63449e03c5593a81f2f7ed3e7c9..f511e3824d59a8de3ab00737ffc98147742964e5 100644
+index 0f3156c2dd1884bc5952708636ec559307bb61ba..36239f5c3074a2043442bd0d76a7d6ab68c67020 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -855,6 +855,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0864-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/0864-Add-Alternate-Current-redstone-implementation.patch
index bfbb29cf4e..bfbb29cf4e 100644
--- a/patches/server/0864-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/unapplied/server/0864-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0865-Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/0865-Dont-resent-entity-on-art-update.patch
index ff4ac47ad6..ff4ac47ad6 100644
--- a/patches/server/0865-Dont-resent-entity-on-art-update.patch
+++ b/patches/unapplied/server/0865-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0866-Add-missing-spawn-eggs.patch b/patches/unapplied/server/0866-Add-missing-spawn-eggs.patch
index ba88344787..a23528037d 100644
--- a/patches/server/0866-Add-missing-spawn-eggs.patch
+++ b/patches/unapplied/server/0866-Add-missing-spawn-eggs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing spawn eggs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index ce64286ac5b836283318ac1ac0bd4afb29db9bb7..09b6475b77ebc7f43c13861aa2af26e2f6e6a8b5 100644
+index 8e5bc2bf5fed1f70a9fdcdeb4b23468aa0c7fb8e..760628349ca1ba49d660485b01492cdec7411d72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -196,6 +196,12 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/patches/server/0867-Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/0867-Add-WardenAngerChangeEvent.patch
index cfe1a98c72..cfe1a98c72 100644
--- a/patches/server/0867-Add-WardenAngerChangeEvent.patch
+++ b/patches/unapplied/server/0867-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0868-Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/0868-Add-option-for-strict-advancement-dimension-checks.patch
index 8ac83721d0..8ac83721d0 100644
--- a/patches/server/0868-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/unapplied/server/0868-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0869-Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/0869-Add-missing-important-BlockStateListPopulator-method.patch
index 2296cce864..2296cce864 100644
--- a/patches/server/0869-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/unapplied/server/0869-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0870-Nameable-Banner-API.patch b/patches/unapplied/server/0870-Nameable-Banner-API.patch
index 78f176be32..78f176be32 100644
--- a/patches/server/0870-Nameable-Banner-API.patch
+++ b/patches/unapplied/server/0870-Nameable-Banner-API.patch
diff --git a/patches/server/0871-Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/0871-Don-t-broadcast-messages-to-command-blocks.patch
index bbacc0aef4..e51d59b56b 100644
--- a/patches/server/0871-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/unapplied/server/0871-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index 7c7e5f3c0f9cd1f16192a8fc8163da9b2d9519d5..888936385196a178ab8b730fd5e4fff4
              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 f511e3824d59a8de3ab00737ffc98147742964e5..1cec39362b6f9f23c8e6c8b45f5fd254c8e08efe 100644
+index 36239f5c3074a2043442bd0d76a7d6ab68c67020..410f4f539aaca338b09e503a6828fb1954936556 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1763,7 +1763,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0872-Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/0872-Prevent-empty-items-from-being-added-to-world.patch
index 041967b493..041967b493 100644
--- a/patches/server/0872-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/unapplied/server/0872-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index ad894dbcce..ad894dbcce 100644
--- a/patches/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/unapplied/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/unapplied/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch
index f22ef382fa..b49280e498 100644
--- a/patches/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/unapplied/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a630bc98e5cfb82c1a706214344c4d73d9fc6c1a..e156be2e21e7df4fffc841dd0451dae0cf9ab57b 100644
+index 7a46f1148216102dc02b9a3e74b9113cb285a89d..2ac47839f238b547baa78fc9a2a5944e2ad17eea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2049,7 +2049,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0875-Add-Player-getFishHook.patch b/patches/unapplied/server/0875-Add-Player-getFishHook.patch
index bf5ccb5986..bf5ccb5986 100644
--- a/patches/server/0875-Add-Player-getFishHook.patch
+++ b/patches/unapplied/server/0875-Add-Player-getFishHook.patch
diff --git a/patches/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index f9cbdd0899..f9cbdd0899 100644
--- a/patches/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/unapplied/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch
index 3ba384acaf..3ba384acaf 100644
--- a/patches/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/unapplied/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/unapplied/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 3d57db549e..e57c8a6a84 100644
--- a/patches/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/unapplied/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c7f80f899ebcce306439d1fb55bbd5349f7d81a9..41b25c3d9586b114616332228e115ab4fa4336ae 100644
+index 2ac47839f238b547baa78fc9a2a5944e2ad17eea..0205fc3969c5faf92b43c2cbf274c8e0bd8bf752 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2298,7 +2298,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0879-Fix-Bee-flower-NPE.patch b/patches/unapplied/server/0879-Fix-Bee-flower-NPE.patch
index 6072e1dcc5..6072e1dcc5 100644
--- a/patches/server/0879-Fix-Bee-flower-NPE.patch
+++ b/patches/unapplied/server/0879-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 120e3881ed..71bcbceae0 100644
--- a/patches/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/unapplied/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0e803b7ee309190ebb3878df477feda190638208..4c9fc7d60ca5fc9fd65843947a4f2beb2d1acc97 100644
+index 0205fc3969c5faf92b43c2cbf274c8e0bd8bf752..0227a7df2b3a30d1c0d95acdd1b0a43f9170d19b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2589,7 +2589,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/unapplied/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch
index d26a4989f4..d26a4989f4 100644
--- a/patches/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/unapplied/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0882-More-Teleport-API.patch b/patches/unapplied/server/0882-More-Teleport-API.patch
index db6e6b1d53..db6e6b1d53 100644
--- a/patches/server/0882-More-Teleport-API.patch
+++ b/patches/unapplied/server/0882-More-Teleport-API.patch
diff --git a/patches/server/0883-Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/0883-Add-EntityPortalReadyEvent.patch
index a16122aad2..a16122aad2 100644
--- a/patches/server/0883-Add-EntityPortalReadyEvent.patch
+++ b/patches/unapplied/server/0883-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0884-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0884-Don-t-use-level-random-in-entity-constructors.patch
index 32c6071e98..32c6071e98 100644
--- a/patches/server/0884-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/unapplied/server/0884-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0885-Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/0885-Send-block-entities-after-destroy-prediction.patch
index 1dc2010d6b..4f5e9bab9e 100644
--- a/patches/server/0885-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/unapplied/server/0885-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 9378e83a67a70dbb1fb4f05b33f1e553d008e62b..5a60f5dc202c44b06ca34e9a19d45cb7
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 525183cd9b6b3a75eff3ff2512c686cca89bfa8a..e2310de1152e56ab51bff144e6c32cd4d74798a9 100644
+index a42e2cb31d636637db9f4e7edbe06acdf47d34d2..f082e121331be8aee523751a2d3f3393e3b0d02c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1874,8 +1874,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch
index d73136cc05..d73136cc05 100644
--- a/patches/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/unapplied/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0887-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/0887-Custom-Chat-Completion-Suggestions-API.patch
index 7626d4ebac..7626d4ebac 100644
--- a/patches/server/0887-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/unapplied/server/0887-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0888-Add-missing-BlockFadeEvents.patch b/patches/unapplied/server/0888-Add-missing-BlockFadeEvents.patch
index 6b887deccf..6b887deccf 100644
--- a/patches/server/0888-Add-missing-BlockFadeEvents.patch
+++ b/patches/unapplied/server/0888-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0889-Collision-API.patch b/patches/unapplied/server/0889-Collision-API.patch
index fa1ac8d2e1..fa1ac8d2e1 100644
--- a/patches/server/0889-Collision-API.patch
+++ b/patches/unapplied/server/0889-Collision-API.patch
diff --git a/patches/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 3a5bf3be59..3a5bf3be59 100644
--- a/patches/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/unapplied/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch b/patches/unapplied/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch
index abb42e37a7..06d09e04d7 100644
--- a/patches/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch
+++ b/patches/unapplied/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix command preprocess cancelling and command changing
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e2310de1152e56ab51bff144e6c32cd4d74798a9..334690049d7b74f4b001a2b1421e39a737534656 100644
+index f082e121331be8aee523751a2d3f3393e3b0d02c..ca7afdbfa936801e53e8bb0d154538bc0f042ad3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2259,13 +2259,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0892-Remove-invalid-signature-login-stacktrace.patch b/patches/unapplied/server/0892-Remove-invalid-signature-login-stacktrace.patch
index 5f564a6286..5f564a6286 100644
--- a/patches/server/0892-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/unapplied/server/0892-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/unapplied/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
index 28566014f6..7b076d8d38 100644
--- a/patches/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
+++ b/patches/unapplied/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 334690049d7b74f4b001a2b1421e39a737534656..602f78652d4e4df265e844fec4450e10443dd087 100644
+index ca7afdbfa936801e53e8bb0d154538bc0f042ad3..fddd60ab705f548e54fc741ad9c5b13fde8c852d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1757,6 +1757,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0894-Block-Ticking-API.patch b/patches/unapplied/server/0894-Block-Ticking-API.patch
index 43db29d605..43db29d605 100644
--- a/patches/server/0894-Block-Ticking-API.patch
+++ b/patches/unapplied/server/0894-Block-Ticking-API.patch
diff --git a/patches/server/0895-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0895-Add-Velocity-IP-Forwarding-Support.patch
index 8eb45338da..0f17d8b62c 100644
--- a/patches/server/0895-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/unapplied/server/0895-Add-Velocity-IP-Forwarding-Support.patch
@@ -197,7 +197,7 @@ index df1a1681cdd5f055ff4394aa6990b252a3e25ea8..4be871c79cebfa62b6d2a22674ad2cde
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1cec39362b6f9f23c8e6c8b45f5fd254c8e08efe..4212568bf8de6988c71f43d3e2152fa0fe51d0d7 100644
+index 410f4f539aaca338b09e503a6828fb1954936556..07eac5439164a7345476c55277538a152359630a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -784,7 +784,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/unapplied/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 5466a7d29f..5466a7d29f 100644
--- a/patches/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/unapplied/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0897-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/0897-Add-NamespacedKey-biome-methods.patch
index e6d06097d7..75c824ab88 100644
--- a/patches/server/0897-Add-NamespacedKey-biome-methods.patch
+++ b/patches/unapplied/server/0897-Add-NamespacedKey-biome-methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 747a6bfdf5555d82a07e55e600ae59d8172704bf..db8b186ef6586bcb9887bc3f3a94d43417eddbac 100644
+index f833213ce3aceffa7771e55659987e126e28cf50..103ab25119bfcdd21eac7e1deeac025108e3c138 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -609,6 +609,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0898-Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/0898-Fix-plugin-loggers-on-server-shutdown.patch
index 2ddeeb6b45..2ddeeb6b45 100644
--- a/patches/server/0898-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/unapplied/server/0898-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/unapplied/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch
index 15a6fed34f..306d014d73 100644
--- a/patches/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch
+++ b/patches/unapplied/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch
@@ -16,7 +16,7 @@ Co-authored-by: =?UTF-8?q?Dani=C3=ABl=20Goossens?= <[email protected]>
 Co-authored-by: Nassim Jahnke <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b9143dd8454eb3b1d628188ea11c73dec4fac949..d1edafb3e44a4d17586e0e9c4fca30389b529074 100644
+index 882820653800e0fe9e16441cb4edcd119aa2c44d..55d8ced734a408c990c6c4fbc81707bcb1f27daa 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1328,6 +1328,46 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0900-Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/0900-Stop-large-look-changes-from-crashing-the-server.patch
index 1566b53ccc..0e245c2f92 100644
--- a/patches/server/0900-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/unapplied/server/0900-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 780cff9638fe717e98a97f1241cf65337b55382c..0318c9483a4d96eb39ff4df9054a9e6398186bc3 100644
+index 5463b2fd9fdb8c979baa49479e3dbd7eb2d6dda7..763b065adee8fad24c6cc6898338ab57c6380baa 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3011,37 +3011,15 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/unapplied/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
index e5b945974c..e5b945974c 100644
--- a/patches/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
+++ b/patches/unapplied/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/unapplied/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
index 0bdc6667a6..0bdc6667a6 100644
--- a/patches/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
+++ b/patches/unapplied/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch
index 35c92f85b3..35c92f85b3 100644
--- a/patches/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/unapplied/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0904-Missing-eating-regain-reason.patch b/patches/unapplied/server/0904-Missing-eating-regain-reason.patch
index 43860b492f..43860b492f 100644
--- a/patches/server/0904-Missing-eating-regain-reason.patch
+++ b/patches/unapplied/server/0904-Missing-eating-regain-reason.patch
diff --git a/patches/server/0905-Missing-effect-cause.patch b/patches/unapplied/server/0905-Missing-effect-cause.patch
index 70a763eeb3..70a763eeb3 100644
--- a/patches/server/0905-Missing-effect-cause.patch
+++ b/patches/unapplied/server/0905-Missing-effect-cause.patch
diff --git a/patches/server/0906-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/0906-Added-byte-array-serialization-deserialization-for-P.patch
index 3553cbd00c..3553cbd00c 100644
--- a/patches/server/0906-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/unapplied/server/0906-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index bb23a6dab7..bb23a6dab7 100644
--- a/patches/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/unapplied/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0908-Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/0908-Call-BlockPhysicsEvent-more-often.patch
index 532418a20f..532418a20f 100644
--- a/patches/server/0908-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/unapplied/server/0908-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0909-Configurable-chat-thread-limit.patch b/patches/unapplied/server/0909-Configurable-chat-thread-limit.patch
index 1bb08ba4e5..1bb08ba4e5 100644
--- a/patches/server/0909-Configurable-chat-thread-limit.patch
+++ b/patches/unapplied/server/0909-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 50b3b97c87..50b3b97c87 100644
--- a/patches/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/unapplied/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0911-Set-position-before-player-sending-on-dimension-chan.patch b/patches/unapplied/server/0911-Set-position-before-player-sending-on-dimension-chan.patch
index c1c4dd1415..c1c4dd1415 100644
--- a/patches/server/0911-Set-position-before-player-sending-on-dimension-chan.patch
+++ b/patches/unapplied/server/0911-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0912-fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/0912-fix-Jigsaw-block-kicking-user.patch
index 846e244a93..846e244a93 100644
--- a/patches/server/0912-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/unapplied/server/0912-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 9e935dca74..9e935dca74 100644
--- a/patches/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/unapplied/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/unapplied/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
index 517828b9b3..517828b9b3 100644
--- a/patches/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
+++ b/patches/unapplied/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0915-Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/0915-Fix-a-bunch-of-vanilla-bugs.patch
index ec6dfdcf9c..ec6dfdcf9c 100644
--- a/patches/server/0915-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/unapplied/server/0915-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0916-Fix-nothing-mlg.patch b/patches/unapplied/server/0916-Fix-nothing-mlg.patch
index fbb19bc114..47f11ac6b1 100644
--- a/patches/server/0916-Fix-nothing-mlg.patch
+++ b/patches/unapplied/server/0916-Fix-nothing-mlg.patch
@@ -19,7 +19,7 @@ doCheckFallDamage method is meant to be called repeatedly anyway.
 Mojira-ID: MC-255653
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 602f78652d4e4df265e844fec4450e10443dd087..4ab50df1e4c855587ef030cf3f2a1502798cb721 100644
+index fddd60ab705f548e54fc741ad9c5b13fde8c852d..d31a345edfffe39f127073fc3aec8b3489bae79c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1564,6 +1564,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch
index c63066e87d..c63066e87d 100644
--- a/patches/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/unapplied/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0918-Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/0918-Fix-custom-piglin-loved-items.patch
index ae724fdce5..ae724fdce5 100644
--- a/patches/server/0918-Fix-custom-piglin-loved-items.patch
+++ b/patches/unapplied/server/0918-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0919-EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/0919-EntityPickupItemEvent-fixes.patch
index 09bd195b0c..09bd195b0c 100644
--- a/patches/server/0919-EntityPickupItemEvent-fixes.patch
+++ b/patches/unapplied/server/0919-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch
index 3c2b0a812f..3c2b0a812f 100644
--- a/patches/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/unapplied/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0921-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/0921-Add-PlayerInventorySlotChangeEvent.patch
index 3993721d66..3993721d66 100644
--- a/patches/server/0921-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/unapplied/server/0921-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0922-Elder-Guardian-appearance-API.patch b/patches/unapplied/server/0922-Elder-Guardian-appearance-API.patch
index 10303d5e44..10303d5e44 100644
--- a/patches/server/0922-Elder-Guardian-appearance-API.patch
+++ b/patches/unapplied/server/0922-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0923-Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/server/0923-Allow-changing-bed-s-occupied-property.patch
index 4d0128b6d3..4d0128b6d3 100644
--- a/patches/server/0923-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/unapplied/server/0923-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0924-Add-entity-knockback-API.patch b/patches/unapplied/server/0924-Add-entity-knockback-API.patch
index 45833587c9..45833587c9 100644
--- a/patches/server/0924-Add-entity-knockback-API.patch
+++ b/patches/unapplied/server/0924-Add-entity-knockback-API.patch
diff --git a/patches/server/0925-Detect-headless-JREs.patch b/patches/unapplied/server/0925-Detect-headless-JREs.patch
index 42bb718a84..42bb718a84 100644
--- a/patches/server/0925-Detect-headless-JREs.patch
+++ b/patches/unapplied/server/0925-Detect-headless-JREs.patch
diff --git a/patches/server/0926-fixed-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/0926-fixed-entity-vehicle-collision-event-not-called.patch
index 38afe823d5..38afe823d5 100644
--- a/patches/server/0926-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/unapplied/server/0926-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0927-optimized-dirt-and-snow-spreading.patch b/patches/unapplied/server/0927-optimized-dirt-and-snow-spreading.patch
index a146caa330..a146caa330 100644
--- a/patches/server/0927-optimized-dirt-and-snow-spreading.patch
+++ b/patches/unapplied/server/0927-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0928-Added-EntityToggleSitEvent.patch b/patches/unapplied/server/0928-Added-EntityToggleSitEvent.patch
index 8c73e84a97..8c73e84a97 100644
--- a/patches/server/0928-Added-EntityToggleSitEvent.patch
+++ b/patches/unapplied/server/0928-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0929-Add-fire-tick-delay-option.patch b/patches/unapplied/server/0929-Add-fire-tick-delay-option.patch
index 8fc456cff3..8fc456cff3 100644
--- a/patches/server/0929-Add-fire-tick-delay-option.patch
+++ b/patches/unapplied/server/0929-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0930-Add-Moving-Piston-API.patch b/patches/unapplied/server/0930-Add-Moving-Piston-API.patch
index 53df041ba1..53df041ba1 100644
--- a/patches/server/0930-Add-Moving-Piston-API.patch
+++ b/patches/unapplied/server/0930-Add-Moving-Piston-API.patch
diff --git a/patches/server/0931-Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/0931-Ignore-impossible-spawn-tick.patch
index 47caf4baae..d4837fbbbb 100644
--- a/patches/server/0931-Ignore-impossible-spawn-tick.patch
+++ b/patches/unapplied/server/0931-Ignore-impossible-spawn-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ignore impossible spawn tick
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 8d403b4a6db98cc5c3851d5f2c485560cf8b412f..6dea3a2a72e41e125f715dc9e364d48896056e3b 100644
+index 572982353530663825ab2d576c3277197a5715a3..641709c3a2575dbe79165beff814cb77fa7dbdc1 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -77,6 +77,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/unapplied/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch
index 79d456a58f..79d456a58f 100644
--- a/patches/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/unapplied/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/unapplied/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index af543e8884..af543e8884 100644
--- a/patches/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/unapplied/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 9966a92fd8..9966a92fd8 100644
--- a/patches/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/unapplied/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0935-Prevent-compass-from-loading-chunks.patch b/patches/unapplied/server/0935-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0935-Prevent-compass-from-loading-chunks.patch
+++ b/patches/unapplied/server/0935-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0936-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/0936-Add-PrePlayerAttackEntityEvent.patch
index 91701c9d7c..e638e36961 100644
--- a/patches/server/0936-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/unapplied/server/0936-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9b131f0a827413e9f5d6d0f7491c5481576cb8b1..55bdf4f91be6750dcfd0589c566fbefde4512a1e 100644
+index 4b2495aed39450eb148627a0787848fd7c35f1f9..0ea101f155936f7c340d9e1d1077c58b72551027 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1251,8 +1251,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0937-ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/0937-ensure-reset-EnderDragon-boss-event-name.patch
index badeccb935..badeccb935 100644
--- a/patches/server/0937-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/unapplied/server/0937-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0938-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/unapplied/server/0938-fix-MC-252817-green-map-markers-do-not-disappear.patch
index e7b699f71a..e7b699f71a 100644
--- a/patches/server/0938-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/unapplied/server/0938-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0939-Reorder-bukkit-damage-source-entity-for-explosion-to.patch b/patches/unapplied/server/0939-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
index 02210d5628..02210d5628 100644
--- a/patches/server/0939-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
+++ b/patches/unapplied/server/0939-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
diff --git a/patches/server/0940-Fix-MC-121048.patch b/patches/unapplied/server/0940-Fix-MC-121048.patch
index 44f771024d..14dc0be713 100644
--- a/patches/server/0940-Fix-MC-121048.patch
+++ b/patches/unapplied/server/0940-Fix-MC-121048.patch
@@ -9,7 +9,7 @@ clear the CombatTracker if the entity is dead. This fixes death messages
 such as the "doomed to fall" messages.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..c6cbf02c784d4b0a39c61cd65e777fe04e3c3772 100644
+index 763b065adee8fad24c6cc6898338ab57c6380baa..b4095a3e97e0d7f6fce66869bd88083c9c0cdbe5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2194,8 +2194,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0941-Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/0941-Add-Player-Warden-Warning-API.patch
index 143bc33db5..143bc33db5 100644
--- a/patches/server/0941-Add-Player-Warden-Warning-API.patch
+++ b/patches/unapplied/server/0941-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0942-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/0942-More-vanilla-friendly-methods-to-update-trades.patch
index 892c367765..892c367765 100644
--- a/patches/server/0942-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/unapplied/server/0942-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0943-Add-paper-dumplisteners-command.patch b/patches/unapplied/server/0943-Add-paper-dumplisteners-command.patch
index c59dba6293..c59dba6293 100644
--- a/patches/server/0943-Add-paper-dumplisteners-command.patch
+++ b/patches/unapplied/server/0943-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0944-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0944-check-global-player-list-where-appropriate.patch
index e7d6c0b3bb..6056385e15 100644
--- a/patches/server/0944-check-global-player-list-where-appropriate.patch
+++ b/patches/unapplied/server/0944-check-global-player-list-where-appropriate.patch
@@ -22,7 +22,7 @@ index cc291b58292d33613a639650a6c55293603bb6e5..79aa3374fd47cd57d2e0810bb5afebbd
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3bfa0c6a0d82ed980b3289051892a6d1745ebb69..529d4805d841beec9aaff57b0184d8313fad01c3 100644
+index b4095a3e97e0d7f6fce66869bd88083c9c0cdbe5..fb6fd9357f665a001238384475a9b674715700ba 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3584,7 +3584,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch
index 1a320a8e57..e0d0af6a08 100644
--- a/patches/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/unapplied/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch
@@ -17,7 +17,7 @@ index 80c1e0e47818486a68e0114b063395290365346b..0d3587e2d454fb0994ecff930b5e496a
                  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 62bca85da6c5d9877e21fecb702370506ddf671c..c73468450bfe23e6f3a99d15c3e39a2a1ddf0c77 100644
+index afa802987f96e7d0c5f28d26b759e36edf34b8f4..32865ef1903a5e499b27c82fd5be90aa084744cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -372,10 +372,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0946-ItemStack-damage-API.patch b/patches/unapplied/server/0946-ItemStack-damage-API.patch
index c9b8fa152f..c9b8fa152f 100644
--- a/patches/server/0946-ItemStack-damage-API.patch
+++ b/patches/unapplied/server/0946-ItemStack-damage-API.patch
diff --git a/patches/server/0947-Friction-API.patch b/patches/unapplied/server/0947-Friction-API.patch
index 5d3d0715f1..5d3d0715f1 100644
--- a/patches/server/0947-Friction-API.patch
+++ b/patches/unapplied/server/0947-Friction-API.patch
diff --git a/patches/server/0948-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/0948-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 1c762bdb6f..1c762bdb6f 100644
--- a/patches/server/0948-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/unapplied/server/0948-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0949-Fix-player-kick-on-shutdown.patch b/patches/unapplied/server/0949-Fix-player-kick-on-shutdown.patch
index 093c09fb8e..093c09fb8e 100644
--- a/patches/server/0949-Fix-player-kick-on-shutdown.patch
+++ b/patches/unapplied/server/0949-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0950-Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/0950-Sync-offhand-slot-in-menus.patch
index 681a7687aa..681a7687aa 100644
--- a/patches/server/0950-Sync-offhand-slot-in-menus.patch
+++ b/patches/unapplied/server/0950-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0951-Player-Entity-Tracking-Events.patch b/patches/unapplied/server/0951-Player-Entity-Tracking-Events.patch
index 723e8a1d03..723e8a1d03 100644
--- a/patches/server/0951-Player-Entity-Tracking-Events.patch
+++ b/patches/unapplied/server/0951-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0952-Limit-pet-look-distance.patch b/patches/unapplied/server/0952-Limit-pet-look-distance.patch
index 1dd686c0af..728c07d41f 100644
--- a/patches/server/0952-Limit-pet-look-distance.patch
+++ b/patches/unapplied/server/0952-Limit-pet-look-distance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit pet look distance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
-index 7dc8cc93e8da37e1096c3263c1c8fc55bbf60401..fed2291d24d6014bd30b3d3491d555694c4e99f2 100644
+index 7dc8cc93e8da37e1096c3263c1c8fc55bbf60401..11a101e8ff05fbda5e84018358be02014ca01854 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
 @@ -89,7 +89,7 @@ public class FollowOwnerGoal extends Goal {
diff --git a/work/BuildData b/work/BuildData
-Subproject d96ad8e1e64b7c35bb632339c23621353be1f02
+Subproject 177811e1fa90f674897a302820f3ed84e4d6568
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 38866413a790619d8d8873de5b62f807947b81f
+Subproject bf3239f7a3d8ff0359bcacd13012081146ff3c3
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject f3dab3a488c6ef87abe9639d537c19b7a102901
+Subproject 19e6be0209d7547c7cdcceae54d4b299f9cd751
diff --git a/work/Spigot b/work/Spigot
-Subproject 6198b5ae88da3f3650123abc22e6363a7543faa
+Subproject 61bffe0cce4e22325a65715f407823d860a32c5