Move patches over, start with first few

957 files changed, 282 insertions, 281 deletions

diff --git a/README.md b/README.md
index d85b93583c..149e3f3a8b 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-R0.1-SNAPSHOT</version>
+    <version>1.19.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
  ```
@@ -54,7 +54,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.19-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.19.1-R0.1-SNAPSHOT")
 }
 
 java {
diff --git a/build.gradle.kts b/build.gradle.kts
index 7485ea8bd1..9493c04570 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,7 +61,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.19+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.19.1+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
     decompiler("net.minecraftforge:forgeflower:1.5.605.7")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
diff --git a/gradle.properties b/gradle.properties
index d695afd48c..8f428ef076 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.19-R0.1-SNAPSHOT
-mcVersion=1.19
+version=1.19.1-R0.1-SNAPSHOT
+mcVersion=1.19.1
 
 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 a3355cff9f..cb02926a5a 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..2c096b3ec6d77d824de974f9a6615916
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 5a45ab463e6df9adfbe905c1f456fd41fbf4b8be..0000000000000000000000000000000000000000
+index 847d05f335e393240d2bafea9949545b2dd53069..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,252 +0,0 @@
@@ -125,7 +125,7 @@ index 5a45ab463e6df9adfbe905c1f456fd41fbf4b8be..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.19-R0.1-SNAPSHOT</version>
+-    <version>1.19.1-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index 34fcc84907..560a56fd86 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -1644,7 +1644,7 @@ index 922d33ff4fa9d901d3c5c0a9f8399ad8aef62c37..cd287978c34873c7122794e4f3e76291
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7c2848cef 100644
+index c652660f8e053b066d0d40a89ab6f1b86655f71b..2c5fc4f62b2c16de1f4f94f52aae5baf8af6d694 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -37,7 +37,28 @@ import org.jetbrains.annotations.Nullable;
@@ -1676,8 +1676,8 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
 +    // Paper end
  
      /**
-      * Gets the "friendly" name to display of this player. This may include
-@@ -47,7 +68,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * {@inheritDoc}
+@@ -54,7 +75,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * places defined by plugins.
       *
       * @return the friendly name
@@ -1687,7 +1687,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      @NotNull
      public String getDisplayName();
  
-@@ -59,15 +82,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -66,15 +89,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * places defined by plugins.
       *
       * @param name The new display name.
@@ -1738,7 +1738,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      public String getPlayerListName();
  
      /**
-@@ -76,14 +134,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -83,14 +141,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * If the value is null, the name will be identical to {@link #getName()}.
       *
       * @param name new player list name
@@ -1757,7 +1757,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      @Nullable
      public String getPlayerListHeader();
  
-@@ -91,7 +153,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -98,7 +160,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Gets the currently displayed player list footer for this player.
       *
       * @return player list header or null
@@ -1767,7 +1767,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      @Nullable
      public String getPlayerListFooter();
  
-@@ -99,14 +163,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -106,14 +170,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Sets the currently displayed player list header for this player.
       *
       * @param header player list header, null for empty
@@ -1786,7 +1786,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      public void setPlayerListFooter(@Nullable String footer);
  
      /**
-@@ -115,7 +183,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -122,7 +190,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param header player list header, null for empty
       * @param footer player list footer, null for empty
@@ -1796,7 +1796,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
  
      /**
-@@ -153,9 +223,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -160,9 +230,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Kicks player with custom kick message.
       *
       * @param message kick message
@@ -1822,7 +1822,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      /**
       * Says a message (or runs a command).
       *
-@@ -507,6 +593,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -514,6 +600,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull EquipmentSlot slot, @NotNull ItemStack item);
  
@@ -1913,7 +1913,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      /**
       * Send a sign change. This fakes a sign change packet for a user at
       * a certain location. This will not actually change the world in any way.
-@@ -521,7 +691,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -528,7 +698,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param lines the new text on the sign or null to clear it
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -1923,7 +1923,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
  
      /**
-@@ -540,7 +712,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -547,7 +719,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if dyeColor is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -1933,7 +1933,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
  
      /**
-@@ -560,7 +734,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -567,7 +741,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if dyeColor is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -1943,7 +1943,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
  
      /**
-@@ -1035,6 +1211,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1042,6 +1218,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -1951,7 +1951,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
       * @param url The URL from which the client will download the resource
       *     pack. The string must contain only US-ASCII characters and should
       *     be encoded as per RFC 1738.
-@@ -1048,8 +1225,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1055,8 +1232,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2009,7 +2009,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1124,6 +1350,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1131,6 +1357,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -2017,7 +2017,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
       * @param url The URL from which the client will download the resource
       *     pack. The string must contain only US-ASCII characters and should
       *     be encoded as per RFC 1738.
-@@ -1139,8 +1366,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1146,8 +1373,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2075,7 +2075,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      /**
       * Gets the Scoreboard displayed to this player
       *
-@@ -1256,7 +1532,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1263,7 +1539,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param title Title text
       * @param subtitle Subtitle text
@@ -2084,7 +2084,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
       */
      @Deprecated
      public void sendTitle(@Nullable String title, @Nullable String subtitle);
-@@ -1275,7 +1551,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1282,7 +1558,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param fadeIn time in ticks for titles to fade in. Defaults to 10.
       * @param stay time in ticks for titles to stay. Defaults to 70.
       * @param fadeOut time in ticks for titles to fade out. Defaults to 20.
@@ -2094,7 +2094,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
  
      /**
-@@ -1502,6 +1780,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1509,6 +1787,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public int getClientViewDistance();
  
@@ -2109,7 +2109,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      /**
       * Gets the player's estimated ping in milliseconds.
       *
-@@ -1527,8 +1813,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1534,8 +1820,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * they wish.
       *
       * @return the player's locale
@@ -2120,7 +2120,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      public String getLocale();
  
      /**
-@@ -1570,6 +1858,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1577,6 +1865,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public boolean isAllowingServerListings();
  
@@ -2135,7 +2135,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
      // Spigot start
      public class Spigot extends Entity.Spigot {
  
-@@ -1624,11 +1920,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1631,11 +1927,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2149,7 +2149,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
          @Override
          public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
-@@ -1639,7 +1937,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1646,7 +1944,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param component the components to send
@@ -2159,7 +2159,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1649,7 +1949,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1656,7 +1956,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param components the components to send
@@ -2169,7 +2169,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1660,7 +1962,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1667,7 +1969,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           * @param position the screen position
           * @param sender the sender of the message
           * @param component the components to send
@@ -2179,7 +2179,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1671,7 +1975,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1678,7 +1982,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           * @param position the screen position
           * @param sender the sender of the message
           * @param components the components to send
diff --git a/patches/api/0007-Timings-v2.patch b/patches/api/0007-Timings-v2.patch
index 24dfc1b9b2..7b72817a75 100644
--- a/patches/api/0007-Timings-v2.patch
+++ b/patches/api/0007-Timings-v2.patch
@@ -3391,10 +3391,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c580ec19cd2b55a4aeca49d9cd984ce7c2848cef..ab127d622b51e423883cbd9a7218f1cff6c2fdc1 100644
+index 2c5fc4f62b2c16de1f4f94f52aae5baf8af6d694..fd1056d2ef74e380e586f0eace4d0760fb564334 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1980,7 +1980,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1987,7 +1987,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          @Deprecated // Paper
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
diff --git a/patches/api/0009-Player-affects-spawning-API.patch b/patches/api/0009-Player-affects-spawning-API.patch
index dc3d1182f1..8ee11af337 100644
--- a/patches/api/0009-Player-affects-spawning-API.patch
+++ b/patches/api/0009-Player-affects-spawning-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ab127d622b51e423883cbd9a7218f1cff6c2fdc1..e03ab25cf2add5edbf0d3a28451ac47360fad080 100644
+index fd1056d2ef74e380e586f0eace4d0760fb564334..7a6f43bf88452d0cfa516637975cf4dc871e5e06 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1819,6 +1819,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1826,6 +1826,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Deprecated // Paper
      public String getLocale();
  
diff --git a/patches/api/0014-Add-view-distance-API.patch b/patches/api/0014-Add-view-distance-API.patch
index fee18bd531..933120ca51 100644
--- a/patches/api/0014-Add-view-distance-API.patch
+++ b/patches/api/0014-Add-view-distance-API.patch
@@ -75,10 +75,10 @@ index 1d3bb553c944f5920e81e295f8cd5b7194d37aac..887b85849803cee22a41a701b43cdc90
      public class Spigot {
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e03ab25cf2add5edbf0d3a28451ac47360fad080..b362a0e3954a2a58b896a9951f3e31c1706959ec 100644
+index 7a6f43bf88452d0cfa516637975cf4dc871e5e06..0dc399e83610b73077e656887cc699b5527d201d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1833,6 +1833,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1840,6 +1840,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);
diff --git a/patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 503595c80d..63ee1a6041 100644
--- a/patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -76,10 +76,10 @@ index f6f3297231d3a9e9f142faf992437cc99e241109..1dcf90071bae51e6b767ac26eb6624d3
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b362a0e3954a2a58b896a9951f3e31c1706959ec..84172c4356dd15e0d7de611d871584d8bb69b974 100644
+index 0dc399e83610b73077e656887cc699b5527d201d..ce011547908812764e4687f5e59fbc26dfd9b047 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -747,6 +747,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -754,6 +754,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/patches/api/0023-Player-Tab-List-and-Title-APIs.patch b/patches/api/0023-Player-Tab-List-and-Title-APIs.patch
index 7257eb3e8a..96d969d9c6 100644
--- a/patches/api/0023-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/0023-Player-Tab-List-and-Title-APIs.patch
@@ -432,7 +432,7 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 84172c4356dd15e0d7de611d871584d8bb69b974..0f1f8494443e74d0a3a5326a006be6edfc9b3ce2 100644
+index ce011547908812764e4687f5e59fbc26dfd9b047..d34b72dcc6e03a2337b8f06de9605586c40a0438 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -443,7 +443,7 @@ index 84172c4356dd15e0d7de611d871584d8bb69b974..0f1f8494443e74d0a3a5326a006be6ed
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -781,6 +782,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -788,6 +789,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
diff --git a/patches/api/0025-Complete-resource-pack-API.patch b/patches/api/0025-Complete-resource-pack-API.patch
index ebab3fa62a..d70976768b 100644
--- a/patches/api/0025-Complete-resource-pack-API.patch
+++ b/patches/api/0025-Complete-resource-pack-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0f1f8494443e74d0a3a5326a006be6edfc9b3ce2..51b9d9a85f6de2add0797c816593b38e35e7cfb4 100644
+index d34b72dcc6e03a2337b8f06de9605586c40a0438..e334e7147098169c78f972acbf88757821baa790 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1298,7 +1298,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1305,7 +1305,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 0f1f8494443e74d0a3a5326a006be6edfc9b3ce2..51b9d9a85f6de2add0797c816593b38e
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -2114,6 +2116,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2121,6 +2123,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
          return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
      }
diff --git a/patches/api/0045-Add-String-based-Action-Bar-API.patch b/patches/api/0045-Add-String-based-Action-Bar-API.patch
index 6f0006dda2..6311613fa6 100644
--- a/patches/api/0045-Add-String-based-Action-Bar-API.patch
+++ b/patches/api/0045-Add-String-based-Action-Bar-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 51b9d9a85f6de2add0797c816593b38e35e7cfb4..6e6ec4095ac9d6c17b1ee657133f6521ead35226 100644
+index e334e7147098169c78f972acbf88757821baa790..17c56b7d4dcac0738078101203fbef1716ed3157 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -16,7 +16,7 @@ index 51b9d9a85f6de2add0797c816593b38e35e7cfb4..6e6ec4095ac9d6c17b1ee657133f6521
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -749,6 +750,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -756,6 +757,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -56,7 +56,7 @@ index 51b9d9a85f6de2add0797c816593b38e35e7cfb4..6e6ec4095ac9d6c17b1ee657133f6521
      /**
       * Sends the component to the player
       *
-@@ -776,9 +810,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -783,9 +817,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
@@ -68,7 +68,7 @@ index 51b9d9a85f6de2add0797c816593b38e35e7cfb4..6e6ec4095ac9d6c17b1ee657133f6521
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -2305,6 +2341,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2312,6 +2348,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -76,7 +76,7 @@ index 51b9d9a85f6de2add0797c816593b38e35e7cfb4..6e6ec4095ac9d6c17b1ee657133f6521
           * @param position the screen position
           * @param component the components to send
           * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
-@@ -2317,6 +2354,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2324,6 +2361,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
diff --git a/patches/api/0054-Fix-upstream-javadocs.patch b/patches/api/0054-Fix-upstream-javadocs.patch
index 86737f5199..9d4d17a649 100644
--- a/patches/api/0054-Fix-upstream-javadocs.patch
+++ b/patches/api/0054-Fix-upstream-javadocs.patch
@@ -91,10 +91,10 @@ index be9334a8b5fba9181ad63c211697e798be63da25..0514a141cb93a650be38c63d4336d46e
       * Instructs this Mob to set the specified LivingEntity as its target.
       * <p>
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6e6ec4095ac9d6c17b1ee657133f6521ead35226..cf4beb02cce7b87facd5465291286f1b5e97db59 100644
+index 17c56b7d4dcac0738078101203fbef1716ed3157..f9ecac9a2c45e1d428277e43f9cf1a93a53dd84f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -303,15 +303,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -310,15 +310,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Saves the players current location, health, inventory, motion, and
@@ -114,7 +114,7 @@ index 6e6ec4095ac9d6c17b1ee657133f6521ead35226..cf4beb02cce7b87facd5465291286f1b
       * <p>
       * Note: This will overwrite the players current inventory, health,
       * motion, etc, with the state from the saved dat file.
-@@ -767,7 +767,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -774,7 +774,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
diff --git a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch
index 99f6eff47d..237cd00d8e 100644
--- a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch
@@ -10,10 +10,10 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7f29fd1891b0b0c2037dc6fb7620e6de29083feb..dc8740d5410aebaa17e014d43b7d9fb29ae2a3d0 100644
+index 13b5ab85a89347f8c33ab672bc352f6e425a64af..d3d3cfc0cf43f2b1f2d1937ef1a924b51f8cbde5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1033,12 +1033,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1040,12 +1040,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/api/0091-Player.setPlayerProfile-API.patch
index 23f46da59d..1c57f18834 100644
--- a/patches/api/0091-Player.setPlayerProfile-API.patch
+++ b/patches/api/0091-Player.setPlayerProfile-API.patch
@@ -80,10 +80,10 @@ index 04752eebe9df1138207a969fb1492a1f55b0b753..ca784abeb7f31c65e87df7750ae19aa9
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index dc8740d5410aebaa17e014d43b7d9fb29ae2a3d0..6768ab96fa14d3e297c37fb899943b9f3fd0cc1d 100644
+index d3d3cfc0cf43f2b1f2d1937ef1a924b51f8cbde5..1d3387716f3e4e11155d79f62a759d8c59db84cd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2291,6 +2291,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2298,6 +2298,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
diff --git a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch
index a4fe0d32ff..f28444bf3e 100644
--- a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch
@@ -24,10 +24,10 @@ index bcdf267485f1d68ccc7ea105d5d40bc9bc9db2a2..bd9222b9b5e7ec1f3aebe37838775f34
      /**
       * Make the entity drop the item in their hand.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6768ab96fa14d3e297c37fb899943b9f3fd0cc1d..2eb9b5b2f7449e381914be26aec4e0236c368f47 100644
+index 1d3387716f3e4e11155d79f62a759d8c59db84cd..4cc2be70758e2b5b9ea195a4a7f6cd5a7b735149 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2146,7 +2146,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2153,7 +2153,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Open a Sign for editing by the Player.
       *
diff --git a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
index 86284e6483..bc4077d506 100644
--- a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
@@ -74,10 +74,10 @@ index c5eed3234a8c04bfa9d707685746fc2b40ec8bfc..93f86bb30725dff5dbfcccf15012ffd1
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2eb9b5b2f7449e381914be26aec4e0236c368f47..5093a978dd44f0e6e14af7d8e12b50b602f0b2bd 100644
+index 4cc2be70758e2b5b9ea195a4a7f6cd5a7b735149..ece01269623d3114da78b01aa1e3b7e859533dac 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -750,6 +750,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -757,6 +757,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
diff --git a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
index 4bc983ddf1..6812b80271 100644
--- a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5093a978dd44f0e6e14af7d8e12b50b602f0b2bd..f218b1dd0b0ae97a6ccc0f88adcde7cc167432a9 100644
+index ece01269623d3114da78b01aa1e3b7e859533dac..6827d0b590c4bc7117eac6e4a64606864f793f3d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2461,6 +2461,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2468,6 +2468,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);
diff --git a/patches/api/0176-Fix-Spigot-annotation-mistakes.patch b/patches/api/0176-Fix-Spigot-annotation-mistakes.patch
index dfa453e725..87640ed1fa 100644
--- a/patches/api/0176-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0176-Fix-Spigot-annotation-mistakes.patch
@@ -329,10 +329,10 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f218b1dd0b0ae97a6ccc0f88adcde7cc167432a9..ed2f50647df598a4f289736dcc524281910d1931 100644
+index 6827d0b590c4bc7117eac6e4a64606864f793f3d..0aa71faaa3f2afc29a518657bf1515cb70a86ed2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1368,9 +1368,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1375,9 +1375,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param plugin Plugin that wants to hide the entity
       * @param entity Entity to hide
@@ -343,7 +343,7 @@ index f218b1dd0b0ae97a6ccc0f88adcde7cc167432a9..ed2f50647df598a4f289736dcc524281
      public void hideEntity(@NotNull Plugin plugin, @NotNull Entity entity);
  
      /**
-@@ -1380,9 +1379,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1387,9 +1386,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param plugin Plugin that wants to show the entity
       * @param entity Entity to show
@@ -354,7 +354,7 @@ index f218b1dd0b0ae97a6ccc0f88adcde7cc167432a9..ed2f50647df598a4f289736dcc524281
      public void showEntity(@NotNull Plugin plugin, @NotNull Entity entity);
  
      /**
-@@ -1391,9 +1389,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1398,9 +1396,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param entity Entity to check
       * @return True if the provided entity is not being hidden from this
       *     player
diff --git a/patches/api/0195-Add-Player-Client-Options-API.patch b/patches/api/0195-Add-Player-Client-Options-API.patch
index 355fd87af5..0bd8071d14 100644
--- a/patches/api/0195-Add-Player-Client-Options-API.patch
+++ b/patches/api/0195-Add-Player-Client-Options-API.patch
@@ -193,7 +193,7 @@ index 0000000000000000000000000000000000000000..f7f171c4ee0b8339b2f8fbe82442d65f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ed2f50647df598a4f289736dcc524281910d1931..797c49510a515b4423bb7b886726afaf63305227 100644
+index 0aa71faaa3f2afc29a518657bf1515cb70a86ed2..f870a20de42f17dd020057365901fb62afccebbe 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -204,7 +204,7 @@ index ed2f50647df598a4f289736dcc524281910d1931..797c49510a515b4423bb7b886726afaf
  import com.destroystokyo.paper.Title; // Paper
  import net.kyori.adventure.text.Component;
  import org.bukkit.DyeColor;
-@@ -2478,6 +2479,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2485,6 +2486,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the cooldown counter to 0, effectively starting the cooldown period.
       */
      void resetCooldown();
diff --git a/patches/api/0214-Brand-support.patch b/patches/api/0214-Brand-support.patch
index fc68f4cecf..cdbb7e142f 100644
--- a/patches/api/0214-Brand-support.patch
+++ b/patches/api/0214-Brand-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 797c49510a515b4423bb7b886726afaf63305227..73dbe57b872db6a0ff4812af9c359fb8e632fb9c 100644
+index f870a20de42f17dd020057365901fb62afccebbe..f601bd04d6ee0d39d4554d32628912208072a017 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2613,6 +2613,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2620,6 +2620,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          // Paper end
      }
  
diff --git a/patches/api/0228-Player-elytra-boost-API.patch b/patches/api/0228-Player-elytra-boost-API.patch
index 13332e33e5..d435285ae0 100644
--- a/patches/api/0228-Player-elytra-boost-API.patch
+++ b/patches/api/0228-Player-elytra-boost-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 73dbe57b872db6a0ff4812af9c359fb8e632fb9c..a097d060dc2a345406c3121b2aed038377148862 100644
+index f601bd04d6ee0d39d4554d32628912208072a017..0454748478428828ce8b824f90463f4b03a010bd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2485,6 +2485,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2492,6 +2492,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @NotNull
      <T> T getClientOption(@NotNull ClientOption<T> option);
diff --git a/patches/api/0256-Add-sendOpLevel-API.patch b/patches/api/0256-Add-sendOpLevel-API.patch
index 80abd8945e..dca15f6d2d 100644
--- a/patches/api/0256-Add-sendOpLevel-API.patch
+++ b/patches/api/0256-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a097d060dc2a345406c3121b2aed038377148862..701b34b02886dcef2837f00a945f813165d914f5 100644
+index 0454748478428828ce8b824f90463f4b03a010bd..ae009440a7b1e073f3772b1c3d91b6ae6fca0495 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2498,6 +2498,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2505,6 +2505,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @Nullable
      Firework boostElytra(@NotNull ItemStack firework);
diff --git a/patches/api/0307-Add-PlayerKickEvent-causes.patch b/patches/api/0307-Add-PlayerKickEvent-causes.patch
index f9cb7ed1f8..7bd35b8138 100644
--- a/patches/api/0307-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0307-Add-PlayerKickEvent-causes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 701b34b02886dcef2837f00a945f813165d914f5..792441dd8465edd1e6c2ffcbb8b2823a5884554f 100644
+index ae009440a7b1e073f3772b1c3d91b6ae6fca0495..0a400ecdffa18eb836fed62961f151ff6842011b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -243,6 +243,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -250,6 +250,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param message kick message
       */
      void kick(final @Nullable net.kyori.adventure.text.Component message);
diff --git a/patches/api/0342-Add-player-health-update-API.patch b/patches/api/0342-Add-player-health-update-API.patch
index a8f2c3ba79..06b3a54182 100644
--- a/patches/api/0342-Add-player-health-update-API.patch
+++ b/patches/api/0342-Add-player-health-update-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 792441dd8465edd1e6c2ffcbb8b2823a5884554f..b2b28b48e6e7d9f32460b8a65cbe294be4812bd9 100644
+index 0a400ecdffa18eb836fed62961f151ff6842011b..78034fcc89ceeba6934569189f24e5a41229d848 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1886,6 +1886,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1893,6 +1893,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public double getHealthScale();
  
diff --git a/patches/api/0358-Multi-Block-Change-API.patch b/patches/api/0358-Multi-Block-Change-API.patch
index 45520149bb..a8bdc6fff0 100644
--- a/patches/api/0358-Multi-Block-Change-API.patch
+++ b/patches/api/0358-Multi-Block-Change-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Multi Block Change API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b2b28b48e6e7d9f32460b8a65cbe294be4812bd9..c0fc38cacf441273e8430dda31958c15a48fc9b6 100644
+index 78034fcc89ceeba6934569189f24e5a41229d848..6ec49c213c87e9dbf7ebfbdb93f1d993a2639ac5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -593,6 +593,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -600,6 +600,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendBlockDamage(@NotNull Location loc, float progress);
  
diff --git a/patches/api/0387-More-Teleport-API.patch b/patches/api/0387-More-Teleport-API.patch
index 28e4ee46a6..d0cfa4990f 100644
--- a/patches/api/0387-More-Teleport-API.patch
+++ b/patches/api/0387-More-Teleport-API.patch
@@ -159,10 +159,10 @@ index 8bc6876c82935988436597161fa0ec94c032174b..03b35d3ba8ba00c0fa0272450f193552
       * Teleports this entity to the given location. If this entity is riding a
       * vehicle, it will be dismounted prior to teleportation.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c0fc38cacf441273e8430dda31958c15a48fc9b6..b39afbcd1fa88a7f00cd5f4482d52f2d089497dc 100644
+index 6ec49c213c87e9dbf7ebfbdb93f1d993a2639ac5..3fcfe8651a9c422fa9c8ff77556477f1461424cf 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2701,6 +2701,71 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2708,6 +2708,71 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index 0b695d66fc..c4dd2d89f4 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -172,7 +172,7 @@ index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index a38fed1181775f25367486725528c35701d4a8a9..0000000000000000000000000000000000000000
+index a0701510d9e24d734a3e321bd20afbed80e3909b..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,623 +0,0 @@
@@ -182,7 +182,7 @@ index a38fed1181775f25367486725528c35701d4a8a9..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.19-R0.1-SNAPSHOT</version>
+-    <version>1.19.1-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
@@ -252,7 +252,7 @@ index a38fed1181775f25367486725528c35701d4a8a9..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>authlib</artifactId>
--            <version>3.5.41</version>
+-            <version>3.11.49</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0004-Paper-config-files.patch
index 505883304c..fb472372b4 100644
--- a/patches/server/0004-Paper-config-files.patch
+++ b/patches/server/0004-Paper-config-files.patch
@@ -4176,10 +4176,10 @@ index 853e7c2019f5147e9681e95a82eaef0825b6341e..a48a12a31a3d09a9373b688dcc093035
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6cc81495d8d09ff1fbb09f2e63a16ec4fa6138ec..73662a463fc9d38b39c4c779fcfaa09a4689d704 100644
+index e7b1456a123208241d0b1c5956a137d6a5cfbfcd..7740e69617c3d543a67ed0942ba8ec550ad4386d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -279,6 +279,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -281,6 +281,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private static final int SAMPLE_INTERVAL = 100;
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
@@ -4187,7 +4187,7 @@ index 6cc81495d8d09ff1fbb09f2e63a16ec4fa6138ec..73662a463fc9d38b39c4c779fcfaa09a
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -369,6 +370,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -371,6 +372,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
@@ -4234,7 +4234,7 @@ index 697ca7457115423a8c4d8a7d1f7a353237b56509..d7d65d0faefa5551480a4090de3a8818
      }
  }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 570db14d930e15a96621d0d24ce11a27dc38494b..e476f93547f386ded0174693a6218d793ccc450b 100644
+index 7d965247833c91dc824e6cc56e8b0fe5f3413d1d..08ae7a96e93c0d8547f560b3f753804525621c6b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -188,6 +188,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -4249,10 +4249,10 @@ index 570db14d930e15a96621d0d24ce11a27dc38494b..e476f93547f386ded0174693a6218d79
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 808142eef47d05679c50d654d3c6adfe055ca85b..de3965861b5e78ab6cc0dd02c4af53cb4fc063b5 100644
+index 3f4dbd3503bc3224a2f483563af25a76cc0b68f9..1a23437b9fa17846fd28163ae930d21a6bb00138 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -226,7 +226,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -227,7 +227,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
          // Holder holder = worlddimension.typeHolder(); // CraftBukkit - decompile error
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/server/0005-MC-Dev-fixes.patch
index 80159200f2..de995ef8a5 100644
--- a/patches/server/0005-MC-Dev-fixes.patch
+++ b/patches/server/0005-MC-Dev-fixes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 1eaf731486d458223dc8ff0629a1a2422e6664da..9f1bd2de71381140736ef1dbcc5b75e8bdcee0e8 100644
+index c237683b040b13f693675c2bead26868d582efa4..c52be35a75613936cbf1b2dc9b1aa959f5577627 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -370,7 +370,7 @@ public class Util {
+@@ -376,7 +376,7 @@ public class Util {
      }
  
      public static <K> Hash.Strategy<K> identityStrategy() {
@@ -40,10 +40,10 @@ index eabf34265470e68b56c0d8787a7acffcf9b49e83..c94084aee70d269a71a5423c13a5eba2
                  }
              };
 diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index 423c750d4a5d719f7bc593aff5b1298e5c3c417b..2df77845b78b9d5fae0a36103d42c8202ee2af9e 100644
+index 0929472fd54aa0a81344476a5b137b2b4f194d79..d6d8adf1e49cdb74dc5d8e2e60bcaca7c5e1c16d 100644
 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java
 +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
-@@ -39,14 +39,14 @@ import net.minecraft.world.level.material.FluidState;
+@@ -40,14 +40,14 @@ import net.minecraft.world.level.material.FluidState;
  import org.slf4j.Logger;
  
  public final class NbtUtils {
@@ -60,7 +60,7 @@ index 423c750d4a5d719f7bc593aff5b1298e5c3c417b..2df77845b78b9d5fae0a36103d42c820
          return nbt.getDouble(1);
      }).thenComparingDouble((nbt) -> {
          return nbt.getDouble(0);
-@@ -494,7 +494,7 @@ public final class NbtUtils {
+@@ -495,7 +495,7 @@ public final class NbtUtils {
      }
  
      public static CompoundTag update(DataFixer fixer, DataFixTypes fixTypes, CompoundTag compound, int oldVersion, int targetVersion) {
@@ -70,7 +70,7 @@ index 423c750d4a5d719f7bc593aff5b1298e5c3c417b..2df77845b78b9d5fae0a36103d42c820
  
      public static Component toPrettyComponent(Tag element) {
 diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java
-index 1acdee3424fa2301e1a7e4807eb817bd0406b84d..d15ef330db69e0c948824d9bf112a26680c90b1b 100644
+index b552d2c0a07e322224ce6693e89f1dd6552c2037..672e296cec289abd3bf797d84e16983ca50907be 100644
 --- a/src/main/java/net/minecraft/network/ConnectionProtocol.java
 +++ b/src/main/java/net/minecraft/network/ConnectionProtocol.java
 @@ -16,6 +16,7 @@ import javax.annotation.Nullable;
@@ -81,7 +81,7 @@ index 1acdee3424fa2301e1a7e4807eb817bd0406b84d..d15ef330db69e0c948824d9bf112a266
  import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
  import net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket;
  import net.minecraft.network.protocol.game.ClientboundAddPlayerPacket;
-@@ -119,6 +120,7 @@ import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket;
+@@ -122,6 +123,7 @@ import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket;
  import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
  import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
  import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
@@ -89,7 +89,7 @@ index 1acdee3424fa2301e1a7e4807eb817bd0406b84d..d15ef330db69e0c948824d9bf112a266
  import net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket;
  import net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery;
  import net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket;
-@@ -167,26 +169,33 @@ import net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket;
+@@ -171,27 +173,33 @@ import net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket;
  import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
  import net.minecraft.network.protocol.game.ServerboundUseItemPacket;
  import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
@@ -115,18 +115,19 @@ index 1acdee3424fa2301e1a7e4807eb817bd0406b84d..d15ef330db69e0c948824d9bf112a266
  
  public enum ConnectionProtocol {
 -    HANDSHAKING(-1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientIntentionPacket.class, ClientIntentionPacket::new))),
--    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockChangedAckPacket.class, ClientboundBlockChangedAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPreviewPacket.class, ClientboundChatPreviewPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkWithLightPacket.class, ClientboundLevelChunkWithLightPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerChatPacket.class, ClientboundPlayerChatPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundServerDataPacket.class, ClientboundServerDataPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayChatPreviewPacket.class, ClientboundSetDisplayChatPreviewPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSimulationDistancePacket.class, ClientboundSetSimulationDistancePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundSystemChatPacket.class, ClientboundSystemChatPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatCommandPacket.class, ServerboundChatCommandPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundChatPreviewPacket.class, ServerboundChatPreviewPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
+-    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockChangedAckPacket.class, ClientboundBlockChangedAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPreviewPacket.class, ClientboundChatPreviewPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomChatCompletionsPacket.class, ClientboundCustomChatCompletionsPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDeleteChatPacket.class, ClientboundDeleteChatPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkWithLightPacket.class, ClientboundLevelChunkWithLightPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerChatHeaderPacket.class, ClientboundPlayerChatHeaderPacket::new).addPacket(ClientboundPlayerChatPacket.class, ClientboundPlayerChatPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundServerDataPacket.class, ClientboundServerDataPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayChatPreviewPacket.class, ClientboundSetDisplayChatPreviewPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSimulationDistancePacket.class, ClientboundSetSimulationDistancePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundSystemChatPacket.class, ClientboundSystemChatPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatAckPacket.class, ServerboundChatAckPacket::new).addPacket(ServerboundChatCommandPacket.class, ServerboundChatCommandPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundChatPreviewPacket.class, ServerboundChatPreviewPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
 -    STATUS(1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundStatusRequestPacket.class, ServerboundStatusRequestPacket::new).addPacket(ServerboundPingRequestPacket.class, ServerboundPingRequestPacket::new)).addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundStatusResponsePacket.class, ClientboundStatusResponsePacket::new).addPacket(ClientboundPongResponsePacket.class, ClientboundPongResponsePacket::new))),
 -    LOGIN(2, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundLoginDisconnectPacket.class, ClientboundLoginDisconnectPacket::new).addPacket(ClientboundHelloPacket.class, ClientboundHelloPacket::new).addPacket(ClientboundGameProfilePacket.class, ClientboundGameProfilePacket::new).addPacket(ClientboundLoginCompressionPacket.class, ClientboundLoginCompressionPacket::new).addPacket(ClientboundCustomQueryPacket.class, ClientboundCustomQueryPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundHelloPacket.class, ServerboundHelloPacket::new).addPacket(ServerboundKeyPacket.class, ServerboundKeyPacket::new).addPacket(ServerboundCustomQueryPacket.class, ServerboundCustomQueryPacket::new)));
+-
 +    // Paper start - fix decompile error - add correct generic packet listeners (e.g. ServerHandshakePacketListener) to PacketSet's generic type, matching the packet flow direction
 +    HANDSHAKING(-1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerHandshakePacketListener>()).addPacket(ClientIntentionPacket.class, ClientIntentionPacket::new))),
-+    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientGamePacketListener>()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockChangedAckPacket.class, ClientboundBlockChangedAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPreviewPacket.class, ClientboundChatPreviewPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkWithLightPacket.class, ClientboundLevelChunkWithLightPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerChatPacket.class, ClientboundPlayerChatPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundServerDataPacket.class, ClientboundServerDataPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayChatPreviewPacket.class, ClientboundSetDisplayChatPreviewPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSimulationDistancePacket.class, ClientboundSetSimulationDistancePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundSystemChatPacket.class, ClientboundSystemChatPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerGamePacketListener>()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatCommandPacket.class, ServerboundChatCommandPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundChatPreviewPacket.class, ServerboundChatPreviewPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
++    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientGamePacketListener>()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockChangedAckPacket.class, ClientboundBlockChangedAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPreviewPacket.class, ClientboundChatPreviewPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomChatCompletionsPacket.class, ClientboundCustomChatCompletionsPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDeleteChatPacket.class, ClientboundDeleteChatPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkWithLightPacket.class, ClientboundLevelChunkWithLightPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerChatHeaderPacket.class, ClientboundPlayerChatHeaderPacket::new).addPacket(ClientboundPlayerChatPacket.class, ClientboundPlayerChatPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundServerDataPacket.class, ClientboundServerDataPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayChatPreviewPacket.class, ClientboundSetDisplayChatPreviewPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSimulationDistancePacket.class, ClientboundSetSimulationDistancePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundSystemChatPacket.class, ClientboundSystemChatPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerGamePacketListener>()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatAckPacket.class, ServerboundChatAckPacket::new).addPacket(ServerboundChatCommandPacket.class, ServerboundChatCommandPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundChatPreviewPacket.class, ServerboundChatPreviewPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
 +    STATUS(1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerStatusPacketListener>()).addPacket(ServerboundStatusRequestPacket.class, ServerboundStatusRequestPacket::new).addPacket(ServerboundPingRequestPacket.class, ServerboundPingRequestPacket::new)).addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientStatusPacketListener>()).addPacket(ClientboundStatusResponsePacket.class, ClientboundStatusResponsePacket::new).addPacket(ClientboundPongResponsePacket.class, ClientboundPongResponsePacket::new))),
 +    LOGIN(2, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientLoginPacketListener>()).addPacket(ClientboundLoginDisconnectPacket.class, ClientboundLoginDisconnectPacket::new).addPacket(ClientboundHelloPacket.class, ClientboundHelloPacket::new).addPacket(ClientboundGameProfilePacket.class, ClientboundGameProfilePacket::new).addPacket(ClientboundLoginCompressionPacket.class, ClientboundLoginCompressionPacket::new).addPacket(ClientboundCustomQueryPacket.class, ClientboundCustomQueryPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerLoginPacketListener>()).addPacket(ServerboundHelloPacket.class, ServerboundHelloPacket::new).addPacket(ServerboundKeyPacket.class, ServerboundKeyPacket::new).addPacket(ServerboundCustomQueryPacket.class, ServerboundCustomQueryPacket::new)));
 +    // Paper end
- 
      private static final int MIN_PROTOCOL_ID = -1;
      private static final int MAX_PROTOCOL_ID = 2;
+     private static final ConnectionProtocol[] LOOKUP = new ConnectionProtocol[4];
 diff --git a/src/main/java/net/minecraft/resources/RegistryLoader.java b/src/main/java/net/minecraft/resources/RegistryLoader.java
 index 82764c462f82163ee49f4e9466f383366cd23b8b..8da1226a6c293abb038d10c7921a77ed71ad06cc 100644
 --- a/src/main/java/net/minecraft/resources/RegistryLoader.java
@@ -141,7 +142,7 @@ index 82764c462f82163ee49f4e9466f383366cd23b8b..8da1226a6c293abb038d10c7921a77ed
          });
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 73662a463fc9d38b39c4c779fcfaa09a4689d704..415f2191c10c39f8a48e6c9a2d74426ac4bdfb82 100644
+index 7740e69617c3d543a67ed0942ba8ec550ad4386d..b7d44c4a961ad3881bbf8f87f1595be79e3467f6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1737,7 +1737,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -232,18 +233,18 @@ index 17c72a767e7b749ed78a9b54af19bae5381b296c..4872f70977e73c889fe6e2339d00ebc6
          this.byName = Maps.newHashMap(builder.build()); // CraftBukkit
          RecipeManager.LOGGER.info("Loaded {} recipes", map1.size());
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index df2aa5d917a1742e3b82e27c8aa19de7c51bdba1..1152bf7f7a7784457c778b215db91b9e02066fba 100644
+index 95b03b7bc63bc2171347c030cba3a38e55de23a3..78e20871e4bd8d92c4475f797a55733c68f6aeb4 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -56,7 +56,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
      }
  
-     private static <T, C extends PalettedContainerRO<T>> Codec<C> codec(IdMap<T> idMap, Codec<T> entryCodec, PalettedContainer.Strategy provider, T object, PalettedContainerRO.Unpacker<T, C> unpacker) {
+     private static <T, C extends PalettedContainerRO<T>> Codec<C> codec(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy provider, T defaultValue, PalettedContainerRO.Unpacker<T, C> reader) {
 -        return RecordCodecBuilder.create((instance) -> {
 +        return RecordCodecBuilder.<PackedData<T>>create((instance) -> { // Paper - decompile fix
-             return instance.group(entryCodec.mapResult(ExtraCodecs.orElsePartial(object)).listOf().fieldOf("palette").forGetter(PalettedContainerRO.PackedData::paletteEntries), Codec.LONG_STREAM.optionalFieldOf("data").forGetter(PalettedContainerRO.PackedData::storage)).apply(instance, PalettedContainerRO.PackedData::new);
-         }).comapFlatMap((packedData) -> {
-             return unpacker.read(idMap, provider, packedData);
+             return instance.group(entryCodec.mapResult(ExtraCodecs.orElsePartial(defaultValue)).listOf().fieldOf("palette").forGetter(PalettedContainerRO.PackedData::paletteEntries), Codec.LONG_STREAM.optionalFieldOf("data").forGetter(PalettedContainerRO.PackedData::storage)).apply(instance, PalettedContainerRO.PackedData::new);
+         }).comapFlatMap((serialized) -> {
+             return reader.read(idList, provider, serialized);
 diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
 index 3864da01056970ae05cc3ca094f923178b4ffc97..e6b9f812e521abd552e0c7dc0429d5a62f2bfc35 100644
 --- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
diff --git a/patches/server/0006-CB-fixes.patch b/patches/server/0006-CB-fixes.patch
index 278860331d..1cebd7f071 100644
--- a/patches/server/0006-CB-fixes.patch
+++ b/patches/server/0006-CB-fixes.patch
@@ -17,10 +17,10 @@ Subject: [PATCH] CB fixes
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index de3965861b5e78ab6cc0dd02c4af53cb4fc063b5..fb8e2bcbe27438fa5274d440751b6733cce550cb 100644
+index 1a23437b9fa17846fd28163ae930d21a6bb00138..4f1e8d36c363eb74e8f1e593f35a7bb8550f8918 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -292,7 +292,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -293,7 +293,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          long l = minecraftserver.getWorldData().worldGenSettings().seed();
  
diff --git a/patches/server/0007-MC-Utils.patch b/patches/server/0007-MC-Utils.patch
index 7ad1715c2b..8f59a33c89 100644
--- a/patches/server/0007-MC-Utils.patch
+++ b/patches/server/0007-MC-Utils.patch
@@ -4429,10 +4429,10 @@ index 0000000000000000000000000000000000000000..4d3dc8fba51bf5c0dceb06744781d1df
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 9f1bd2de71381140736ef1dbcc5b75e8bdcee0e8..d7e22ddf89619b58516ccef1d75a4c33df61b73c 100644
+index c52be35a75613936cbf1b2dc9b1aa959f5577627..168ab805ecc48dd55db90eb7fe1c56fda3f2776c 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -114,7 +114,7 @@ public class Util {
+@@ -116,7 +116,7 @@ public class Util {
      }
  
      public static long getNanos() {
@@ -5016,10 +5016,10 @@ index 0000000000000000000000000000000000000000..9f292deee1b793d52b5774304318e940
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 415f2191c10c39f8a48e6c9a2d74426ac4bdfb82..1ad7797dbef61f8e8011ae6db3089939a279071c 100644
+index b7d44c4a961ad3881bbf8f87f1595be79e3467f6..3aadba90ab32388b9e8ef96f182fa263c760f53b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -280,6 +280,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -282,6 +282,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
@@ -5027,7 +5027,7 @@ index 415f2191c10c39f8a48e6c9a2d74426ac4bdfb82..1ad7797dbef61f8e8011ae6db3089939
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -919,6 +920,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -921,6 +922,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              MinecraftServer.LOGGER.error("Failed to unlock level {}", this.storageSource.getLevelId(), ioexception1);
          }
          // Spigot start
@@ -5037,7 +5037,7 @@ index 415f2191c10c39f8a48e6c9a2d74426ac4bdfb82..1ad7797dbef61f8e8011ae6db3089939
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              MinecraftServer.LOGGER.info("Saving usercache.json");
              this.getProfileCache().save();
-@@ -985,6 +989,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -988,6 +992,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.lastOverloadWarning = this.nextTickTime;
                  }
  
@@ -5304,10 +5304,10 @@ index f902b1f7062fc2c81e0ce43e8b8599192469e57c..90fcb4dc89643b1c706ea4554595a842
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc154064c164a25 100644
+index 91a9b9ff0d7821a2261e7137fb1b3989ba096b88..6304a5b78ab1f3ef2478c7e2c493ebd760b5508e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -62,6 +62,7 @@ import net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket;
+@@ -63,6 +63,7 @@ import net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket;
  import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
  import net.minecraft.network.protocol.game.ClientboundSetPassengersPacket;
  import net.minecraft.network.protocol.game.DebugPackets;
@@ -5315,7 +5315,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
  import net.minecraft.server.level.progress.ChunkProgressListener;
  import net.minecraft.server.network.ServerPlayerConnection;
  import net.minecraft.util.CsvOutput;
-@@ -168,6 +169,56 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -169,6 +170,56 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      };
      // CraftBukkit end
  
@@ -5372,7 +5372,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
      public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance, boolean dsync) {
          super(session.getDimensionPath(world.dimension()).resolve("region"), dataFixer, dsync);
          this.visibleChunkMap = this.updatingChunkMap.clone();
-@@ -217,6 +268,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -218,6 +269,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          this.overworldDataStorage = persistentStateManagerFactory;
          this.poiManager = new PoiManager(path.resolve("poi"), dataFixer, dsync, world.registryAccess(), world);
          this.setViewDistance(viewDistance);
@@ -5383,7 +5383,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
      }
  
      protected ChunkGenerator generator() {
-@@ -310,6 +365,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -311,6 +366,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
      }
  
@@ -5398,7 +5398,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
      private CompletableFuture<Either<List<ChunkAccess>, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkPos centerChunk, int margin, IntFunction<ChunkStatus> distanceToStatus) {
          List<CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> list = new ArrayList();
          List<ChunkHolder> list1 = new ArrayList();
-@@ -441,6 +504,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -442,6 +505,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      holder.setTicketLevel(level);
                  } else {
                      holder = new ChunkHolder(new ChunkPos(pos), level, this.level, this.lightEngine, this.queueSorter, this);
@@ -5410,7 +5410,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
                  }
  
                  this.updatingChunkMap.put(pos, holder);
-@@ -558,7 +626,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -559,7 +627,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              if (completablefuture1 != completablefuture) {
                  this.scheduleUnload(pos, holder);
              } else {
@@ -5425,7 +5425,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
                      if (ichunkaccess instanceof LevelChunk) {
                          ((LevelChunk) ichunkaccess).setLoaded(false);
                      }
-@@ -574,7 +648,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -575,7 +649,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      this.lightEngine.tryScheduleUpdate();
                      this.progressListener.onStatusChange(ichunkaccess.getPos(), (ChunkStatus) null);
                      this.chunkSaveCooldowns.remove(ichunkaccess.getPos().toLong());
@@ -5437,7 +5437,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
  
              }
          };
-@@ -1144,6 +1222,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1145,6 +1223,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              if (!flag1) {
                  this.distanceManager.addPlayer(SectionPos.of((EntityAccess) player), player);
              }
@@ -5445,7 +5445,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
          } else {
              SectionPos sectionposition = player.getLastSectionPos();
  
-@@ -1151,6 +1230,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1152,6 +1231,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              if (!flag2) {
                  this.distanceManager.removePlayer(sectionposition, player);
              }
@@ -5453,7 +5453,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
          }
  
          for (int k = i - this.viewDistance - 1; k <= i + this.viewDistance + 1; ++k) {
-@@ -1263,6 +1343,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1264,6 +1344,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              }
          }
  
@@ -5462,7 +5462,7 @@ index 3e49e739238096442e89b7ab23d2af8aff55912e..91fd4243416c41b1c2b0f0f1abc15406
      }
  
      @Override
-@@ -1466,7 +1548,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1467,7 +1549,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      public class ChunkDistanceManager extends DistanceManager {
  
          protected ChunkDistanceManager(Executor workerExecutor, Executor mainThreadExecutor) {
@@ -5914,10 +5914,10 @@ index ce88976db29b9e9524dbe45b16721ef90afb692b..186a8f5895fedbaf27a7949d9bdbb1a9
          ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fb8e2bcbe27438fa5274d440751b6733cce550cb..58da012345126bbfc9980538adf3f79bd87412bb 100644
+index 4f1e8d36c363eb74e8f1e593f35a7bb8550f8918..95c3273d2379509cf6cd51a718f18b8697908932 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -167,6 +167,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
+@@ -168,6 +168,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
  import org.bukkit.event.world.GenericGameEvent;
  import org.bukkit.event.world.TimeSkipEvent;
  // CraftBukkit end
@@ -5925,7 +5925,7 @@ index fb8e2bcbe27438fa5274d440751b6733cce550cb..58da012345126bbfc9980538adf3f79b
  
  public class ServerLevel extends Level implements WorldGenLevel {
  
-@@ -222,6 +223,96 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -223,6 +224,96 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return convertable.dimensionType;
      }
  
@@ -6023,10 +6023,10 @@ index fb8e2bcbe27438fa5274d440751b6733cce550cb..58da012345126bbfc9980538adf3f79b
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
          // Holder holder = worlddimension.typeHolder(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f49690b7521270ef34285ccb73a9ec105c966bbd..d04f0819df55480fefa3ac5807658b05b3a6441a 100644
+index d9424f016060d7a2b446801c64c6cc0c3d826fb8..4759a0eceeccf28b62cb8865b423235d47d07443 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -242,6 +242,8 @@ public class ServerPlayer extends Player {
+@@ -243,6 +243,8 @@ public class ServerPlayer extends Player {
      public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
      // CraftBukkit end
  
@@ -6035,7 +6035,7 @@ index f49690b7521270ef34285ccb73a9ec105c966bbd..d04f0819df55480fefa3ac5807658b05
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, @Nullable ProfilePublicKey publicKey) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile, publicKey);
          this.chatVisibility = ChatVisiblity.FULL;
-@@ -305,6 +307,8 @@ public class ServerPlayer extends Player {
+@@ -306,6 +308,8 @@ public class ServerPlayer extends Player {
          this.maxUpStep = 1.0F;
          this.fudgeSpawnLocation(world);
  
@@ -6057,10 +6057,10 @@ index 3a4f026c73cdd22d30bdadabbcf24bef969b73e4..0d536d72ac918fbd403397ff369d1014
      private final String name;
      private final Comparator<T> comparator;
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index ced08665126a88d68ccd7cfb858b3268ab5680c2..ba3023c7dd5b3bcf66f829fe5dc9757f96d16b45 100644
+index 96ab71f72b43758b86f8990a74a238ad68e10890..32d6e4b194c3c4eca7009059f8d185896b5ae556 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -158,6 +158,26 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -159,6 +159,26 @@ public class WorldGenRegion implements WorldGenLevel {
          return chunkX >= this.firstPos.x && chunkX <= this.lastPos.x && chunkZ >= this.firstPos.z && chunkZ <= this.lastPos.z;
      }
  
@@ -6106,7 +6106,7 @@ index 288fdbef407d11ab430d5d7026dfad148c3c1065..6fefa619299d3202158490630d62c16a
      @Override
      public void tell(R runnable) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9a716e01516d0e84d0ba4dbbc99bc36f1c409a7a..4ab6e75929ba34bcea6558ab51c8c551d6f70b02 100644
+index 6e6d33fcf2786fb995696cf69d66fc10b11a1dfa..331686c382fa88c0fd32056e2c68c3078341f4b7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -315,6 +315,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -6122,7 +6122,7 @@ index 9a716e01516d0e84d0ba4dbbc99bc36f1c409a7a..4ab6e75929ba34bcea6558ab51c8c551
      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 72da39aa2bb8bb70018fdbbbc5f487a2f188b389..1f9701128aedb0343709866207f3044b890fe1be 100644
+index 8fd9667776dc9822cb2e4f54b77c33f5e2bfd3f2..c4f91b80add5d79d999aa49c5da6dab094a24694 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 {
@@ -6171,7 +6171,7 @@ index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292
          super(type, world);
          this.xpReward = 5;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index e7e831f0e179ec6740e6a5271d63a76a3d699159..7f778e037c1821cc45236bf2a95c28243d0ec126 100644
+index b32f699740680b792990fa70b230ee5f07f2149b..e937186aaf819a77c80beeb9e08413a1f781c13a 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -751,6 +751,25 @@ public final class ItemStack {
@@ -6464,10 +6464,10 @@ index ccf37eb05846f825d9acc874455cbbcdcdd2ecc2..138f5576a1df6714e754d9829f209f1a
      public WorldBorder getWorldBorder() {
          return this.level.getWorldBorder();
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 6aba60bc79d373f098e97a7f9d8be0a78fb776a3..06525d7687fec5b37cd6020ad1bac998b194e89f 100644
+index 11cf00e1a20b3a84c6482f59583bcb5b6402a978..f0bd06ab32e99c188510b3c3fa41f1737ab4fe78 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -658,14 +658,14 @@ public abstract class BlockBehaviour {
+@@ -659,14 +659,14 @@ public abstract class BlockBehaviour {
  
      public abstract static class BlockStateBase extends StateHolder<Block, BlockState> {
  
@@ -6485,7 +6485,7 @@ index 6aba60bc79d373f098e97a7f9d8be0a78fb776a3..06525d7687fec5b37cd6020ad1bac998
          private final BlockBehaviour.StatePredicate isRedstoneConductor;
          private final BlockBehaviour.StatePredicate isSuffocating;
          private final BlockBehaviour.StatePredicate isViewBlocking;
-@@ -695,10 +695,18 @@ public abstract class BlockBehaviour {
+@@ -696,10 +696,18 @@ public abstract class BlockBehaviour {
              this.offsetType = (BlockBehaviour.OffsetType) blockbase_info.offsetType.apply(this.asState());
          }
  
@@ -6504,7 +6504,7 @@ index 6aba60bc79d373f098e97a7f9d8be0a78fb776a3..06525d7687fec5b37cd6020ad1bac998
  
          }
  
-@@ -734,8 +742,8 @@ public abstract class BlockBehaviour {
+@@ -735,8 +743,8 @@ public abstract class BlockBehaviour {
              return this.getBlock().getOcclusionShape(this.asState(), world, pos);
          }
  
@@ -6516,7 +6516,7 @@ index 6aba60bc79d373f098e97a7f9d8be0a78fb776a3..06525d7687fec5b37cd6020ad1bac998
  
          public boolean useShapeForLightOcclusion() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-index e71e0c7b00fa8ce2cbac9f17ac00902b05823809..91d2939bde77c52c25d2633dacc461d7284ef2d3 100644
+index d484aaae8614e78fdb984b26304b1de8b649e4bd..fabc7df600c89b01d97a76eb0b1206a32407b906 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
 @@ -58,7 +58,7 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
@@ -6738,7 +6738,7 @@ index e518e8e417f2eee43ff0847c24b6858054e7c9a9..ab986a3d1dc2f605b5b84d2b62cd9700
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-index c5af1f7521d87fd5344e01e034c16065ca60d962..3b11824a1b85da437eec108f631eacfb5192459e 100644
+index 9668a960dbd3b4ff3c0635df2fb7cc1af289d235..603111a52346f678aba0fd66b010d8f3026fce40 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
 @@ -74,6 +74,18 @@ public class ProtoChunk extends ChunkAccess {
@@ -6983,7 +6983,7 @@ index 0000000000000000000000000000000000000000..909b2c98e7a9117d2f737245e4661792
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 3e5aba82640e6e5b55c5dc873019b6a36457dd2b..0d0a5b436ff68d49cf7a043127818bd474562b4b 100644
+index 96bbfe115f4fcd9b5bfe733ee8e0a64f5dcf4198..8c5165c449f740e51aad3f41405aaad1cfe5c657 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -100,8 +100,17 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0008-Adventure.patch b/patches/unapplied/server/0008-Adventure.patch
index c5582d33ed..c5582d33ed 100644
--- a/patches/server/0008-Adventure.patch
+++ b/patches/unapplied/server/0008-Adventure.patch
diff --git a/patches/server/0009-Paper-command.patch b/patches/unapplied/server/0009-Paper-command.patch
index 62c835c158..59b2a9e70d 100644
--- a/patches/server/0009-Paper-command.patch
+++ b/patches/unapplied/server/0009-Paper-command.patch
@@ -559,7 +559,7 @@ index e476f93547f386ded0174693a6218d793ccc450b..393e465b0bac55d407f2ec66d7b11ed0
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d7a6371c3913a1021beffd8dc3189083f74a84d4..9c97599b2742ff3f7778114b231d6487077189da 100644
+index 837fb51698e6650c6df720f798b7196322b6e7bb..80333fe069e417ef692cb7b80292ed42d6e820a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -894,6 +894,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0010-Not-implemeneted.patch b/patches/unapplied/server/0010-Not-implemeneted.patch
index 8820930234..8820930234 100644
--- a/patches/server/0010-Not-implemeneted.patch
+++ b/patches/unapplied/server/0010-Not-implemeneted.patch
diff --git a/patches/server/0011-Paper-Metrics.patch b/patches/unapplied/server/0011-Paper-Metrics.patch
index 37974e62f8..37974e62f8 100644
--- a/patches/server/0011-Paper-Metrics.patch
+++ b/patches/unapplied/server/0011-Paper-Metrics.patch
diff --git a/patches/server/0012-Timings-v2.patch b/patches/unapplied/server/0012-Timings-v2.patch
index 9498e218cb..6dcdb8a998 100644
--- a/patches/server/0012-Timings-v2.patch
+++ b/patches/unapplied/server/0012-Timings-v2.patch
@@ -1333,7 +1333,7 @@ index 9e0c61b63cc402c26ca1306313ca6054efb108b8..dbd53de61057eb9eb8be651abf9abcad
  
      public UserWhiteList getWhiteList() {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3def476eee5fd6065762bdebd6659a3cc1a8dfbc..e6a884fb477f66502c3ce3091e8123f3370188ff 100644
+index 4ab6e75929ba34bcea6558ab51c8c551d6f70b02..358042454272243663de7f82a77c21c35714a62a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -132,7 +132,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
diff --git a/patches/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index df739e2911..8c0dfd9cbd 100644
--- a/patches/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 99bd8a5b516de6d98803141a0df337e3d96d7501..7c0e64404f442721b9279e7a167e6a5e26a81829 100644
+index 7b645fd1bb170a09f56a827048f5d8816254df2f..a9d9bc91b150597275d9b15f21dc00b49c5e3b28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -403,10 +403,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch
index e794b359ef..e794b359ef 100644
--- a/patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch
+++ b/patches/unapplied/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0015-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0015-Configurable-baby-zombie-movement-speed.patch
index e0d10bc34b..e0d10bc34b 100644
--- a/patches/server/0015-Configurable-baby-zombie-movement-speed.patch
+++ b/patches/unapplied/server/0015-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0016-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0016-Configurable-fishing-time-ranges.patch
index 71d66591ff..71d66591ff 100644
--- a/patches/server/0016-Configurable-fishing-time-ranges.patch
+++ b/patches/unapplied/server/0016-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
index c142430702..c142430702 100644
--- a/patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
+++ b/patches/unapplied/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
diff --git a/patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch
index 2724d12408..2724d12408 100644
--- a/patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/patches/unapplied/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch
diff --git a/patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0019-Allow-for-toggling-of-spawn-chunks.patch
index eb27f9892b..eb27f9892b 100644
--- a/patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch
+++ b/patches/unapplied/server/0019-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index ed1b412de9..ed1b412de9 100644
--- a/patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/unapplied/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index a74c44eae8..a74c44eae8 100644
--- a/patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/unapplied/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
diff --git a/patches/server/0022-Implement-Paper-VersionChecker.patch b/patches/unapplied/server/0022-Implement-Paper-VersionChecker.patch
index 81f7d8feb5..81f7d8feb5 100644
--- a/patches/server/0022-Implement-Paper-VersionChecker.patch
+++ b/patches/unapplied/server/0022-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0023-Add-version-history-to-version-command.patch b/patches/unapplied/server/0023-Add-version-history-to-version-command.patch
index fa801003c8..fa801003c8 100644
--- a/patches/server/0023-Add-version-history-to-version-command.patch
+++ b/patches/unapplied/server/0023-Add-version-history-to-version-command.patch
diff --git a/patches/server/0024-Player-affects-spawning-API.patch b/patches/unapplied/server/0024-Player-affects-spawning-API.patch
index f98bb5175e..f98bb5175e 100644
--- a/patches/server/0024-Player-affects-spawning-API.patch
+++ b/patches/unapplied/server/0024-Player-affects-spawning-API.patch
diff --git a/patches/server/0025-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0025-Further-improve-server-tick-loop.patch
index 77df3f7459..77df3f7459 100644
--- a/patches/server/0025-Further-improve-server-tick-loop.patch
+++ b/patches/unapplied/server/0025-Further-improve-server-tick-loop.patch
diff --git a/patches/server/0026-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0026-Only-refresh-abilities-if-needed.patch
index eefbf28c80..eefbf28c80 100644
--- a/patches/server/0026-Only-refresh-abilities-if-needed.patch
+++ b/patches/unapplied/server/0026-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0027-Entity-Origin-API.patch b/patches/unapplied/server/0027-Entity-Origin-API.patch
index fdb796eee0..1f20525981 100644
--- a/patches/server/0027-Entity-Origin-API.patch
+++ b/patches/unapplied/server/0027-Entity-Origin-API.patch
@@ -25,7 +25,7 @@ index a14386502e9b3ccec23233db2ddfedeec94ffb91..bae0b45aba0b04a229f5e098d13a5e63
  
          public void onTrackingEnd(Entity entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e6a884fb477f66502c3ce3091e8123f3370188ff..95dbf90ec1ce3f470eaaf99115668d5bd1c7bea1 100644
+index 358042454272243663de7f82a77c21c35714a62a..632945ac54a234b102e75d9558b00c1c8485b915 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -304,7 +304,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/0028-Prevent-tile-entity-and-entity-crashes.patch
index 5337d1fa05..5337d1fa05 100644
--- a/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/unapplied/server/0028-Prevent-tile-entity-and-entity-crashes.patch
diff --git a/patches/server/0029-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0029-Configurable-top-of-nether-void-damage.patch
index 36b041337e..17232fda22 100644
--- a/patches/server/0029-Configurable-top-of-nether-void-damage.patch
+++ b/patches/unapplied/server/0029-Configurable-top-of-nether-void-damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable top of nether void damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 95dbf90ec1ce3f470eaaf99115668d5bd1c7bea1..aee2429a0e55e5788ea874c17bcadecaa3d4ef0b 100644
+index 632945ac54a234b102e75d9558b00c1c8485b915..3564492eef1cac204ca580795dc8bb1e5e3d510a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -653,7 +653,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
index 64f713e616..64f713e616 100644
--- a/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/unapplied/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0031-Always-tick-falling-blocks.patch b/patches/unapplied/server/0031-Always-tick-falling-blocks.patch
index c52ac50408..c52ac50408 100644
--- a/patches/server/0031-Always-tick-falling-blocks.patch
+++ b/patches/unapplied/server/0031-Always-tick-falling-blocks.patch
diff --git a/patches/server/0032-Configurable-end-credits.patch b/patches/unapplied/server/0032-Configurable-end-credits.patch
index 484b153843..484b153843 100644
--- a/patches/server/0032-Configurable-end-credits.patch
+++ b/patches/unapplied/server/0032-Configurable-end-credits.patch
diff --git a/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
index 3a8886ecac..3a8886ecac 100644
--- a/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/unapplied/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0034-Optimize-explosions.patch b/patches/unapplied/server/0034-Optimize-explosions.patch
index 25c055dded..25c055dded 100644
--- a/patches/server/0034-Optimize-explosions.patch
+++ b/patches/unapplied/server/0034-Optimize-explosions.patch
diff --git a/patches/server/0035-Disable-explosion-knockback.patch b/patches/unapplied/server/0035-Disable-explosion-knockback.patch
index c4216f5d89..c4216f5d89 100644
--- a/patches/server/0035-Disable-explosion-knockback.patch
+++ b/patches/unapplied/server/0035-Disable-explosion-knockback.patch
diff --git a/patches/server/0036-Disable-thunder.patch b/patches/unapplied/server/0036-Disable-thunder.patch
index 85956cf93b..85956cf93b 100644
--- a/patches/server/0036-Disable-thunder.patch
+++ b/patches/unapplied/server/0036-Disable-thunder.patch
diff --git a/patches/server/0037-Disable-ice-and-snow.patch b/patches/unapplied/server/0037-Disable-ice-and-snow.patch
index 4aaa01d673..4aaa01d673 100644
--- a/patches/server/0037-Disable-ice-and-snow.patch
+++ b/patches/unapplied/server/0037-Disable-ice-and-snow.patch
diff --git a/patches/server/0038-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0038-Configurable-mob-spawner-tick-rate.patch
index b33478a7a0..b33478a7a0 100644
--- a/patches/server/0038-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/unapplied/server/0038-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/0039-Implement-PlayerLocaleChangeEvent.patch
index 3281b7fda8..3281b7fda8 100644
--- a/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/unapplied/server/0039-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch b/patches/unapplied/server/0040-Per-Player-View-Distance-API-placeholders.patch
index e8d46dd455..e8d46dd455 100644
--- a/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch
+++ b/patches/unapplied/server/0040-Per-Player-View-Distance-API-placeholders.patch
diff --git a/patches/server/0041-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0041-Add-BeaconEffectEvent.patch
index 4c04a07cd0..4c04a07cd0 100644
--- a/patches/server/0041-Add-BeaconEffectEvent.patch
+++ b/patches/unapplied/server/0041-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0042-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0042-Configurable-container-update-tick-rate.patch
index a91ea58897..a91ea58897 100644
--- a/patches/server/0042-Configurable-container-update-tick-rate.patch
+++ b/patches/unapplied/server/0042-Configurable-container-update-tick-rate.patch
diff --git a/patches/server/0043-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0043-Use-UserCache-for-player-heads.patch
index 2381324116..2381324116 100644
--- a/patches/server/0043-Use-UserCache-for-player-heads.patch
+++ b/patches/unapplied/server/0043-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0044-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0044-Disable-spigot-tick-limiters.patch
index b750d86014..b750d86014 100644
--- a/patches/server/0044-Disable-spigot-tick-limiters.patch
+++ b/patches/unapplied/server/0044-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0045-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0045-Add-PlayerInitialSpawnEvent.patch
index bcfa1912ef..bcfa1912ef 100644
--- a/patches/server/0045-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/unapplied/server/0045-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
index 85180f4352..85180f4352 100644
--- a/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/unapplied/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0047-Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/0047-Ensure-commands-are-not-ran-async.patch
index 9a5a8d1398..bc89e2e293 100644
--- a/patches/server/0047-Ensure-commands-are-not-ran-async.patch
+++ b/patches/unapplied/server/0047-Ensure-commands-are-not-ran-async.patch
@@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 357ff7f3ade2d59a7a2b3d93d7d35534565b6add..e27be8fb00360d546557bdbfec2907736145fa0f 100644
+index 70db08a398fb2461e9580ad2f75276f1a000fa06..4edfafdb3b38c27fb8a9c588c83ff0e6b67956ea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1948,6 +1948,29 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -48,7 +48,7 @@ index 357ff7f3ade2d59a7a2b3d93d7d35534565b6add..e27be8fb00360d546557bdbfec290773
          } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a830c5c8603eacfe52bdcb15cfa5f52cad1eba47..61f521f6e5e9e5b1e01e182df5e0f37c124d259f 100644
+index 415393e965c7253412ec4d893c3e62ad14dd69f2..846c5144fefd1dfd1bbd8e6f82bd9248be34ad1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -861,6 +861,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
index c510a84432..c510a84432 100644
--- a/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/unapplied/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0049-Expose-server-CommandMap.patch b/patches/unapplied/server/0049-Expose-server-CommandMap.patch
index 89de53d336..ef044311a1 100644
--- a/patches/server/0049-Expose-server-CommandMap.patch
+++ b/patches/unapplied/server/0049-Expose-server-CommandMap.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 61f521f6e5e9e5b1e01e182df5e0f37c124d259f..29db11ac78ae02a6dfbf5ce8f28ac45b2c047fc7 100644
+index 846c5144fefd1dfd1bbd8e6f82bd9248be34ad1a..3c1f2bcaedba7ec59d1a865ca8b5615a5c6d3d52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1981,6 +1981,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
index edd16859a7..edd16859a7 100644
--- a/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/unapplied/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch b/patches/unapplied/server/0051-Ensure-inv-drag-is-in-bounds.patch
index f323028a3e..f323028a3e 100644
--- a/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch
+++ b/patches/unapplied/server/0051-Ensure-inv-drag-is-in-bounds.patch
diff --git a/patches/server/0052-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0052-Player-Tab-List-and-Title-APIs.patch
index 7ad11121d7..7ad11121d7 100644
--- a/patches/server/0052-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/unapplied/server/0052-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/server/0053-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0053-Add-configurable-portal-search-radius.patch
index 5c46e4de2a..5c46e4de2a 100644
--- a/patches/server/0053-Add-configurable-portal-search-radius.patch
+++ b/patches/unapplied/server/0053-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0054-Add-velocity-warnings.patch b/patches/unapplied/server/0054-Add-velocity-warnings.patch
index 7105e04dfa..7ec4434dab 100644
--- a/patches/server/0054-Add-velocity-warnings.patch
+++ b/patches/unapplied/server/0054-Add-velocity-warnings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 29db11ac78ae02a6dfbf5ce8f28ac45b2c047fc7..5905936a47649171c79000da9c1f85ef0be10d2a 100644
+index 3c1f2bcaedba7ec59d1a865ca8b5615a5c6d3d52..3dc04ad966c9f44f62af918c50ff1e8ed461fe3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -278,6 +278,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0055-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0055-Configurable-inter-world-teleportation-safety.patch
index f50a3ab567..f50a3ab567 100644
--- a/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/unapplied/server/0055-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0056-Add-exception-reporting-event.patch b/patches/unapplied/server/0056-Add-exception-reporting-event.patch
index efada83cad..efada83cad 100644
--- a/patches/server/0056-Add-exception-reporting-event.patch
+++ b/patches/unapplied/server/0056-Add-exception-reporting-event.patch
diff --git a/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 324b906814..324b906814 100644
--- a/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/patches/unapplied/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
index b17b5640fe..8c48a6dfd9 100644
--- a/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/unapplied/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
@@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 125e89bf8473dc7febd791073e6801aa75b85840..1bdbd36133615fde517174ab336f2de81efc5875 100644
+index 7953111f8d00413b39a17d2b09b1b74b55c2ab63..380b7a31bae4d63248f8473dcbb602f4abbd4dd8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2578,6 +2578,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index b73f1a823f..b73f1a823f 100644
--- a/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/unapplied/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0060-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0060-Chunk-Save-Reattempt.patch
index 82a269b220..82a269b220 100644
--- a/patches/server/0060-Chunk-Save-Reattempt.patch
+++ b/patches/unapplied/server/0060-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0061-Complete-resource-pack-API.patch b/patches/unapplied/server/0061-Complete-resource-pack-API.patch
index e7911ba01a..cdf42160ff 100644
--- a/patches/server/0061-Complete-resource-pack-API.patch
+++ b/patches/unapplied/server/0061-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 e27be8fb00360d546557bdbfec2907736145fa0f..d5cbeb088c95537fa63a489603a71307481ee455 100644
+index 4edfafdb3b38c27fb8a9c588c83ff0e6b67956ea..2266ddf2ed66dfc9f82facddcbe6fcc89e1c0267 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1687,8 +1687,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0062-Default-loading-permissions.yml-before-plugins.patch
index e236378075..cd39cadade 100644
--- a/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/unapplied/server/0062-Default-loading-permissions.yml-before-plugins.patch
@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5905936a47649171c79000da9c1f85ef0be10d2a..96c8e08a0c4cec7f6c79de0477011c53b7c90af2 100644
+index 3dc04ad966c9f44f62af918c50ff1e8ed461fe3b..9f9d2c32d184a9ef7f2fbdef85129654b43cf3ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -460,6 +460,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0063-Allow-Reloading-of-Custom-Permissions.patch
index e2b4ea8cff..248ca2704d 100644
--- a/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/unapplied/server/0063-Allow-Reloading-of-Custom-Permissions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 96c8e08a0c4cec7f6c79de0477011c53b7c90af2..fde49ecd08fed39ace86955877998c9909215e3d 100644
+index 9f9d2c32d184a9ef7f2fbdef85129654b43cf3ab..bb90cb49fc2b4bb4034d43d16eee61643773ecfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2530,5 +2530,23 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0064-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0064-Remove-Metadata-on-reload.patch
index 752c522c92..4a9ce42f3b 100644
--- a/patches/server/0064-Remove-Metadata-on-reload.patch
+++ b/patches/unapplied/server/0064-Remove-Metadata-on-reload.patch
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fde49ecd08fed39ace86955877998c9909215e3d..78759fbd83f36a7c03891660324ccc1b077713a6 100644
+index bb90cb49fc2b4bb4034d43d16eee61643773ecfa..aa6a40eae3a3897ab3cca93921635e4e3e37db9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -948,8 +948,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0065-Handle-Item-Meta-Inconsistencies.patch
index 78b0f1ae1f..78b0f1ae1f 100644
--- a/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/unapplied/server/0065-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 9544e6114a..9544e6114a 100644
--- a/patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/unapplied/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0067-Add-World-Util-Methods.patch b/patches/unapplied/server/0067-Add-World-Util-Methods.patch
index 782de5b1eb..782de5b1eb 100644
--- a/patches/server/0067-Add-World-Util-Methods.patch
+++ b/patches/unapplied/server/0067-Add-World-Util-Methods.patch
diff --git a/patches/server/0068-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0068-Custom-replacement-for-eaten-items.patch
index a35a5251b0..a35a5251b0 100644
--- a/patches/server/0068-Custom-replacement-for-eaten-items.patch
+++ b/patches/unapplied/server/0068-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index a7e086d2ed..a7e086d2ed 100644
--- a/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/unapplied/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0070-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0070-Use-a-Shared-Random-for-Entities.patch
index bd6f220da5..e9f27723f4 100644
--- a/patches/server/0070-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/unapplied/server/0070-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 1bdbd36133615fde517174ab336f2de81efc5875..770d232297908f13e4636bf2a2e40e50924eda14 100644
+index 380b7a31bae4d63248f8473dcbb602f4abbd4dd8..4e5dbb2414c76181053db13b13082154366f581a 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/0071-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
index 36024711ec..36024711ec 100644
--- a/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/unapplied/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 3aae2fc17f..3aae2fc17f 100644
--- a/patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/unapplied/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index b835194d53..b835194d53 100644
--- a/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/unapplied/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
index 6a891f7c96..6a891f7c96 100644
--- a/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/unapplied/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0075-Configurable-Chunk-Inhabited-Time.patch
index 3dc363ab29..3dc363ab29 100644
--- a/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/unapplied/server/0075-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0076-EntityPathfindEvent.patch b/patches/unapplied/server/0076-EntityPathfindEvent.patch
index b076482d21..b076482d21 100644
--- a/patches/server/0076-EntityPathfindEvent.patch
+++ b/patches/unapplied/server/0076-EntityPathfindEvent.patch
diff --git a/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
index 071a254a0c..071a254a0c 100644
--- a/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/unapplied/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0078-Do-not-load-chunks-for-Pathfinding.patch
index f2b3dffd68..f2b3dffd68 100644
--- a/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/unapplied/server/0078-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0079-Add-PlayerUseUnknownEntityEvent.patch
index 37c0edc824..f300347d6c 100644
--- a/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/server/0079-Add-PlayerUseUnknownEntityEvent.patch
@@ -20,7 +20,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 d5cbeb088c95537fa63a489603a71307481ee455..3100b69930682ccb9f72ba15e00254d91ab79b4f 100644
+index 2266ddf2ed66dfc9f82facddcbe6fcc89e1c0267..a33a142ba55be937fb19f70239f8327f8b7f236e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2411,8 +2411,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
index 50a9c78703..50a9c78703 100644
--- a/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/patches/unapplied/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index eb66aab2ea..eb66aab2ea 100644
--- a/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/unapplied/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0082-Optimize-DataBits.patch b/patches/unapplied/server/0082-Optimize-DataBits.patch
index 8686b1aff9..8686b1aff9 100644
--- a/patches/server/0082-Optimize-DataBits.patch
+++ b/patches/unapplied/server/0082-Optimize-DataBits.patch
diff --git a/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 4b02783b1c..4b02783b1c 100644
--- a/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/unapplied/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0084-Configurable-Player-Collision.patch b/patches/unapplied/server/0084-Configurable-Player-Collision.patch
index 960978e78f..960978e78f 100644
--- a/patches/server/0084-Configurable-Player-Collision.patch
+++ b/patches/unapplied/server/0084-Configurable-Player-Collision.patch
diff --git a/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 0f1b5b5544..0f1b5b5544 100644
--- a/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0086-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0086-Configurable-RCON-IP-address.patch
index 40f64fe29f..40f64fe29f 100644
--- a/patches/server/0086-Configurable-RCON-IP-address.patch
+++ b/patches/unapplied/server/0086-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch
index 2e02c69cc0..2e02c69cc0 100644
--- a/patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0088-Add-ability-to-configure-frosted_ice-properties.patch
index 8e938c31ad..8e938c31ad 100644
--- a/patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/unapplied/server/0088-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0089-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0089-remove-null-possibility-for-getServer-singleton.patch
index 1ea8fa682c..1ea8fa682c 100644
--- a/patches/server/0089-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/unapplied/server/0089-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index ae5e2f1978..ae5e2f1978 100644
--- a/patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/unapplied/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch
index eaaaa50553..4aedf42424 100644
--- a/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/unapplied/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -485,7 +485,7 @@ index 0000000000000000000000000000000000000000..3377b86c337d0234bbb9b0349e4034a7
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 770d232297908f13e4636bf2a2e40e50924eda14..39f74f7648f73e296176c121fadb35bdf3ed160c 100644
+index 4e5dbb2414c76181053db13b13082154366f581a..a96d50b68d6ce6fe9b36de5af132b2fa6d08961c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -232,6 +232,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index c233fb2657..c233fb2657 100644
--- a/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/unapplied/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0093-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0093-System-property-for-disabling-watchdoge.patch
index 8d880e6928..8d880e6928 100644
--- a/patches/server/0093-System-property-for-disabling-watchdoge.patch
+++ b/patches/unapplied/server/0093-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0094-Async-GameProfileCache-saving.patch b/patches/unapplied/server/0094-Async-GameProfileCache-saving.patch
index 9566025418..9566025418 100644
--- a/patches/server/0094-Async-GameProfileCache-saving.patch
+++ b/patches/unapplied/server/0094-Async-GameProfileCache-saving.patch
diff --git a/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0095-Optional-TNT-doesn-t-move-in-water.patch
index 3cb11be6b8..3cb11be6b8 100644
--- a/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/unapplied/server/0095-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
index bb9244b467..bb9244b467 100644
--- a/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/unapplied/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0097-Add-server-name-parameter.patch b/patches/unapplied/server/0097-Add-server-name-parameter.patch
index ae657c8fce..ae657c8fce 100644
--- a/patches/server/0097-Add-server-name-parameter.patch
+++ b/patches/unapplied/server/0097-Add-server-name-parameter.patch
diff --git a/patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/unapplied/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 1cfb68f251..1cfb68f251 100644
--- a/patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/patches/unapplied/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
diff --git a/patches/server/0099-Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/0099-Fix-Old-Sign-Conversion.patch
index 624d458372..624d458372 100644
--- a/patches/server/0099-Fix-Old-Sign-Conversion.patch
+++ b/patches/unapplied/server/0099-Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
index 5650234bb6..5650234bb6 100644
--- a/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/unapplied/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 7c155f0b54..7c155f0b54 100644
--- a/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/unapplied/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0102-Add-setting-for-proxy-online-mode-status.patch
index dbad98baa3..8435ac73b0 100644
--- a/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/unapplied/server/0102-Add-setting-for-proxy-online-mode-status.patch
@@ -43,7 +43,7 @@ index da98f074ccd5a40c635824112c97fd174c393cb1..6599f874d9f97e9ef4862039ecad7277
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 78759fbd83f36a7c03891660324ccc1b077713a6..4277923c31a3593409113a7d860c09f640c5f288 100644
+index aa6a40eae3a3897ab3cca93921635e4e3e37db9f..34d4157d187ff8485d860eb4f75b898aee06863c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1704,7 +1704,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0103-Optimise-BlockState-s-hashCode-equals.patch
index 53db895e2e..53db895e2e 100644
--- a/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/unapplied/server/0103-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0104-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0104-Configurable-packet-in-spam-threshold.patch
index f6484c573e..009584d272 100644
--- a/patches/server/0104-Configurable-packet-in-spam-threshold.patch
+++ b/patches/unapplied/server/0104-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 3100b69930682ccb9f72ba15e00254d91ab79b4f..0e85f5c0396f3931462f5daab10fce76ab28f414 100644
+index a33a142ba55be937fb19f70239f8327f8b7f236e..299dc4ff01642a5d7229a1e0540c3154e42e25a7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1535,13 +1535,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0105-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0105-Configurable-flying-kick-messages.patch
index 3aed64d12d..2dc6e3402e 100644
--- a/patches/server/0105-Configurable-flying-kick-messages.patch
+++ b/patches/unapplied/server/0105-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 0e85f5c0396f3931462f5daab10fce76ab28f414..af162828963571f87f7b530443fdf6c3fa22fd4d 100644
+index 299dc4ff01642a5d7229a1e0540c3154e42e25a7..6aac105a9717b02af648be82fe8e1b2b30bef8a6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -327,7 +327,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0106-Add-EntityZapEvent.patch b/patches/unapplied/server/0106-Add-EntityZapEvent.patch
index 545c1bc427..545c1bc427 100644
--- a/patches/server/0106-Add-EntityZapEvent.patch
+++ b/patches/unapplied/server/0106-Add-EntityZapEvent.patch
diff --git a/patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/unapplied/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 9fc8ffaeaf..9fc8ffaeaf 100644
--- a/patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/patches/unapplied/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
diff --git a/patches/server/0108-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0108-Cache-user-authenticator-threads.patch
index b884eeb7e8..b884eeb7e8 100644
--- a/patches/server/0108-Cache-user-authenticator-threads.patch
+++ b/patches/unapplied/server/0108-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0109-Allow-Reloading-of-Command-Aliases.patch
index ba5dac2241..f94697a6b2 100644
--- a/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/server/0109-Allow-Reloading-of-Command-Aliases.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4277923c31a3593409113a7d860c09f640c5f288..a1288400fec4f58aeee849b8bce6d3c7751b2967 100644
+index 34d4157d187ff8485d860eb4f75b898aee06863c..8c041ca80cb20800178f8d4a5584e1b26bf3cb15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2556,5 +2556,24 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0110-Add-source-to-PlayerExpChangeEvent.patch
index e290b2ac51..e290b2ac51 100644
--- a/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/server/0110-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0111-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0111-Add-ProjectileCollideEvent.patch
index 150e864a9e..150e864a9e 100644
--- a/patches/server/0111-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/server/0111-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0112-Prevent-Pathfinding-out-of-World-Border.patch
index 266eb9f28f..266eb9f28f 100644
--- a/patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/unapplied/server/0112-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch
index 2756e56e5d..2756e56e5d 100644
--- a/patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/unapplied/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0114-Bound-Treasure-Maps-to-World-Border.patch
index 9c764f4aaf..9c764f4aaf 100644
--- a/patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/unapplied/server/0114-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0115-Configurable-Cartographer-Treasure-Maps.patch
index 25ad0e6acc..25ad0e6acc 100644
--- a/patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/unapplied/server/0115-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0116-Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/0116-Optimize-ItemStack.isEmpty.patch
index b76cd7ea27..b76cd7ea27 100644
--- a/patches/server/0116-Optimize-ItemStack.isEmpty.patch
+++ b/patches/unapplied/server/0116-Optimize-ItemStack.isEmpty.patch
diff --git a/patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 6b19100733..6b19100733 100644
--- a/patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/unapplied/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0118-String-based-Action-Bar-API.patch b/patches/unapplied/server/0118-String-based-Action-Bar-API.patch
index 39b8077051..39b8077051 100644
--- a/patches/server/0118-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/server/0118-String-based-Action-Bar-API.patch
diff --git a/patches/server/0119-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch
index afd7d81df6..afd7d81df6 100644
--- a/patches/server/0119-Properly-fix-item-duplication-bug.patch
+++ b/patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0120-Firework-API-s.patch b/patches/unapplied/server/0120-Firework-API-s.patch
index cde42af88b..cde42af88b 100644
--- a/patches/server/0120-Firework-API-s.patch
+++ b/patches/unapplied/server/0120-Firework-API-s.patch
diff --git a/patches/server/0121-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0121-PlayerTeleportEndGatewayEvent.patch
index 65f98958b1..65f98958b1 100644
--- a/patches/server/0121-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0121-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
index 91494190e3..91494190e3 100644
--- a/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0123-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0123-Enforce-Sync-Player-Saves.patch
index ec06df175a..ec06df175a 100644
--- a/patches/server/0123-Enforce-Sync-Player-Saves.patch
+++ b/patches/unapplied/server/0123-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch
index 98df5e8731..008caa0dd6 100644
--- a/patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/patches/unapplied/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 39f74f7648f73e296176c121fadb35bdf3ed160c..28b8e72fe681557fb85ddd57e96cd1b00b1fcd99 100644
+index a96d50b68d6ce6fe9b36de5af132b2fa6d08961c..9d854cb4722ccd3a665fd29aff8bf368163c30e4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2322,6 +2322,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index c3bca094a3..c3bca094a3 100644
--- a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0126-Cap-Entity-Collisions.patch b/patches/unapplied/server/0126-Cap-Entity-Collisions.patch
index e3925b144d..bf9b261933 100644
--- a/patches/server/0126-Cap-Entity-Collisions.patch
+++ b/patches/unapplied/server/0126-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 28b8e72fe681557fb85ddd57e96cd1b00b1fcd99..3bd991edf1659c96358d4e217a4d41a3a88310a8 100644
+index 9d854cb4722ccd3a665fd29aff8bf368163c30e4..1daffb325617f8e9f3218aa879eb7d8467d69447 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 {
diff --git a/patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch
index eacad1fb97..eacad1fb97 100644
--- a/patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/unapplied/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0128-Do-not-let-armorstands-drown.patch b/patches/unapplied/server/0128-Do-not-let-armorstands-drown.patch
index 948bf3a496..948bf3a496 100644
--- a/patches/server/0128-Do-not-let-armorstands-drown.patch
+++ b/patches/unapplied/server/0128-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/unapplied/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 284230e4dc..284230e4dc 100644
--- a/patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/patches/unapplied/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
diff --git a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
index c74bffe328..c74bffe328 100644
--- a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/unapplied/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 7f0bb5b68f..f99fdc6fab 100644
--- a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/unapplied/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 34f58fb835abaad145e2f1fa71cce193386a28fb..8481e16454fbee019f0c8f3c9371576cbfc48d07 100644
+index aafeb6643bcc08ae1d88ba2a68f1f6a29c8ce2b7..61752ae5602e901ed03037cb2dee29f461b68cac 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2259,6 +2259,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
index 6e282a3b8e..2ced48b9ad 100644
--- a/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a1288400fec4f58aeee849b8bce6d3c7751b2967..aacddeb767770472990bfc2b5f9109d5605b3053 100644
+index 8c041ca80cb20800178f8d4a5584e1b26bf3cb15..be392b054d3fe86118265cbe65067e83b37f36e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2575,5 +2575,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
index e094d1b1a4..e094d1b1a4 100644
--- a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/unapplied/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
diff --git a/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
index d5c14819e2..d5c14819e2 100644
--- a/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/unapplied/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0135-Item-canEntityPickup.patch b/patches/unapplied/server/0135-Item-canEntityPickup.patch
index f16e7c836b..f16e7c836b 100644
--- a/patches/server/0135-Item-canEntityPickup.patch
+++ b/patches/unapplied/server/0135-Item-canEntityPickup.patch
diff --git a/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 18d03a9022..18d03a9022 100644
--- a/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/unapplied/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0137-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0137-PlayerAttemptPickupItemEvent.patch
index 0f8e97e022..0f8e97e022 100644
--- a/patches/server/0137-PlayerAttemptPickupItemEvent.patch
+++ b/patches/unapplied/server/0137-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index aece8e9710..aece8e9710 100644
--- a/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/unapplied/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0139-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0139-Add-UnknownCommandEvent.patch
index c76492382c..1e362236a7 100644
--- a/patches/server/0139-Add-UnknownCommandEvent.patch
+++ b/patches/unapplied/server/0139-Add-UnknownCommandEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 48cf396d30a4964632fff31969995d3c291bb52f..a74f3f4f475626d4713b35166050bbbdc4590a67 100644
+index ad469e105871105a3918f9213bc9f27263955063..6d9ec963c1f0c5ee477ee4d84862a3c699eeba46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -890,7 +890,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0140-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0140-Basic-PlayerProfile-API.patch
index 77205edb13..34aaa75a27 100644
--- a/patches/server/0140-Basic-PlayerProfile-API.patch
+++ b/patches/unapplied/server/0140-Basic-PlayerProfile-API.patch
@@ -621,7 +621,7 @@ index 6c8a1d9c7696fa55dae6ba5e4ea50a0ffc7ea543..2347c7b44793aabe431b57bb1b44935f
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a74f3f4f475626d4713b35166050bbbdc4590a67..010004567a0958b46cefce4d83e73118f1c9dac5 100644
+index 6d9ec963c1f0c5ee477ee4d84862a3c699eeba46..733423010e7941d160b838d614c732980111fb55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -242,6 +242,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
diff --git a/patches/server/0141-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0141-Shoulder-Entities-Release-API.patch
index 6278bc65ff..6278bc65ff 100644
--- a/patches/server/0141-Shoulder-Entities-Release-API.patch
+++ b/patches/unapplied/server/0141-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0142-Profile-Lookup-Events.patch b/patches/unapplied/server/0142-Profile-Lookup-Events.patch
index a9a4210f19..a9a4210f19 100644
--- a/patches/server/0142-Profile-Lookup-Events.patch
+++ b/patches/unapplied/server/0142-Profile-Lookup-Events.patch
diff --git a/patches/server/0143-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0143-Block-player-logins-during-server-shutdown.patch
index 1852937314..1852937314 100644
--- a/patches/server/0143-Block-player-logins-during-server-shutdown.patch
+++ b/patches/unapplied/server/0143-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0144-Entity-fromMobSpawner.patch b/patches/unapplied/server/0144-Entity-fromMobSpawner.patch
index b656393396..c7bc55b35c 100644
--- a/patches/server/0144-Entity-fromMobSpawner.patch
+++ b/patches/unapplied/server/0144-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3bd991edf1659c96358d4e217a4d41a3a88310a8..0302462b03884ba8086115c6593c8fe4a4571a59 100644
+index 1daffb325617f8e9f3218aa879eb7d8467d69447..e233f1bd8047c06d69aed0e22c220658b9868729 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -380,6 +380,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0145-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0145-Improve-the-Saddle-API-for-Horses.patch
index ccd3b7baf4..ccd3b7baf4 100644
--- a/patches/server/0145-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/unapplied/server/0145-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0146-Implement-ensureServerConversions-API.patch b/patches/unapplied/server/0146-Implement-ensureServerConversions-API.patch
index f98e7f543c..f98e7f543c 100644
--- a/patches/server/0146-Implement-ensureServerConversions-API.patch
+++ b/patches/unapplied/server/0146-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0147-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0147-Implement-getI18NDisplayName.patch
index 7011d8a566..7011d8a566 100644
--- a/patches/server/0147-Implement-getI18NDisplayName.patch
+++ b/patches/unapplied/server/0147-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0148-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0148-ProfileWhitelistVerifyEvent.patch
index 6a1584c243..6a1584c243 100644
--- a/patches/server/0148-ProfileWhitelistVerifyEvent.patch
+++ b/patches/unapplied/server/0148-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0149-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0149-Fix-this-stupid-bullshit.patch
index 1a754ae1ad..1a754ae1ad 100644
--- a/patches/server/0149-Fix-this-stupid-bullshit.patch
+++ b/patches/unapplied/server/0149-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0150-LivingEntity-setKiller.patch b/patches/unapplied/server/0150-LivingEntity-setKiller.patch
index c8eb4f6720..c8eb4f6720 100644
--- a/patches/server/0150-LivingEntity-setKiller.patch
+++ b/patches/unapplied/server/0150-LivingEntity-setKiller.patch
diff --git a/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 884de65442..884de65442 100644
--- a/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/unapplied/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index c47d4472ba..c47d4472ba 100644
--- a/patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/unapplied/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch
index 720b3fddbb..720b3fddbb 100644
--- a/patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/unapplied/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 24e5ff4f30..24e5ff4f30 100644
--- a/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/unapplied/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 5afb9562c0..5afb9562c0 100644
--- a/patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/unapplied/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0156-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0156-Add-PlayerJumpEvent.patch
index 1296658f92..d49e991db0 100644
--- a/patches/server/0156-Add-PlayerJumpEvent.patch
+++ b/patches/unapplied/server/0156-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 8481e16454fbee019f0c8f3c9371576cbfc48d07..c5ab3ee4525f8eb611f273ff35d1b91787bc95b8 100644
+index 61752ae5602e901ed03037cb2dee29f461b68cac..751086ab2f87269ecd43306b794d8b1c3dcd143f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1217,7 +1217,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/0157-handle-ServerboundKeepAlivePacket-async.patch
index 784d02d07d..020dcdcc16 100644
--- a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/unapplied/server/0157-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 c5ab3ee4525f8eb611f273ff35d1b91787bc95b8..a38061ba575a2603b6b04382cb2f5c8396b05bdd 100644
+index 751086ab2f87269ecd43306b794d8b1c3dcd143f..1669732069b255df1b53e3d82e310deab93dd296 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2996,14 +2996,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0158-Expose-client-protocol-version-and-virtual-host.patch
index 0ae6a79465..0ae6a79465 100644
--- a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/server/0158-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0159-revert-serverside-behavior-of-keepalives.patch
index 7c5718deea..879da0970f 100644
--- a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/unapplied/server/0159-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 a38061ba575a2603b6b04382cb2f5c8396b05bdd..86f9991cfe6aca5923c64d8cdde6e90b9ba5591d 100644
+index 1669732069b255df1b53e3d82e310deab93dd296..b3d75627ecf672c048e9129e3e64a1994f683204 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -240,7 +240,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index c8919be744..c8919be744 100644
--- a/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/unapplied/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0161-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0161-Add-PlayerArmorChangeEvent.patch
index fab2852fe7..fab2852fe7 100644
--- a/patches/server/0161-Add-PlayerArmorChangeEvent.patch
+++ b/patches/unapplied/server/0161-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
index 7b4e3a0b6f..7b4e3a0b6f 100644
--- a/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/unapplied/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index d0a52d5728..d0a52d5728 100644
--- a/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/unapplied/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
index 8c4fa7bc1d..8c4fa7bc1d 100644
--- a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/unapplied/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
index c2d8befb3f..c2d8befb3f 100644
--- a/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0166-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0166-AsyncTabCompleteEvent.patch
index 2d22d82f5b..c2cfcbec35 100644
--- a/patches/server/0166-AsyncTabCompleteEvent.patch
+++ b/patches/unapplied/server/0166-AsyncTabCompleteEvent.patch
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 86f9991cfe6aca5923c64d8cdde6e90b9ba5591d..7f17875e359855a25618a52bc2e844fe10258aaf 100644
+index b3d75627ecf672c048e9129e3e64a1994f683204..0354657082890577d965c21fc18b1515480c203d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -741,10 +741,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -72,7 +72,7 @@ index 86f9991cfe6aca5923c64d8cdde6e90b9ba5591d..7f17875e359855a25618a52bc2e844fe
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 010004567a0958b46cefce4d83e73118f1c9dac5..f9ccc60e0632bedfad05d03b2524cde7f439aa86 100644
+index 733423010e7941d160b838d614c732980111fb55..45d3fc8174ff32c140c1c234b655a6971a27913e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2084,7 +2084,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0167-PlayerPickupExperienceEvent.patch
index f59d0999a5..f59d0999a5 100644
--- a/patches/server/0167-PlayerPickupExperienceEvent.patch
+++ b/patches/unapplied/server/0167-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0168-Ability-to-apply-mending-to-XP-API.patch
index d953751fe7..d953751fe7 100644
--- a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/unapplied/server/0168-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
index d41ab432ae..d41ab432ae 100644
--- a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/unapplied/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
index a87a829f5b..a87a829f5b 100644
--- a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/unapplied/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0171-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0171-PreCreatureSpawnEvent.patch
index 82fc009561..82fc009561 100644
--- a/patches/server/0171-PreCreatureSpawnEvent.patch
+++ b/patches/unapplied/server/0171-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0172-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0172-Fill-Profile-Property-Events.patch
index 30643d081c..30643d081c 100644
--- a/patches/server/0172-Fill-Profile-Property-Events.patch
+++ b/patches/unapplied/server/0172-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0173-PlayerAdvancementCriterionGrantEvent.patch
index de0f23f170..de0f23f170 100644
--- a/patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/unapplied/server/0173-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0174-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0174-Add-ArmorStand-Item-Meta.patch
index 08077b5138..08077b5138 100644
--- a/patches/server/0174-Add-ArmorStand-Item-Meta.patch
+++ b/patches/unapplied/server/0174-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0175-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0175-Extend-Player-Interact-cancellation.patch
index ef330b35a9..ef330b35a9 100644
--- a/patches/server/0175-Extend-Player-Interact-cancellation.patch
+++ b/patches/unapplied/server/0175-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0176-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0176-Tameable-getOwnerUniqueId-API.patch
index 7fca628e8a..7fca628e8a 100644
--- a/patches/server/0176-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/unapplied/server/0176-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 8ec53f2390..8ec53f2390 100644
--- a/patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/patches/unapplied/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
index 137aaae93f..137aaae93f 100644
--- a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/unapplied/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0179-Implement-extended-PaperServerListPingEvent.patch
index 5fae0ed291..5fae0ed291 100644
--- a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/server/0179-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 96cfdac92b..96cfdac92b 100644
--- a/patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/unapplied/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0181-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0181-Player.setPlayerProfile-API.patch
index b34a02e7bd..b34a02e7bd 100644
--- a/patches/server/0181-Player.setPlayerProfile-API.patch
+++ b/patches/unapplied/server/0181-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0182-getPlayerUniqueId-API.patch b/patches/unapplied/server/0182-getPlayerUniqueId-API.patch
index 5d46e08695..059bc2b977 100644
--- a/patches/server/0182-getPlayerUniqueId-API.patch
+++ b/patches/unapplied/server/0182-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 f9ccc60e0632bedfad05d03b2524cde7f439aa86..a13949140f18cae6813ab2e19247969e93e64451 100644
+index 45d3fc8174ff32c140c1c234b655a6971a27913e..1775174221c84b627ea778c0d0892ce46c1d56b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1706,6 +1706,25 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0183-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0183-Improved-Async-Task-Scheduler.patch
index b62fddc7b9..b62fddc7b9 100644
--- a/patches/server/0183-Improved-Async-Task-Scheduler.patch
+++ b/patches/unapplied/server/0183-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0184-Make-legacy-ping-handler-more-reliable.patch
index 4b8b62f71a..4b8b62f71a 100644
--- a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/unapplied/server/0184-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 2e957c1ff4..2e957c1ff4 100644
--- a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/unapplied/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0186-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0186-Flag-to-disable-the-channel-limit.patch
index 5aad550fa6..5aad550fa6 100644
--- a/patches/server/0186-Flag-to-disable-the-channel-limit.patch
+++ b/patches/unapplied/server/0186-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0187-Add-openSign-method-to-HumanEntity.patch
index e3578a257b..e3578a257b 100644
--- a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/unapplied/server/0187-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0188-Configurable-sprint-interruption-on-attack.patch
index 157f5b6c24..157f5b6c24 100644
--- a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/unapplied/server/0188-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 96b5ad6c81..3db2a4753c 100644
--- a/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/unapplied/server/0189-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 7f17875e359855a25618a52bc2e844fe10258aaf..d729042a22f01decbf30d35d7842e43cab283c05 100644
+index 0354657082890577d965c21fc18b1515480c203d..15bad199895be87a93122fb3e860c2b552b89c55 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3002,9 +3002,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0190-EndermanEscapeEvent.patch b/patches/unapplied/server/0190-EndermanEscapeEvent.patch
index 3fff4f9bad..3fff4f9bad 100644
--- a/patches/server/0190-EndermanEscapeEvent.patch
+++ b/patches/unapplied/server/0190-EndermanEscapeEvent.patch
diff --git a/patches/server/0191-Enderman.teleportRandomly.patch b/patches/unapplied/server/0191-Enderman.teleportRandomly.patch
index aafeea74bb..aafeea74bb 100644
--- a/patches/server/0191-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/server/0191-Enderman.teleportRandomly.patch
diff --git a/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0192-Block-Enderpearl-Travel-Exploit.patch
index 6ea8be62f8..6ea8be62f8 100644
--- a/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/unapplied/server/0192-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
index a19404abea..a19404abea 100644
--- a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index b9c45b572d..b9c45b572d 100644
--- a/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/patches/unapplied/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0195-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0195-EndermanAttackPlayerEvent.patch
index 6a1eef464f..6a1eef464f 100644
--- a/patches/server/0195-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/server/0195-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0196-WitchConsumePotionEvent.patch b/patches/unapplied/server/0196-WitchConsumePotionEvent.patch
index f054a8dd3c..f054a8dd3c 100644
--- a/patches/server/0196-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/server/0196-WitchConsumePotionEvent.patch
diff --git a/patches/server/0197-WitchThrowPotionEvent.patch b/patches/unapplied/server/0197-WitchThrowPotionEvent.patch
index 86ba404bc1..86ba404bc1 100644
--- a/patches/server/0197-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/server/0197-WitchThrowPotionEvent.patch
diff --git a/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 9bfc81d04d..9bfc81d04d 100644
--- a/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/unapplied/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0199-WitchReadyPotionEvent.patch b/patches/unapplied/server/0199-WitchReadyPotionEvent.patch
index 99ac9dce10..99ac9dce10 100644
--- a/patches/server/0199-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/server/0199-WitchReadyPotionEvent.patch
diff --git a/patches/server/0200-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0200-ItemStack-getMaxItemUseDuration.patch
index 96e27516fa..96e27516fa 100644
--- a/patches/server/0200-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/server/0200-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
index b1a4699bbc..b1a4699bbc 100644
--- a/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 6f7b7cd31b..6f7b7cd31b 100644
--- a/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/unapplied/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0203-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0203-Fix-CraftEntity-hashCode.patch
index 99f647d7b3..99f647d7b3 100644
--- a/patches/server/0203-Fix-CraftEntity-hashCode.patch
+++ b/patches/unapplied/server/0203-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
index 40dce864c6..40dce864c6 100644
--- a/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/unapplied/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
index 1fa6aa9aac..1fa6aa9aac 100644
--- a/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/unapplied/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0206-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0206-Make-shield-blocking-delay-configurable.patch
index c2dd0c466b..c2dd0c466b 100644
--- a/patches/server/0206-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/server/0206-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0207-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0207-Improve-EntityShootBowEvent.patch
index 80a633b156..80a633b156 100644
--- a/patches/server/0207-Improve-EntityShootBowEvent.patch
+++ b/patches/unapplied/server/0207-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0208-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0208-PlayerReadyArrowEvent.patch
index cb650e6788..cb650e6788 100644
--- a/patches/server/0208-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/server/0208-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch b/patches/unapplied/server/0209-Implement-EntityKnockbackByEntityEvent.patch
index 8de06d78b7..8de06d78b7 100644
--- a/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/unapplied/server/0209-Implement-EntityKnockbackByEntityEvent.patch
diff --git a/patches/server/0210-Expand-Explosions-API.patch b/patches/unapplied/server/0210-Expand-Explosions-API.patch
index 65c44e48dd..65c44e48dd 100644
--- a/patches/server/0210-Expand-Explosions-API.patch
+++ b/patches/unapplied/server/0210-Expand-Explosions-API.patch
diff --git a/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
index b8c1582431..b8c1582431 100644
--- a/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/unapplied/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0212-RangedEntity-API.patch b/patches/unapplied/server/0212-RangedEntity-API.patch
index 94da937638..94da937638 100644
--- a/patches/server/0212-RangedEntity-API.patch
+++ b/patches/unapplied/server/0212-RangedEntity-API.patch
diff --git a/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
index e2cb389ce5..e2cb389ce5 100644
--- a/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/unapplied/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0214-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0214-Implement-World.getEntity-UUID-API.patch
index 5c3dc04177..5c3dc04177 100644
--- a/patches/server/0214-Implement-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/server/0214-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0215-InventoryCloseEvent-Reason-API.patch
index dda06e28f4..dda06e28f4 100644
--- a/patches/server/0215-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/server/0215-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0216-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0216-Vex-get-setSummoner-API.patch
index b39cab89d2..b39cab89d2 100644
--- a/patches/server/0216-Vex-get-setSummoner-API.patch
+++ b/patches/unapplied/server/0216-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 848c40c382..73b1f7ebaa 100644
--- a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/unapplied/server/0217-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 8b9e569ccefaa5123c966590a9bba77cc8eec64d..ff79bb6e51d8c7e4b61509f7cf95b1282e7a844e 100644
+index 70b81723e411283f4e4c41ab8b0c3eae9ed62f0f..1079db210d055e99fc5f543744a2802940af9906 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2426,6 +2426,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 93bf1ca349..93bf1ca349 100644
--- a/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/unapplied/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0219-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0219-add-more-information-to-Entity.toString.patch
index 7a408f02d9..7ec78e2619 100644
--- a/patches/server/0219-add-more-information-to-Entity.toString.patch
+++ b/patches/unapplied/server/0219-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0302462b03884ba8086115c6593c8fe4a4571a59..472332bff5f3e89925103df15a22b0d81689594b 100644
+index e233f1bd8047c06d69aed0e22c220658b9868729..214eeee95bcc176f3aa3daaff2465837e6a2933d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2905,7 +2905,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/unapplied/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index ac845dd260..ac845dd260 100644
--- a/patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/patches/unapplied/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/0221-EnderDragon-Events.patch b/patches/unapplied/server/0221-EnderDragon-Events.patch
index 6368f8e07f..6368f8e07f 100644
--- a/patches/server/0221-EnderDragon-Events.patch
+++ b/patches/unapplied/server/0221-EnderDragon-Events.patch
diff --git a/patches/server/0222-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0222-PlayerElytraBoostEvent.patch
index fde7853fad..fde7853fad 100644
--- a/patches/server/0222-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/server/0222-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0223-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0223-PlayerLaunchProjectileEvent.patch
index d732a1386e..d732a1386e 100644
--- a/patches/server/0223-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/server/0223-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0224-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0224-Improve-BlockPosition-inlining.patch
index c8ba260207..c8ba260207 100644
--- a/patches/server/0224-Improve-BlockPosition-inlining.patch
+++ b/patches/unapplied/server/0224-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index cdc5540281..cdc5540281 100644
--- a/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/unapplied/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0226-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0226-Vanished-players-don-t-have-rights.patch
index 07339f4496..07339f4496 100644
--- a/patches/server/0226-Vanished-players-don-t-have-rights.patch
+++ b/patches/unapplied/server/0226-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0227-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/0227-Allow-disabling-armour-stand-ticking.patch
index 8c8a8d1532..8c8a8d1532 100644
--- a/patches/server/0227-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/unapplied/server/0227-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0228-SkeletonHorse-Additions.patch b/patches/unapplied/server/0228-SkeletonHorse-Additions.patch
index 587c1eae7f..587c1eae7f 100644
--- a/patches/server/0228-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/server/0228-SkeletonHorse-Additions.patch
diff --git a/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
index bc8d5e861e..bc8d5e861e 100644
--- a/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/unapplied/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0230-Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/0230-Implement-Expanded-ArmorStand-API.patch
index ace889510d..ace889510d 100644
--- a/patches/server/0230-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/unapplied/server/0230-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0231-AnvilDamageEvent.patch b/patches/unapplied/server/0231-AnvilDamageEvent.patch
index c20941bfde..c20941bfde 100644
--- a/patches/server/0231-AnvilDamageEvent.patch
+++ b/patches/unapplied/server/0231-AnvilDamageEvent.patch
diff --git a/patches/server/0232-Add-hand-to-bucket-events.patch b/patches/unapplied/server/0232-Add-hand-to-bucket-events.patch
index b514aa8def..b514aa8def 100644
--- a/patches/server/0232-Add-hand-to-bucket-events.patch
+++ b/patches/unapplied/server/0232-Add-hand-to-bucket-events.patch
diff --git a/patches/server/0233-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0233-Add-TNTPrimeEvent.patch
index ee73234df5..ee73234df5 100644
--- a/patches/server/0233-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/server/0233-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch
index 72d3957f92..79d2880c4c 100644
--- a/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/unapplied/server/0234-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 ff79bb6e51d8c7e4b61509f7cf95b1282e7a844e..14b102e8341d4cb10935e9d247d7451661a02017 100644
+index 1079db210d055e99fc5f543744a2802940af9906..5df920842608f7d4dd4bb24872de1adb3548f20c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -246,6 +246,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch b/patches/unapplied/server/0235-MC-135506-Experience-should-save-as-Integers.patch
index 8248a48e4a..8248a48e4a 100644
--- a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/unapplied/server/0235-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0236-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0236-Remove-unnecessary-itemmeta-handling.patch
index 88a7a7fd0c..88a7a7fd0c 100644
--- a/patches/server/0236-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/unapplied/server/0236-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 4e14262213..0adafd0b9c 100644
--- a/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/unapplied/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -72,7 +72,7 @@ index 0531b9c5b10fe250531b0c04cb2ffe2751e7d1c5..25df052247ba26b75e49c801587f71d0
              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 472332bff5f3e89925103df15a22b0d81689594b..7b37bfe4a42a78184610bfac25165c1ac27d4fe9 100644
+index 214eeee95bcc176f3aa3daaff2465837e6a2933d..bde7eeea9dba42b1d38c2ebdc871bc5d003af9a1 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/0238-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
index 5cffab8fba..5cffab8fba 100644
--- a/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/unapplied/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0239-Use-ConcurrentHashMap-in-JsonList.patch
index 17c9498842..17c9498842 100644
--- a/patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/unapplied/server/0239-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0240-Use-a-Queue-for-Queueing-Commands.patch
index 1d3fa2d45c..1d3fa2d45c 100644
--- a/patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/unapplied/server/0240-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 9917cfd41d..9917cfd41d 100644
--- a/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/unapplied/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0242-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0242-Optimize-BlockPosition-helper-methods.patch
index 3fe5135a6b..3fe5135a6b 100644
--- a/patches/server/0242-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/unapplied/server/0242-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index e10d949eea..e10d949eea 100644
--- a/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/unapplied/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0244-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0244-Slime-Pathfinder-Events.patch
index e6984e42ea..e6984e42ea 100644
--- a/patches/server/0244-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/server/0244-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0245-Configurable-speed-for-water-flowing-over-lava.patch
index 05e4b14d22..05e4b14d22 100644
--- a/patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/unapplied/server/0245-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0246-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0246-Optimize-CraftBlockData-Creation.patch
index 6f729d9927..6f729d9927 100644
--- a/patches/server/0246-Optimize-CraftBlockData-Creation.patch
+++ b/patches/unapplied/server/0246-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0247-Optimize-MappedRegistry.patch b/patches/unapplied/server/0247-Optimize-MappedRegistry.patch
index 70684ff905..70684ff905 100644
--- a/patches/server/0247-Optimize-MappedRegistry.patch
+++ b/patches/unapplied/server/0247-Optimize-MappedRegistry.patch
diff --git a/patches/server/0248-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0248-Add-PhantomPreSpawnEvent.patch
index f4862ce10d..f4862ce10d 100644
--- a/patches/server/0248-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/server/0248-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0249-Add-More-Creeper-API.patch b/patches/unapplied/server/0249-Add-More-Creeper-API.patch
index ca052b8893..ca052b8893 100644
--- a/patches/server/0249-Add-More-Creeper-API.patch
+++ b/patches/unapplied/server/0249-Add-More-Creeper-API.patch
diff --git a/patches/server/0250-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0250-Inventory-removeItemAnySlot.patch
index 533e72fb45..533e72fb45 100644
--- a/patches/server/0250-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/server/0250-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 3994515245..3994515245 100644
--- a/patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/unapplied/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch b/patches/unapplied/server/0252-Asynchronous-chunk-IO-and-loading.patch
index 57ff5539f9..57ff5539f9 100644
--- a/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/unapplied/server/0252-Asynchronous-chunk-IO-and-loading.patch
diff --git a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
index dbe67aaffd..dbe67aaffd 100644
--- a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0254-Expose-attack-cooldown-methods-for-Player.patch
index 5f01ad5b65..5f01ad5b65 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 fd14c78534..fd14c78534 100644
--- a/patches/server/0255-Improve-death-events.patch
+++ b/patches/unapplied/server/0255-Improve-death-events.patch
diff --git a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
index be052700eb..be052700eb 100644
--- a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0257-Mob-Pathfinding-API.patch b/patches/unapplied/server/0257-Mob-Pathfinding-API.patch
index 49c958043d..49c958043d 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 7c943a7345..7c943a7345 100644
--- a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/unapplied/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
index 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 becfaf70e5..becfaf70e5 100644
--- a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0264-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0264-Honor-EntityAgeable.ageLock.patch
index 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 388accb3aa..388accb3aa 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 a3aff98067..a3aff98067 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 ad93f9fbae..ad93f9fbae 100644
--- a/patches/server/0267-PreSpawnerSpawnEvent.patch
+++ b/patches/unapplied/server/0267-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch
index 99a05da4e2..99a05da4e2 100644
--- a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0269-Add-sun-related-API.patch b/patches/unapplied/server/0269-Add-sun-related-API.patch
index 3f3308e435..3f3308e435 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 1bc6544713..1bc6544713 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 f1d88ea588..f1d88ea588 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..b766300549 100644
--- a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/patches/unapplied/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0273-Add-Velocity-IP-Forwarding-Support.patch
index dea44cfdf5..8cf9219bba 100644
--- a/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/unapplied/server/0273-Add-Velocity-IP-Forwarding-Support.patch
@@ -189,7 +189,7 @@ index 1b075033f0640433341957f6e26ebe25f18928ee..8b5eddce4845619603ccfeec158d97cb
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 97f7d0f144e9b0bd40ed714ea04153bf538bf36e..f1af15d229424bcb570c1cea0cde9aec94841b6b 100644
+index 21f0e1a23d6e9c6c76abfa9af555642fadeba69c..59ce840dadcecf9c6aed77747a06519eca5fea90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -764,7 +764,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0274-Add-more-Witch-API.patch b/patches/unapplied/server/0274-Add-more-Witch-API.patch
index 4fdcae61a9..4fdcae61a9 100644
--- a/patches/server/0274-Add-more-Witch-API.patch
+++ b/patches/unapplied/server/0274-Add-more-Witch-API.patch
diff --git a/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch
index ec62c27d6f..ec62c27d6f 100644
--- a/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/unapplied/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
index a53897608f..46715b081e 100644
--- a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/unapplied/server/0276-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 a4bdfaaef7f4d340e7e818e7f5ed92f195d91a58..9d95696c56682fb79a84ad7405e520b3484ec605 100644
+index b22762ed6731350a1803d80cb1a684a26ca0acac..471725c11de5f02d91ddb9246e79533774f25548 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -526,9 +526,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0277-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0277-Reset-players-airTicks-on-respawn.patch
index 3f235b7a3e..3f235b7a3e 100644
--- a/patches/server/0277-Reset-players-airTicks-on-respawn.patch
+++ b/patches/unapplied/server/0277-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index c4f99ad87b..c4f99ad87b 100644
--- a/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/unapplied/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index cc81e98e4a..cc81e98e4a 100644
--- a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/unapplied/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0280-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0280-Optimize-World-Time-Updates.patch
index 90c0f8a72c..90c0f8a72c 100644
--- a/patches/server/0280-Optimize-World-Time-Updates.patch
+++ b/patches/unapplied/server/0280-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0281-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0281-Restore-custom-InventoryHolder-support.patch
index b6b1612284..b6b1612284 100644
--- a/patches/server/0281-Restore-custom-InventoryHolder-support.patch
+++ b/patches/unapplied/server/0281-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/0282-Use-Vanilla-Minecart-Speeds.patch
index 9fde4a8e53..9fde4a8e53 100644
--- a/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/unapplied/server/0282-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0283-Fix-SpongeAbsortEvent-handling.patch
index a527364310..a527364310 100644
--- a/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/unapplied/server/0283-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
index ccb2d302f7..2214e2b146 100644
--- a/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/unapplied/server/0284-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 9d95696c56682fb79a84ad7405e520b3484ec605..8c1329e62f02ddbb8e9f40e6bf8fcea68d92a498 100644
+index 471725c11de5f02d91ddb9246e79533774f25548..deef30cf640d84aeb69cb6df3eeed29d21bf1f68 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1598,6 +1598,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0285-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0285-Make-the-default-permission-message-configurable.patch
index 53af80fe93..0b94345053 100644
--- a/patches/server/0285-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/server/0285-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index b3a58bf4b654e336826dc04da9e2f80ff8b9a9a7..cd4936ef114b504df8649fba8f1823d9
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f1af15d229424bcb570c1cea0cde9aec94841b6b..8b4cb0e38136427cf897316b74f075d671dfa144 100644
+index 59ce840dadcecf9c6aed77747a06519eca5fea90..6031bc3ada3fd7f2389f00b6d9e37db13e242282 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2615,6 +2615,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/0286-Prevent-rayTrace-from-loading-chunks.patch
index dd9d69d953..dd9d69d953 100644
--- a/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/unapplied/server/0286-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0287-Handle-Large-Packets-disconnecting-client.patch
index d1eec9fe11..d1eec9fe11 100644
--- a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/unapplied/server/0287-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0288-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0288-force-entity-dismount-during-teleportation.patch
index f3572aed58..f3572aed58 100644
--- a/patches/server/0288-force-entity-dismount-during-teleportation.patch
+++ b/patches/unapplied/server/0288-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0289-Add-more-Zombie-API.patch b/patches/unapplied/server/0289-Add-more-Zombie-API.patch
index d4683e84c2..d4683e84c2 100644
--- a/patches/server/0289-Add-more-Zombie-API.patch
+++ b/patches/unapplied/server/0289-Add-more-Zombie-API.patch
diff --git a/patches/server/0290-Book-Size-Limits.patch b/patches/unapplied/server/0290-Book-Size-Limits.patch
index baf0dc46f9..19f0638cb7 100644
--- a/patches/server/0290-Book-Size-Limits.patch
+++ b/patches/unapplied/server/0290-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 8c1329e62f02ddbb8e9f40e6bf8fcea68d92a498..77e8d224dd669e3ce8cd70c95b0aba6d1483cc90 100644
+index deef30cf640d84aeb69cb6df3eeed29d21bf1f68..ef49922d34ec9d0d360c30be5f698be9859db1f6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1049,6 +1049,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0291-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0291-Add-PlayerConnectionCloseEvent.patch
index d084b3b4ab..d084b3b4ab 100644
--- a/patches/server/0291-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/unapplied/server/0291-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/0292-Prevent-Enderman-from-loading-chunks.patch
index 0eadb94123..0eadb94123 100644
--- a/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/unapplied/server/0292-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 010a33ecea..010a33ecea 100644
--- a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/unapplied/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 073dc45a36..073dc45a36 100644
--- a/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/unapplied/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
index 38285a1e7e..38285a1e7e 100644
--- a/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/unapplied/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0296-BlockDestroyEvent.patch b/patches/unapplied/server/0296-BlockDestroyEvent.patch
index 38b61505fb..38b61505fb 100644
--- a/patches/server/0296-BlockDestroyEvent.patch
+++ b/patches/unapplied/server/0296-BlockDestroyEvent.patch
diff --git a/patches/server/0297-Async-command-map-building.patch b/patches/unapplied/server/0297-Async-command-map-building.patch
index a855feedcd..a855feedcd 100644
--- a/patches/server/0297-Async-command-map-building.patch
+++ b/patches/unapplied/server/0297-Async-command-map-building.patch
diff --git a/patches/server/0298-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0298-Implement-Brigadier-Mojang-API.patch
index 2a3fbd0b7a..8006ed9f60 100644
--- a/patches/server/0298-Implement-Brigadier-Mojang-API.patch
+++ b/patches/unapplied/server/0298-Implement-Brigadier-Mojang-API.patch
@@ -82,7 +82,7 @@ index 4c9773997c63f7b2c8465b19810068f11367466b..a8f3a84615a640d2949d268ef1ac81a0
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 77e8d224dd669e3ce8cd70c95b0aba6d1483cc90..35d65cf4af1990f2aea2767216cc1d838f7473b7 100644
+index ef49922d34ec9d0d360c30be5f698be9859db1f6..befbc382387f921ad1ad9405db6821471b82fbba 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -790,8 +790,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/unapplied/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 903ba48692..903ba48692 100644
--- a/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/patches/unapplied/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0300-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0300-Limit-Client-Sign-length-more.patch
index a90e562538..af15df901c 100644
--- a/patches/server/0300-Limit-Client-Sign-length-more.patch
+++ b/patches/unapplied/server/0300-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 35d65cf4af1990f2aea2767216cc1d838f7473b7..ed951f4645e8ab6c070ed267a665b81bca19fbbb 100644
+index befbc382387f921ad1ad9405db6821471b82fbba..2a3840963f673e99abe36fa967155231820ff3a9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -276,6 +276,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/unapplied/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 0d3af0b6f8..0d3af0b6f8 100644
--- a/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/unapplied/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index ae6bea1623..ae6bea1623 100644
--- a/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/unapplied/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
index bcaddcfede..bcaddcfede 100644
--- a/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/unapplied/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/unapplied/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 6c82126b25..6c82126b25 100644
--- a/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/patches/unapplied/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 7455c723b4..7455c723b4 100644
--- a/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/unapplied/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0306-Entity-getEntitySpawnReason.patch b/patches/unapplied/server/0306-Entity-getEntitySpawnReason.patch
index aeff29a0f1..a15a3f956c 100644
--- a/patches/server/0306-Entity-getEntitySpawnReason.patch
+++ b/patches/unapplied/server/0306-Entity-getEntitySpawnReason.patch
@@ -35,7 +35,7 @@ index c2370cb1128b55dd9d40a72a01296f40e01630b9..7fc211e97da0f3e00abc9e0098df137b
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 37a8f164d785a1d042f7dcf3d61b15b830621a45..48d107596cadb6af8e037e9a37396dbda9b95d91 100644
+index 2e275bf97258576edfbc96ea69c91905b8755b9c..1ac0e8996ece6bd7be521a9a45fb8c398838b94e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -74,6 +74,8 @@ import net.minecraft.world.InteractionHand;
diff --git a/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch b/patches/unapplied/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
index 340a32e064..f4efc9420a 100644
--- a/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/unapplied/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
@@ -22,7 +22,7 @@ index d6f34adbdf45bbef4a39e629dd7cb6d7fcb5db0f..7881176a900daa3306c691454f688c1f
          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 ed951f4645e8ab6c070ed267a665b81bca19fbbb..63f0b837b875ddd7bc85948eed013f627e202994 100644
+index 2a3840963f673e99abe36fa967155231820ff3a9..8d41fea3d6c8a958be27dec17df8c85af49a5edd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2501,7 +2501,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0308-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0308-Fire-event-on-GS4-query.patch
index 2365b652c2..2365b652c2 100644
--- a/patches/server/0308-Fire-event-on-GS4-query.patch
+++ b/patches/unapplied/server/0308-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0309-Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0309-Implement-PlayerPostRespawnEvent.patch
index 623ee5e32e..623ee5e32e 100644
--- a/patches/server/0309-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/server/0309-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index beb023479e..beb023479e 100644
--- a/patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/unapplied/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0311-Server-Tick-Events.patch b/patches/unapplied/server/0311-Server-Tick-Events.patch
index bacdb3b556..bacdb3b556 100644
--- a/patches/server/0311-Server-Tick-Events.patch
+++ b/patches/unapplied/server/0311-Server-Tick-Events.patch
diff --git a/patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0312-PlayerDeathEvent-getItemsToKeep.patch
index 9350440354..9350440354 100644
--- a/patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/unapplied/server/0312-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/0313-Optimize-Captured-TileEntity-Lookup.patch
index bddfd49587..bddfd49587 100644
--- a/patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/unapplied/server/0313-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0314-Add-Heightmap-API.patch b/patches/unapplied/server/0314-Add-Heightmap-API.patch
index f4574ba880..f4574ba880 100644
--- a/patches/server/0314-Add-Heightmap-API.patch
+++ b/patches/unapplied/server/0314-Add-Heightmap-API.patch
diff --git a/patches/server/0315-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0315-Mob-Spawner-API-Enhancements.patch
index 0947d35c6f..0947d35c6f 100644
--- a/patches/server/0315-Mob-Spawner-API-Enhancements.patch
+++ b/patches/unapplied/server/0315-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch
index 93a9a539c4..a451608cc5 100644
--- a/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/unapplied/server/0316-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 63f0b837b875ddd7bc85948eed013f627e202994..54a4d4061b90a13b79d1dc0fa327ab133754b458 100644
+index 8d41fea3d6c8a958be27dec17df8c85af49a5edd..1383f99a96db680c8c6d1767eda36ea672bf7180 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -467,7 +467,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 8f80e7c151..8f80e7c151 100644
--- a/patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/unapplied/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/unapplied/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index 1e1aed8ebd..1e1aed8ebd 100644
--- a/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/patches/unapplied/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/patches/server/0319-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0319-Implement-CraftBlockSoundGroup.patch
index a62be7b054..a62be7b054 100644
--- a/patches/server/0319-Implement-CraftBlockSoundGroup.patch
+++ b/patches/unapplied/server/0319-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 78470da0d0..78470da0d0 100644
--- a/patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/unapplied/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0321-ChunkMapDistance-CME.patch b/patches/unapplied/server/0321-ChunkMapDistance-CME.patch
index 74fcd81751..74fcd81751 100644
--- a/patches/server/0321-ChunkMapDistance-CME.patch
+++ b/patches/unapplied/server/0321-ChunkMapDistance-CME.patch
diff --git a/patches/server/0322-Chunk-debug-command.patch b/patches/unapplied/server/0322-Chunk-debug-command.patch
index 79c5f0f128..79c5f0f128 100644
--- a/patches/server/0322-Chunk-debug-command.patch
+++ b/patches/unapplied/server/0322-Chunk-debug-command.patch
diff --git a/patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0323-Allow-Saving-of-Oversized-Chunks.patch
index 0f82b9f323..0f82b9f323 100644
--- a/patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/unapplied/server/0323-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0324-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0324-Expose-the-internal-current-tick.patch
index 9176bcb75b..f4ad9f6cae 100644
--- a/patches/server/0324-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/server/0324-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cdc209d56b80fa6dd94b2e1d45918baf96aad153..d4ea341e555ae55e8521aaaa4031ef61007b46e0 100644
+index eeff73b8b0a8b866ddb139ce6da074bd67463eb4..97a0bb12b1158618e86bb0fbab64985faa3d1cec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2656,5 +2656,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0325-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/0325-Fix-World-isChunkGenerated-calls.patch
index e9984535ef..e9984535ef 100644
--- a/patches/server/0325-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/unapplied/server/0325-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch
index f593178909..f593178909 100644
--- a/patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/unapplied/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index a181d9b9ad..a181d9b9ad 100644
--- a/patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/unapplied/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0328-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0328-Configurable-projectile-relative-velocity.patch
index 024876f999..024876f999 100644
--- a/patches/server/0328-Configurable-projectile-relative-velocity.patch
+++ b/patches/unapplied/server/0328-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0329-offset-item-frame-ticking.patch b/patches/unapplied/server/0329-offset-item-frame-ticking.patch
index d20777b4c1..d20777b4c1 100644
--- a/patches/server/0329-offset-item-frame-ticking.patch
+++ b/patches/unapplied/server/0329-offset-item-frame-ticking.patch
diff --git a/patches/server/0330-Fix-MC-158900.patch b/patches/unapplied/server/0330-Fix-MC-158900.patch
index 1491c9e335..1491c9e335 100644
--- a/patches/server/0330-Fix-MC-158900.patch
+++ b/patches/unapplied/server/0330-Fix-MC-158900.patch
diff --git a/patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0331-Prevent-consuming-the-wrong-itemstack.patch
index 1e411abebd..1e411abebd 100644
--- a/patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/unapplied/server/0331-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0332-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0332-Dont-send-unnecessary-sign-update.patch
index 65e408f785..fe9a063314 100644
--- a/patches/server/0332-Dont-send-unnecessary-sign-update.patch
+++ b/patches/unapplied/server/0332-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 54a4d4061b90a13b79d1dc0fa327ab133754b458..ca5342785c49d459203087184baa341da6c93f1f 100644
+index 1383f99a96db680c8c6d1767eda36ea672bf7180..6f13ce05d8b818e501a286a9fe3f9c0aad85af0d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3092,6 +3092,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0333-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0333-Add-option-to-disable-pillager-patrols.patch
index 65d645b929..65d645b929 100644
--- a/patches/server/0333-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/unapplied/server/0333-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/unapplied/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index a3bd2f610c..5db678a6fb 100644
--- a/patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/unapplied/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
 Fixes GH-2718
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ca5342785c49d459203087184baa341da6c93f1f..fcbd099d77b4dec7a91da2b7fb219c300482a83b 100644
+index 6f13ce05d8b818e501a286a9fe3f9c0aad85af0d..7b78a7f5e4257f929fd870913e27b6090fa882ce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1791,6 +1791,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0335-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/0335-Flat-bedrock-generator-settings.patch
index 2b9f7e9a1e..2b9f7e9a1e 100644
--- a/patches/server/0335-Flat-bedrock-generator-settings.patch
+++ b/patches/unapplied/server/0335-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index ea3c47b7b2..ea3c47b7b2 100644
--- a/patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/unapplied/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 44844fef0d..44844fef0d 100644
--- a/patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/unapplied/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0338-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0338-Duplicate-UUID-Resolve-Option.patch
index dc45920035..dc45920035 100644
--- a/patches/server/0338-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/unapplied/server/0338-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0339-Optimize-Hoppers.patch b/patches/unapplied/server/0339-Optimize-Hoppers.patch
index d671e8ff7e..d671e8ff7e 100644
--- a/patches/server/0339-Optimize-Hoppers.patch
+++ b/patches/unapplied/server/0339-Optimize-Hoppers.patch
diff --git a/patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0340-PlayerDeathEvent-shouldDropExperience.patch
index 29b3f5b03f..29b3f5b03f 100644
--- a/patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/server/0340-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch
index 3e8d451777..3e8d451777 100644
--- a/patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/unapplied/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 71f28eb22f..71f28eb22f 100644
--- a/patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/unapplied/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch
index bc391d7a2a..bc391d7a2a 100644
--- a/patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/unapplied/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/unapplied/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch
index b4a66435dc..b4a66435dc 100644
--- a/patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/unapplied/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/patches/server/0345-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0345-Fix-items-not-falling-correctly.patch
index 72f9d60111..72f9d60111 100644
--- a/patches/server/0345-Fix-items-not-falling-correctly.patch
+++ b/patches/unapplied/server/0345-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0346-Lag-compensate-eating.patch b/patches/unapplied/server/0346-Lag-compensate-eating.patch
index 696b8217eb..696b8217eb 100644
--- a/patches/server/0346-Lag-compensate-eating.patch
+++ b/patches/unapplied/server/0346-Lag-compensate-eating.patch
diff --git a/patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0347-Optimize-call-to-getFluid-for-explosions.patch
index 952f1fc45d..952f1fc45d 100644
--- a/patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/unapplied/server/0347-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 448854642c..448854642c 100644
--- a/patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/unapplied/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0349-Add-effect-to-block-break-naturally.patch b/patches/unapplied/server/0349-Add-effect-to-block-break-naturally.patch
index b911824bb1..b911824bb1 100644
--- a/patches/server/0349-Add-effect-to-block-break-naturally.patch
+++ b/patches/unapplied/server/0349-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0350-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0350-Entity-Activation-Range-2.0.patch
index 0e09f04e89..ed8b616a30 100644
--- a/patches/server/0350-Entity-Activation-Range-2.0.patch
+++ b/patches/unapplied/server/0350-Entity-Activation-Range-2.0.patch
@@ -108,7 +108,7 @@ index 9993b6a8f40896166c2f86befa7222c6e714da81..ff902ae5a96616bb70897d9326fc65a3
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 48d107596cadb6af8e037e9a37396dbda9b95d91..a4fe06307ae5e559f36c087705aa9c01a19b5508 100644
+index 1ac0e8996ece6bd7be521a9a45fb8c398838b94e..79026ea84a6efca425b351467651332d2d3b9fdd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -384,6 +384,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0351-Increase-Light-Queue-Size.patch b/patches/unapplied/server/0351-Increase-Light-Queue-Size.patch
index df199500d9..df199500d9 100644
--- a/patches/server/0351-Increase-Light-Queue-Size.patch
+++ b/patches/unapplied/server/0351-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0352-Fix-Light-Command.patch b/patches/unapplied/server/0352-Fix-Light-Command.patch
index e7baf69516..e7baf69516 100644
--- a/patches/server/0352-Fix-Light-Command.patch
+++ b/patches/unapplied/server/0352-Fix-Light-Command.patch
diff --git a/patches/server/0353-Anti-Xray.patch b/patches/unapplied/server/0353-Anti-Xray.patch
index 4aa6ff7bcc..a89586783f 100644
--- a/patches/server/0353-Anti-Xray.patch
+++ b/patches/unapplied/server/0353-Anti-Xray.patch
@@ -1551,7 +1551,7 @@ index cf48c93d89da53e0ec771e5c2c8582e30b35e3f5..518dfbb7dbd4221937636cf46d27109d
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d4ea341e555ae55e8521aaaa4031ef61007b46e0..8c6b829db9b48d7d355b61eab2c6dd9705f2a7da 100644
+index 97a0bb12b1158618e86bb0fbab64985faa3d1cec..08dad640ae4315d0746587d91deb4709231c2bcc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2228,7 +2228,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0354-Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/0354-Implement-alternative-item-despawn-rate.patch
index f1d44765bf..f1d44765bf 100644
--- a/patches/server/0354-Implement-alternative-item-despawn-rate.patch
+++ b/patches/unapplied/server/0354-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0355-Tracking-Range-Improvements.patch b/patches/unapplied/server/0355-Tracking-Range-Improvements.patch
index 84ad9dcefd..84ad9dcefd 100644
--- a/patches/server/0355-Tracking-Range-Improvements.patch
+++ b/patches/unapplied/server/0355-Tracking-Range-Improvements.patch
diff --git a/patches/server/0356-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0356-Fix-items-vanishing-through-end-portal.patch
index cb9f4d0ca8..e9979d4382 100644
--- a/patches/server/0356-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/unapplied/server/0356-Fix-items-vanishing-through-end-portal.patch
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a4fe06307ae5e559f36c087705aa9c01a19b5508..ca7b60b621b4cc1482dfeef84fc51be8f1e25f72 100644
+index 79026ea84a6efca425b351467651332d2d3b9fdd..22ea44067f742008e82114155867cecb841a67b3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3112,6 +3112,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0357-implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/0357-implement-optional-per-player-mob-spawns.patch
index 3f76b68451..3f76b68451 100644
--- a/patches/server/0357-implement-optional-per-player-mob-spawns.patch
+++ b/patches/unapplied/server/0357-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/unapplied/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch
index 58fd30373e..58fd30373e 100644
--- a/patches/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/unapplied/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 2b398af935..2b398af935 100644
--- a/patches/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/unapplied/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 3831aba372..3831aba372 100644
--- a/patches/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/unapplied/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0361-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0361-Add-debug-for-sync-chunk-loads.patch
index 8c29b00d34..8c29b00d34 100644
--- a/patches/server/0361-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/unapplied/server/0361-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0362-Remove-garbage-Java-version-check.patch b/patches/unapplied/server/0362-Remove-garbage-Java-version-check.patch
index d13eb8982a..d13eb8982a 100644
--- a/patches/server/0362-Remove-garbage-Java-version-check.patch
+++ b/patches/unapplied/server/0362-Remove-garbage-Java-version-check.patch
diff --git a/patches/server/0363-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0363-Add-ThrownEggHatchEvent.patch
index c026427598..c026427598 100644
--- a/patches/server/0363-Add-ThrownEggHatchEvent.patch
+++ b/patches/unapplied/server/0363-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0364-Entity-Jump-API.patch b/patches/unapplied/server/0364-Entity-Jump-API.patch
index 477b71d8ab..477b71d8ab 100644
--- a/patches/server/0364-Entity-Jump-API.patch
+++ b/patches/unapplied/server/0364-Entity-Jump-API.patch
diff --git a/patches/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 8c3ebdd16f..13eddf2311 100644
--- a/patches/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/unapplied/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ca7b60b621b4cc1482dfeef84fc51be8f1e25f72..9ad20adfd336eb1843c5c1ed524662915173d7b3 100644
+index 22ea44067f742008e82114155867cecb841a67b3..a2bc22baf3de2fa41e093347ae36845329498290 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -386,6 +386,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0366-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0366-Make-the-GUI-graph-fancier.patch
index b97ce20f84..b97ce20f84 100644
--- a/patches/server/0366-Make-the-GUI-graph-fancier.patch
+++ b/patches/unapplied/server/0366-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0367-add-hand-to-BlockMultiPlaceEvent.patch
index 486014f2be..486014f2be 100644
--- a/patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/unapplied/server/0367-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0368-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0368-Validate-tripwire-hook-placement-before-update.patch
index fd8a74807c..fd8a74807c 100644
--- a/patches/server/0368-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/unapplied/server/0368-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index f058d157d0..f058d157d0 100644
--- a/patches/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/unapplied/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0370-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0370-Configurable-chance-of-villager-zombie-infection.patch
index ce51b7964c..ce51b7964c 100644
--- a/patches/server/0370-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/unapplied/server/0370-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0371-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0371-Optimise-Chunk-getFluid.patch
index 14f1eb470a..14f1eb470a 100644
--- a/patches/server/0371-Optimise-Chunk-getFluid.patch
+++ b/patches/unapplied/server/0371-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 45ea278818..45ea278818 100644
--- a/patches/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/unapplied/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0373-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0373-Add-tick-times-API-and-mspt-command.patch
index 4f37b7ad9d..4f37b7ad9d 100644
--- a/patches/server/0373-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/unapplied/server/0373-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0374-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0374-Expose-MinecraftServer-isRunning.patch
index 6f1e0bd8a3..88f87452ce 100644
--- a/patches/server/0374-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/server/0374-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 22d95ec01e748d649e86bdbad57a8882e987157d..365b2983fde7f635f40aff796e4342ee76ae46bd 100644
+index 1043271c20d092e3133855335eaf75d9d533d984..4b3a431701fa1e1e1595301291baccd5bafa52f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2671,5 +2671,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch
index 0bda60667b..0bda60667b 100644
--- a/patches/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 27dfc389b9..27dfc389b9 100644
--- a/patches/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/unapplied/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 7b7f683bff..7b7f683bff 100644
--- a/patches/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/unapplied/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index aa61dfee66..aa61dfee66 100644
--- a/patches/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/unapplied/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index dd68224f72..dd68224f72 100644
--- a/patches/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/unapplied/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0380-Don-t-tick-dead-players.patch b/patches/unapplied/server/0380-Don-t-tick-dead-players.patch
index 14174b88fa..14174b88fa 100644
--- a/patches/server/0380-Don-t-tick-dead-players.patch
+++ b/patches/unapplied/server/0380-Don-t-tick-dead-players.patch
diff --git a/patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 3f94fb7fbe..3f94fb7fbe 100644
--- a/patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/unapplied/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0382-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0382-Optimize-Collision-to-not-load-chunks.patch
index 615c332457..4711964eb4 100644
--- a/patches/server/0382-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/unapplied/server/0382-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index f14d4bfd5ac03eeffefcf98e1077d915fd3fa2cb..d8b34055aff358cb2c236199da1e22d8
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9ad20adfd336eb1843c5c1ed524662915173d7b3..6d18cd8eda224f94f41816c24868ded73667b10d 100644
+index a2bc22baf3de2fa41e093347ae36845329498290..6f1ff17fd75163ee7905a2e37f176813293652af 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -236,6 +236,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0383-Don-t-move-existing-players-to-world-spawn.patch
index c005c89083..c005c89083 100644
--- a/patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/unapplied/server/0383-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index cf8d69b485..cf8d69b485 100644
--- a/patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/unapplied/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0385-Improved-Watchdog-Support.patch b/patches/unapplied/server/0385-Improved-Watchdog-Support.patch
index 60ccbe7318..60ccbe7318 100644
--- a/patches/server/0385-Improved-Watchdog-Support.patch
+++ b/patches/unapplied/server/0385-Improved-Watchdog-Support.patch
diff --git a/patches/server/0386-Optimize-Pathfinding.patch b/patches/unapplied/server/0386-Optimize-Pathfinding.patch
index 061629eb03..061629eb03 100644
--- a/patches/server/0386-Optimize-Pathfinding.patch
+++ b/patches/unapplied/server/0386-Optimize-Pathfinding.patch
diff --git a/patches/server/0387-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0387-Reduce-Either-Optional-allocation.patch
index 0f4641263b..0f4641263b 100644
--- a/patches/server/0387-Reduce-Either-Optional-allocation.patch
+++ b/patches/unapplied/server/0387-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch
index 740fcbecab..740fcbecab 100644
--- a/patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/unapplied/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0389-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0389-Prevent-opening-inventories-when-frozen.patch
index f1d4031ffc..f1d4031ffc 100644
--- a/patches/server/0389-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/unapplied/server/0389-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0390-Optimise-ArraySetSorted-removeIf.patch b/patches/unapplied/server/0390-Optimise-ArraySetSorted-removeIf.patch
index 1aa31112c4..1aa31112c4 100644
--- a/patches/server/0390-Optimise-ArraySetSorted-removeIf.patch
+++ b/patches/unapplied/server/0390-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch
index 692a677c55..692a677c55 100644
--- a/patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/unapplied/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0392-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0392-Implement-Player-Client-Options-API.patch
index 3a3a1b2015..3a3a1b2015 100644
--- a/patches/server/0392-Implement-Player-Client-Options-API.patch
+++ b/patches/unapplied/server/0392-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index fe3a5aca21..fe3a5aca21 100644
--- a/patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/unapplied/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/unapplied/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch
index 70a84a37da..70a84a37da 100644
--- a/patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/patches/unapplied/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 9b49d32f90..9b49d32f90 100644
--- a/patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/unapplied/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch b/patches/unapplied/server/0396-Load-Chunks-for-Login-Asynchronously.patch
index d0e288f45b..d0e288f45b 100644
--- a/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/unapplied/server/0396-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index bfa322de36..d0e02df90c 100644
--- a/patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/unapplied/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -7,7 +7,7 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6d18cd8eda224f94f41816c24868ded73667b10d..13564786c8ab32bdff5583290a24ec1ba9bc2b80 100644
+index 6f1ff17fd75163ee7905a2e37f176813293652af..c7f70ca9e4b19476b368f3c4133a36e7f310519b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2099,9 +2099,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch
index 984cebcdfd..984cebcdfd 100644
--- a/patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/unapplied/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch
index b9aecc5313..b9aecc5313 100644
--- a/patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/unapplied/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0400-Add-phantom-creative-and-insomniac-controls.patch
index 3b9eaafdbf..3b9eaafdbf 100644
--- a/patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/unapplied/server/0400-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index b307ba5cb8..1b3e64ae0e 100644
--- a/patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/unapplied/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 13564786c8ab32bdff5583290a24ec1ba9bc2b80..f9b7c72b89e3cdbd10cd92bcfcca3125d686d6dd 100644
+index c7f70ca9e4b19476b368f3c4133a36e7f310519b..7d6507ef6b50e62c2d5e02483337124390f7bf59 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2229,11 +2229,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0402-Villager-Restocks-API.patch b/patches/unapplied/server/0402-Villager-Restocks-API.patch
index d4af2305a8..d4af2305a8 100644
--- a/patches/server/0402-Villager-Restocks-API.patch
+++ b/patches/unapplied/server/0402-Villager-Restocks-API.patch
diff --git a/patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 6b21e3f045..945b68b7ae 100644
--- a/patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/unapplied/server/0403-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 ec82608da0d39a1b60d1595cee9aeae3efef9fac..2c46a7853edda6f9b6a057e1e3ab0919dcd5436d 100644
+index 21126008755c79990205359226a27546f08ec044..de7d5711885bdba0222513e0a4818a1f23306bf0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -918,7 +918,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0404-Expose-game-version.patch b/patches/unapplied/server/0404-Expose-game-version.patch
index 380767d89a..566af6eac3 100644
--- a/patches/server/0404-Expose-game-version.patch
+++ b/patches/unapplied/server/0404-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1186e259b7e1bb5feb1d6ecefd6ab1cb3d467654..fd9f329c4e32027cec28eb9e66ec5c39997916e9 100644
+index b5ed78fa95349974c71ac7113e5f6533bec9385e..d45d1ec667fba102a20f62df1b207a95b06318b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -577,6 +577,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0405-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0405-Optimize-Voxel-Shape-Merging.patch
index 7bfe849396..7bfe849396 100644
--- a/patches/server/0405-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/unapplied/server/0405-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 51d1a58f90..51d1a58f90 100644
--- a/patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/unapplied/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0407-misc-debugging-dumps.patch b/patches/unapplied/server/0407-misc-debugging-dumps.patch
index 7ae3dc55da..7ae3dc55da 100644
--- a/patches/server/0407-misc-debugging-dumps.patch
+++ b/patches/unapplied/server/0407-misc-debugging-dumps.patch
diff --git a/patches/server/0408-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0408-Prevent-teleporting-dead-entities.patch
index d070c2b472..64c8586b7f 100644
--- a/patches/server/0408-Prevent-teleporting-dead-entities.patch
+++ b/patches/unapplied/server/0408-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 2c46a7853edda6f9b6a057e1e3ab0919dcd5436d..5157c257a3480b4f26d4a5830c36725af2d4bd4b 100644
+index de7d5711885bdba0222513e0a4818a1f23306bf0..ea83ac86eb392652c55c5a4a774481d631b76dd1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1559,6 +1559,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 981e5c6969..981e5c6969 100644
--- a/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/unapplied/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0410-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0410-Implement-Mob-Goal-API.patch
index 826e45c227..e0089a0954 100644
--- a/patches/server/0410-Implement-Mob-Goal-API.patch
+++ b/patches/unapplied/server/0410-Implement-Mob-Goal-API.patch
@@ -789,7 +789,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4568e9641490addccd530cfc962758c82cd29a34..7859cda59999ab1b7b22af6cd682c1afe8a7029f 100644
+index 96e4ba547472cbb29009574458865090d63464e3..9933bd2998e2b3723ee87e4f6710f74758bd8107 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2684,5 +2684,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0411-Add-villager-reputation-API.patch b/patches/unapplied/server/0411-Add-villager-reputation-API.patch
index 4c38780334..4c38780334 100644
--- a/patches/server/0411-Add-villager-reputation-API.patch
+++ b/patches/unapplied/server/0411-Add-villager-reputation-API.patch
diff --git a/patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch
index 4239e066f4..4239e066f4 100644
--- a/patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/unapplied/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0413-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0413-ExperienceOrbMergeEvent.patch
index 1ff06b6779..1ff06b6779 100644
--- a/patches/server/0413-ExperienceOrbMergeEvent.patch
+++ b/patches/unapplied/server/0413-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0414-Fix-PotionEffect-ignores-icon-flag.patch
index e542865e62..e542865e62 100644
--- a/patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/unapplied/server/0414-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0415-Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/0415-Optimize-brigadier-child-sorting-performance.patch
index 2d398241d6..2d398241d6 100644
--- a/patches/server/0415-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/unapplied/server/0415-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0416-Potential-bed-API.patch b/patches/unapplied/server/0416-Potential-bed-API.patch
index d63e2bb9ee..d63e2bb9ee 100644
--- a/patches/server/0416-Potential-bed-API.patch
+++ b/patches/unapplied/server/0416-Potential-bed-API.patch
diff --git a/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
index 545bdda31c..545bdda31c 100644
--- a/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/unapplied/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index 94dbb79f58..94dbb79f58 100644
--- a/patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/unapplied/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 983a2332ce..983a2332ce 100644
--- a/patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/unapplied/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch
index 881c2f0231..881c2f0231 100644
--- a/patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/patches/unapplied/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 1de506b9e3..1de506b9e3 100644
--- a/patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/unapplied/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0422-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0422-Ensure-safe-gateway-teleport.patch
index 6d352f74a8..6d352f74a8 100644
--- a/patches/server/0422-Ensure-safe-gateway-teleport.patch
+++ b/patches/unapplied/server/0422-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0423-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0423-Add-option-for-console-having-all-permissions.patch
index d1e3317d94..d1e3317d94 100644
--- a/patches/server/0423-Add-option-for-console-having-all-permissions.patch
+++ b/patches/unapplied/server/0423-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index b1b132ffcf..b1b132ffcf 100644
--- a/patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/unapplied/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0425-Use-distance-map-to-optimise-entity-tracker.patch
index 7cd25d59ef..1bf77d801c 100644
--- a/patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/unapplied/server/0425-Use-distance-map-to-optimise-entity-tracker.patch
@@ -280,7 +280,7 @@ index bc698f8aee7eb5f2dbc1affd24e9af9f7c1ad2d5..86cdc8951544c16f8dc5148bc2c7bf9b
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f9b7c72b89e3cdbd10cd92bcfcca3125d686d6dd..30a7aa44e9e2abaf47d548c295ee060f8ac67e8e 100644
+index 7d6507ef6b50e62c2d5e02483337124390f7bf59..175f5400225584f1fedc940d967a3d6f8ede84c0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -57,6 +57,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/unapplied/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch
index 7c253c9113..7c253c9113 100644
--- a/patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch
+++ b/patches/unapplied/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/unapplied/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 21c409adc6..21c409adc6 100644
--- a/patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/patches/unapplied/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0428-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0428-Fix-villager-trading-demand-MC-163962.patch
index fb5e330854..fb5e330854 100644
--- a/patches/server/0428-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/unapplied/server/0428-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0429-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0429-Maps-shouldn-t-load-chunks.patch
index 3ab19f357a..3ab19f357a 100644
--- a/patches/server/0429-Maps-shouldn-t-load-chunks.patch
+++ b/patches/unapplied/server/0429-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 9ed5e37d35..9ed5e37d35 100644
--- a/patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/unapplied/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 1cafad18f3..1cafad18f3 100644
--- a/patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/unapplied/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch
index dcc303244a..dcc303244a 100644
--- a/patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/unapplied/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0433-Fix-sand-duping.patch b/patches/unapplied/server/0433-Fix-sand-duping.patch
index 5780d77de8..5780d77de8 100644
--- a/patches/server/0433-Fix-sand-duping.patch
+++ b/patches/unapplied/server/0433-Fix-sand-duping.patch
diff --git a/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch
index 8b62d6533b..8b62d6533b 100644
--- a/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/unapplied/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch
index ac3be39dff..cbf8b7bff9 100644
--- a/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/unapplied/server/0435-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 5157c257a3480b4f26d4a5830c36725af2d4bd4b..2daac5b9e7a9855a919024040bed4c065dce697a 100644
+index ea83ac86eb392652c55c5a4a774481d631b76dd1..c03867ed9a66a408900cadf81b09704e415dfca6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1373,6 +1373,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0436-Inventory-getHolder-method-without-block-snapshot.patch
index 9ed9fe0826..9ed9fe0826 100644
--- a/patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/unapplied/server/0436-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0437-Improve-Arrow-API.patch b/patches/unapplied/server/0437-Improve-Arrow-API.patch
index 47bb897a5a..47bb897a5a 100644
--- a/patches/server/0437-Improve-Arrow-API.patch
+++ b/patches/unapplied/server/0437-Improve-Arrow-API.patch
diff --git a/patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 764c4e8bb6..e38911a158 100644
--- a/patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/unapplied/server/0438-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 2daac5b9e7a9855a919024040bed4c065dce697a..b3fa92cc2ff977107f310a8d95c0d63aa446295e 100644
+index c03867ed9a66a408900cadf81b09704e415dfca6..00a8b49b4e3b443fed22761b57ebcfa64c8d46aa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2997,9 +2997,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0439-Hide-sync-chunk-writes-behind-flag.patch
index 299fc6e59a..299fc6e59a 100644
--- a/patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/unapplied/server/0439-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0440-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0440-Add-permission-for-command-blocks.patch
index d48cbc7c86..c345cbc58f 100644
--- a/patches/server/0440-Add-permission-for-command-blocks.patch
+++ b/patches/unapplied/server/0440-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 b3fa92cc2ff977107f310a8d95c0d63aa446295e..30d0c22d4576f0aef49bb9fb08ff3c9a8edf8d5a 100644
+index 00a8b49b4e3b443fed22761b57ebcfa64c8d46aa..ffe92ac27172e9f00b7941a574d98475b4daff94 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -829,7 +829,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch
index fbba382527..9a81ad2d79 100644
--- a/patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/unapplied/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 30a7aa44e9e2abaf47d548c295ee060f8ac67e8e..173824e96c51c4f1a9f43401cfa3fc79a2432600 100644
+index 175f5400225584f1fedc940d967a3d6f8ede84c0..520b991a0a8adb91c933288faeba64c1798d8577 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -662,8 +662,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 1e8a466bdc..1e8a466bdc 100644
--- a/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/unapplied/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0443-Paper-dumpitem-command.patch b/patches/unapplied/server/0443-Paper-dumpitem-command.patch
index 930a212a00..930a212a00 100644
--- a/patches/server/0443-Paper-dumpitem-command.patch
+++ b/patches/unapplied/server/0443-Paper-dumpitem-command.patch
diff --git a/patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch b/patches/unapplied/server/0444-Don-t-allow-null-UUID-s-for-chat.patch
index bc2aff6a45..bc2aff6a45 100644
--- a/patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch
+++ b/patches/unapplied/server/0444-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0445-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0445-Improve-Legacy-Component-serialization-size.patch
index 866302739f..866302739f 100644
--- a/patches/server/0445-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/unapplied/server/0445-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0446-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0446-Optimize-Bit-Operations-by-inlining.patch
index c1cce4278a..c1cce4278a 100644
--- a/patches/server/0446-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/unapplied/server/0446-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 350281756c..c4c18d2c4e 100644
--- a/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/unapplied/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2a135947a7d5b934454dc86e4bfdfd1145f6f3aa..ad2e460086a2f7f9e168c2f99d920862deacc844 100644
+index b4cc5f89b6694f1f3fc38d822a0f503c170d45c4..2d7de60d7e663b91f0a72241f24913338bd725dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -358,7 +358,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0448-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0448-incremental-chunk-and-player-saving.patch
index 601c03668c..601c03668c 100644
--- a/patches/server/0448-incremental-chunk-and-player-saving.patch
+++ b/patches/unapplied/server/0448-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch
index 74e5860e6b..74e5860e6b 100644
--- a/patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/unapplied/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0450-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0450-Support-old-UUID-format-for-NBT.patch
index abd9b26387..abd9b26387 100644
--- a/patches/server/0450-Support-old-UUID-format-for-NBT.patch
+++ b/patches/unapplied/server/0450-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/0451-Clean-up-duplicated-GameProfile-Properties.patch
index c742d4af9a..c742d4af9a 100644
--- a/patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/unapplied/server/0451-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0452-Convert-legacy-attributes-in-Item-Meta.patch
index b949a9e873..b949a9e873 100644
--- a/patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/unapplied/server/0452-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0453-Remove-some-streams-from-structures.patch b/patches/unapplied/server/0453-Remove-some-streams-from-structures.patch
index f695d56529..f695d56529 100644
--- a/patches/server/0453-Remove-some-streams-from-structures.patch
+++ b/patches/unapplied/server/0453-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/0454-Remove-streams-from-classes-related-villager-gossip.patch
index b70ae30d26..b70ae30d26 100644
--- a/patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/unapplied/server/0454-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0455-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0455-Support-components-in-ItemMeta.patch
index 05ab3c1898..05ab3c1898 100644
--- a/patches/server/0455-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/server/0455-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/unapplied/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
index 68a10afd43..68a10afd43 100644
--- a/patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
+++ b/patches/unapplied/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0457-Add-entity-liquid-API.patch b/patches/unapplied/server/0457-Add-entity-liquid-API.patch
index 91b94fb4dc..91b94fb4dc 100644
--- a/patches/server/0457-Add-entity-liquid-API.patch
+++ b/patches/unapplied/server/0457-Add-entity-liquid-API.patch
diff --git a/patches/server/0458-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0458-Update-itemstack-legacy-name-and-lore.patch
index 7512e6019e..7512e6019e 100644
--- a/patches/server/0458-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/unapplied/server/0458-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0459-Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/0459-Spawn-player-in-correct-world-on-login.patch
index ed8eedfdde..ed8eedfdde 100644
--- a/patches/server/0459-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/unapplied/server/0459-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0460-Add-PrepareResultEvent.patch b/patches/unapplied/server/0460-Add-PrepareResultEvent.patch
index 8217e01b4b..8217e01b4b 100644
--- a/patches/server/0460-Add-PrepareResultEvent.patch
+++ b/patches/unapplied/server/0460-Add-PrepareResultEvent.patch
diff --git a/patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 3c25c05af4..3c25c05af4 100644
--- a/patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/unapplied/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/unapplied/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index a46253fa87..a46253fa87 100644
--- a/patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/unapplied/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0463-Optimize-NetworkManager-Exception-Handling.patch
index 1cc708621a..1cc708621a 100644
--- a/patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/unapplied/server/0463-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/unapplied/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch
index 449f7a5007..449f7a5007 100644
--- a/patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/patches/unapplied/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0465-Fix-arrows-never-despawning-MC-125757.patch
index 8bdc8589fd..8bdc8589fd 100644
--- a/patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/unapplied/server/0465-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch
index 1017b5f0fa..1017b5f0fa 100644
--- a/patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/unapplied/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0467-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0467-Fix-SPIGOT-5989.patch
index 8af3e2590b..8af3e2590b 100644
--- a/patches/server/0467-Fix-SPIGOT-5989.patch
+++ b/patches/unapplied/server/0467-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 02319f5891..02319f5891 100644
--- a/patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/unapplied/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index d18114cb9b..d18114cb9b 100644
--- a/patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/unapplied/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index c03f4b1f88..c03f4b1f88 100644
--- a/patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/unapplied/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/unapplied/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index 2fc1e0bde7..2fc1e0bde7 100644
--- a/patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/unapplied/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0472-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0472-Fix-some-rails-connecting-improperly.patch
index 4dc21a2695..4dc21a2695 100644
--- a/patches/server/0472-Fix-some-rails-connecting-improperly.patch
+++ b/patches/unapplied/server/0472-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index be48fd5ae2..be48fd5ae2 100644
--- a/patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/unapplied/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 6fb1c85c61..6fb1c85c61 100644
--- a/patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/unapplied/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0475-Brand-support.patch b/patches/unapplied/server/0475-Brand-support.patch
index 40bdc94b3d..40a041a7c5 100644
--- a/patches/server/0475-Brand-support.patch
+++ b/patches/unapplied/server/0475-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 41250053943118526ee36e296b19c1a68c434aa5..05c18c233c8400c2031f9d7b3e5ce230dd89a25f 100644
+index 50226c6672ffb933fe7e22bf43641983eb6caa54..b924bf36e5a13d9fb7078e091e50c7e468bdd5b5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -279,6 +279,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0476-Add-setMaxPlayers-API.patch b/patches/unapplied/server/0476-Add-setMaxPlayers-API.patch
index 95a81339af..1ca3cb5512 100644
--- a/patches/server/0476-Add-setMaxPlayers-API.patch
+++ b/patches/unapplied/server/0476-Add-setMaxPlayers-API.patch
@@ -18,7 +18,7 @@ index be7a25560cd5521ddfe4793c7e51b1036fc8a19c..869fa7c3913185c3537185426e75c076
      private int simulationDistance;
      private boolean allowCheatsForAllPlayers;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ad2e460086a2f7f9e168c2f99d920862deacc844..efa7069504ef5aa4fc25320fdf8020222b17a48d 100644
+index 2d7de60d7e663b91f0a72241f24913338bd725dd..57c4871b977a31f55e5c39aba4159b39b1ac325d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -672,6 +672,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch
index 9efead6d4e..9efead6d4e 100644
--- a/patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/unapplied/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0478-Don-t-require-FACING-data.patch b/patches/unapplied/server/0478-Don-t-require-FACING-data.patch
index fd2ab14906..fd2ab14906 100644
--- a/patches/server/0478-Don-t-require-FACING-data.patch
+++ b/patches/unapplied/server/0478-Don-t-require-FACING-data.patch
diff --git a/patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 8368326183..8368326183 100644
--- a/patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/unapplied/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0480-Add-moon-phase-API.patch b/patches/unapplied/server/0480-Add-moon-phase-API.patch
index c400ce80c7..c400ce80c7 100644
--- a/patches/server/0480-Add-moon-phase-API.patch
+++ b/patches/unapplied/server/0480-Add-moon-phase-API.patch
diff --git a/patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch b/patches/unapplied/server/0481-Improve-Chunk-Status-Transition-Speed.patch
index 0485c6fc55..0485c6fc55 100644
--- a/patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/unapplied/server/0481-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0482-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0482-Prevent-headless-pistons-from-being-created.patch
index b31a2a9b3a..b31a2a9b3a 100644
--- a/patches/server/0482-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/unapplied/server/0482-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0483-Add-BellRingEvent.patch b/patches/unapplied/server/0483-Add-BellRingEvent.patch
index e6528721cf..e6528721cf 100644
--- a/patches/server/0483-Add-BellRingEvent.patch
+++ b/patches/unapplied/server/0483-Add-BellRingEvent.patch
diff --git a/patches/server/0484-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0484-Add-zombie-targets-turtle-egg-config.patch
index a92287451d..a92287451d 100644
--- a/patches/server/0484-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/unapplied/server/0484-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0485-Buffer-joins-to-world.patch b/patches/unapplied/server/0485-Buffer-joins-to-world.patch
index bf33110d9e..bf33110d9e 100644
--- a/patches/server/0485-Buffer-joins-to-world.patch
+++ b/patches/unapplied/server/0485-Buffer-joins-to-world.patch
diff --git a/patches/server/0486-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/0486-Eigencraft-redstone-implementation.patch
index e4a4e5398a..e4a4e5398a 100644
--- a/patches/server/0486-Eigencraft-redstone-implementation.patch
+++ b/patches/unapplied/server/0486-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 3c9abb3a48..3c9abb3a48 100644
--- a/patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/unapplied/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch
index 431d375f7b..431d375f7b 100644
--- a/patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/unapplied/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0489-Fix-CraftTeam-null-check.patch b/patches/unapplied/server/0489-Fix-CraftTeam-null-check.patch
index fc8ca37076..fc8ca37076 100644
--- a/patches/server/0489-Fix-CraftTeam-null-check.patch
+++ b/patches/unapplied/server/0489-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0490-Add-more-Evoker-API.patch b/patches/unapplied/server/0490-Add-more-Evoker-API.patch
index 367e900e25..367e900e25 100644
--- a/patches/server/0490-Add-more-Evoker-API.patch
+++ b/patches/unapplied/server/0490-Add-more-Evoker-API.patch
diff --git a/patches/server/0491-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0491-Add-methods-to-get-translation-keys.patch
index c099427caf..c099427caf 100644
--- a/patches/server/0491-Add-methods-to-get-translation-keys.patch
+++ b/patches/unapplied/server/0491-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch
index 238466b430..238466b430 100644
--- a/patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/unapplied/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0493-Cache-block-data-strings.patch b/patches/unapplied/server/0493-Cache-block-data-strings.patch
index b059d4b2a9..b059d4b2a9 100644
--- a/patches/server/0493-Cache-block-data-strings.patch
+++ b/patches/unapplied/server/0493-Cache-block-data-strings.patch
diff --git a/patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index c89b051afc..5b89bb0d25 100644
--- a/patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/unapplied/server/0494-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 05c18c233c8400c2031f9d7b3e5ce230dd89a25f..df8e091e72901518ef21903bd3890988ea4a5645 100644
+index b924bf36e5a13d9fb7078e091e50c7e468bdd5b5..b1281d1a0a51953703552e5855dd5a48de4e781e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -721,7 +721,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -31,7 +31,7 @@ index 05c18c233c8400c2031f9d7b3e5ce230dd89a25f..df8e091e72901518ef21903bd3890988
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c1bf81770f9d00f4e3ba5844260812bb4f6026ca..0618606ab87bf0745b667e3b59328bf78de503cf 100644
+index bc3b174ceda5fb6dc6873429b8523ff85a1258a0..602525fdfe46fbe6e480a60f3382d04c344c7117 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -158,6 +158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0495-Add-additional-open-container-api-to-HumanEntity.patch
index 53f2348da6..53f2348da6 100644
--- a/patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/unapplied/server/0495-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 602cc3a878..602cc3a878 100644
--- a/patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/unapplied/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch
index 41752c6cf5..41752c6cf5 100644
--- a/patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/unapplied/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/unapplied/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index e3de5bc8a4..e3de5bc8a4 100644
--- a/patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/unapplied/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 7ef1034eb5..324320a425 100644
--- a/patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0618606ab87bf0745b667e3b59328bf78de503cf..e0170e0b4318e16c1322cd20e1879ae88e893e7d 100644
+index 602525fdfe46fbe6e480a60f3382d04c344c7117..c2a17211cc216b9cf83ff393bf69ef49a3e778e8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4077,4 +4077,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0500-Lazily-track-plugin-scoreboards-by-default.patch
index 2bb9e702d3..2bb9e702d3 100644
--- a/patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/unapplied/server/0500-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0501-Entity-isTicking.patch b/patches/unapplied/server/0501-Entity-isTicking.patch
index a4312ddea0..bf0a469853 100644
--- a/patches/server/0501-Entity-isTicking.patch
+++ b/patches/unapplied/server/0501-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e0170e0b4318e16c1322cd20e1879ae88e893e7d..b6e2a0b8c4ee3a14a8c7e61a6316d473e2724fe4 100644
+index c2a17211cc216b9cf83ff393bf69ef49a3e778e8..c5cd18b02e5956fef6779b0b89d33b515bc9d13a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -59,6 +59,7 @@ import net.minecraft.resources.ResourceKey;
diff --git a/patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 52b55a6ae3..52b55a6ae3 100644
--- a/patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/unapplied/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch
index 5b3dba224c..5b3dba224c 100644
--- a/patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/unapplied/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 31cde5ee93..31cde5ee93 100644
--- a/patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/unapplied/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0505-Fix-for-large-move-vectors-crashing-server.patch
index 06229ba917..87d5c75434 100644
--- a/patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/unapplied/server/0505-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 df8e091e72901518ef21903bd3890988ea4a5645..bbe945c7c26ece9d8589f46388d0e465f07b1e81 100644
+index b1281d1a0a51953703552e5855dd5a48de4e781e..f1a41a931b22f88f0dd530fb559b1c2ed839527a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -536,9 +536,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0506-Optimise-getType-calls.patch b/patches/unapplied/server/0506-Optimise-getType-calls.patch
index 5d53107ff2..5d53107ff2 100644
--- a/patches/server/0506-Optimise-getType-calls.patch
+++ b/patches/unapplied/server/0506-Optimise-getType-calls.patch
diff --git a/patches/server/0507-Villager-resetOffers.patch b/patches/unapplied/server/0507-Villager-resetOffers.patch
index 7448270230..7448270230 100644
--- a/patches/server/0507-Villager-resetOffers.patch
+++ b/patches/unapplied/server/0507-Villager-resetOffers.patch
diff --git a/patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/unapplied/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch
index 91ae1561af..91ae1561af 100644
--- a/patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/patches/unapplied/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0509-Retain-block-place-order-when-capturing-blockstates.patch
index ae8ed41c93..ae8ed41c93 100644
--- a/patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/unapplied/server/0509-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch
index 3f620bf4e9..3f620bf4e9 100644
--- a/patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/unapplied/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0511-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0511-Fix-item-locations-dropped-from-campfires.patch
index df944d4a66..df944d4a66 100644
--- a/patches/server/0511-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/unapplied/server/0511-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0512-Player-elytra-boost-API.patch b/patches/unapplied/server/0512-Player-elytra-boost-API.patch
index 5c4eddda62..5c4eddda62 100644
--- a/patches/server/0512-Player-elytra-boost-API.patch
+++ b/patches/unapplied/server/0512-Player-elytra-boost-API.patch
diff --git a/patches/server/0513-Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/0513-Fixed-TileEntityBell-memory-leak.patch
index 09d0b77f4a..09d0b77f4a 100644
--- a/patches/server/0513-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/unapplied/server/0513-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index f48528d0b5..f48528d0b5 100644
--- a/patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/unapplied/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0515-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0515-Add-getOfflinePlayerIfCached-String.patch
index 878b60c6f8..e82189979d 100644
--- a/patches/server/0515-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/server/0515-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index efa7069504ef5aa4fc25320fdf8020222b17a48d..0afcf909d93973061c4b0735cba3e091fa79833b 100644
+index 57c4871b977a31f55e5c39aba4159b39b1ac325d..da3ca296a4bcc0c6d303df9de5370a89a5ae0d67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1801,6 +1801,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0516-Add-ignore-discounts-API.patch b/patches/unapplied/server/0516-Add-ignore-discounts-API.patch
index e77eb448c9..e77eb448c9 100644
--- a/patches/server/0516-Add-ignore-discounts-API.patch
+++ b/patches/unapplied/server/0516-Add-ignore-discounts-API.patch
diff --git a/patches/server/0517-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0517-Toggle-for-removing-existing-dragon.patch
index 157073f779..157073f779 100644
--- a/patches/server/0517-Toggle-for-removing-existing-dragon.patch
+++ b/patches/unapplied/server/0517-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0518-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0518-Fix-client-lag-on-advancement-loading.patch
index e48d21e361..e48d21e361 100644
--- a/patches/server/0518-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/unapplied/server/0518-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0519-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0519-Item-no-age-no-player-pickup.patch
index 13b456555a..13b456555a 100644
--- a/patches/server/0519-Item-no-age-no-player-pickup.patch
+++ b/patches/unapplied/server/0519-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 91c966567f..91c966567f 100644
--- a/patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/unapplied/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0521-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0521-Beacon-API-custom-effect-ranges.patch
index 42125ab17d..42125ab17d 100644
--- a/patches/server/0521-Beacon-API-custom-effect-ranges.patch
+++ b/patches/unapplied/server/0521-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0522-Add-API-for-quit-reason.patch b/patches/unapplied/server/0522-Add-API-for-quit-reason.patch
index 33b22a2441..33b22a2441 100644
--- a/patches/server/0522-Add-API-for-quit-reason.patch
+++ b/patches/unapplied/server/0522-Add-API-for-quit-reason.patch
diff --git a/patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch
index a5adffed4f..a5adffed4f 100644
--- a/patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/unapplied/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0524-Expose-world-spawn-angle.patch b/patches/unapplied/server/0524-Expose-world-spawn-angle.patch
index 769d8e8343..769d8e8343 100644
--- a/patches/server/0524-Expose-world-spawn-angle.patch
+++ b/patches/unapplied/server/0524-Expose-world-spawn-angle.patch
diff --git a/patches/server/0525-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0525-Add-Destroy-Speed-API.patch
index a2b7640fee..a2b7640fee 100644
--- a/patches/server/0525-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/server/0525-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 8a7c0c0a6f..8a7c0c0a6f 100644
--- a/patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/unapplied/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0527-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0527-Add-LivingEntity-clearActiveItem.patch
index 6b43687673..6b43687673 100644
--- a/patches/server/0527-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/unapplied/server/0527-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0528-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0528-Add-PlayerItemCooldownEvent.patch
index 584621c1af..584621c1af 100644
--- a/patches/server/0528-Add-PlayerItemCooldownEvent.patch
+++ b/patches/unapplied/server/0528-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0529-Significantly-improve-performance-of-the-end-generat.patch
index 8986e82f72..8986e82f72 100644
--- a/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/unapplied/server/0529-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0530-More-lightning-API.patch b/patches/unapplied/server/0530-More-lightning-API.patch
index 5b18a81437..5b18a81437 100644
--- a/patches/server/0530-More-lightning-API.patch
+++ b/patches/unapplied/server/0530-More-lightning-API.patch
diff --git a/patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
index 443e56ad91..b97441d14d 100644
--- a/patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/unapplied/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b6e2a0b8c4ee3a14a8c7e61a6316d473e2724fe4..6d2853238897cc7b801af12dc4fe44495e815f26 100644
+index c5cd18b02e5956fef6779b0b89d33b515bc9d13a..933b49da673c07e45f6cb5727598df492cf1a958 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1837,6 +1837,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0532-Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/0532-Added-missing-default-perms-for-commands.patch
index ddaf0c6aec..ddaf0c6aec 100644
--- a/patches/server/0532-Added-missing-default-perms-for-commands.patch
+++ b/patches/unapplied/server/0532-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0533-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0533-Add-PlayerShearBlockEvent.patch
index 4004036b95..4004036b95 100644
--- a/patches/server/0533-Add-PlayerShearBlockEvent.patch
+++ b/patches/unapplied/server/0533-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/0534-Fix-curing-zombie-villager-discount-exploit.patch
index c6cb27bebe..c6cb27bebe 100644
--- a/patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/unapplied/server/0534-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0535-Limit-recipe-packets.patch b/patches/unapplied/server/0535-Limit-recipe-packets.patch
index b8d2cfacad..4fab8524f0 100644
--- a/patches/server/0535-Limit-recipe-packets.patch
+++ b/patches/unapplied/server/0535-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 336274ad506034bbed408c2f62aa520a39d5d49d..47c36be46c8d24c243f2d5db9a3d07eb5c177809 100644
+index 2687823d07df2c4b57cb684000621c69c1cfd10d..8254c6d3bcff79c9a718c89f8c04c2c2db035a8f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -248,6 +248,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0536-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0536-Fix-CraftSound-backwards-compatibility.patch
index 60e8ef1e6b..60e8ef1e6b 100644
--- a/patches/server/0536-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/unapplied/server/0536-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0537-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0537-Player-Chunk-Load-Unload-Events.patch
index f4e0c3d78e..f4e0c3d78e 100644
--- a/patches/server/0537-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/server/0537-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0538-Optimize-Dynamic-get-Missing-Keys.patch
index 5a4efe035c..5a4efe035c 100644
--- a/patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/unapplied/server/0538-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0539-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0539-Expose-LivingEntity-hurt-direction.patch
index 2f461711f6..2f461711f6 100644
--- a/patches/server/0539-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/server/0539-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 5c4a714385..5c4a714385 100644
--- a/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index a66e8fc14d..a66e8fc14d 100644
--- a/patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/unapplied/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index e02f2667cb..e02f2667cb 100644
--- a/patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/unapplied/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0543-Implement-TargetHitEvent.patch b/patches/unapplied/server/0543-Implement-TargetHitEvent.patch
index 78722933d9..78722933d9 100644
--- a/patches/server/0543-Implement-TargetHitEvent.patch
+++ b/patches/unapplied/server/0543-Implement-TargetHitEvent.patch
diff --git a/patches/server/0544-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0544-MC-4-Fix-item-position-desync.patch
index 204aa5b2c1..2efd15bacb 100644
--- a/patches/server/0544-MC-4-Fix-item-position-desync.patch
+++ b/patches/unapplied/server/0544-MC-4-Fix-item-position-desync.patch
@@ -27,7 +27,7 @@ index 3768a71491ef7836b9739bdaec7a077c523dbacd..a57957ace1a72b3308487f180a366c38
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6d2853238897cc7b801af12dc4fe44495e815f26..34594585edbe6990a8f36daff43d9276a655ec74 100644
+index 933b49da673c07e45f6cb5727598df492cf1a958..c665ecbff7d2b4626eb07aace543448e2278a2da 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3893,6 +3893,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0545-Additional-Block-Material-API-s.patch b/patches/unapplied/server/0545-Additional-Block-Material-API-s.patch
index e93239aae5..e93239aae5 100644
--- a/patches/server/0545-Additional-Block-Material-API-s.patch
+++ b/patches/unapplied/server/0545-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0546-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0546-Fix-harming-potion-dupe.patch
index d131d6c979..d131d6c979 100644
--- a/patches/server/0546-Fix-harming-potion-dupe.patch
+++ b/patches/unapplied/server/0546-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 33941db038..33941db038 100644
--- a/patches/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/unapplied/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0548-Cache-burn-durations.patch b/patches/unapplied/server/0548-Cache-burn-durations.patch
index 35387cbe57..35387cbe57 100644
--- a/patches/server/0548-Cache-burn-durations.patch
+++ b/patches/unapplied/server/0548-Cache-burn-durations.patch
diff --git a/patches/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index b11735c5d7..b11735c5d7 100644
--- a/patches/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/unapplied/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch
index 8967f3f735..8967f3f735 100644
--- a/patches/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/unapplied/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/0552-Fix-interact-event-not-being-called-in-adventure.patch
index 8e7ec11fd5..51eaaaca60 100644
--- a/patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/unapplied/server/0552-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 47c36be46c8d24c243f2d5db9a3d07eb5c177809..25e8e284ab83e0b3d8ef943f287b24ab6aed9447 100644
+index 8254c6d3bcff79c9a718c89f8c04c2c2db035a8f..0f7be5c33fbc5e762cf64f9cc0cd8dc502751360 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1779,7 +1779,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0553-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0553-Zombie-API-breaking-doors.patch
index b89994b417..b89994b417 100644
--- a/patches/server/0553-Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/server/0553-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0554-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0554-Fix-nerfed-slime-when-splitting.patch
index 726d362dff..726d362dff 100644
--- a/patches/server/0554-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/unapplied/server/0554-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0555-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0555-Add-EntityLoadCrossbowEvent.patch
index 6ffab47e6e..6ffab47e6e 100644
--- a/patches/server/0555-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/server/0555-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0556-Guardian-beam-workaround.patch b/patches/unapplied/server/0556-Guardian-beam-workaround.patch
index fa66573d2b..fa66573d2b 100644
--- a/patches/server/0556-Guardian-beam-workaround.patch
+++ b/patches/unapplied/server/0556-Guardian-beam-workaround.patch
diff --git a/patches/server/0557-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0557-Added-WorldGameRuleChangeEvent.patch
index 34d10452cc..34d10452cc 100644
--- a/patches/server/0557-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/server/0557-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0558-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0558-Added-ServerResourcesReloadedEvent.patch
index d7d3a17b46..d7d3a17b46 100644
--- a/patches/server/0558-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/0558-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0559-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0559-Added-world-settings-for-mobs-picking-up-loot.patch
index 4c1e7b2549..4c1e7b2549 100644
--- a/patches/server/0559-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/unapplied/server/0559-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0560-Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0560-Implemented-BlockFailedDispenseEvent.patch
index 9c14300d5a..9c14300d5a 100644
--- a/patches/server/0560-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/server/0560-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0561-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0561-Added-PlayerLecternPageChangeEvent.patch
index d8fd03b1c7..d8fd03b1c7 100644
--- a/patches/server/0561-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/server/0561-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0562-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0562-Added-PlayerLoomPatternSelectEvent.patch
index 9b172da84b..9b172da84b 100644
--- a/patches/server/0562-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/server/0562-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0563-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0563-Configurable-door-breaking-difficulty.patch
index 45e5e3e168..45e5e3e168 100644
--- a/patches/server/0563-Configurable-door-breaking-difficulty.patch
+++ b/patches/unapplied/server/0563-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0564-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0564-Empty-commands-shall-not-be-dispatched.patch
index bb95c43e4a..bb95c43e4a 100644
--- a/patches/server/0564-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/unapplied/server/0564-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0565-Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/0565-Implement-API-to-expose-exact-interaction-point.patch
index 0ede6bf153..0ede6bf153 100644
--- a/patches/server/0565-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/unapplied/server/0565-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0566-Remove-stale-POIs.patch b/patches/unapplied/server/0566-Remove-stale-POIs.patch
index 5d84754189..5d84754189 100644
--- a/patches/server/0566-Remove-stale-POIs.patch
+++ b/patches/unapplied/server/0566-Remove-stale-POIs.patch
diff --git a/patches/server/0567-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0567-Fix-villager-boat-exploit.patch
index 41111aa03e..41111aa03e 100644
--- a/patches/server/0567-Fix-villager-boat-exploit.patch
+++ b/patches/unapplied/server/0567-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0568-Add-sendOpLevel-API.patch b/patches/unapplied/server/0568-Add-sendOpLevel-API.patch
index def544bb34..def544bb34 100644
--- a/patches/server/0568-Add-sendOpLevel-API.patch
+++ b/patches/unapplied/server/0568-Add-sendOpLevel-API.patch
diff --git a/patches/server/0569-Add-PaperRegistry.patch b/patches/unapplied/server/0569-Add-PaperRegistry.patch
index 8e7d64bb09..8e7d64bb09 100644
--- a/patches/server/0569-Add-PaperRegistry.patch
+++ b/patches/unapplied/server/0569-Add-PaperRegistry.patch
diff --git a/patches/server/0570-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0570-Add-StructuresLocateEvent.patch
index a2fbda08bb..a2fbda08bb 100644
--- a/patches/server/0570-Add-StructuresLocateEvent.patch
+++ b/patches/unapplied/server/0570-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0571-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0571-Collision-option-for-requiring-a-player-participant.patch
index b3511541c5..c5d18d1a23 100644
--- a/patches/server/0571-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/unapplied/server/0571-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 34594585edbe6990a8f36daff43d9276a655ec74..876c9ba5f50b64801298ff5f16673fb662ee04af 100644
+index c665ecbff7d2b4626eb07aace543448e2278a2da..12d067202cbd861362d782c21c924a5641471b11 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1720,6 +1720,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0572-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0572-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 1af8b9fb5e..1af8b9fb5e 100644
--- a/patches/server/0572-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/unapplied/server/0572-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0573-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0573-Return-chat-component-with-empty-text-instead-of-thr.patch
index 71ca8dddef..71ca8dddef 100644
--- a/patches/server/0573-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/server/0573-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0574-Make-schedule-command-per-world.patch b/patches/unapplied/server/0574-Make-schedule-command-per-world.patch
index 60f5d1fc66..60f5d1fc66 100644
--- a/patches/server/0574-Make-schedule-command-per-world.patch
+++ b/patches/unapplied/server/0574-Make-schedule-command-per-world.patch
diff --git a/patches/server/0575-Configurable-max-leash-distance.patch b/patches/unapplied/server/0575-Configurable-max-leash-distance.patch
index ba76f79b7f..ba76f79b7f 100644
--- a/patches/server/0575-Configurable-max-leash-distance.patch
+++ b/patches/unapplied/server/0575-Configurable-max-leash-distance.patch
diff --git a/patches/server/0576-Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/0576-Implement-BlockPreDispenseEvent.patch
index 34982b77cc..34982b77cc 100644
--- a/patches/server/0576-Implement-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/server/0576-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0577-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0577-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 2f90dea41c..2f90dea41c 100644
--- a/patches/server/0577-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/server/0577-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0578-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0578-Add-toggle-for-always-placing-the-dragon-egg.patch
index caffaecf90..caffaecf90 100644
--- a/patches/server/0578-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/unapplied/server/0578-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0579-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0579-Added-PlayerStonecutterRecipeSelectEvent.patch
index 1c6497d193..1c6497d193 100644
--- a/patches/server/0579-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/server/0579-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 8056b4b3b0..8056b4b3b0 100644
--- a/patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/unapplied/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0581-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0581-Reset-shield-blocking-on-dimension-change.patch
index 3622789530..3622789530 100644
--- a/patches/server/0581-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/unapplied/server/0581-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0582-add-DragonEggFormEvent.patch b/patches/unapplied/server/0582-add-DragonEggFormEvent.patch
index 40273bbb47..40273bbb47 100644
--- a/patches/server/0582-add-DragonEggFormEvent.patch
+++ b/patches/unapplied/server/0582-add-DragonEggFormEvent.patch
diff --git a/patches/server/0583-EntityMoveEvent.patch b/patches/unapplied/server/0583-EntityMoveEvent.patch
index b191460744..b191460744 100644
--- a/patches/server/0583-EntityMoveEvent.patch
+++ b/patches/unapplied/server/0583-EntityMoveEvent.patch
diff --git a/patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch
index 1954931c8d..1954931c8d 100644
--- a/patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/unapplied/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0585-Inline-shift-direction-fields.patch b/patches/unapplied/server/0585-Inline-shift-direction-fields.patch
index d4353368a2..d4353368a2 100644
--- a/patches/server/0585-Inline-shift-direction-fields.patch
+++ b/patches/unapplied/server/0585-Inline-shift-direction-fields.patch
diff --git a/patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch
index e71e9cff71..e71e9cff71 100644
--- a/patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0588-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0588-living-entity-allow-attribute-registration.patch
index 88cf7f15c6..88cf7f15c6 100644
--- a/patches/server/0588-living-entity-allow-attribute-registration.patch
+++ b/patches/unapplied/server/0588-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0589-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0589-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0589-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/unapplied/server/0589-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/unapplied/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0591-Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/0591-Add-support-for-hex-color-codes-in-console.patch
index 66f4f44c39..66f4f44c39 100644
--- a/patches/server/0591-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/unapplied/server/0591-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0592-Expose-Tracked-Players.patch b/patches/unapplied/server/0592-Expose-Tracked-Players.patch
index 116eacbb27..116eacbb27 100644
--- a/patches/server/0592-Expose-Tracked-Players.patch
+++ b/patches/unapplied/server/0592-Expose-Tracked-Players.patch
diff --git a/patches/server/0593-Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/0593-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0593-Remove-streams-from-SensorNearest.patch
+++ b/patches/unapplied/server/0593-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0594-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/0594-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..e013e32526 100644
--- a/patches/server/0594-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/unapplied/server/0594-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0595-Improve-ServerGUI.patch b/patches/unapplied/server/0595-Improve-ServerGUI.patch
index e573bd2f58..e573bd2f58 100644
--- a/patches/server/0595-Improve-ServerGUI.patch
+++ b/patches/unapplied/server/0595-Improve-ServerGUI.patch
diff --git a/patches/server/0596-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/0596-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0596-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/unapplied/server/0596-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0597-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0597-fix-converting-txt-to-json-file.patch
index a3eca69835..a3eca69835 100644
--- a/patches/server/0597-fix-converting-txt-to-json-file.patch
+++ b/patches/unapplied/server/0597-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0598-Add-worldborder-events.patch b/patches/unapplied/server/0598-Add-worldborder-events.patch
index af0cf2d370..af0cf2d370 100644
--- a/patches/server/0598-Add-worldborder-events.patch
+++ b/patches/unapplied/server/0598-Add-worldborder-events.patch
diff --git a/patches/server/0599-added-PlayerNameEntityEvent.patch b/patches/unapplied/server/0599-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0599-added-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/server/0599-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0600-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0600-Prevent-grindstones-from-overstacking-items.patch
index 3e79faf014..3e79faf014 100644
--- a/patches/server/0600-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/unapplied/server/0600-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0601-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0601-Add-recipe-to-cook-events.patch
index 61023ab91c..61023ab91c 100644
--- a/patches/server/0601-Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/server/0601-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0602-Add-Block-isValidTool.patch b/patches/unapplied/server/0602-Add-Block-isValidTool.patch
index 95bf6c3432..95bf6c3432 100644
--- a/patches/server/0602-Add-Block-isValidTool.patch
+++ b/patches/unapplied/server/0602-Add-Block-isValidTool.patch
diff --git a/patches/server/0603-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0603-Allow-using-signs-inside-spawn-protection.patch
index b541d545e6..091019f37f 100644
--- a/patches/server/0603-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/unapplied/server/0603-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 25e8e284ab83e0b3d8ef943f287b24ab6aed9447..a45b2909300e0a66d92702eb85e541e621d27fea 100644
+index 0f7be5c33fbc5e762cf64f9cc0cd8dc502751360..7690084dc9eb7ae5d8c6ca82efe0126643eb5730 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1771,7 +1771,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0604-Expand-world-key-API.patch b/patches/unapplied/server/0604-Expand-world-key-API.patch
index e6558c9753..047e7d05a0 100644
--- a/patches/server/0604-Expand-world-key-API.patch
+++ b/patches/unapplied/server/0604-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index ee5e59c37301d9a806e2f696d52d9d217b232833..bb5d22125b6cd4e60d2b7e2e00af158c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0afcf909d93973061c4b0735cba3e091fa79833b..a84fb8c6d4af395da08e9a685f3705bcdf8440a6 100644
+index da3ca296a4bcc0c6d303df9de5370a89a5ae0d67..65fb1db4dd7078cfc6c0cb9ed5f0fe267e067249 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1141,9 +1141,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0605-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0605-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0605-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/unapplied/server/0605-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0606-Item-Rarity-API.patch b/patches/unapplied/server/0606-Item-Rarity-API.patch
index d26dcc93ec..d26dcc93ec 100644
--- a/patches/server/0606-Item-Rarity-API.patch
+++ b/patches/unapplied/server/0606-Item-Rarity-API.patch
diff --git a/patches/server/0607-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0607-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index a8810d8bca..a8810d8bca 100644
--- a/patches/server/0607-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/unapplied/server/0607-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0608-copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/0608-copy-TESign-isEditable-from-snapshots.patch
index 766607080f..766607080f 100644
--- a/patches/server/0608-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/unapplied/server/0608-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0609-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0609-Drop-carried-item-when-player-has-disconnected.patch
index 0a38c072e9..0a38c072e9 100644
--- a/patches/server/0609-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/unapplied/server/0609-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0610-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0610-forced-whitelist-use-configurable-kick-message.patch
index d04aff94a6..d04aff94a6 100644
--- a/patches/server/0610-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/unapplied/server/0610-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index a1114d03f3..61edd6e82f 100644
--- a/patches/server/0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/unapplied/server/0611-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 a45b2909300e0a66d92702eb85e541e621d27fea..f582c7c41022c8b94ea6c7bc0ac9312499e7c434 100644
+index 7690084dc9eb7ae5d8c6ca82efe0126643eb5730..06fe6b44bf1639f142744321f892b711edb731a0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1221,7 +1221,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0612-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0612-Entity-load-save-limit-per-chunk.patch
index 64d4f515d8..64d4f515d8 100644
--- a/patches/server/0612-Entity-load-save-limit-per-chunk.patch
+++ b/patches/unapplied/server/0612-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0613-Expose-protocol-version.patch b/patches/unapplied/server/0613-Expose-protocol-version.patch
index 5da137f698..5da137f698 100644
--- a/patches/server/0613-Expose-protocol-version.patch
+++ b/patches/unapplied/server/0613-Expose-protocol-version.patch
diff --git a/patches/server/0614-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/unapplied/server/0614-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 4faeb78538..8cd6b91467 100644
--- a/patches/server/0614-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/unapplied/server/0614-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow for Component suggestion tooltips in
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f582c7c41022c8b94ea6c7bc0ac9312499e7c434..6fb7bfd504839cc4a6f38ec9f99a571a1396e222 100644
+index 06fe6b44bf1639f142744321f892b711edb731a0..4bd7e297d81b3e1f880d9bf8d61b61f6ae448984 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -803,12 +803,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0615-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0615-Enhance-console-tab-completions-for-brigadier-comman.patch
index d16673ad36..d16673ad36 100644
--- a/patches/server/0615-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/unapplied/server/0615-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 52f5ed46ee..52f5ed46ee 100644
--- a/patches/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/unapplied/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0617-Add-bypass-host-check.patch b/patches/unapplied/server/0617-Add-bypass-host-check.patch
index 85854dc71d..85854dc71d 100644
--- a/patches/server/0617-Add-bypass-host-check.patch
+++ b/patches/unapplied/server/0617-Add-bypass-host-check.patch
diff --git a/patches/server/0618-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0618-Set-area-affect-cloud-rotation.patch
index 08e992b45c..08e992b45c 100644
--- a/patches/server/0618-Set-area-affect-cloud-rotation.patch
+++ b/patches/unapplied/server/0618-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0619-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0619-add-isDeeplySleeping-to-HumanEntity.patch
index 18ba539fd0..18ba539fd0 100644
--- a/patches/server/0619-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/server/0619-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0620-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0620-add-consumeFuel-to-FurnaceBurnEvent.patch
index 0c37516dd7..0c37516dd7 100644
--- a/patches/server/0620-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/server/0620-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0621-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0621-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0621-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/server/0621-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0622-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0622-fix-PigZombieAngerEvent-cancellation.patch
index df4e7b0b17..df4e7b0b17 100644
--- a/patches/server/0622-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/unapplied/server/0622-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0623-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/unapplied/server/0623-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0623-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/unapplied/server/0623-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0624-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0624-fix-PlayerItemHeldEvent-firing-twice.patch
index 948edcfd77..2c47798d72 100644
--- a/patches/server/0624-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/unapplied/server/0624-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 6fb7bfd504839cc4a6f38ec9f99a571a1396e222..33354c6ca4005d3ae1aedc4fac57dcd047bab853 100644
+index 4bd7e297d81b3e1f880d9bf8d61b61f6ae448984..200886cb577959812f9b384d8af061806fe03e5e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1986,6 +1986,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0625-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0625-Added-PlayerDeepSleepEvent.patch
index 3d655f6013..3d655f6013 100644
--- a/patches/server/0625-Added-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/0625-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0626-More-World-API.patch b/patches/unapplied/server/0626-More-World-API.patch
index d6a3687642..d6a3687642 100644
--- a/patches/server/0626-More-World-API.patch
+++ b/patches/unapplied/server/0626-More-World-API.patch
diff --git a/patches/server/0627-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0627-Added-PlayerBedFailEnterEvent.patch
index ad6eaeb223..ad6eaeb223 100644
--- a/patches/server/0627-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/0627-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0628-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0628-Implement-methods-to-convert-between-Component-and-B.patch
index 79e7635b2c..79e7635b2c 100644
--- a/patches/server/0628-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/unapplied/server/0628-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index b2973e3d1e..b2973e3d1e 100644
--- a/patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/unapplied/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0630-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0630-Introduce-beacon-activation-deactivation-events.patch
index b3f265d709..b3f265d709 100644
--- a/patches/server/0630-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/server/0630-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 4790213300..a513fca820 100644
--- a/patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/unapplied/server/0631-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 33354c6ca4005d3ae1aedc4fac57dcd047bab853..24025a814b2659829983c902f40214a2b7b6bcf4 100644
+index 200886cb577959812f9b384d8af061806fe03e5e..a698c43128dd9303af7715fc912c01fb835d426a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2674,7 +2674,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0632-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0632-Add-Channel-initialization-listeners.patch
index bbef1c0922..bbef1c0922 100644
--- a/patches/server/0632-Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/0632-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch
index 64a9abbcc7..64a9abbcc7 100644
--- a/patches/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/unapplied/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0634-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0634-Add-more-WanderingTrader-API.patch
index 65d351d6df..65d351d6df 100644
--- a/patches/server/0634-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/0634-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0635-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0635-Add-EntityBlockStorage-clearEntities.patch
index 2bd0ddfa38..2bd0ddfa38 100644
--- a/patches/server/0635-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/0635-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 1eae76c523..1eae76c523 100644
--- a/patches/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 78e9c23a17..78e9c23a17 100644
--- a/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0638-Inventory-close.patch b/patches/unapplied/server/0638-Inventory-close.patch
index e7f478324a..e7f478324a 100644
--- a/patches/server/0638-Inventory-close.patch
+++ b/patches/unapplied/server/0638-Inventory-close.patch
diff --git a/patches/server/0639-call-PortalCreateEvent-players-and-end-platform.patch b/patches/unapplied/server/0639-call-PortalCreateEvent-players-and-end-platform.patch
index cc13959a77..cc13959a77 100644
--- a/patches/server/0639-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/unapplied/server/0639-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 15c8339c99..15c8339c99 100644
--- a/patches/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0641-Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/0641-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0641-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/unapplied/server/0641-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0642-Add-basic-Datapack-API.patch b/patches/unapplied/server/0642-Add-basic-Datapack-API.patch
index 7c119886c5..1a66d7bc0d 100644
--- a/patches/server/0642-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/0642-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a84fb8c6d4af395da08e9a685f3705bcdf8440a6..887bf340b56177099bc5c55ac185fb66d8a080f7 100644
+index 65fb1db4dd7078cfc6c0cb9ed5f0fe267e067249..5196eef152a64269f460b3631aba455b0b434246 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -280,6 +280,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0643-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0643-Add-environment-variable-to-disable-server-gui.patch
index 426508e900..426508e900 100644
--- a/patches/server/0643-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/0643-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0644-additions-to-PlayerGameModeChangeEvent.patch
index 134d1f6dd8..134d1f6dd8 100644
--- a/patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/server/0644-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0645-ItemStack-repair-check-API.patch b/patches/unapplied/server/0645-ItemStack-repair-check-API.patch
index 553e56cb06..553e56cb06 100644
--- a/patches/server/0645-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/server/0645-ItemStack-repair-check-API.patch
diff --git a/patches/server/0646-More-Enchantment-API.patch b/patches/unapplied/server/0646-More-Enchantment-API.patch
index 9068048df0..9068048df0 100644
--- a/patches/server/0646-More-Enchantment-API.patch
+++ b/patches/unapplied/server/0646-More-Enchantment-API.patch
diff --git a/patches/server/0647-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0647-Move-range-check-for-block-placing-up.patch
index adbb6b0083..43e26ae4ed 100644
--- a/patches/server/0647-Move-range-check-for-block-placing-up.patch
+++ b/patches/unapplied/server/0647-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 c9da8961af6ae392230355ef722e5f9be4e3fc5c..f3a8b36956dbb8b9396bac4fc17aae7a3cb1d594 100644
+index 7abd31f1f18624cc69262fedb072008d9ff43af1..de2d10a57b8146bd8d039577b8d48889a2c96d93 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1763,6 +1763,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0648-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0648-Fix-and-optimise-world-force-upgrading.patch
index c925b72304..c925b72304 100644
--- a/patches/server/0648-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/unapplied/server/0648-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0649-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0649-Add-Mob-lookAt-API.patch
index 14378270ee..14378270ee 100644
--- a/patches/server/0649-Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/server/0649-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0650-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0650-Add-Unix-domain-socket-support.patch
index cd56cfe1a7..cd56cfe1a7 100644
--- a/patches/server/0650-Add-Unix-domain-socket-support.patch
+++ b/patches/unapplied/server/0650-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0651-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0651-Add-EntityInsideBlockEvent.patch
index 0ca02bfa9a..0ca02bfa9a 100644
--- a/patches/server/0651-Add-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/server/0651-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0652-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0652-Attributes-API-for-item-defaults.patch
index ab2191630c..ab2191630c 100644
--- a/patches/server/0652-Attributes-API-for-item-defaults.patch
+++ b/patches/unapplied/server/0652-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0653-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0653-Add-cause-to-Weather-ThunderChangeEvents.patch
index 011698d798..011698d798 100644
--- a/patches/server/0653-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/server/0653-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0654-More-Lidded-Block-API.patch b/patches/unapplied/server/0654-More-Lidded-Block-API.patch
index 135fd68698..135fd68698 100644
--- a/patches/server/0654-More-Lidded-Block-API.patch
+++ b/patches/unapplied/server/0654-More-Lidded-Block-API.patch
diff --git a/patches/server/0655-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0655-Limit-item-frame-cursors-on-maps.patch
index 4e2cd3bfa2..4e2cd3bfa2 100644
--- a/patches/server/0655-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/unapplied/server/0655-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0656-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0656-Add-PlayerKickEvent-causes.patch
index 4d94028225..4d94028225 100644
--- a/patches/server/0656-Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/server/0656-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0657-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0657-Add-PufferFishStateChangeEvent.patch
index e15126884a..e15126884a 100644
--- a/patches/server/0657-Add-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/server/0657-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0658-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0658-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 0ebe5f6ad9..0ebe5f6ad9 100644
--- a/patches/server/0658-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/unapplied/server/0658-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0659-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0659-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index e2333c8ac7..e2333c8ac7 100644
--- a/patches/server/0659-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/unapplied/server/0659-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0660-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0660-Add-option-to-fix-items-merging-through-walls.patch
index 4cde97de50..4cde97de50 100644
--- a/patches/server/0660-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/unapplied/server/0660-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0661-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0661-Add-BellRevealRaiderEvent.patch
index 587e0f0400..587e0f0400 100644
--- a/patches/server/0661-Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/server/0661-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0662-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0662-Fix-invulnerable-end-crystals.patch
index e5ce326afa..e5ce326afa 100644
--- a/patches/server/0662-Fix-invulnerable-end-crystals.patch
+++ b/patches/unapplied/server/0662-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0663-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0663-Add-ElderGuardianAppearanceEvent.patch
index 13c35cf8b6..13c35cf8b6 100644
--- a/patches/server/0663-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/server/0663-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0664-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0664-Fix-dangerous-end-portal-logic.patch
index b63725b6ba..da5922b67d 100644
--- a/patches/server/0664-Fix-dangerous-end-portal-logic.patch
+++ b/patches/unapplied/server/0664-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 876c9ba5f50b64801298ff5f16673fb662ee04af..e42b62a20adc487a6218d1ba87442dd9bc375182 100644
+index 12d067202cbd861362d782c21c924a5641471b11..7c239cf6a05ac427cbd1bee0ae05709632538bc8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -459,6 +459,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0665-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0665-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index c46f8fbb65..c46f8fbb65 100644
--- a/patches/server/0665-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/unapplied/server/0665-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0666-Make-item-validations-configurable.patch b/patches/unapplied/server/0666-Make-item-validations-configurable.patch
index 8c87e474af..8c87e474af 100644
--- a/patches/server/0666-Make-item-validations-configurable.patch
+++ b/patches/unapplied/server/0666-Make-item-validations-configurable.patch
diff --git a/patches/server/0667-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0667-Line-Of-Sight-Changes.patch
index e20e5491d4..e20e5491d4 100644
--- a/patches/server/0667-Line-Of-Sight-Changes.patch
+++ b/patches/unapplied/server/0667-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0668-add-per-world-spawn-limits.patch b/patches/unapplied/server/0668-add-per-world-spawn-limits.patch
index 3cc35c613b..3cc35c613b 100644
--- a/patches/server/0668-add-per-world-spawn-limits.patch
+++ b/patches/unapplied/server/0668-add-per-world-spawn-limits.patch
diff --git a/patches/server/0669-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/unapplied/server/0669-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 56f02dad6e..56f02dad6e 100644
--- a/patches/server/0669-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/unapplied/server/0669-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0670-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0670-Add-more-LimitedRegion-API.patch
index e9e7611f99..e9e7611f99 100644
--- a/patches/server/0670-Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/server/0670-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0671-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0671-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 7e329e49be..7e329e49be 100644
--- a/patches/server/0671-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/unapplied/server/0671-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0672-Missing-Entity-Behavior-API.patch b/patches/unapplied/server/0672-Missing-Entity-Behavior-API.patch
index 6cd7611b8d..6cd7611b8d 100644
--- a/patches/server/0672-Missing-Entity-Behavior-API.patch
+++ b/patches/unapplied/server/0672-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0673-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0673-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 397c546096..46f3ae638b 100644
--- a/patches/server/0673-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/unapplied/server/0673-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 c8e99e115c0c40834cc73c8373bb757ea7e1e88f..83129a209741b42d98993d48f2d3f98183671707 100644
+index 00f78ce251301217317698a65939065403b6580a..9331bd6d74feea033ce78a3a708ceaa0042f00e1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1146,7 +1146,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0674-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0674-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 863796fe03..863796fe03 100644
--- a/patches/server/0674-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/unapplied/server/0674-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch
index e5d3069ee5..e5d3069ee5 100644
--- a/patches/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/unapplied/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0676-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0676-Fix-commands-from-signs-not-firing-command-events.patch
index 01d4a6921d..01d4a6921d 100644
--- a/patches/server/0676-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/unapplied/server/0676-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0677-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0677-Adds-PlayerArmSwingEvent.patch
index 23dceed6df..a95fff2058 100644
--- a/patches/server/0677-Adds-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/server/0677-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 83129a209741b42d98993d48f2d3f98183671707..b3cc17742c095a4fe7a4a43fbd7fe27284c34825 100644
+index 9331bd6d74feea033ce78a3a708ceaa0042f00e1..d44a60ba363b2e24e96c72dc950c6a4a0959b307 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2437,7 +2437,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch
index 538277e6b2..538277e6b2 100644
--- a/patches/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/unapplied/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0679-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0679-Add-config-for-mobs-immune-to-default-effects.patch
index 84d669db48..84d669db48 100644
--- a/patches/server/0679-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/unapplied/server/0679-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0680-Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/0680-Fix-incorrect-message-for-outdated-client.patch
index 7f39718ca5..7f39718ca5 100644
--- a/patches/server/0680-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/unapplied/server/0680-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0681-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0681-Don-t-apply-cramming-damage-to-players.patch
index 506b29a65c..506b29a65c 100644
--- a/patches/server/0681-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/unapplied/server/0681-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0682-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0682-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 30867e6cf9..30867e6cf9 100644
--- a/patches/server/0682-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/unapplied/server/0682-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0683-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/0683-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 34628f8969..34628f8969 100644
--- a/patches/server/0683-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/unapplied/server/0683-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0684-Stinger-API.patch b/patches/unapplied/server/0684-Stinger-API.patch
index 33f8959315..33f8959315 100644
--- a/patches/server/0684-Stinger-API.patch
+++ b/patches/unapplied/server/0684-Stinger-API.patch
diff --git a/patches/server/0685-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0685-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index a58750b226..a58750b226 100644
--- a/patches/server/0685-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/unapplied/server/0685-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0686-Add-System.out-err-catcher.patch b/patches/unapplied/server/0686-Add-System.out-err-catcher.patch
index 8adaa8196d..58a7215c05 100644
--- a/patches/server/0686-Add-System.out-err-catcher.patch
+++ b/patches/unapplied/server/0686-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cb2a03fa0fab132db498be708cb2870a6a8549ef..b84d0c8225a9d5f64dda7ba91a3836e1e21a525c 100644
+index e8f327693e8b488790bf58d4927497402211bf1d..2f91be86f31c868dee3699ce5426a3ce5c8296b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -282,6 +282,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0687-Fix-test-not-bootstrapping.patch b/patches/unapplied/server/0687-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0687-Fix-test-not-bootstrapping.patch
+++ b/patches/unapplied/server/0687-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0688-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0688-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0688-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/server/0688-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0689-Improve-boat-collision-performance.patch b/patches/unapplied/server/0689-Improve-boat-collision-performance.patch
index 853da317a0..853da317a0 100644
--- a/patches/server/0689-Improve-boat-collision-performance.patch
+++ b/patches/unapplied/server/0689-Improve-boat-collision-performance.patch
diff --git a/patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch
index 53b8389ed9..8f8b86f47e 100644
--- a/patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/unapplied/server/0690-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 9a9f4b985c01c8e076d26c22c37d090bb7348371..28c04f16ddabe33518634759d9a1ea3c7462cb91 100644
+index 8d7da9affb98f3d660e049685139a6e53cc0faa1..6ec86b033063066b231462b75c4b1190cc452cdd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -413,7 +413,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch
index 6395f3f4a8..6395f3f4a8 100644
--- a/patches/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/unapplied/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0692-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0692-Add-PlayerSetSpawnEvent.patch
index 6ff40263a0..6ff40263a0 100644
--- a/patches/server/0692-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/server/0692-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch
index b4a083a5f7..b4a083a5f7 100644
--- a/patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/unapplied/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0694-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0694-Optimize-entity-tracker-passenger-checks.patch
index d3fef67200..d3fef67200 100644
--- a/patches/server/0694-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/unapplied/server/0694-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0695-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0695-Config-option-for-Piglins-guarding-chests.patch
index c66e6ea022..c66e6ea022 100644
--- a/patches/server/0695-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/unapplied/server/0695-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0696-Added-EntityDamageItemEvent.patch b/patches/unapplied/server/0696-Added-EntityDamageItemEvent.patch
index bff8b22585..bff8b22585 100644
--- a/patches/server/0696-Added-EntityDamageItemEvent.patch
+++ b/patches/unapplied/server/0696-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0697-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0697-Optimize-indirect-passenger-iteration.patch
index 8d3a348ef7..53bcccd48d 100644
--- a/patches/server/0697-Optimize-indirect-passenger-iteration.patch
+++ b/patches/unapplied/server/0697-Optimize-indirect-passenger-iteration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e42b62a20adc487a6218d1ba87442dd9bc375182..75f0a60c3158a9fa6e2d64c8b51ede839dd958ba 100644
+index 7c239cf6a05ac427cbd1bee0ae05709632538bc8..b756f333d8a016d277bc8a2767d7639b7ab12d36 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3599,26 +3599,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/unapplied/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch
index 418540c464..418540c464 100644
--- a/patches/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/unapplied/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0699-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0699-Configurable-item-frame-map-cursor-update-interval.patch
index 5e1d739a7c..5e1d739a7c 100644
--- a/patches/server/0699-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/unapplied/server/0699-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0700-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0700-Make-EntityUnleashEvent-cancellable.patch
index 10b64ca856..10b64ca856 100644
--- a/patches/server/0700-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/unapplied/server/0700-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0701-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0701-Clear-bucket-NBT-after-dispense.patch
index 52e26f4674..52e26f4674 100644
--- a/patches/server/0701-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/unapplied/server/0701-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0702-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0702-Change-EnderEye-target-without-changing-other-things.patch
index ce9dc32309..ce9dc32309 100644
--- a/patches/server/0702-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/server/0702-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0703-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0703-Add-BlockBreakBlockEvent.patch
index b139762722..b139762722 100644
--- a/patches/server/0703-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/server/0703-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/unapplied/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0705-More-CommandBlock-API.patch b/patches/unapplied/server/0705-More-CommandBlock-API.patch
index 3cbd2436d3..3cbd2436d3 100644
--- a/patches/server/0705-More-CommandBlock-API.patch
+++ b/patches/unapplied/server/0705-More-CommandBlock-API.patch
diff --git a/patches/server/0706-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0706-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0706-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/server/0706-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0707-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0707-Add-back-EntityPortalExitEvent.patch
index 9a6455c3fa..46ae47d5cd 100644
--- a/patches/server/0707-Add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/server/0707-Add-back-EntityPortalExitEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 75f0a60c3158a9fa6e2d64c8b51ede839dd958ba..4473937b65fbdde5a77b508213935488e4f97888 100644
+index b756f333d8a016d277bc8a2767d7639b7ab12d36..9b2445319daa55a7e818d8ee3985a3101254a097 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3101,6 +3101,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch
index 40d2624aa6..40d2624aa6 100644
--- a/patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0709-Get-entity-default-attributes.patch b/patches/unapplied/server/0709-Get-entity-default-attributes.patch
index fe8d293a99..fe8d293a99 100644
--- a/patches/server/0709-Get-entity-default-attributes.patch
+++ b/patches/unapplied/server/0709-Get-entity-default-attributes.patch
diff --git a/patches/server/0710-Left-handed-API.patch b/patches/unapplied/server/0710-Left-handed-API.patch
index 8a6c26a272..8a6c26a272 100644
--- a/patches/server/0710-Left-handed-API.patch
+++ b/patches/unapplied/server/0710-Left-handed-API.patch
diff --git a/patches/server/0711-Add-advancement-display-API.patch b/patches/unapplied/server/0711-Add-advancement-display-API.patch
index dd860e3b4d..dd860e3b4d 100644
--- a/patches/server/0711-Add-advancement-display-API.patch
+++ b/patches/unapplied/server/0711-Add-advancement-display-API.patch
diff --git a/patches/server/0712-Add-ItemFactory-getMonsterEgg-API.patch b/patches/unapplied/server/0712-Add-ItemFactory-getMonsterEgg-API.patch
index 1944914081..1944914081 100644
--- a/patches/server/0712-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/unapplied/server/0712-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0713-Add-critical-damage-API.patch b/patches/unapplied/server/0713-Add-critical-damage-API.patch
index b7f4539a3c..b7f4539a3c 100644
--- a/patches/server/0713-Add-critical-damage-API.patch
+++ b/patches/unapplied/server/0713-Add-critical-damage-API.patch
diff --git a/patches/server/0714-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0714-Fix-issues-with-mob-conversion.patch
index 69feb4b3a4..69feb4b3a4 100644
--- a/patches/server/0714-Fix-issues-with-mob-conversion.patch
+++ b/patches/unapplied/server/0714-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0715-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0715-Add-isCollidable-methods-to-various-places.patch
index a553062120..a553062120 100644
--- a/patches/server/0715-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/unapplied/server/0715-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0716-Goat-ram-API.patch b/patches/unapplied/server/0716-Goat-ram-API.patch
index 426746ea8f..426746ea8f 100644
--- a/patches/server/0716-Goat-ram-API.patch
+++ b/patches/unapplied/server/0716-Goat-ram-API.patch
diff --git a/patches/server/0717-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0717-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0717-Add-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/server/0717-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0718-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0718-Add-Raw-Byte-Entity-Serialization.patch
index 76c1bb540f..3f416ce6e5 100644
--- a/patches/server/0718-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/server/0718-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4473937b65fbdde5a77b508213935488e4f97888..37e67c8543410f754c5e75e375575564621296cf 100644
+index 9b2445319daa55a7e818d8ee3985a3101254a097..e8d9f41334e0de72672f01276fe86568f7528d89 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1926,6 +1926,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0719-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0719-Vanilla-command-permission-fixes.patch
index 8cdc94788c..8cdc94788c 100644
--- a/patches/server/0719-Vanilla-command-permission-fixes.patch
+++ b/patches/unapplied/server/0719-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0720-Make-CallbackExecutor-strict-again.patch b/patches/unapplied/server/0720-Make-CallbackExecutor-strict-again.patch
index 06de400e59..06de400e59 100644
--- a/patches/server/0720-Make-CallbackExecutor-strict-again.patch
+++ b/patches/unapplied/server/0720-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/unapplied/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index 169dae61cc..169dae61cc 100644
--- a/patches/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/unapplied/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 2f433c8c32..2f433c8c32 100644
--- a/patches/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/unapplied/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/unapplied/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch
index f152c64ae6..f152c64ae6 100644
--- a/patches/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/unapplied/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0724-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0724-Fix-GameProfileCache-concurrency.patch
index 400971f5f6..400971f5f6 100644
--- a/patches/server/0724-Fix-GameProfileCache-concurrency.patch
+++ b/patches/unapplied/server/0724-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/unapplied/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index 59e935284f..59e935284f 100644
--- a/patches/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/unapplied/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/unapplied/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index 44ba7aa7b3..44ba7aa7b3 100644
--- a/patches/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/unapplied/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/unapplied/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index c863630ea8..c863630ea8 100644
--- a/patches/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/unapplied/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0728-Log-when-the-async-catcher-is-tripped.patch b/patches/unapplied/server/0728-Log-when-the-async-catcher-is-tripped.patch
index bede76faf6..bede76faf6 100644
--- a/patches/server/0728-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/unapplied/server/0728-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 6cd599f45d..b5dc131bb0 100644
--- a/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/unapplied/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -286,7 +286,7 @@ index fa23e9c476d4edc6176d8b8a6cb13c52d2f66a87..4150e8cd7197eac53042d56f0a53a495
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b84d0c8225a9d5f64dda7ba91a3836e1e21a525c..268a70912722a9ae25b7f88a90daf83f5444781a 100644
+index 2f91be86f31c868dee3699ce5426a3ce5c8296b0..669dade4853ae52ba011ede9bc8944ea11e5fa54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2154,6 +2154,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/unapplied/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index a8485996ae..a8485996ae 100644
--- a/patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/unapplied/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0731-Sanitize-ResourceLocation-error-logging.patch
index 2a00379593..2a00379593 100644
--- a/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/unapplied/server/0731-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0732-Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/0732-Allow-controlled-flushing-for-network-manager.patch
index 66923c8221..b0edf138e4 100644
--- a/patches/server/0732-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/unapplied/server/0732-Allow-controlled-flushing-for-network-manager.patch
@@ -9,7 +9,7 @@ This patch will be used to optimise out flush calls in later
 patches.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 00abdd5bba02b7cdf8dbdc423594f0fde890dd84..05b1b2bdc5396d7f95106bd7c75c4e319e7975a2 100644
+index 45598a94524519257c5ffb03800f0b081f4d7a78..0ace0209dd21b708ccf5afa7ef3f53d9dea8d521 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -103,6 +103,39 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0733-Optimise-general-POI-access.patch b/patches/unapplied/server/0733-Optimise-general-POI-access.patch
index b7014db094..b7014db094 100644
--- a/patches/server/0733-Optimise-general-POI-access.patch
+++ b/patches/unapplied/server/0733-Optimise-general-POI-access.patch
diff --git a/patches/server/0734-Add-more-async-catchers.patch b/patches/unapplied/server/0734-Add-more-async-catchers.patch
index 30eca154ba..30eca154ba 100644
--- a/patches/server/0734-Add-more-async-catchers.patch
+++ b/patches/unapplied/server/0734-Add-more-async-catchers.patch
diff --git a/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/unapplied/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch
index 5d9f79da13..273d68bf8a 100644
--- a/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/unapplied/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch
@@ -953,7 +953,7 @@ index ba3023c7dd5b3bcf66f829fe5dc9757f96d16b45..05ff7bcc79e617904903cf082f6687d2
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 37e67c8543410f754c5e75e375575564621296cf..146bfce3dd90e68c4f5a0589722995acbed005e7 100644
+index e8d9f41334e0de72672f01276fe86568f7528d89..43bbf654d97bbf4009e5ea59c756926a05089f68 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -490,6 +490,56 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0736-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0736-Optimise-chunk-tick-iteration.patch
index 9b47592223..9b47592223 100644
--- a/patches/server/0736-Optimise-chunk-tick-iteration.patch
+++ b/patches/unapplied/server/0736-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0737-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0737-Execute-chunk-tasks-mid-tick.patch
index faee0ae897..faee0ae897 100644
--- a/patches/server/0737-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/unapplied/server/0737-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0738-Do-not-copy-visible-chunks.patch b/patches/unapplied/server/0738-Do-not-copy-visible-chunks.patch
index 4dd1b77571..4dd1b77571 100644
--- a/patches/server/0738-Do-not-copy-visible-chunks.patch
+++ b/patches/unapplied/server/0738-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 06d2ade2a6..06d2ade2a6 100644
--- a/patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/unapplied/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch
index 6cf6b743b6..6cf6b743b6 100644
--- a/patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/unapplied/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0741-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0741-Detail-more-information-in-watchdog-dumps.patch
index f4346159ed..487e57b4e9 100644
--- a/patches/server/0741-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/unapplied/server/0741-Detail-more-information-in-watchdog-dumps.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Detail more information in watchdog dumps
 - Dump player name, player uuid, position, and world for packet handling
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 05b1b2bdc5396d7f95106bd7c75c4e319e7975a2..05a15b2da76a6d246b705e682b61a7c40c5dade7 100644
+index 0ace0209dd21b708ccf5afa7ef3f53d9dea8d521..363829a3bce2803e234ff81ae4b0cba3072fd5f9 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -465,7 +465,14 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -123,7 +123,7 @@ index a82c81f8a4178fc049ffaa2e5a837836ef5b42a6..9ab6f7df04b56012413f2485dd5a8785
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 146bfce3dd90e68c4f5a0589722995acbed005e7..5ffe466d0be59baa99adddf5d052a40ee64f7002 100644
+index 43bbf654d97bbf4009e5ea59c756926a05089f68..a325b145be3efda4c3521871c6b1cffddbd68c00 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -971,7 +971,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0742-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0742-Manually-inline-methods-in-BlockPosition.patch
index 0cab0f9b56..0cab0f9b56 100644
--- a/patches/server/0742-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/unapplied/server/0742-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0743-Distance-manager-tick-timings.patch b/patches/unapplied/server/0743-Distance-manager-tick-timings.patch
index 98a316c64e..98a316c64e 100644
--- a/patches/server/0743-Distance-manager-tick-timings.patch
+++ b/patches/unapplied/server/0743-Distance-manager-tick-timings.patch
diff --git a/patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/unapplied/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 300dfa8887..300dfa8887 100644
--- a/patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/unapplied/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0746-Add-packet-limiter-config.patch b/patches/unapplied/server/0746-Add-packet-limiter-config.patch
index 374c9fb3d8..9dfffd0e37 100644
--- a/patches/server/0746-Add-packet-limiter-config.patch
+++ b/patches/unapplied/server/0746-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 05a15b2da76a6d246b705e682b61a7c40c5dade7..1d98e328982255b6dab8e24223c97eaea2612a45 100644
+index 363829a3bce2803e234ff81ae4b0cba3072fd5f9..7f089f7451b956e4c8cb6581354beb5fc4e45318 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -135,6 +135,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/unapplied/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch
index 56b7f40b2f..56b7f40b2f 100644
--- a/patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/unapplied/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 7f656dff77..7f656dff77 100644
--- a/patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/unapplied/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 17c273d2c0..17c273d2c0 100644
--- a/patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/unapplied/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch
index eef7de0e32..eef7de0e32 100644
--- a/patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/unapplied/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0751-Time-scoreboard-search.patch b/patches/unapplied/server/0751-Time-scoreboard-search.patch
index bcff6d3469..bcff6d3469 100644
--- a/patches/server/0751-Time-scoreboard-search.patch
+++ b/patches/unapplied/server/0751-Time-scoreboard-search.patch
diff --git a/patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch
index b63f55bd81..b63f55bd81 100644
--- a/patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/unapplied/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/0753-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/unapplied/server/0753-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0754-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0754-Oprimise-map-impl-for-tracked-players.patch
index c583ec8590..c583ec8590 100644
--- a/patches/server/0754-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/unapplied/server/0754-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch
index bb523f58c5..bb523f58c5 100644
--- a/patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/unapplied/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/unapplied/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index bf79d6270e..bf79d6270e 100644
--- a/patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/unapplied/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0757-Optimise-random-block-ticking.patch b/patches/unapplied/server/0757-Optimise-random-block-ticking.patch
index c74ca4535f..c74ca4535f 100644
--- a/patches/server/0757-Optimise-random-block-ticking.patch
+++ b/patches/unapplied/server/0757-Optimise-random-block-ticking.patch
diff --git a/patches/server/0758-Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/0758-Optimise-non-flush-packet-sending.patch
index 37c3764b3c..3bd4d0232f 100644
--- a/patches/server/0758-Optimise-non-flush-packet-sending.patch
+++ b/patches/unapplied/server/0758-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 1d98e328982255b6dab8e24223c97eaea2612a45..7e2256ac88e874b34b6a0c638bfced368ba29be2 100644
+index 7f089f7451b956e4c8cb6581354beb5fc4e45318..e0a29625d17d315b2f614c65a0a82c6d1a82676d 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -50,6 +50,8 @@ import org.slf4j.Logger;
diff --git a/patches/server/0759-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0759-Optimise-nearby-player-lookups.patch
index d1b84b529f..d1b84b529f 100644
--- a/patches/server/0759-Optimise-nearby-player-lookups.patch
+++ b/patches/unapplied/server/0759-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0760-Optimise-WorldServer-notify.patch b/patches/unapplied/server/0760-Optimise-WorldServer-notify.patch
index 47d3d5dd31..47d3d5dd31 100644
--- a/patches/server/0760-Optimise-WorldServer-notify.patch
+++ b/patches/unapplied/server/0760-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0761-Remove-streams-for-villager-AI.patch b/patches/unapplied/server/0761-Remove-streams-for-villager-AI.patch
index 3af840ec77..3af840ec77 100644
--- a/patches/server/0761-Remove-streams-for-villager-AI.patch
+++ b/patches/unapplied/server/0761-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0762-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0762-Rewrite-dataconverter-system.patch
index adadd49386..adadd49386 100644
--- a/patches/server/0762-Rewrite-dataconverter-system.patch
+++ b/patches/unapplied/server/0762-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0763-Use-Velocity-compression-and-cipher-natives.patch
index 64a5cad490..64a5cad490 100644
--- a/patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/unapplied/server/0763-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 7291e1cb36..7291e1cb36 100644
--- a/patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/unapplied/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/unapplied/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index d601eb8884..d601eb8884 100644
--- a/patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/unapplied/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch b/patches/unapplied/server/0766-Async-catch-modifications-to-critical-entity-state.patch
index 3b0091079e..3b0091079e 100644
--- a/patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/unapplied/server/0766-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 283d481666..283d481666 100644
--- a/patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/unapplied/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 37ceb18401..37ceb18401 100644
--- a/patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/unapplied/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0769-Check-requirement-before-suggesting-root-nodes.patch
index d824c5f2af..d824c5f2af 100644
--- a/patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/unapplied/server/0769-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index f486ce51d7..d82f442a04 100644
--- a/patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/unapplied/server/0770-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 28c04f16ddabe33518634759d9a1ea3c7462cb91..d29d71a100967d2cd411b78f55560617d598db52 100644
+index 6ec86b033063066b231462b75c4b1190cc452cdd..5765b977dacc3982b633e47031dfcd4507c26a5d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -802,6 +802,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 81bcca30af..81bcca30af 100644
--- a/patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/unapplied/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0772-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0772-Ensure-valid-vehicle-status.patch
index 733de7e6cc..733de7e6cc 100644
--- a/patches/server/0772-Ensure-valid-vehicle-status.patch
+++ b/patches/unapplied/server/0772-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0773-Prevent-softlocked-end-exit-portal-generation.patch
index 2286afa5f2..2286afa5f2 100644
--- a/patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/unapplied/server/0773-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/unapplied/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0775-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0775-Don-t-log-debug-logging-being-disabled.patch
index 83460a961a..83460a961a 100644
--- a/patches/server/0775-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/unapplied/server/0775-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0776-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0776-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0776-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/unapplied/server/0776-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/unapplied/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index f2cbce6e16..f2cbce6e16 100644
--- a/patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/unapplied/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0778-Preserve-overstacked-loot.patch b/patches/unapplied/server/0778-Preserve-overstacked-loot.patch
index e39eb87bbc..e39eb87bbc 100644
--- a/patches/server/0778-Preserve-overstacked-loot.patch
+++ b/patches/unapplied/server/0778-Preserve-overstacked-loot.patch
diff --git a/patches/server/0779-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0779-Update-head-rotation-in-missing-places.patch
index f244d616cf..5c174a3e2b 100644
--- a/patches/server/0779-Update-head-rotation-in-missing-places.patch
+++ b/patches/unapplied/server/0779-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5ffe466d0be59baa99adddf5d052a40ee64f7002..7b664032b6d8fd3a40e1b9ad664290359d4f2a81 100644
+index a325b145be3efda4c3521871c6b1cffddbd68c00..25b0ab58e32d1fe1746d6c97d6098db931fd39db 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1754,6 +1754,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0780-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0780-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0780-prevent-unintended-light-block-manipulation.patch
+++ b/patches/unapplied/server/0780-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0781-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0781-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0781-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/unapplied/server/0781-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0782-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0782-Fix-upstreams-block-state-factories.patch
index 221799c0b1..221799c0b1 100644
--- a/patches/server/0782-Fix-upstreams-block-state-factories.patch
+++ b/patches/unapplied/server/0782-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/0783-Add-config-option-for-logging-player-ip-addresses.patch
index 92fd04d237..92fd04d237 100644
--- a/patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/unapplied/server/0783-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0784-Configurable-feature-seeds.patch b/patches/unapplied/server/0784-Configurable-feature-seeds.patch
index 39ae263f66..39ae263f66 100644
--- a/patches/server/0784-Configurable-feature-seeds.patch
+++ b/patches/unapplied/server/0784-Configurable-feature-seeds.patch
diff --git a/patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 54bf3f7028..54bf3f7028 100644
--- a/patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/unapplied/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0786-Add-root-admin-user-detection.patch b/patches/unapplied/server/0786-Add-root-admin-user-detection.patch
index 03ceae7507..03ceae7507 100644
--- a/patches/server/0786-Add-root-admin-user-detection.patch
+++ b/patches/unapplied/server/0786-Add-root-admin-user-detection.patch
diff --git a/patches/server/0787-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0787-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0787-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/unapplied/server/0787-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0788-don-t-attempt-to-teleport-dead-entities.patch
index 4170d4e447..9eba599902 100644
--- a/patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/unapplied/server/0788-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7b664032b6d8fd3a40e1b9ad664290359d4f2a81..f9774bd5ba69ae98498ef9b9bc3f837707c4d164 100644
+index 25b0ab58e32d1fe1746d6c97d6098db931fd39db..ed36fccf553d4758576afa620b6c0ab127d152d1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -779,7 +779,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch
index 2fadc8cf33..2fadc8cf33 100644
--- a/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/unapplied/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch
index a08f54ceee..a08f54ceee 100644
--- a/patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/unapplied/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0791-Rewrite-the-light-engine.patch b/patches/unapplied/server/0791-Rewrite-the-light-engine.patch
index aef68f2bdb..aef68f2bdb 100644
--- a/patches/server/0791-Rewrite-the-light-engine.patch
+++ b/patches/unapplied/server/0791-Rewrite-the-light-engine.patch
diff --git a/patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index 6723907d85..6723907d85 100644
--- a/patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/unapplied/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0793-Fix-removing-recipes-from-RecipeIterator.patch
index 5784fd4dc3..5784fd4dc3 100644
--- a/patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/unapplied/server/0793-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch
index b06d7e84c2..b06d7e84c2 100644
--- a/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/unapplied/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0795-Hide-unnecessary-itemmeta-from-clients.patch
index 53dd21259f..53dd21259f 100644
--- a/patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/unapplied/server/0795-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/unapplied/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index 60f87f5973..60f87f5973 100644
--- a/patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/unapplied/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/unapplied/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0798-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0798-Add-PlayerItemFrameChangeEvent.patch
index f9ce7fc78c..f9ce7fc78c 100644
--- a/patches/server/0798-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/unapplied/server/0798-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0799-Add-player-health-update-API.patch b/patches/unapplied/server/0799-Add-player-health-update-API.patch
index 164ebe2cb1..164ebe2cb1 100644
--- a/patches/server/0799-Add-player-health-update-API.patch
+++ b/patches/unapplied/server/0799-Add-player-health-update-API.patch
diff --git a/patches/server/0800-Optimize-HashMapPalette.patch b/patches/unapplied/server/0800-Optimize-HashMapPalette.patch
index ef1880895f..ef1880895f 100644
--- a/patches/server/0800-Optimize-HashMapPalette.patch
+++ b/patches/unapplied/server/0800-Optimize-HashMapPalette.patch
diff --git a/patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch
index e16775338f..930b668b61 100644
--- a/patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/unapplied/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 268a70912722a9ae25b7f88a90daf83f5444781a..df17cd9332d9f9e86480714d161be246fb16af56 100644
+index 669dade4853ae52ba011ede9bc8944ea11e5fa54..2a48cb31263426abd7577bbddd1c0504ac42f7e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2322,6 +2322,90 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 002bbd667f..002bbd667f 100644
--- a/patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/unapplied/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch
index 65d906a7bd..e2b66180f8 100644
--- a/patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/unapplied/server/0803-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 d29d71a100967d2cd411b78f55560617d598db52..a84ab1754ffee0436ac3abf05e3fd69f3523e5e6 100644
+index 5765b977dacc3982b633e47031dfcd4507c26a5d..1f4be9ed8bd36ed15ca591751c0f76be21fac320 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -614,7 +614,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0804-Actually-unload-POI-data.patch b/patches/unapplied/server/0804-Actually-unload-POI-data.patch
index 016fa6f30c..016fa6f30c 100644
--- a/patches/server/0804-Actually-unload-POI-data.patch
+++ b/patches/unapplied/server/0804-Actually-unload-POI-data.patch
diff --git a/patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 4eb953eb31..4eb953eb31 100644
--- a/patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/unapplied/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0806-Update-Log4j.patch b/patches/unapplied/server/0806-Update-Log4j.patch
index 41cc02c122..41cc02c122 100644
--- a/patches/server/0806-Update-Log4j.patch
+++ b/patches/unapplied/server/0806-Update-Log4j.patch
diff --git a/patches/server/0807-Add-more-Campfire-API.patch b/patches/unapplied/server/0807-Add-more-Campfire-API.patch
index 5381096620..5381096620 100644
--- a/patches/server/0807-Add-more-Campfire-API.patch
+++ b/patches/unapplied/server/0807-Add-more-Campfire-API.patch
diff --git a/patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 7c333b5f55..7c333b5f55 100644
--- a/patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/unapplied/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0809-Fix-tripwire-state-inconsistency.patch b/patches/unapplied/server/0809-Fix-tripwire-state-inconsistency.patch
index d567618d3d..d567618d3d 100644
--- a/patches/server/0809-Fix-tripwire-state-inconsistency.patch
+++ b/patches/unapplied/server/0809-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/unapplied/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch
index 1f9012a293..1f9012a293 100644
--- a/patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/unapplied/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0811-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0811-Forward-CraftEntity-in-teleport-command.patch
index cbccdfb26e..7ad6ed0ecb 100644
--- a/patches/server/0811-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/unapplied/server/0811-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4c795720195a5f8fa9f31db7b79e107c2d8938a1..82ab6107a964bd44760875a0d50d20c5934301dd 100644
+index 7e71fe2d570af700f09833a394bbe7af17a3ca3e..45d55054c8bd677ab0532b15f2aa2cf3449344bf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3265,6 +3265,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0812-Improve-scoreboard-entries.patch b/patches/unapplied/server/0812-Improve-scoreboard-entries.patch
index 313567a730..313567a730 100644
--- a/patches/server/0812-Improve-scoreboard-entries.patch
+++ b/patches/unapplied/server/0812-Improve-scoreboard-entries.patch
diff --git a/patches/server/0813-Entity-powdered-snow-API.patch b/patches/unapplied/server/0813-Entity-powdered-snow-API.patch
index dec5da0889..dec5da0889 100644
--- a/patches/server/0813-Entity-powdered-snow-API.patch
+++ b/patches/unapplied/server/0813-Entity-powdered-snow-API.patch
diff --git a/patches/server/0814-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0814-Add-API-for-item-entity-health.patch
index d923270a18..d923270a18 100644
--- a/patches/server/0814-Add-API-for-item-entity-health.patch
+++ b/patches/unapplied/server/0814-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch
index 57131436c7..57131436c7 100644
--- a/patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/unapplied/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0816-Configurable-max-block-light-for-monster-spawning.patch
index 3430e3062a..3430e3062a 100644
--- a/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/unapplied/server/0816-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 698fbc2d5e..698fbc2d5e 100644
--- a/patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/unapplied/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch
index b44bde85fd..b44bde85fd 100644
--- a/patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/unapplied/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/unapplied/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0820-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0820-Fix-bees-aging-inside-hives.patch
index 2be01a557c..2be01a557c 100644
--- a/patches/server/0820-Fix-bees-aging-inside-hives.patch
+++ b/patches/unapplied/server/0820-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0821-Bucketable-API.patch b/patches/unapplied/server/0821-Bucketable-API.patch
index ff1194970a..ff1194970a 100644
--- a/patches/server/0821-Bucketable-API.patch
+++ b/patches/unapplied/server/0821-Bucketable-API.patch
diff --git a/patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch b/patches/unapplied/server/0822-Check-player-world-in-endPortalSoundRadius.patch
index a5edd3fe44..a5edd3fe44 100644
--- a/patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch
+++ b/patches/unapplied/server/0822-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0823-Validate-usernames.patch b/patches/unapplied/server/0823-Validate-usernames.patch
index 572381f175..572381f175 100644
--- a/patches/server/0823-Validate-usernames.patch
+++ b/patches/unapplied/server/0823-Validate-usernames.patch
diff --git a/patches/server/0824-Fix-saving-configs-with-more-long-comments.patch b/patches/unapplied/server/0824-Fix-saving-configs-with-more-long-comments.patch
index 7d52b01085..7d52b01085 100644
--- a/patches/server/0824-Fix-saving-configs-with-more-long-comments.patch
+++ b/patches/unapplied/server/0824-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0825-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0825-Make-water-animal-spawn-height-configurable.patch
index dea45f0b70..dea45f0b70 100644
--- a/patches/server/0825-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/unapplied/server/0825-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 352f92941f..352f92941f 100644
--- a/patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/unapplied/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch
index de155852d0..de155852d0 100644
--- a/patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/unapplied/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/unapplied/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0829-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0829-Multiple-Entries-with-Scoreboards.patch
index b644176ac9..b644176ac9 100644
--- a/patches/server/0829-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/unapplied/server/0829-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0830-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0830-Reset-placed-block-on-exception.patch
index abdf99f132..abdf99f132 100644
--- a/patches/server/0830-Reset-placed-block-on-exception.patch
+++ b/patches/unapplied/server/0830-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0831-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0831-Add-configurable-height-for-slime-spawn.patch
index a05bae35ee..a05bae35ee 100644
--- a/patches/server/0831-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/unapplied/server/0831-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 2ae23404b3..2ae23404b3 100644
--- a/patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0833-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0833-Fix-xp-reward-for-baby-zombies.patch
index 42920471c5..42920471c5 100644
--- a/patches/server/0833-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/unapplied/server/0833-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0834-Kick-on-main-for-illegal-chat.patch b/patches/unapplied/server/0834-Kick-on-main-for-illegal-chat.patch
index 633f847b26..1839cf1212 100644
--- a/patches/server/0834-Kick-on-main-for-illegal-chat.patch
+++ b/patches/unapplied/server/0834-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 a84ab1754ffee0436ac3abf05e3fd69f3523e5e6..dbd16fabc781a2820dc073154830667ea88cb27d 100644
+index 1f4be9ed8bd36ed15ca591751c0f76be21fac320..3a9b39d7718948636de9cc47b793ef3489300c00 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2105,7 +2105,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0835-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0835-Multi-Block-Change-API-Implementation.patch
index d50b51941b..d50b51941b 100644
--- a/patches/server/0835-Multi-Block-Change-API-Implementation.patch
+++ b/patches/unapplied/server/0835-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0836-Fix-NotePlayEvent.patch b/patches/unapplied/server/0836-Fix-NotePlayEvent.patch
index 83040e523a..83040e523a 100644
--- a/patches/server/0836-Fix-NotePlayEvent.patch
+++ b/patches/unapplied/server/0836-Fix-NotePlayEvent.patch
diff --git a/patches/server/0837-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0837-Freeze-Tick-Lock-API.patch
index 93a26fe18a..2d0adac7f5 100644
--- a/patches/server/0837-Freeze-Tick-Lock-API.patch
+++ b/patches/unapplied/server/0837-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 82ab6107a964bd44760875a0d50d20c5934301dd..2cf778ce1f4d9461023e1d99fe2481ffa5b46d4f 100644
+index 45d55054c8bd677ab0532b15f2aa2cf3449344bf..cd9ecce672415c9dd26b091b8107d085bb03e759 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -397,6 +397,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0838-Dolphin-API.patch b/patches/unapplied/server/0838-Dolphin-API.patch
index 4bb12a6785..4bb12a6785 100644
--- a/patches/server/0838-Dolphin-API.patch
+++ b/patches/unapplied/server/0838-Dolphin-API.patch
diff --git a/patches/server/0839-More-PotionEffectType-API.patch b/patches/unapplied/server/0839-More-PotionEffectType-API.patch
index 5d8c4415d3..5d8c4415d3 100644
--- a/patches/server/0839-More-PotionEffectType-API.patch
+++ b/patches/unapplied/server/0839-More-PotionEffectType-API.patch
diff --git a/patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 2bbcd10eb9..2bbcd10eb9 100644
--- a/patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/unapplied/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch
index 199acd2a3a..eaa7c86ed9 100644
--- a/patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/unapplied/server/0841-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 455e48b74f2e2426b811c421611b1b44daa7c49e..78adaeab6f568caa599c3edf2ad13b1db10b3b99 100644
+index 3c4fdd1a6e3bf04c523aca2b18632f6439189caa..b6280e653f4f625272e4208c663fc818424e8fca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1988,6 +1988,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0842-Add-config-for-stronghold-seed.patch b/patches/unapplied/server/0842-Add-config-for-stronghold-seed.patch
index 9cde0d0a5a..9cde0d0a5a 100644
--- a/patches/server/0842-Add-config-for-stronghold-seed.patch
+++ b/patches/unapplied/server/0842-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0843-Implement-regenerateChunk.patch b/patches/unapplied/server/0843-Implement-regenerateChunk.patch
index 273d8c3b32..273d8c3b32 100644
--- a/patches/server/0843-Implement-regenerateChunk.patch
+++ b/patches/unapplied/server/0843-Implement-regenerateChunk.patch
diff --git a/patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch b/patches/unapplied/server/0844-Log-exceptions-thrown-during-chat-processing.patch
index 7e974e4627..7e974e4627 100644
--- a/patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch
+++ b/patches/unapplied/server/0844-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch
index d0db4013fe..d0db4013fe 100644
--- a/patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/unapplied/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 252231d3c2..9ec9b002df 100644
--- a/patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/unapplied/server/0846-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 78adaeab6f568caa599c3edf2ad13b1db10b3b99..5401d612d440fc63774b4dcfb41e3428d2fcce6b 100644
+index b6280e653f4f625272e4208c663fc818424e8fca..b880b31cd80153569db1fb55655e5485ea36cde0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2162,6 +2162,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0847-Add-GameEvent-tags.patch b/patches/unapplied/server/0847-Add-GameEvent-tags.patch
index a343da4aa1..1dcf3cecb0 100644
--- a/patches/server/0847-Add-GameEvent-tags.patch
+++ b/patches/unapplied/server/0847-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 5401d612d440fc63774b4dcfb41e3428d2fcce6b..5cca8ffd11e5d9ab899c7dd75487a41b9f0bb3b8 100644
+index b880b31cd80153569db1fb55655e5485ea36cde0..941e2b22807373f739925b0d9a3eec28300ac7ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2568,6 +2568,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index b7915b1deb..b7915b1deb 100644
--- a/patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/unapplied/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0849-Replace-ticket-level-propagator.patch b/patches/unapplied/server/0849-Replace-ticket-level-propagator.patch
index 8959b46f3f..8959b46f3f 100644
--- a/patches/server/0849-Replace-ticket-level-propagator.patch
+++ b/patches/unapplied/server/0849-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0850-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0850-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0850-Furnace-RecipesUsed-API.patch
+++ b/patches/unapplied/server/0850-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0851-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0851-Configurable-sculk-sensor-listener-range.patch
index f19796285a..f19796285a 100644
--- a/patches/server/0851-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/unapplied/server/0851-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0852-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/0852-Add-missing-block-data-mins-and-maxes.patch
index 83ba5f6bc1..83ba5f6bc1 100644
--- a/patches/server/0852-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/unapplied/server/0852-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index b8c9568116..b8c9568116 100644
--- a/patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/unapplied/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0854-Put-world-into-worldlist-before-initing-the-world.patch
index 1f3ef53a0b..1f3ef53a0b 100644
--- a/patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/unapplied/server/0854-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0855-Fix-Entity-Position-Desync.patch b/patches/unapplied/server/0855-Fix-Entity-Position-Desync.patch
index f4b0a0dc54..f4b0a0dc54 100644
--- a/patches/server/0855-Fix-Entity-Position-Desync.patch
+++ b/patches/unapplied/server/0855-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0856-Custom-Potion-Mixes.patch b/patches/unapplied/server/0856-Custom-Potion-Mixes.patch
index 2a9c45317d..2a9c45317d 100644
--- a/patches/server/0856-Custom-Potion-Mixes.patch
+++ b/patches/unapplied/server/0856-Custom-Potion-Mixes.patch
diff --git a/patches/server/0857-Replace-player-chunk-loader-system.patch b/patches/unapplied/server/0857-Replace-player-chunk-loader-system.patch
index 48ca5d9151..48ca5d9151 100644
--- a/patches/server/0857-Replace-player-chunk-loader-system.patch
+++ b/patches/unapplied/server/0857-Replace-player-chunk-loader-system.patch
diff --git a/patches/server/0858-Fix-Fluid-tags-isTagged-method.patch b/patches/unapplied/server/0858-Fix-Fluid-tags-isTagged-method.patch
index 4b8e71e081..4b8e71e081 100644
--- a/patches/server/0858-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/unapplied/server/0858-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0859-Force-close-world-loading-screen.patch b/patches/unapplied/server/0859-Force-close-world-loading-screen.patch
index 672783b749..672783b749 100644
--- a/patches/server/0859-Force-close-world-loading-screen.patch
+++ b/patches/unapplied/server/0859-Force-close-world-loading-screen.patch
diff --git a/patches/server/0860-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0860-Fix-falling-block-spawn-methods.patch
index 168a31ec9e..168a31ec9e 100644
--- a/patches/server/0860-Fix-falling-block-spawn-methods.patch
+++ b/patches/unapplied/server/0860-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0861-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0861-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0861-Expose-furnace-minecart-push-values.patch
+++ b/patches/unapplied/server/0861-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index a9cdda7a75..a9cdda7a75 100644
--- a/patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/unapplied/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0863-Fix-save-problems-on-shutdown.patch b/patches/unapplied/server/0863-Fix-save-problems-on-shutdown.patch
index 20dd6ea7fc..20dd6ea7fc 100644
--- a/patches/server/0863-Fix-save-problems-on-shutdown.patch
+++ b/patches/unapplied/server/0863-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0864-More-Projectile-API.patch b/patches/unapplied/server/0864-More-Projectile-API.patch
index 6fbb0c86b1..6fbb0c86b1 100644
--- a/patches/server/0864-More-Projectile-API.patch
+++ b/patches/unapplied/server/0864-More-Projectile-API.patch
diff --git a/patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch
index df73aa2280..df73aa2280 100644
--- a/patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/unapplied/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index defeb60030..aedd078a47 100644
--- a/patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/unapplied/server/0866-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 dbd16fabc781a2820dc073154830667ea88cb27d..842a1535e26afc6bc072f49d033479395de59a09 100644
+index 3a9b39d7718948636de9cc47b793ef3489300c00..cd4fbce5d7b53e343db2a16f45ef05c696b97121 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -544,6 +544,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0867-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0867-Implement-getComputedBiome-API.patch
index b6a274bb77..b6a274bb77 100644
--- a/patches/server/0867-Implement-getComputedBiome-API.patch
+++ b/patches/unapplied/server/0867-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0868-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0868-Make-some-itemstacks-nonnull.patch
index e2cba95fe4..e2cba95fe4 100644
--- a/patches/server/0868-Make-some-itemstacks-nonnull.patch
+++ b/patches/unapplied/server/0868-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/unapplied/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
index fe6855e900..fe6855e900 100644
--- a/patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
+++ b/patches/unapplied/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0870-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0870-Implement-enchantWithLevels-API.patch
index 204d4534fb..204d4534fb 100644
--- a/patches/server/0870-Implement-enchantWithLevels-API.patch
+++ b/patches/unapplied/server/0870-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0871-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0871-Fix-saving-in-unloadWorld.patch
index 1e0a5e98ce..68deba0168 100644
--- a/patches/server/0871-Fix-saving-in-unloadWorld.patch
+++ b/patches/unapplied/server/0871-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 749a551149bad76dd1e037100eb3ebee519793c1..02b9363d3683d529b91e61211c62e7da949a9c9e 100644
+index 91ba3684c73bb127d67c6385bf55e71d96f69075..092bbbecfbb7154774befe5952e316f607b4334d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1287,7 +1287,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0872-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0872-Buffer-OOB-setBlock-calls.patch
index 2c96f312d6..2c96f312d6 100644
--- a/patches/server/0872-Buffer-OOB-setBlock-calls.patch
+++ b/patches/unapplied/server/0872-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0873-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0873-Add-TameableDeathMessageEvent.patch
index 8bbbaffa2c..8bbbaffa2c 100644
--- a/patches/server/0873-Add-TameableDeathMessageEvent.patch
+++ b/patches/unapplied/server/0873-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/unapplied/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
index 8ecf55d257..8ecf55d257 100644
--- a/patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
+++ b/patches/unapplied/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 886665f7f9..886665f7f9 100644
--- a/patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/unapplied/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 52f7495da5..0c3fdbabbc 100644
--- a/patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/unapplied/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2cf778ce1f4d9461023e1d99fe2481ffa5b46d4f..20969cc499caf902b5b303f5a0c29efcde28e4a5 100644
+index cd9ecce672415c9dd26b091b8107d085bb03e759..00ab453328eafa4b5c7b4d1f7ec4eb1e7e1cf359 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2673,6 +2673,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0877-Guard-against-invalid-entity-positions.patch b/patches/unapplied/server/0877-Guard-against-invalid-entity-positions.patch
index 8422c7c7e5..e6609c09dd 100644
--- a/patches/server/0877-Guard-against-invalid-entity-positions.patch
+++ b/patches/unapplied/server/0877-Guard-against-invalid-entity-positions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 20969cc499caf902b5b303f5a0c29efcde28e4a5..43a0dfd2f1391156ac54ae15d6d58904201984a5 100644
+index 00ab453328eafa4b5c7b4d1f7ec4eb1e7e1cf359..ae30cfb8681e474af1236411a7ec8e8f99d045ca 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4176,11 +4176,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0878-cache-resource-keys.patch b/patches/unapplied/server/0878-cache-resource-keys.patch
index 4234b8673f..4234b8673f 100644
--- a/patches/server/0878-cache-resource-keys.patch
+++ b/patches/unapplied/server/0878-cache-resource-keys.patch
diff --git a/patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/unapplied/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch
index b53e022e0b..b53e022e0b 100644
--- a/patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/unapplied/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 7cec15c2aa..7cec15c2aa 100644
--- a/patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/unapplied/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/unapplied/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index 4b39ce4dc3..4b39ce4dc3 100644
--- a/patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/unapplied/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0882-Prevent-tile-entity-copies-loading-chunks.patch
index f08181b86e..0987d09117 100644
--- a/patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/unapplied/server/0882-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 842a1535e26afc6bc072f49d033479395de59a09..d8985815a947fd7007f87db8ebd2a6296899bee6 100644
+index cd4fbce5d7b53e343db2a16f45ef05c696b97121..e08e6091dc0b885275045260386c88b368954fe6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3176,7 +3176,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 3f13a2e598..3f13a2e598 100644
--- a/patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/unapplied/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/unapplied/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 951baf9062..951baf9062 100644
--- a/patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/unapplied/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/unapplied/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch
index 880809e015..880809e015 100644
--- a/patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/unapplied/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 02e3a789cb..02e3a789cb 100644
--- a/patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/unapplied/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0887-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0887-WorldCreator-keepSpawnLoaded.patch
index 0228dcf102..0bc5d393e7 100644
--- a/patches/server/0887-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/unapplied/server/0887-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 02b9363d3683d529b91e61211c62e7da949a9c9e..76a2ebaf74b79a63ec83e8adc2a696428cd6427a 100644
+index 092bbbecfbb7154774befe5952e316f607b4334d..bf19acd9587cd9c3da50aba5ede60708652f0d33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1246,6 +1246,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/unapplied/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch
index d33dabf6c9..d33dabf6c9 100644
--- a/patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch
+++ b/patches/unapplied/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 79c74b0a57..79c74b0a57 100644
--- a/patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/unapplied/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 8eacb2217e..8eacb2217e 100644
--- a/patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/unapplied/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch
index c0fcd53f55..c0fcd53f55 100644
--- a/patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/unapplied/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch
index aef5bd0551..aef5bd0551 100644
--- a/patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/unapplied/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0893-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0893-Add-PlayerStopUsingItemEvent.patch
index 67e5737362..67e5737362 100644
--- a/patches/server/0893-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/unapplied/server/0893-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0894-FallingBlock-auto-expire-setting.patch b/patches/unapplied/server/0894-FallingBlock-auto-expire-setting.patch
index a7b0c20dd6..a7b0c20dd6 100644
--- a/patches/server/0894-FallingBlock-auto-expire-setting.patch
+++ b/patches/unapplied/server/0894-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0895-Don-t-tick-markers.patch b/patches/unapplied/server/0895-Don-t-tick-markers.patch
index 7c5f605b79..7c5f605b79 100644
--- a/patches/server/0895-Don-t-tick-markers.patch
+++ b/patches/unapplied/server/0895-Don-t-tick-markers.patch
diff --git a/patches/server/0896-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0896-Do-not-accept-invalid-client-settings.patch
index 4febc590df..12ba26b4ad 100644
--- a/patches/server/0896-Do-not-accept-invalid-client-settings.patch
+++ b/patches/unapplied/server/0896-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 736444c288421db84ae127d7b8cb746b6edc355f..a82f5516274c2e7b582d38c70cd116d23d0687c8 100644
+index e8069222397f7143ffd662e554904ff811b386d4..28c76e7b3260ce56421057b88c3555f18b29da06 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3354,6 +3354,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0897-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0897-Add-support-for-Proxy-Protocol.patch
index 0092abc62a..0092abc62a 100644
--- a/patches/server/0897-Add-support-for-Proxy-Protocol.patch
+++ b/patches/unapplied/server/0897-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch
index b11ce011a5..b11ce011a5 100644
--- a/patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/unapplied/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/unapplied/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch b/patches/unapplied/server/0900-Sanitize-Sent-BlockEntity-NBT.patch
index fb3c8b1818..fb3c8b1818 100644
--- a/patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/unapplied/server/0900-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0901-Prevent-entity-loading-causing-async-lookups.patch
index ec4d159128..9527752d66 100644
--- a/patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/unapplied/server/0901-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 43a0dfd2f1391156ac54ae15d6d58904201984a5..74459ab5ccb94863677f0803f8f737f013cb83a3 100644
+index ae30cfb8681e474af1236411a7ec8e8f99d045ca..172016efc07d12fa0bbafe3c45410ffd72acd984 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -788,6 +788,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0902-Disable-component-selector-resolving-in-books-by-def.patch
index d79b7fb1b1..d79b7fb1b1 100644
--- a/patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/unapplied/server/0902-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0903-Throw-exception-on-world-create-while-being-ticked.patch
index 662f08ef95..662f08ef95 100644
--- a/patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/unapplied/server/0903-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/0904-Add-Alternate-Current-redstone-implementation.patch
index 4ab0be6c35..4ab0be6c35 100644
--- a/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/unapplied/server/0904-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0905-Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/0905-Dont-resent-entity-on-art-update.patch
index ff4ac47ad6..ff4ac47ad6 100644
--- a/patches/server/0905-Dont-resent-entity-on-art-update.patch
+++ b/patches/unapplied/server/0905-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0906-Untrash-chat-handling.patch b/patches/unapplied/server/0906-Untrash-chat-handling.patch
index a43565c0ef..c10fea24a7 100644
--- a/patches/server/0906-Untrash-chat-handling.patch
+++ b/patches/unapplied/server/0906-Untrash-chat-handling.patch
@@ -47,7 +47,7 @@ index 3825aa2c381a3ee77e05bea520ff5fb828733857..4e9832d5753b98621e68246ffc5d80c8
  
      public String getMessage() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a82f5516274c2e7b582d38c70cd116d23d0687c8..630a762b71861bfe21c47a11d4fe05e1a3b7d339 100644
+index 28c76e7b3260ce56421057b88c3555f18b29da06..8e6045c51c46b8d8fa6f4b7fbe4b9478693bac82 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2104,11 +2104,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0907-Add-missing-spawn-eggs.patch b/patches/unapplied/server/0907-Add-missing-spawn-eggs.patch
index 5be733c857..5be733c857 100644
--- a/patches/server/0907-Add-missing-spawn-eggs.patch
+++ b/patches/unapplied/server/0907-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0908-Remove-invalid-signature-login-stacktrace.patch b/patches/unapplied/server/0908-Remove-invalid-signature-login-stacktrace.patch
index 46bb8a96aa..46bb8a96aa 100644
--- a/patches/server/0908-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/unapplied/server/0908-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0909-Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/0909-Add-WardenAngerChangeEvent.patch
index cfe1a98c72..cfe1a98c72 100644
--- a/patches/server/0909-Add-WardenAngerChangeEvent.patch
+++ b/patches/unapplied/server/0909-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0910-Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/0910-Add-option-for-strict-advancement-dimension-checks.patch
index 729882ed8d..729882ed8d 100644
--- a/patches/server/0910-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/unapplied/server/0910-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0911-Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/0911-Add-missing-important-BlockStateListPopulator-method.patch
index 25aee4a60d..25aee4a60d 100644
--- a/patches/server/0911-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/unapplied/server/0911-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0912-Nameable-Banner-API.patch b/patches/unapplied/server/0912-Nameable-Banner-API.patch
index 78f176be32..78f176be32 100644
--- a/patches/server/0912-Nameable-Banner-API.patch
+++ b/patches/unapplied/server/0912-Nameable-Banner-API.patch
diff --git a/patches/server/0913-Fix-MC-252439.patch b/patches/unapplied/server/0913-Fix-MC-252439.patch
index d378b7bfab..d378b7bfab 100644
--- a/patches/server/0913-Fix-MC-252439.patch
+++ b/patches/unapplied/server/0913-Fix-MC-252439.patch
diff --git a/patches/server/0914-Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/0914-Don-t-broadcast-messages-to-command-blocks.patch
index 323e1d8a48..f27d75afb1 100644
--- a/patches/server/0914-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/unapplied/server/0914-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index c0195f73cd2c8721e882c681eaead65471710081..861b348f73867af3199f1cc0dab1ddd4
              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 75645f3aa877d87d595fb4406e5606af54fb1e5a..a8cf1ab9d7504dfdb2310f1dca82324a225bea7d 100644
+index e38a56460ff6c6b04ded3a544a27161ba5ab44d8..bfde5bbcccfaa754ec6bdf4f3817981a93e465bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1756,7 +1756,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0915-Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/0915-Prevent-empty-items-from-being-added-to-world.patch
index 815d0659ac..815d0659ac 100644
--- a/patches/server/0915-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/unapplied/server/0915-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0916-Fix-missing-null-check-in-ChunkGenerator-findNearest.patch b/patches/unapplied/server/0916-Fix-missing-null-check-in-ChunkGenerator-findNearest.patch
index 3961e71e15..3961e71e15 100644
--- a/patches/server/0916-Fix-missing-null-check-in-ChunkGenerator-findNearest.patch
+++ b/patches/unapplied/server/0916-Fix-missing-null-check-in-ChunkGenerator-findNearest.patch
diff --git a/patches/server/0917-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/0917-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index a14591f9b1..a14591f9b1 100644
--- a/patches/server/0917-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/unapplied/server/0917-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0918-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/unapplied/server/0918-Don-t-print-component-in-resource-pack-rejection-mes.patch
index da493d931b..db866686eb 100644
--- a/patches/server/0918-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/unapplied/server/0918-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 630a762b71861bfe21c47a11d4fe05e1a3b7d339..6f2006c53a27531ab04a95e446e30d85eb422970 100644
+index 8e6045c51c46b8d8fa6f4b7fbe4b9478693bac82..924d0601dab2e1b4e38dd138c9ecd7287ca4d733 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1979,7 +1979,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0919-Add-Player-getFishHook.patch b/patches/unapplied/server/0919-Add-Player-getFishHook.patch
index 89347ce701..89347ce701 100644
--- a/patches/server/0919-Add-Player-getFishHook.patch
+++ b/patches/unapplied/server/0919-Add-Player-getFishHook.patch
diff --git a/patches/server/0920-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/0920-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index f9cbdd0899..f9cbdd0899 100644
--- a/patches/server/0920-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/unapplied/server/0920-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0921-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/0921-Add-various-missing-EntityDropItemEvent-calls.patch
index f47913c824..00fa1b6574 100644
--- a/patches/server/0921-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/unapplied/server/0921-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 74459ab5ccb94863677f0803f8f737f013cb83a3..19a64b582bc042e426220e080d9c21b3a82cf3f7 100644
+index 172016efc07d12fa0bbafe3c45410ffd72acd984..5449c84d131915284822c1da14e972b04c022853 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2509,6 +2509,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0922-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/unapplied/server/0922-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 1c93647f33..be4798d8f9 100644
--- a/patches/server/0922-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/unapplied/server/0922-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 6f2006c53a27531ab04a95e446e30d85eb422970..1290f1c33062b2ea821abca33433a53662b6d340 100644
+index 924d0601dab2e1b4e38dd138c9ecd7287ca4d733..8914b20e5823c0b0cfccf986db9e9265b7f757f5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2159,14 +2159,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0923-Fix-Bee-flower-NPE.patch b/patches/unapplied/server/0923-Fix-Bee-flower-NPE.patch
index d1fca0922f..d1fca0922f 100644
--- a/patches/server/0923-Fix-Bee-flower-NPE.patch
+++ b/patches/unapplied/server/0923-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0924-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/0924-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 195db54a6a..45dc64843d 100644
--- a/patches/server/0924-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/unapplied/server/0924-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 1290f1c33062b2ea821abca33433a53662b6d340..f342043f4a8aef7e757571ead0e0218fe7e5ee58 100644
+index 8914b20e5823c0b0cfccf986db9e9265b7f757f5..9d89da66c0c5ab07252430eaff6d20e5e83db658 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2400,7 +2400,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0925-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch b/patches/unapplied/server/0925-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch
index dd94178b5a..dd94178b5a 100644
--- a/patches/server/0925-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch
+++ b/patches/unapplied/server/0925-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch
diff --git a/patches/server/0926-More-Teleport-API.patch b/patches/unapplied/server/0926-More-Teleport-API.patch
index 30bf24bb60..30bf24bb60 100644
--- a/patches/server/0926-More-Teleport-API.patch
+++ b/patches/unapplied/server/0926-More-Teleport-API.patch
diff --git a/patches/server/0927-Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/0927-Add-EntityPortalReadyEvent.patch
index 2edd69640b..90a107abc4 100644
--- a/patches/server/0927-Add-EntityPortalReadyEvent.patch
+++ b/patches/unapplied/server/0927-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 19a64b582bc042e426220e080d9c21b3a82cf3f7..76b9beb0d8ebeee0f603d2740ba71beabbf19e25 100644
+index 5449c84d131915284822c1da14e972b04c022853..99f454b4a3a12fb9bf8e1d506ab311e4166700da 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2856,6 +2856,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0928-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0928-Don-t-use-level-random-in-entity-constructors.patch
index 18739a1c8a..18739a1c8a 100644
--- a/patches/server/0928-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/unapplied/server/0928-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/work/BuildData b/work/BuildData
-Subproject e6ebde42e39100b18ca0265596b04f557b2b27c
+Subproject c540b6e228dc33c13c02b2af63a2691cda0cdea
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 23f557a0a005db45e17f16e58c8f0a583682be7
+Subproject 632aa120808402af8933aef8d991e7935c9c013
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject ef094640942637ee78314416474425a1a53b2a6
+Subproject 6da82662bb8fa7e6f99ef6009e25b4082b10248
diff --git a/work/Spigot b/work/Spigot
-Subproject 14a2382f7da41c880fdbf64536fb222df98dc11
+Subproject 21831450a43f67f1730dd0dec987c7a7ff19caa