diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index ba7f181417..8be7cade4f 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -754,10 +754,10 @@ index 0000000000000000000000000000000000000000..6e94562d79206d88b74b53814f9423f1
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba93af305d7 100644
+index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d45d1fc74 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -388,7 +388,9 @@ public final class Bukkit {
+@@ -389,7 +389,9 @@ public final class Bukkit {
       *
       * @param message the message
       * @return the number of players
@@ -767,7 +767,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      public static int broadcastMessage(@NotNull String message) {
          return server.broadcastMessage(message);
      }
-@@ -1104,6 +1106,19 @@ public final class Bukkit {
+@@ -1105,6 +1107,19 @@ public final class Bukkit {
          server.shutdown();
      }
  
@@ -787,7 +787,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      /**
       * Broadcasts the specified message to every user with the given
       * permission name.
-@@ -1113,6 +1128,21 @@ public final class Bukkit {
+@@ -1114,6 +1129,21 @@ public final class Bukkit {
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
       */
@@ -809,7 +809,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      public static int broadcast(@NotNull String message, @NotNull String permission) {
          return server.broadcast(message, permission);
      }
-@@ -1351,6 +1381,7 @@ public final class Bukkit {
+@@ -1375,6 +1405,7 @@ public final class Bukkit {
          return server.createInventory(owner, type);
      }
  
@@ -817,7 +817,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      /**
       * Creates an empty inventory with the specified type and title. If the type
       * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1376,6 +1407,38 @@ public final class Bukkit {
+@@ -1400,6 +1431,38 @@ public final class Bukkit {
       * @see InventoryType#isCreatable()
       */
      @NotNull
@@ -856,7 +856,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
          return server.createInventory(owner, type, title);
      }
-@@ -1394,6 +1457,7 @@ public final class Bukkit {
+@@ -1418,6 +1481,7 @@ public final class Bukkit {
          return server.createInventory(owner, size);
      }
  
@@ -864,7 +864,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1406,10 +1470,30 @@ public final class Bukkit {
+@@ -1430,10 +1494,30 @@ public final class Bukkit {
       * @throws IllegalArgumentException if the size is not a multiple of 9
       */
      @NotNull
@@ -895,7 +895,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      /**
       * Creates an empty merchant.
       *
-@@ -1417,7 +1501,20 @@ public final class Bukkit {
+@@ -1441,7 +1525,20 @@ public final class Bukkit {
       * when the merchant inventory is viewed
       * @return a new merchant
       */
@@ -916,7 +916,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      public static Merchant createMerchant(@Nullable String title) {
          return server.createMerchant(title);
      }
-@@ -1534,12 +1631,43 @@ public final class Bukkit {
+@@ -1558,12 +1655,43 @@ public final class Bukkit {
          return server.isPrimaryThread();
      }
  
@@ -960,7 +960,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      public static String getMotd() {
          return server.getMotd();
      }
-@@ -1548,7 +1676,9 @@ public final class Bukkit {
+@@ -1572,7 +1700,9 @@ public final class Bukkit {
       * Set the message that is displayed on the server list.
       *
       * @param motd The message to be displayed
@@ -970,7 +970,7 @@ index ff86f4f5d7f460e8986c4a4fa483f5b5a1d3a1b6..cd9566aeace9e2e1e01fb014b0c50ba9
      public static void setMotd(@NotNull String motd) {
          server.setMotd(motd);
      }
-@@ -1557,8 +1687,10 @@ public final class Bukkit {
+@@ -1581,8 +1711,10 @@ public final class Bukkit {
       * Gets the default message that is displayed when the server is stopped.
       *
       * @return the shutdown message
@@ -1152,10 +1152,10 @@ index c559f38fdb92cfee9f2e0ffb7088d1cf74a7f73d..a42f1d53340e4073038d46b7fabf5d44
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844cbafe2d9 100644
+index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3eead8a112 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -60,13 +60,13 @@ import org.jetbrains.annotations.Nullable;
+@@ -61,13 +61,13 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a server implementation.
   */
@@ -1171,7 +1171,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
       */
      public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin";
  
-@@ -74,7 +74,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -75,7 +75,7 @@ public interface Server extends PluginMessageRecipient {
       * Used for all announcement messages, such as informing users that a
       * player has joined.
       * <p>
@@ -1180,7 +1180,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
       */
      public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
  
-@@ -327,7 +327,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -328,7 +328,9 @@ public interface Server extends PluginMessageRecipient {
       *
       * @param message the message
       * @return the number of players
@@ -1190,7 +1190,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
      public int broadcastMessage(@NotNull String message);
  
      /**
-@@ -945,8 +947,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -946,8 +948,33 @@ public interface Server extends PluginMessageRecipient {
       * @param permission the required permission {@link Permissible
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
@@ -1224,7 +1224,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
  
      /**
       * Gets the player by the given name, regardless if they are offline or
-@@ -1144,6 +1171,35 @@ public interface Server extends PluginMessageRecipient {
+@@ -1164,6 +1191,35 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
  
@@ -1260,7 +1260,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
      /**
       * Creates an empty inventory with the specified type and title. If the type
       * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1165,9 +1221,11 @@ public interface Server extends PluginMessageRecipient {
+@@ -1185,9 +1241,11 @@ public interface Server extends PluginMessageRecipient {
       * @return The new inventory.
       * @throws IllegalArgumentException if the {@link InventoryType} cannot be
       * viewed.
@@ -1272,7 +1272,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
  
-@@ -1183,6 +1241,22 @@ public interface Server extends PluginMessageRecipient {
+@@ -1203,6 +1261,22 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
  
@@ -1295,7 +1295,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1193,18 +1267,32 @@ public interface Server extends PluginMessageRecipient {
+@@ -1213,18 +1287,32 @@ public interface Server extends PluginMessageRecipient {
       *     viewed
       * @return a new inventory
       * @throws IllegalArgumentException if the size is not a multiple of 9
@@ -1328,7 +1328,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
      Merchant createMerchant(@Nullable String title);
  
      /**
-@@ -1300,27 +1388,56 @@ public interface Server extends PluginMessageRecipient {
+@@ -1320,27 +1408,56 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean isPrimaryThread();
  
@@ -1385,7 +1385,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
      String getShutdownMessage();
  
      /**
-@@ -1702,7 +1819,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1722,7 +1839,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends the component to the player
           *
           * @param component the components to send
@@ -1395,7 +1395,7 @@ index d3684494b81d06b82eab72c6cfbd76d36dfc0e97..e359bc68007fbe62270ee62be762f844
          public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1711,7 +1830,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1731,7 +1850,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends an array of components as a single message to the player
           *
           * @param components the components to send
@@ -1570,7 +1570,7 @@ index 372c0bd5a4d7800a11c24c95e39fe376a96232bf..9c88be68b4f403d0500cb607394b3a16
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java
-index 80f6b718dba4a48130449388f147b4f12510d9f9..abefc7a96528c52434bd7d4eef3be63c5e31e770 100644
+index 5fc1c759e6e8f3fd43a5fa5c6e3f777efa16b1ec..e6b87ad5b2099800a61e7f585a5404e9e672228a 100644
 --- a/src/main/java/org/bukkit/block/Sign.java
 +++ b/src/main/java/org/bukkit/block/Sign.java
 @@ -10,12 +10,50 @@ import org.jetbrains.annotations.NotNull;
@@ -2081,10 +2081,10 @@ index f3afe67f0832cb828d25be3654518ff73a80b0e1..598abaa82c634178043a29f6caa6ac52
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcadaddba9d43 100644
+index 7591d6de16694467b0fa5ab7ee746f3efdafad82..72b014ebf1a88bf0bf583f570b339ecc1d7a8ef1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -43,7 +43,41 @@ import org.jetbrains.annotations.Nullable;
+@@ -49,7 +49,41 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */
@@ -2127,7 +2127,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
  
      /**
       * {@inheritDoc}
-@@ -60,7 +94,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -66,7 +100,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * places defined by plugins.
       *
       * @return the friendly name
@@ -2137,7 +2137,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      @NotNull
      public String getDisplayName();
  
-@@ -72,15 +108,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -78,15 +114,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * places defined by plugins.
       *
       * @param name The new display name.
@@ -2188,7 +2188,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      public String getPlayerListName();
  
      /**
-@@ -89,14 +160,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -95,14 +166,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
@@ -2207,7 +2207,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      @Nullable
      public String getPlayerListHeader();
  
-@@ -104,7 +179,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -110,7 +185,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
@@ -2217,7 +2217,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      @Nullable
      public String getPlayerListFooter();
  
-@@ -112,14 +189,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -118,14 +195,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
@@ -2236,7 +2236,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      public void setPlayerListFooter(@Nullable String footer);
  
      /**
-@@ -128,7 +209,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -134,7 +215,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
@@ -2246,7 +2246,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
  
      /**
-@@ -166,9 +249,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -172,9 +255,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Kicks player with custom kick message.
       *
       * @param message kick message
@@ -2270,9 +2270,9 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
 +    // Paper end
 +
      /**
-      * Says a message (or runs a command).
-      *
-@@ -633,6 +732,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
+      * update the entry.
+@@ -671,6 +770,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map<EquipmentSlot, ItemStack> items);
  
@@ -2363,7 +2363,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      /**
       * 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.
-@@ -650,7 +833,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -688,7 +871,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
@@ -2373,7 +2373,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
  
      /**
-@@ -672,7 +857,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -710,7 +895,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
@@ -2383,7 +2383,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
  
      /**
-@@ -695,7 +882,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -733,7 +920,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
@@ -2393,7 +2393,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
  
      /**
-@@ -1211,6 +1400,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1249,6 +1438,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -2401,7 +2401,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
       * @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.
-@@ -1267,8 +1457,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1305,8 +1495,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2459,7 +2459,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1298,6 +1537,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1336,6 +1575,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -2467,7 +2467,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
       * @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.
-@@ -1358,8 +1598,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1396,8 +1636,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2525,7 +2525,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      /**
       * Gets the Scoreboard displayed to this player
       *
-@@ -1475,7 +1764,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1532,7 +1821,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param title Title text
       * @param subtitle Subtitle text
@@ -2534,7 +2534,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
       */
      @Deprecated
      public void sendTitle(@Nullable String title, @Nullable String subtitle);
-@@ -1494,7 +1783,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1551,7 +1840,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.
@@ -2544,7 +2544,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
  
      /**
-@@ -1721,6 +2012,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1778,6 +2069,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public int getClientViewDistance();
  
@@ -2559,7 +2559,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      /**
       * Gets the player's estimated ping in milliseconds.
       *
-@@ -1746,8 +2045,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1803,8 +2102,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * they wish.
       *
       * @return the player's locale
@@ -2570,7 +2570,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      public String getLocale();
  
      /**
-@@ -1799,6 +2100,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1856,6 +2157,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public boolean isAllowingServerListings();
  
@@ -2585,7 +2585,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
      // Spigot start
      public class Spigot extends Entity.Spigot {
  
-@@ -1830,11 +2139,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1887,11 +2196,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2599,7 +2599,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
          @Override
          public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
-@@ -1845,7 +2156,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1902,7 +2213,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param component the components to send
@@ -2609,7 +2609,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
          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.");
          }
-@@ -1855,7 +2168,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1912,7 +2225,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param components the components to send
@@ -2619,7 +2619,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
          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.");
          }
-@@ -1866,7 +2181,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1923,7 +2238,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
@@ -2629,7 +2629,7 @@ index 6860eb5e85d115d1c00ace8c646ccc080bff29ce..84e63caeabe3e44381a464bde47bcada
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1877,7 +2194,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1934,7 +2251,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
@@ -2933,10 +2933,10 @@ index 3c2ea8fec3a748cab7f5ad9100d12bd8213ec6c9..a803bfea5400b3578bb4cf3261874e87
       * Gets how much EXP the Player should have at respawn.
       * <p>
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 3eb3a2cb67d9aa54180ab310524770189ad37c99..b821fa535b23fe5af5884e536b1708460076ee40 100644
+index ec9f58ea221bfcde706d2454483888c54d44023a..19ba2d948ad83baab2a14ae6f7b3ce43c3d4971f 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -156,6 +156,18 @@ public enum InventoryType {
+@@ -155,6 +155,18 @@ public enum InventoryType {
      private final String title;
      private final boolean isCreatable;
  
@@ -2955,7 +2955,7 @@ index 3eb3a2cb67d9aa54180ab310524770189ad37c99..b821fa535b23fe5af5884e536b170846
      private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) {
          this(defaultSize, defaultTitle, true);
      }
-@@ -164,6 +176,7 @@ public enum InventoryType {
+@@ -163,6 +175,7 @@ public enum InventoryType {
          size = defaultSize;
          title = defaultTitle;
          this.isCreatable = isCreatable;
@@ -2963,7 +2963,7 @@ index 3eb3a2cb67d9aa54180ab310524770189ad37c99..b821fa535b23fe5af5884e536b170846
      }
  
      public int getDefaultSize() {
-@@ -171,6 +184,7 @@ public enum InventoryType {
+@@ -170,6 +183,7 @@ public enum InventoryType {
      }
  
      @NotNull
diff --git a/patches/api/0008-Paper-Plugins.patch b/patches/api/0008-Paper-Plugins.patch
index 1d88cead8e..98d549fe68 100644
--- a/patches/api/0008-Paper-Plugins.patch
+++ b/patches/api/0008-Paper-Plugins.patch
@@ -1441,10 +1441,10 @@ index 94f8ceb965cecb5669a84a0ec61c0f706c2a2673..e773db6da357ad210eb24d4c389af2dc
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
-index 77a380537b338fdd0aa2f6777ff775056cc6b221..028805bcdb1d2bb0d11387db165b7376579e5f60 100644
+index 0eae1c027cab0444a125ae4efed7f9fcb1b9934f..07e8908d25fcd4e5eabadc9f019b54acff3b5e3c 100644
 --- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
 +++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
-@@ -195,7 +195,7 @@ import org.yaml.snakeyaml.nodes.Tag;
+@@ -197,7 +197,7 @@ import org.yaml.snakeyaml.representer.Representer;
   *      inferno.burningdeaths: true
   *</pre></blockquote>
   */
@@ -1453,7 +1453,7 @@ index 77a380537b338fdd0aa2f6777ff775056cc6b221..028805bcdb1d2bb0d11387db165b7376
      private static final Pattern VALID_NAME = Pattern.compile("^[A-Za-z0-9 _.-]+$");
      private static final ThreadLocal<Yaml> YAML = new ThreadLocal<Yaml>() {
          @Override
-@@ -255,6 +255,70 @@ public final class PluginDescriptionFile {
+@@ -258,6 +258,70 @@ public final class PluginDescriptionFile {
      private Set<PluginAwareness> awareness = ImmutableSet.of();
      private String apiVersion = null;
      private List<String> libraries = ImmutableList.of();
diff --git a/patches/api/0010-Timings-v2.patch b/patches/api/0010-Timings-v2.patch
index 43601634ff..bb48ab628e 100644
--- a/patches/api/0010-Timings-v2.patch
+++ b/patches/api/0010-Timings-v2.patch
@@ -2854,10 +2854,10 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cd9566aeace9e2e1e01fb014b0c50ba93af305d7..1f4df6984a8b8bd3e72a5eb7fb1c66b6bfddfbf5 100644
+index b7bc68c5d0dbb41c089f59b7db51342d45d1fc74..8d101352f72fc7fa21e0ba68039c79ce2fb92eb9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -832,7 +832,6 @@ public final class Bukkit {
+@@ -833,7 +833,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2866,10 +2866,10 @@ index cd9566aeace9e2e1e01fb014b0c50ba93af305d7..1f4df6984a8b8bd3e72a5eb7fb1c66b6
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e359bc68007fbe62270ee62be762f844cbafe2d9..e773b40ff5fa9890c72e45e5c75a155bd7d02954 100644
+index e3602c6703b29ffec17ef7806c9deb3eead8a112..3e642d8a0294f7290c3d4310813e6e8a467810e7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1815,6 +1815,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1835,6 +1835,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -3455,10 +3455,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 84e63caeabe3e44381a464bde47bcadaddba9d43..7303c09e078dad0855c96280174b2760eacc20cd 100644
+index 72b014ebf1a88bf0bf583f570b339ecc1d7a8ef1..c370100ad6363640368c58a6adec6c8fc6e10ab9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2199,7 +2199,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2256,7 +2256,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          @Deprecated // Paper
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
diff --git a/patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 4d6266c64b..d0a062d1ff 100644
--- a/patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ffacdd168e2b68663becfcfc5c917a41f8ec817d..003d1613fb1b5a24146fb3eeba0be7bf5a4eb8b8 100644
+index 45f9ac35874c67c24718f6891b95df1ff4f0b93f..7717f5346aa784df4a0f6e43a5a74a66f279bc8a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -77,6 +77,20 @@ public final class Bukkit {
+@@ -78,6 +78,20 @@ public final class Bukkit {
          return server;
      }
  
@@ -32,10 +32,10 @@ index ffacdd168e2b68663becfcfc5c917a41f8ec817d..003d1613fb1b5a24146fb3eeba0be7bf
       * Attempts to set the {@link Server} singleton.
       * <p>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index cadf590c7e597a503078892b3d5671642a80eb3f..15b07d05d948d5df21591dc9e1b0fc0232c984ec 100644
+index 087da3cd2cafd8255ed70e5e632b270a33e37eaf..0f990d33ab07249e4cf2d2269920b4cbeed27d39 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -62,6 +62,18 @@ import org.jetbrains.annotations.Nullable;
+@@ -63,6 +63,18 @@ import org.jetbrains.annotations.Nullable;
   */
  public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
  
diff --git a/patches/api/0012-Player-affects-spawning-API.patch b/patches/api/0012-Player-affects-spawning-API.patch
index 9b4bb245fc..50a8d76863 100644
--- a/patches/api/0012-Player-affects-spawning-API.patch
+++ b/patches/api/0012-Player-affects-spawning-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7303c09e078dad0855c96280174b2760eacc20cd..c1affe53a8dc1d1219118610f1f0908c68bb7e51 100644
+index c370100ad6363640368c58a6adec6c8fc6e10ab9..268361f4476baa96aafdbb01e0f2859c010de612 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2051,6 +2051,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2108,6 +2108,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Deprecated // Paper
      public String getLocale();
  
diff --git a/patches/api/0013-Add-getTPS-method.patch b/patches/api/0013-Add-getTPS-method.patch
index f5bdf29597..7c2ca86cfc 100644
--- a/patches/api/0013-Add-getTPS-method.patch
+++ b/patches/api/0013-Add-getTPS-method.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d77a7acb3ea82a331cb773bfda3e66d26a2bbd68..b2effed0281997a64dd0fdc965bce2a54af0cf4d 100644
+index 7717f5346aa784df4a0f6e43a5a74a66f279bc8a..fba3e617a8847a3e9282e6a1a389132b2ad5511c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1940,6 +1940,17 @@ public final class Bukkit {
+@@ -1964,6 +1964,17 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -27,10 +27,10 @@ index d77a7acb3ea82a331cb773bfda3e66d26a2bbd68..b2effed0281997a64dd0fdc965bce2a5
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 76d28815a51d73fc79ef8bb5abe8fc7758e6fd23..04f5191398dcfac02eb6553d549e77207c06e550 100644
+index 0f990d33ab07249e4cf2d2269920b4cbeed27d39..c8cf66e64a3163c2bdf781f3ce52059546969b9b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1652,6 +1652,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1672,6 +1672,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  
diff --git a/patches/api/0015-Entity-Origin-API.patch b/patches/api/0015-Entity-Origin-API.patch
index 908dae809d..1b28cbdd5b 100644
--- a/patches/api/0015-Entity-Origin-API.patch
+++ b/patches/api/0015-Entity-Origin-API.patch
@@ -25,10 +25,10 @@ index 598abaa82c634178043a29f6caa6ac5221659d06..70a32f89c16439c575d8928332cfed64
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 9a57341691ebfbb6ec5a426a13f2fa5d61009b48..bd87d1548faa2fb095adce9f156f24163995dbe7 100644
+index d96fd494b523491fcf1ac54d164351fd487f65d6..ae1ce2ee2deb82f3f4144ec54b3ba119b437c5e9 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
-@@ -92,4 +92,15 @@ public interface FallingBlock extends Entity {
+@@ -126,4 +126,15 @@ public interface FallingBlock extends Entity {
       * @param damage the max damage to set. Must be >= 0
       */
      void setMaxDamage(int damage);
diff --git a/patches/api/0017-Add-view-distance-API.patch b/patches/api/0017-Add-view-distance-API.patch
index b019320419..4dba07a43c 100644
--- a/patches/api/0017-Add-view-distance-API.patch
+++ b/patches/api/0017-Add-view-distance-API.patch
@@ -75,10 +75,10 @@ index 5357291ff0f2f20bd87ab9f6e57f6a4f6ff65226..887aa6217583d224d66f6d238ac269c2
      public class Spigot {
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c1affe53a8dc1d1219118610f1f0908c68bb7e51..05f0fca8f94da035512bb44aa6f0f99609b8afc6 100644
+index 268361f4476baa96aafdbb01e0f2859c010de612..950ca8562568cb161f6935deeafd8caa716fa33f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2065,6 +2065,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2122,6 +2122,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/0020-Expose-server-CommandMap.patch b/patches/api/0020-Expose-server-CommandMap.patch
index f64662cba3..d335e297f9 100644
--- a/patches/api/0020-Expose-server-CommandMap.patch
+++ b/patches/api/0020-Expose-server-CommandMap.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b2effed0281997a64dd0fdc965bce2a54af0cf4d..f3a976ea2d7433623202c1d7cbf777608b0ba457 100644
+index fba3e617a8847a3e9282e6a1a389132b2ad5511c..acb34296923fb27cfc28c130cf0b5405cfe340f6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2141,6 +2141,19 @@ public final class Bukkit {
+@@ -2165,6 +2165,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index b2effed0281997a64dd0fdc965bce2a54af0cf4d..f3a976ea2d7433623202c1d7cbf77760
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 04f5191398dcfac02eb6553d549e77207c06e550..c0c67866014940a1331cd714d5c6eb50256ae143 100644
+index c8cf66e64a3163c2bdf781f3ce52059546969b9b..5b3c34b01038849b1463870ccf657b11db82cd09 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1662,6 +1662,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1682,6 +1682,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public double[] getTPS();
      // Paper end
  
diff --git a/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 44569c683c..e8a3509ba6 100644
--- a/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f3a976ea2d7433623202c1d7cbf777608b0ba457..77b267c50523433eee0fa35c6c5b8a9e121c0862 100644
+index b53e94d79862d66165bbcd2a79b82770398a7f3e..9417030074fccdd9113bf75eb8f17f74b9a9118b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -409,6 +409,30 @@ public final class Bukkit {
+@@ -410,6 +410,30 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -41,10 +41,10 @@ index f3a976ea2d7433623202c1d7cbf777608b0ba457..77b267c50523433eee0fa35c6c5b8a9e
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c0c67866014940a1331cd714d5c6eb50256ae143..0e63d438a74b96075d7d8fb51ddbd21be3447377 100644
+index 124e88e512d24b6ff7ace3cf7d5a6adf4c2bb40d..ccc825a2ea43bb84a5a08dff00c4d8ec27e4e95a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -344,6 +344,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -345,6 +345,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Deprecated // Paper
      public int broadcastMessage(@NotNull String message);
  
@@ -76,10 +76,10 @@ index c0c67866014940a1331cd714d5c6eb50256ae143..0e63d438a74b96075d7d8fb51ddbd21b
       * 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 05f0fca8f94da035512bb44aa6f0f99609b8afc6..f5d419920aa5b83b6c9f680cba6c87646c2be026 100644
+index 950ca8562568cb161f6935deeafd8caa716fa33f..dbdbea106c11136f449b572b9709969c8a9569bd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -915,6 +915,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -953,6 +953,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/patches/api/0025-Player-Tab-List-and-Title-APIs.patch b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch
index 63400d9a6b..41b75a52a9 100644
--- a/patches/api/0025-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch
@@ -432,10 +432,10 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f5d419920aa5b83b6c9f680cba6c87646c2be026..28ca7231bfd8b5381b54ea323dfa2c3a972c9700 100644
+index dbdbea106c11136f449b572b9709969c8a9569bd..48fb241657cd596d467135c067ad793c10f26418 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -949,6 +949,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -987,6 +987,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/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index a1913f44d8..5fda7e4691 100644
--- a/patches/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -7,7 +7,7 @@ Upstream added methods for this so the original methods
 are now deprecated
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 2b816f0e6bdb912ceeff82c0043272b3970fe243..9977bb3cb5a66c84db816f8e4597db1c053f77c8 100644
+index 7c82644de3c438f45476ac02ce2c51c6fdbd543a..390bb294d09389877937ee2c6c3f346e65dfb178 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -215,12 +215,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -38,7 +38,7 @@ index 2b816f0e6bdb912ceeff82c0043272b3970fe243..9977bb3cb5a66c84db816f8e4597db1c
  
      /**
       * Returns the living entity's current maximum no damage ticks.
-@@ -689,4 +703,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -722,4 +736,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @return Whether the entity is invisible
       */
      public boolean isInvisible();
diff --git a/patches/api/0027-Complete-resource-pack-API.patch b/patches/api/0027-Complete-resource-pack-API.patch
index ea6054e17d..7b9f2a9448 100644
--- a/patches/api/0027-Complete-resource-pack-API.patch
+++ b/patches/api/0027-Complete-resource-pack-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 28ca7231bfd8b5381b54ea323dfa2c3a972c9700..d980cc3ed54db4bdf22c73d75d99871f1b16ecb0 100644
+index 48fb241657cd596d467135c067ad793c10f26418..15e289557a85a0b0e62ab4f150a601512ab3f72e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1529,7 +1529,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1567,7 +1567,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 28ca7231bfd8b5381b54ea323dfa2c3a972c9700..d980cc3ed54db4bdf22c73d75d99871f
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -2355,6 +2357,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2412,6 +2414,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/0030-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch
index 94d7e38e7d..6f09311d3f 100644
--- a/patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 77b267c50523433eee0fa35c6c5b8a9e121c0862..0b9b28b7a07a8176142b18cfa767c81f5035d52d 100644
+index 88cbb61a855d77fe6840be48140261032c5a38b8..540c57e82247eaad2cae1ab0199caf2a6cabcab1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2176,6 +2176,13 @@ public final class Bukkit {
+@@ -2200,6 +2200,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 77b267c50523433eee0fa35c6c5b8a9e121c0862..0b9b28b7a07a8176142b18cfa767c81f
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0e63d438a74b96075d7d8fb51ddbd21be3447377..e76c11688760a24f8395f562108b4c5fd7139b42 100644
+index 7edaadd0a99fd8bbe3c683a126efd29993ed596c..f3452f65e6b69e8a2f0942c7a6afb9837a6d88fd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1923,4 +1923,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1943,4 +1943,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      Spigot spigot();
      // Spigot end
diff --git a/patches/api/0043-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0043-Allow-Reloading-of-Command-Aliases.patch
index 7e19f95ecf..58204dcd0a 100644
--- a/patches/api/0043-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0043-Allow-Reloading-of-Command-Aliases.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0b9b28b7a07a8176142b18cfa767c81f5035d52d..22d9538abe61ccb3e5d3ae407d54446fa172fa39 100644
+index 540c57e82247eaad2cae1ab0199caf2a6cabcab1..abbafce790d30bab81b40c6c973d21f09d3d24ef 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2183,6 +2183,15 @@ public final class Bukkit {
+@@ -2207,6 +2207,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 0b9b28b7a07a8176142b18cfa767c81f5035d52d..22d9538abe61ccb3e5d3ae407d54446f
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e76c11688760a24f8395f562108b4c5fd7139b42..26516ae5519675dac359b578d0f06ea2c0745ab3 100644
+index f3452f65e6b69e8a2f0942c7a6afb9837a6d88fd..925e3e32bf971efc08fd39d1e10d83bb0c6e8634 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1925,4 +1925,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1945,4 +1945,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Spigot end
  
      void reloadPermissions(); // Paper
diff --git a/patches/api/0046-Add-String-based-Action-Bar-API.patch b/patches/api/0046-Add-String-based-Action-Bar-API.patch
index b773fde223..63fc6e4cde 100644
--- a/patches/api/0046-Add-String-based-Action-Bar-API.patch
+++ b/patches/api/0046-Add-String-based-Action-Bar-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d980cc3ed54db4bdf22c73d75d99871f1b16ecb0..5b9480a3d06155c391f1347cb56fde9612d75ed8 100644
+index 15e289557a85a0b0e62ab4f150a601512ab3f72e..96ca3feb93b949f1b052fc9d85f583e25f87ace7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -916,6 +916,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -954,6 +954,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -48,7 +48,7 @@ index d980cc3ed54db4bdf22c73d75d99871f1b16ecb0..5b9480a3d06155c391f1347cb56fde96
      /**
       * Sends the component to the player
       *
-@@ -943,9 +976,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -981,9 +1014,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
diff --git a/patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch
index 2013c6f360..976eca824f 100644
--- a/patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 22d9538abe61ccb3e5d3ae407d54446fa172fa39..68a79316cec0c4ab83c6f986e3a9561440994319 100644
+index abbafce790d30bab81b40c6c973d21f09d3d24ef..4665d42f167d587ec3edaf6432eef0a5a883401f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2192,6 +2192,16 @@ public final class Bukkit {
+@@ -2216,6 +2216,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index 22d9538abe61ccb3e5d3ae407d54446fa172fa39..68a79316cec0c4ab83c6f986e3a95614
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 26516ae5519675dac359b578d0f06ea2c0745ab3..0cf214c45078d83d678f12f6cb350e50fc5f1e94 100644
+index 925e3e32bf971efc08fd39d1e10d83bb0c6e8634..7b95c1049ec365b8a1c20e5e18f6a79d4042fa38 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1927,4 +1927,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1947,4 +1947,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch
index 7bdb3f4135..1f620b96ca 100644
--- a/patches/api/0055-Fix-upstream-javadocs.patch
+++ b/patches/api/0055-Fix-upstream-javadocs.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadocs
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/BanList.java b/src/main/java/org/bukkit/BanList.java
-index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f33589583 100644
+index ce35cf91d4a5156e08cd5100fd65db28e38c30e6..c229d3bc37c4e454a4b5a93eda1fe6466a4f4e8b 100644
 --- a/src/main/java/org/bukkit/BanList.java
 +++ b/src/main/java/org/bukkit/BanList.java
-@@ -27,6 +27,9 @@ public interface BanList {
+@@ -36,6 +36,9 @@ public interface BanList<T> {
  
      /**
       * Gets a {@link BanEntry} by target.
@@ -19,12 +19,9 @@ index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f
       *
       * @param target entry parameter to search for
       * @return the corresponding entry, or null if none found
-@@ -35,8 +38,11 @@ public interface BanList {
-     public BanEntry getBanEntry(@NotNull String target);
- 
+@@ -57,6 +60,9 @@ public interface BanList<T> {
      /**
--     * Adds a ban to the this list. If a previous ban exists, this will
-+     * Adds a ban to this list. If a previous ban exists, this will
+      * Adds a ban to this list. If a previous ban exists, this will
       * update the previous entry.
 +     * <p>
 +     * Bans by name for ban type {@link Type#NAME NAME} are no longer supported and this method will return
@@ -32,7 +29,7 @@ index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f
       *
       * @param target the target of the ban
       * @param reason reason for the ban, null indicates implementation default
-@@ -60,6 +66,9 @@ public interface BanList {
+@@ -107,6 +113,9 @@ public interface BanList<T> {
      /**
       * Gets if a {@link BanEntry} exists for the target, indicating an active
       * ban status.
@@ -41,8 +38,8 @@ index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f
 +     * The replacement is bans by UUID.
       *
       * @param target the target to find
-      * @return true if a {@link BanEntry} exists for the name, indicating an
-@@ -70,6 +79,9 @@ public interface BanList {
+      * @return true if a {@link BanEntry} exists for the target, indicating an
+@@ -129,6 +138,9 @@ public interface BanList<T> {
      /**
       * Removes the specified target from this list, therefore indicating a
       * "not banned" status.
@@ -53,22 +50,10 @@ index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f
       * @param target the target to remove from this list
       */
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 68a79316cec0c4ab83c6f986e3a9561440994319..316fc8348445b99af7ffc7c4ad24948a1115dfe6 100644
+index add298a1a0b6f6dbd72fe9e8f87794d193760fb7..b21f90f291a087b6282cd7b55e0075a01729f0ba 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1299,10 +1299,7 @@ public final class Bukkit {
-     }
- 
-     /**
--     * Gets a ban list for the supplied type.
--     * <p>
--     * Bans by name are no longer supported and this method will return
--     * null when trying to request them. The replacement is bans by UUID.
-+     * Gets a ban list for the supplied type. <!-- Paper Remove notice: wrong place -->
-      *
-      * @param type the type of list to fetch, cannot be null
-      * @return a ban list of the specified type
-@@ -1364,6 +1361,8 @@ public final class Bukkit {
+@@ -1388,6 +1388,8 @@ public final class Bukkit {
  
      /**
       * Gets every player that has ever played on this server.
@@ -130,10 +115,10 @@ index 43f5aab2fe70af5f570de1f21eca83905f1e2f57..05c29cbd2ae1ca0434a90f8389479bd6
       * @param statePredicate The predicate which should get used to test if a block should be set or not.
       * @return true if the tree was created successfully, otherwise false
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0cf214c45078d83d678f12f6cb350e50fc5f1e94..d7b081ac72d7d2aa3b675c6cbb8fb66f73facc99 100644
+index 22d508a6c80d7e19352bceb57009fdbcb16bc723..3c1862b9a9293155f756615b5bd23cc810a6df5e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -542,13 +542,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -543,13 +543,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * </ul>
       * <p>
       * <b>Note:</b> If set to 0, {@link SpawnCategory} mobs spawning will be disabled.
@@ -148,19 +133,7 @@ index 0cf214c45078d83d678f12f6cb350e50fc5f1e94..d7b081ac72d7d2aa3b675c6cbb8fb66f
       */
      public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
  
-@@ -1108,10 +1105,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     public Set<OfflinePlayer> getBannedPlayers();
- 
-     /**
--     * Gets a ban list for the supplied type.
--     * <p>
--     * Bans by name are no longer supported and this method will return
--     * null when trying to request them. The replacement is bans by UUID.
-+     * Gets a ban list for the supplied type. <!-- Paper Remove notice: wrong place -->
-      *
-      * @param type the type of list to fetch, cannot be null
-      * @return a ban list of the specified type
-@@ -1161,6 +1155,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1181,6 +1178,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
      /**
       * Gets every player that has ever played on this server.
@@ -414,10 +387,10 @@ index ae9eaaa8e38e1d9dfc459926c7fc51ddb89de84a..b2ec535bb1b0ce0c114ddd7638b90218
      @Override
      public int getConversionTime();
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5b9480a3d06155c391f1347cb56fde9612d75ed8..26236250f4418def6f65c811800063588b43fa84 100644
+index 96ca3feb93b949f1b052fc9d85f583e25f87ace7..77b2e935b823b302a7221cd5be6441ec10557908 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -327,15 +327,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -365,15 +365,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Saves the players current location, health, inventory, motion, and
@@ -437,7 +410,7 @@ index 5b9480a3d06155c391f1347cb56fde9612d75ed8..26236250f4418def6f65c81180006358
       * <p>
       * Note: This will overwrite the players current inventory, health,
       * motion, etc, with the state from the saved dat file.
-@@ -570,7 +570,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -608,7 +608,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Plays an effect to just this player.
       *
@@ -446,7 +419,7 @@ index 5b9480a3d06155c391f1347cb56fde9612d75ed8..26236250f4418def6f65c81180006358
       * @param loc the location to play the effect at
       * @param effect the {@link Effect}
       * @param data a data bit needed for some effects
-@@ -933,7 +933,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -971,7 +971,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -455,7 +428,7 @@ index 5b9480a3d06155c391f1347cb56fde9612d75ed8..26236250f4418def6f65c81180006358
       * @param message The message to send
       * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
       */
-@@ -1399,7 +1399,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1437,7 +1437,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see a player that was previously hidden. If
@@ -464,7 +437,7 @@ index 5b9480a3d06155c391f1347cb56fde9612d75ed8..26236250f4418def6f65c81180006358
       * remain hidden until the other plugin calls this method too.
       *
       * @param plugin Plugin that wants to show the player
-@@ -1428,7 +1428,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1466,7 +1466,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see an entity that was previously hidden. If
diff --git a/patches/api/0059-Basic-PlayerProfile-API.patch b/patches/api/0059-Basic-PlayerProfile-API.patch
index 13200b1ca2..d4887664bc 100644
--- a/patches/api/0059-Basic-PlayerProfile-API.patch
+++ b/patches/api/0059-Basic-PlayerProfile-API.patch
@@ -321,10 +321,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 316fc8348445b99af7ffc7c4ad24948a1115dfe6..10eeb288ef41dfc6bd70fc8f6ec218dabc60b2a4 100644
+index ae017e210a54e78ecd14117ac939e1bb3da4497a..047676a7ea94bf26c8dd0552c72760bcc264218f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2201,6 +2201,83 @@ public final class Bukkit {
+@@ -2228,6 +2228,83 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -409,10 +409,10 @@ index 316fc8348445b99af7ffc7c4ad24948a1115dfe6..10eeb288ef41dfc6bd70fc8f6ec218da
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d7b081ac72d7d2aa3b675c6cbb8fb66f73facc99..1487b5de4fba5304b7e2105c6f88872923aa7974 100644
+index e1211bb9c3186ffb1c5c7b858b8bab50bf87df9f..94192cfe9bb15c0083cf28761bc3f0f6bb19aa8d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1932,5 +1932,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1955,5 +1955,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
diff --git a/patches/api/0067-LivingEntity-setKiller.patch b/patches/api/0067-LivingEntity-setKiller.patch
index e117b6ac51..b73c828ca5 100644
--- a/patches/api/0067-LivingEntity-setKiller.patch
+++ b/patches/api/0067-LivingEntity-setKiller.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9977bb3cb5a66c84db816f8e4597db1c053f77c8..ccd8f36c8450bab9f609bb220b5270394960580e 100644
+index c094070f8399586af7e02fe4ed489c82080f3678..ae201851aa00d47da37cca087ec9f8c03738a94a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -295,6 +295,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -319,6 +319,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      @Nullable
      public Player getKiller();
  
diff --git a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
index 9fc11e1b48..dc62c440b7 100644
--- a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
@@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 26236250f4418def6f65c811800063588b43fa84..bd6881d18d18d03f7e9b7821fa6cc433a79dc17e 100644
+index 77b2e935b823b302a7221cd5be6441ec10557908..4a1c42a55df02b33c144da55b4a01c610217d63c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -49,7 +49,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */
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 f226c832e7..d8a92f7124 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 bd6881d18d18d03f7e9b7821fa6cc433a79dc17e..b4efaec20a64e6f1955819b0d784d9f671d928e0 100644
+index 4a1c42a55df02b33c144da55b4a01c610217d63c..8916caa53a638f4029ec6293b2ab11ad1bcdb14d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1242,6 +1242,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1280,6 +1280,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
@@ -29,7 +29,7 @@ index bd6881d18d18d03f7e9b7821fa6cc433a79dc17e..b4efaec20a64e6f1955819b0d784d9f6
      /**
       * Gets the player's cooldown between picking up experience orbs.
       *
-@@ -1267,8 +1276,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1305,8 +1314,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Gives the player the amount of experience specified.
       *
       * @param amount Exp amount to give
diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/api/0091-Player.setPlayerProfile-API.patch
index ea78af9a06..37395fbbf2 100644
--- a/patches/api/0091-Player.setPlayerProfile-API.patch
+++ b/patches/api/0091-Player.setPlayerProfile-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 10eeb288ef41dfc6bd70fc8f6ec218dabc60b2a4..ace8904541fb4571cb03f14e6e3baa02ae460d1e 100644
+index dcd539220e5a2bda41f27101ea4c0ece146e1d0d..f5358612884aae8d0686f3ff98ccee567a746f16 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1229,8 +1229,10 @@ public final class Bukkit {
+@@ -1230,8 +1230,10 @@ public final class Bukkit {
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if both the unique id is
       * <code>null</code> and the name is <code>null</code> or blank
@@ -20,7 +20,7 @@ index 10eeb288ef41dfc6bd70fc8f6ec218dabc60b2a4..ace8904541fb4571cb03f14e6e3baa02
      public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
          return server.createPlayerProfile(uniqueId, name);
      }
-@@ -1241,8 +1243,10 @@ public final class Bukkit {
+@@ -1242,8 +1244,10 @@ public final class Bukkit {
       * @param uniqueId the unique id
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the unique id is <code>null</code>
@@ -31,7 +31,7 @@ index 10eeb288ef41dfc6bd70fc8f6ec218dabc60b2a4..ace8904541fb4571cb03f14e6e3baa02
      public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
          return server.createPlayerProfile(uniqueId);
      }
-@@ -1254,8 +1258,10 @@ public final class Bukkit {
+@@ -1255,8 +1259,10 @@ public final class Bukkit {
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the name is <code>null</code> or
       * blank
@@ -43,10 +43,10 @@ index 10eeb288ef41dfc6bd70fc8f6ec218dabc60b2a4..ace8904541fb4571cb03f14e6e3baa02
          return server.createPlayerProfile(name);
      }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 5acb0d36a008cf5ad332c867e9303d35235b4028..b1ded556a1ce4e1d3c873ab9d7f799b6edcc5118 100644
+index f000d706bdf50c48314bcbd83978920f5d2daae4..829077d76ad6b179e6f6abf7fb848353fa53a60a 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -55,7 +55,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -57,7 +57,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * @return the player's profile
       */
      @NotNull
@@ -54,12 +54,12 @@ index 5acb0d36a008cf5ad332c867e9303d35235b4028..b1ded556a1ce4e1d3c873ab9d7f799b6
 +    com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile(); // Paper
  
      /**
-      * Checks if this player is banned or not
+      * Checks if this player has had their profile banned.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1487b5de4fba5304b7e2105c6f88872923aa7974..e4f8031ab979ba7e3fd7242b788e41974f490565 100644
+index 016cee903c7179baf711984503d1d0793d40c5c5..064edd612885b2ea4b35001a864503b568c53987 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1049,8 +1049,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1050,8 +1050,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if both the unique id is
       * <code>null</code> and the name is <code>null</code> or blank
@@ -70,7 +70,7 @@ index 1487b5de4fba5304b7e2105c6f88872923aa7974..e4f8031ab979ba7e3fd7242b788e4197
      PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
  
      /**
-@@ -1059,8 +1061,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1060,8 +1062,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param uniqueId the unique id
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the unique id is <code>null</code>
@@ -81,7 +81,7 @@ index 1487b5de4fba5304b7e2105c6f88872923aa7974..e4f8031ab979ba7e3fd7242b788e4197
      PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
  
      /**
-@@ -1070,8 +1074,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1071,8 +1075,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the name is <code>null</code> or
       * blank
@@ -93,10 +93,10 @@ index 1487b5de4fba5304b7e2105c6f88872923aa7974..e4f8031ab979ba7e3fd7242b788e4197
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b4efaec20a64e6f1955819b0d784d9f671d928e0..7b2d8fd3cb0d44a531bd5d618154059d2a934d48 100644
+index 8916caa53a638f4029ec6293b2ab11ad1bcdb14d..317db645b6459a6ee2c888b7cf2e40fdbb30bdde 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2531,6 +2531,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2588,6 +2588,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/0092-getPlayerUniqueId-API.patch b/patches/api/0092-getPlayerUniqueId-API.patch
index ad0e12f4d8..24f46585be 100644
--- a/patches/api/0092-getPlayerUniqueId-API.patch
+++ b/patches/api/0092-getPlayerUniqueId-API.patch
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ace8904541fb4571cb03f14e6e3baa02ae460d1e..36c5294e6169c3aa4517cd2c945b5dfb7a2a0c51 100644
+index 5b9d04de045a83e786df4bf9bfe2fc50835247bb..67c92e10b38af2ac45c1d9b6374695247bf1e7c3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -687,6 +687,20 @@ public final class Bukkit {
+@@ -688,6 +688,20 @@ public final class Bukkit {
          return server.getPlayer(id);
      }
  
@@ -34,10 +34,10 @@ index ace8904541fb4571cb03f14e6e3baa02ae460d1e..36c5294e6169c3aa4517cd2c945b5dfb
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e4f8031ab979ba7e3fd7242b788e41974f490565..2ac191185e4dabb2f39b05a56548b0d97daa2979 100644
+index 9865238afb71f19b5c1cc7c414ea3a637f9fc00c..88b93ac279f2bd23ca853788c409549fe2afe041 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -591,6 +591,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -592,6 +592,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      public Player getPlayer(@NotNull UUID id);
  
diff --git a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch
index c7123e4667..e941bfe265 100644
--- a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch
@@ -36,10 +36,10 @@ index abdca9fe5acc90f167219eb769ece66c35682bb1..b3aa3dc6aa5afbc36cc86741b4cba56f
      /**
       * Make the entity drop the item in their hand.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7b2d8fd3cb0d44a531bd5d618154059d2a934d48..cf7e79eaf1be19f1253761d8e9785b337420f625 100644
+index 317db645b6459a6ee2c888b7cf2e40fdbb30bdde..ee13cbc86cea2892521424df01cceceb6c0b3842 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2376,10 +2376,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2433,10 +2433,12 @@ 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 f81af92e14..ba61dcd33d 100644
--- a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
@@ -8,10 +8,10 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index b1ded556a1ce4e1d3c873ab9d7f799b6edcc5118..6ab8f05be11f8101202d56bfebc7ec23f868dddd 100644
+index 829077d76ad6b179e6f6abf7fb848353fa53a60a..0666cc126ab3709fd7d59c3902c3ec0e712b001c 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -63,6 +63,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -65,6 +65,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * @return true if banned, otherwise false
       */
      public boolean isBanned();
@@ -72,12 +72,12 @@ index b1ded556a1ce4e1d3c873ab9d7f799b6edcc5118..6ab8f05be11f8101202d56bfebc7ec23
 +    // Paper end
  
      /**
-      * Checks if this player is whitelisted or not
+      * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cf7e79eaf1be19f1253761d8e9785b337420f625..45633a83af30ed7a18f26911a13bc065a3a027b6 100644
+index ee13cbc86cea2892521424df01cceceb6c0b3842..03363c3d3a2eb6078eac5d3edff7a33472158f3a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -916,6 +916,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -954,6 +954,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
diff --git a/patches/api/0109-Make-shield-blocking-delay-configurable.patch b/patches/api/0109-Make-shield-blocking-delay-configurable.patch
index 42c5c4e0cb..e7fe3e1f17 100644
--- a/patches/api/0109-Make-shield-blocking-delay-configurable.patch
+++ b/patches/api/0109-Make-shield-blocking-delay-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ccd8f36c8450bab9f609bb220b5270394960580e..2bfeebe26f32d2e931dc483714d30430deeb9b04 100644
+index 6a9df4ec0eee205bcd37de9c4d04a6c67eb21644..b470d86c00be238a430e64d349a247e2740cfeec 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -731,5 +731,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -764,5 +764,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      @Deprecated
      void setArrowsStuck(int arrows);
diff --git a/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
index 5e689dc105..7ceb852dcb 100644
--- a/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -20,10 +20,10 @@ index b3aa3dc6aa5afbc36cc86741b4cba56f463c2234..9e012c3c0671e5d0e55c243fdb4e1405
      public ItemStack getItemInUse();
  
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 2bfeebe26f32d2e931dc483714d30430deeb9b04..17e5d2e2acdae23d8ea3b3b1a89f62e8be7b81a8 100644
+index b470d86c00be238a430e64d349a247e2740cfeec..97d0f82041a229e85217a7e575bf003eddc31b70 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -745,5 +745,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -778,5 +778,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);
diff --git a/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch
index fdf4715617..3dd64b0e60 100644
--- a/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 45633a83af30ed7a18f26911a13bc065a3a027b6..b21834a0ec507d223cdb178b4500981c9e8dc248 100644
+index 03363c3d3a2eb6078eac5d3edff7a33472158f3a..19b8fb15f893445f1e7a30baa3262b1947e869a6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2703,6 +2703,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2760,6 +2760,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/0146-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0146-Add-Git-information-to-version-command-on-startup.patch
index 91979498d6..13fd93e179 100644
--- a/patches/api/0146-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/api/0146-Add-Git-information-to-version-command-on-startup.patch
@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7113f38eac400bc86a427972e501b0ca5653dae6..733b537d4236e5cb06efc188183ad876db31c0ff 100644
+index 67c92e10b38af2ac45c1d9b6374695247bf1e7c3..627c04f5e71ad032760296092a65596b08807a55 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -55,6 +55,7 @@ import org.bukkit.util.CachedServerIcon;
+@@ -56,6 +56,7 @@ import org.bukkit.util.CachedServerIcon;
  import org.jetbrains.annotations.Contract;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
@@ -59,7 +59,7 @@ index 7113f38eac400bc86a427972e501b0ca5653dae6..733b537d4236e5cb06efc188183ad876
  
  /**
   * Represents the Bukkit core, for version and Server singleton handling
-@@ -104,7 +105,25 @@ public final class Bukkit {
+@@ -105,7 +106,25 @@ public final class Bukkit {
          }
  
          Bukkit.server = server;
diff --git a/patches/api/0160-Make-the-default-permission-message-configurable.patch b/patches/api/0160-Make-the-default-permission-message-configurable.patch
index fdedf8eed1..b2373cd4b4 100644
--- a/patches/api/0160-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0160-Make-the-default-permission-message-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 36a127864be2a75a38bcc6eacafde5109e5c6c69..8649a3453bd3c3ee5f2bf5b706b125cb70d3bb1b 100644
+index 627c04f5e71ad032760296092a65596b08807a55..213b76f4ba50e882b6c7349d980701e0b6323e7c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2241,6 +2241,28 @@ public final class Bukkit {
+@@ -2268,6 +2268,28 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -38,10 +38,10 @@ index 36a127864be2a75a38bcc6eacafde5109e5c6c69..8649a3453bd3c3ee5f2bf5b706b125cb
       * Creates a PlayerProfile for the specified uuid, with name as null.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2ac191185e4dabb2f39b05a56548b0d97daa2979..771a504a6f64644f434e2a6d20d285d338b5dff4 100644
+index 88b93ac279f2bd23ca853788c409549fe2afe041..281c1e511e46a31a1c3ee9380d60888628af87c3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1951,6 +1951,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1974,6 +1974,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
diff --git a/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 95255e34fe..6d2c903a3a 100644
--- a/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,10 +16,10 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 6ab8f05be11f8101202d56bfebc7ec23f868dddd..72175dcae49f75b494ab70958053ed994a8828f4 100644
+index 0666cc126ab3709fd7d59c3902c3ec0e712b001c..4d014215dce2c2ff09a2701accf2db144603c55a 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -165,7 +165,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -181,7 +181,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * UTC.
       *
       * @return Date of last log-in for this player, or 0
@@ -29,7 +29,7 @@ index 6ab8f05be11f8101202d56bfebc7ec23f868dddd..72175dcae49f75b494ab70958053ed99
      public long getLastPlayed();
  
      /**
-@@ -183,6 +185,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -199,6 +201,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       */
      @Nullable
      public Location getBedSpawnLocation();
diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
index 812216d485..3927c91ead 100644
--- a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
@@ -9,10 +9,10 @@ a ton of noise to plugin developers.
 These do not help plugin developers if they bring moise noise than value.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8649a3453bd3c3ee5f2bf5b706b125cb70d3bb1b..ef7445fc5c169e64a73dce4f71a2885fb976caf3 100644
+index 213b76f4ba50e882b6c7349d980701e0b6323e7c..f377b0d6bfdc88be2af2a8b059aac04421c4f378 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -836,9 +836,8 @@ public final class Bukkit {
+@@ -837,9 +837,8 @@ public final class Bukkit {
       *
       * @param id the id of the map to get
       * @return a map view if it exists, or null otherwise
@@ -23,7 +23,7 @@ index 8649a3453bd3c3ee5f2bf5b706b125cb70d3bb1b..ef7445fc5c169e64a73dce4f71a2885f
      @Nullable
      public static MapView getMap(int id) {
          return server.getMap(id);
-@@ -1230,10 +1229,8 @@ public final class Bukkit {
+@@ -1231,10 +1230,8 @@ public final class Bukkit {
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -35,7 +35,7 @@ index 8649a3453bd3c3ee5f2bf5b706b125cb70d3bb1b..ef7445fc5c169e64a73dce4f71a2885f
      @NotNull
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
-@@ -1798,7 +1795,7 @@ public final class Bukkit {
+@@ -1825,7 +1822,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -203,10 +203,10 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..10f5cfb1885833a1d2c1027c03974da4
      CRACKED(0x0),
      GLYPHED(0x1),
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 771a504a6f64644f434e2a6d20d285d338b5dff4..5edef1114f1c94e921656972141d62a9d6338105 100644
+index 281c1e511e46a31a1c3ee9380d60888628af87c3..bb90413c0170d3d37bc67565a6bd6f8795b2f6bd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -702,9 +702,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -703,9 +703,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @param id the id of the map to get
       * @return a map view if it exists, or null otherwise
@@ -217,7 +217,7 @@ index 771a504a6f64644f434e2a6d20d285d338b5dff4..5edef1114f1c94e921656972141d62a9
      @Nullable
      public MapView getMap(int id);
  
-@@ -1033,10 +1032,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1034,10 +1033,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -229,7 +229,7 @@ index 771a504a6f64644f434e2a6d20d285d338b5dff4..5edef1114f1c94e921656972141d62a9
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
-@@ -1514,7 +1511,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1537,7 +1534,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -397,10 +397,10 @@ index f124b35ec76e6cb6a1a0dc464005087043c3efd0..f50aaddf8582be55fd4860ad374d8f22
 +@Deprecated(forRemoval = true) // Paper
  public interface LingeringPotion extends ThrownPotion { }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 94fad96f8fd57314c571b6396f44cd9d91254cfc..b4c41ab64ef35ac0d172c041d97e8fe9b3eb8aa6 100644
+index ebb66f19478908518685938ae3b79357d77fc614..cc1f52354d34bc4000a550f795f290244e8e7a7d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -640,7 +640,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -664,7 +664,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * This may have unexpected results if the entity is not in water.
       *
       * @param swimming True if the entity is swimming.
diff --git a/patches/api/0180-Expose-the-internal-current-tick.patch b/patches/api/0180-Expose-the-internal-current-tick.patch
index 401df320b5..6a2097718b 100644
--- a/patches/api/0180-Expose-the-internal-current-tick.patch
+++ b/patches/api/0180-Expose-the-internal-current-tick.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ef7445fc5c169e64a73dce4f71a2885fb976caf3..d39c6b5d3fef5fe9727868175cf266fd68c2efa4 100644
+index f377b0d6bfdc88be2af2a8b059aac04421c4f378..93c83d1513745ada3c1ea9b5cc88905f1957d3c4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2336,6 +2336,10 @@ public final class Bukkit {
+@@ -2363,6 +2363,10 @@ public final class Bukkit {
      public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
          return server.createProfileExact(uuid, name);
      }
@@ -20,10 +20,10 @@ index ef7445fc5c169e64a73dce4f71a2885fb976caf3..d39c6b5d3fef5fe9727868175cf266fd
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5edef1114f1c94e921656972141d62a9d6338105..e02bd7323e117e9977275b3a5d3e070ff891fdbd 100644
+index bb90413c0170d3d37bc67565a6bd6f8795b2f6bd..3b3cd9994b84770dc9b3c7a0531461bdc3d4b16a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2033,5 +2033,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2056,5 +2056,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name);
diff --git a/patches/api/0184-Entity-Jump-API.patch b/patches/api/0184-Entity-Jump-API.patch
index 2aa9ff47bf..8b32879e2d 100644
--- a/patches/api/0184-Entity-Jump-API.patch
+++ b/patches/api/0184-Entity-Jump-API.patch
@@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..f0067c2e953d18e1a33536980071ba3f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index b4c41ab64ef35ac0d172c041d97e8fe9b3eb8aa6..9e6ad506611ec05f75da29bef074edebd9d54715 100644
+index 373b3ad6b3f94655289155914aec8294cd4f2fb2..c18899e276eff043128794f27ca57cadaf41f439 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -947,5 +947,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -980,5 +980,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      @NotNull
      org.bukkit.inventory.EquipmentSlot getHandRaised();
diff --git a/patches/api/0186-Add-tick-times-API.patch b/patches/api/0186-Add-tick-times-API.patch
index 491be377a9..1ea7ad7d0b 100644
--- a/patches/api/0186-Add-tick-times-API.patch
+++ b/patches/api/0186-Add-tick-times-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d39c6b5d3fef5fe9727868175cf266fd68c2efa4..354fa01b30ec26f78f874a06e57a89f14ef13ef4 100644
+index 93c83d1513745ada3c1ea9b5cc88905f1957d3c4..d715a069a8cfc8704471f254f421bb7baeb498f4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2008,6 +2008,25 @@ public final class Bukkit {
+@@ -2035,6 +2035,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
@@ -35,10 +35,10 @@ index d39c6b5d3fef5fe9727868175cf266fd68c2efa4..354fa01b30ec26f78f874a06e57a89f1
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e02bd7323e117e9977275b3a5d3e070ff891fdbd..edceaefe5e46515300c819351aebe0fce576d599 100644
+index 3b3cd9994b84770dc9b3c7a0531461bdc3d4b16a..e00d4860ba9ac19014995e85fccea659793f67e7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1695,6 +1695,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1718,6 +1718,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      public double[] getTPS();
diff --git a/patches/api/0187-Expose-MinecraftServer-isRunning.patch b/patches/api/0187-Expose-MinecraftServer-isRunning.patch
index 5e8b1257f3..5d7168be3c 100644
--- a/patches/api/0187-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0187-Expose-MinecraftServer-isRunning.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 354fa01b30ec26f78f874a06e57a89f14ef13ef4..725de23dc102e3b63da5e49bb1eafca96e33fc4c 100644
+index d715a069a8cfc8704471f254f421bb7baeb498f4..e54ba870293676f16fabac5b91ffd7202d3a17e0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2359,6 +2359,15 @@ public final class Bukkit {
+@@ -2386,6 +2386,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
@@ -26,10 +26,10 @@ index 354fa01b30ec26f78f874a06e57a89f14ef13ef4..725de23dc102e3b63da5e49bb1eafca9
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index edceaefe5e46515300c819351aebe0fce576d599..960fc19a04bc3475bd81301ec283c9bb32f62821 100644
+index e00d4860ba9ac19014995e85fccea659793f67e7..e4d7c0a3c36a34ef5bdb728d52cf0c4f2aa3ef77 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2055,5 +2055,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2078,5 +2078,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return Current tick
       */
      int getCurrentTick();
diff --git a/patches/api/0189-Add-Player-Client-Options-API.patch b/patches/api/0189-Add-Player-Client-Options-API.patch
index 359289e4bf..d4c30cee0e 100644
--- a/patches/api/0189-Add-Player-Client-Options-API.patch
+++ b/patches/api/0189-Add-Player-Client-Options-API.patch
@@ -229,10 +229,10 @@ index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f52
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b21834a0ec507d223cdb178b4500981c9e8dc248..e5781bec16cde82603022e117868be71c2a1faa4 100644
+index 19b8fb15f893445f1e7a30baa3262b1947e869a6..c907585e27b6a5103323aa6d199cc8d6f4d43fa4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2723,6 +2723,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2780,6 +2780,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/0194-Expose-game-version.patch b/patches/api/0194-Expose-game-version.patch
index dcec8271d6..9c40467c3f 100644
--- a/patches/api/0194-Expose-game-version.patch
+++ b/patches/api/0194-Expose-game-version.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 39fdcada6aa98058491aa6b5e5b9943c8a57a59d..e1a9a0ec6036133aa8fb195d22611df221bf5661 100644
+index e54ba870293676f16fabac5b91ffd7202d3a17e0..eb1e5e87d003e5cd7fbf4a01265ef30bb87abd47 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -156,6 +156,18 @@ public final class Bukkit {
+@@ -157,6 +157,18 @@ public final class Bukkit {
          return server.getBukkitVersion();
      }
  
@@ -28,10 +28,10 @@ index 39fdcada6aa98058491aa6b5e5b9943c8a57a59d..e1a9a0ec6036133aa8fb195d22611df2
       * Gets a view of all currently logged in players. This {@linkplain
       * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 65daa359f000cf1acc3067af62e3210ced378519..357f59f07387d3de75a0792e7e883cb82aafa2e2 100644
+index e4d7c0a3c36a34ef5bdb728d52cf0c4f2aa3ef77..4ec70d58f4341e9fe9467f2b3a65b9808a3d81a4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -114,6 +114,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -115,6 +115,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public String getBukkitVersion();
  
diff --git a/patches/api/0195-Add-Mob-Goal-API.patch b/patches/api/0195-Add-Mob-Goal-API.patch
index a9605fb0bc..53d9aaa672 100644
--- a/patches/api/0195-Add-Mob-Goal-API.patch
+++ b/patches/api/0195-Add-Mob-Goal-API.patch
@@ -525,10 +525,10 @@ index 0000000000000000000000000000000000000000..c9837c7c47314b5bdf6c7973e6bc962d
 +    @Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21") GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index dfeaddc2d71f8569c349740c00c96868f9a56a12..4e5e29251b713885eee562091ea4f253f027bdbb 100644
+index eb1e5e87d003e5cd7fbf4a01265ef30bb87abd47..520cfd6b8568fb05b3a732ffa641b0231ec936eb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2380,6 +2380,16 @@ public final class Bukkit {
+@@ -2407,6 +2407,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
@@ -546,10 +546,10 @@ index dfeaddc2d71f8569c349740c00c96868f9a56a12..4e5e29251b713885eee562091ea4f253
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ccec37c00f8ab318d41350907b40a64118e4fab1..9634d82d603426979cab978f9474cc041e1cb701 100644
+index 4ec70d58f4341e9fe9467f2b3a65b9808a3d81a4..83c9d688666095ff50bf8fdf4e7510a622128ab4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2072,5 +2072,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2095,5 +2095,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if server is in the process of being shutdown
       */
      boolean isStopping();
diff --git a/patches/api/0206-Brand-support.patch b/patches/api/0206-Brand-support.patch
index b7f049dcb2..19d3cb2248 100644
--- a/patches/api/0206-Brand-support.patch
+++ b/patches/api/0206-Brand-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e5781bec16cde82603022e117868be71c2a1faa4..f42bc869ab78abb4f05d36c9a6563c71dfe1ea4f 100644
+index c907585e27b6a5103323aa6d199cc8d6f4d43fa4..a93bd6abd567dcd75d3b119534041d2e19dc3da6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2832,6 +2832,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2889,6 +2889,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          // Paper end
      }
  
diff --git a/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch
index 89bd0bb3fc..08b1135ece 100644
--- a/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9e6ad506611ec05f75da29bef074edebd9d54715..f686a92ec450c2fdf0c94ebdbab1d94af7c342d1 100644
+index c18899e276eff043128794f27ca57cadaf41f439..d53bc45dbec1b399d4df2aa87a2f2c490c4a6788 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -967,5 +967,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1000,5 +1000,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param jumping entity jump state
       */
      void setJumping(boolean jumping);
diff --git a/patches/api/0217-Player-elytra-boost-API.patch b/patches/api/0217-Player-elytra-boost-API.patch
index 935331d62f..d976ae824d 100644
--- a/patches/api/0217-Player-elytra-boost-API.patch
+++ b/patches/api/0217-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 f42bc869ab78abb4f05d36c9a6563c71dfe1ea4f..e232de8c09397fd7a539f15e326a8344358a7d2a 100644
+index a93bd6abd567dcd75d3b119534041d2e19dc3da6..2fd141ebda1c8aeeab5144e6e83816e137b0c41a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2729,6 +2729,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2786,6 +2786,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @NotNull
      <T> T getClientOption(@NotNull com.destroystokyo.paper.ClientOption<T> option);
diff --git a/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
index 6d5e161e24..5ea2eff63b 100644
--- a/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4e5e29251b713885eee562091ea4f253f027bdbb..6d5423f6b6b1aa013a1f77d368058e4cdf2cbe84 100644
+index 520cfd6b8568fb05b3a732ffa641b0231ec936eb..68e39ed5a80d6d2d26366122d8d09395d38434dd 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1248,6 +1248,27 @@ public final class Bukkit {
+@@ -1249,6 +1249,27 @@ public final class Bukkit {
          return server.getOfflinePlayer(name);
      }
  
@@ -37,10 +37,10 @@ index 4e5e29251b713885eee562091ea4f253f027bdbb..6d5423f6b6b1aa013a1f77d368058e4c
       * Gets the player by the given UUID, regardless if they are offline or
       * online.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9634d82d603426979cab978f9474cc041e1cb701..f8ef98c9d266e12a3a3f69647cf4d7a9bc633419 100644
+index 83c9d688666095ff50bf8fdf4e7510a622128ab4..87c617edb7259932de48606c4931ec69086d2bee 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1047,6 +1047,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1048,6 +1048,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
diff --git a/patches/api/0224-Add-LivingEntity-clearActiveItem.patch b/patches/api/0224-Add-LivingEntity-clearActiveItem.patch
index 224ac62396..7bc93949fb 100644
--- a/patches/api/0224-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0224-Add-LivingEntity-clearActiveItem.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f686a92ec450c2fdf0c94ebdbab1d94af7c342d1..511a48df780364d054858079273fe408aa0bc749 100644
+index d53bc45dbec1b399d4df2aa87a2f2c490c4a6788..b830a5f4ebc4cacebc1e86c571c1dfb0293cc1b0 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -918,6 +918,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -951,6 +951,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      @NotNull
      org.bukkit.inventory.ItemStack getActiveItem();
  
diff --git a/patches/api/0229-Expose-LivingEntity-hurt-direction.patch b/patches/api/0229-Expose-LivingEntity-hurt-direction.patch
index 717b97d228..4af40bdf52 100644
--- a/patches/api/0229-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0229-Expose-LivingEntity-hurt-direction.patch
@@ -26,10 +26,10 @@ index 94f2c3167f4ce7f5f2b4ecc067739c64af0a2508..4054d2c836342f0e4bcbd33adb13f50d
       * Get the sleep ticks of the player. This value may be capped.
       *
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 511a48df780364d054858079273fe408aa0bc749..6a4c54ea92478be6e53b62ebe4e73068b9ed4a29 100644
+index b830a5f4ebc4cacebc1e86c571c1dfb0293cc1b0..9763cf4720e1278061e3ba139b824147e9540945 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -997,5 +997,21 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1030,5 +1030,21 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param quantity quantity of item
       */
      void playPickupItemAnimation(@NotNull Item item, int quantity);
diff --git a/patches/api/0244-Add-sendOpLevel-API.patch b/patches/api/0244-Add-sendOpLevel-API.patch
index 5ba481a68d..0504a2cac5 100644
--- a/patches/api/0244-Add-sendOpLevel-API.patch
+++ b/patches/api/0244-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 e232de8c09397fd7a539f15e326a8344358a7d2a..4e8f58d57d0273ef6a9ed75cdf195149dea44df7 100644
+index 2fd141ebda1c8aeeab5144e6e83816e137b0c41a..e5f52cabf9447bb7dba77f1f5bbd4cdbf6fa772d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2742,6 +2742,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2799,6 +2799,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @Nullable
      Firework boostElytra(@NotNull ItemStack firework);
diff --git a/patches/api/0264-Expand-world-key-API.patch b/patches/api/0264-Expand-world-key-API.patch
index 1908ecc58e..90d750db0c 100644
--- a/patches/api/0264-Expand-world-key-API.patch
+++ b/patches/api/0264-Expand-world-key-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6d5423f6b6b1aa013a1f77d368058e4cdf2cbe84..be32ddb8ad5d6290b76cb520d159d456ed16f1b1 100644
+index 68e39ed5a80d6d2d26366122d8d09395d38434dd..4521a0142f2d824d57d753cd41512a3264764a0d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -830,6 +830,18 @@ public final class Bukkit {
+@@ -831,6 +831,18 @@ public final class Bukkit {
      public static World getWorld(@NotNull UUID uid) {
          return server.getWorld(uid);
      }
@@ -56,10 +56,10 @@ index 501dd5a26c27294420821b3d75f8938596afb1a8..71ef9b479888aa83455757560b607455
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f8ef98c9d266e12a3a3f69647cf4d7a9bc633419..d1d035ee86264b38b6bb50135d031946daf25a00 100644
+index 87c617edb7259932de48606c4931ec69086d2bee..37a73fb1c275bae05f53746a608e76e23839e729 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -694,6 +694,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -695,6 +695,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      public World getWorld(@NotNull UUID uid);
  
diff --git a/patches/api/0282-Add-basic-Datapack-API.patch b/patches/api/0282-Add-basic-Datapack-API.patch
index 0582d74ff9..10d343ddf5 100644
--- a/patches/api/0282-Add-basic-Datapack-API.patch
+++ b/patches/api/0282-Add-basic-Datapack-API.patch
@@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index be32ddb8ad5d6290b76cb520d159d456ed16f1b1..a6fef51a8435eced8c2981588ae98046c42d8ed4 100644
+index 4521a0142f2d824d57d753cd41512a3264764a0d..b21d1e8a53e4c51fa7742ee6211b4aedcd460a95 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -316,9 +316,11 @@ public final class Bukkit {
+@@ -317,9 +317,11 @@ public final class Bukkit {
      /**
       * Get the DataPack Manager.
       *
@@ -85,7 +85,7 @@ index be32ddb8ad5d6290b76cb520d159d456ed16f1b1..a6fef51a8435eced8c2981588ae98046
      public static DataPackManager getDataPackManager() {
          return server.getDataPackManager();
      }
-@@ -2423,6 +2425,14 @@ public final class Bukkit {
+@@ -2450,6 +2452,14 @@ public final class Bukkit {
      public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return server.getMobGoals();
      }
@@ -101,10 +101,10 @@ index be32ddb8ad5d6290b76cb520d159d456ed16f1b1..a6fef51a8435eced8c2981588ae98046
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d1d035ee86264b38b6bb50135d031946daf25a00..529054834865813520ebe6784894e759c22ec4f4 100644
+index 37a73fb1c275bae05f53746a608e76e23839e729..92db34d3ff29a84b29701de6b64a70413a440ce9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -254,9 +254,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -255,9 +255,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      /**
       * Get the DataPack Manager.
       *
@@ -116,7 +116,7 @@ index d1d035ee86264b38b6bb50135d031946daf25a00..529054834865813520ebe6784894e759
      public DataPackManager getDataPackManager();
  
      /**
-@@ -2110,5 +2112,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2133,5 +2135,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
diff --git a/patches/api/0292-Add-PlayerKickEvent-causes.patch b/patches/api/0292-Add-PlayerKickEvent-causes.patch
index 86dc01a5a3..264c4cf46e 100644
--- a/patches/api/0292-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0292-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 4e8f58d57d0273ef6a9ed75cdf195149dea44df7..e897c373406aa0105b1060549469590585d5c78d 100644
+index e5f52cabf9447bb7dba77f1f5bbd4cdbf6fa772d..3b927832d91dab135da2c3e66d0894ef7a5e4675 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -266,6 +266,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -272,6 +272,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param message kick message
       */
      void kick(final net.kyori.adventure.text.@Nullable Component message);
diff --git a/patches/api/0296-Add-more-line-of-sight-methods.patch b/patches/api/0296-Add-more-line-of-sight-methods.patch
index f8182b74f7..6d8c8334f5 100644
--- a/patches/api/0296-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0296-Add-more-line-of-sight-methods.patch
@@ -23,10 +23,10 @@ index 71ef9b479888aa83455757560b60745572c7196d..cd83348de3f82b3fddcf2d4bb9187ec8
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 6a4c54ea92478be6e53b62ebe4e73068b9ed4a29..626eb1796d5a19d110855e2fb95cb4c761ecc544 100644
+index 8e39aebdc41150b45c241f435ce4e5f1f84d3814..7d505bf501c2b3985417441a543cee405648ec0b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -546,6 +546,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -570,6 +570,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      public boolean hasLineOfSight(@NotNull Entity other);
  
diff --git a/patches/api/0299-Missing-Entity-Behavior-API.patch b/patches/api/0299-Missing-Entity-Behavior-API.patch
index ee75b4ff48..9baf739329 100644
--- a/patches/api/0299-Missing-Entity-Behavior-API.patch
+++ b/patches/api/0299-Missing-Entity-Behavior-API.patch
@@ -796,31 +796,6 @@ index e88154283a8ef594e160d25005870053de15568a..979062aa476e3bd75166458d8831894f
  
      /**
       * Represents the various types a Rabbit might be.
-diff --git a/src/main/java/org/bukkit/entity/Raider.java b/src/main/java/org/bukkit/entity/Raider.java
-index 987f9b0866b213450b4de1310600161c8587a545..144fdcfd1f35b6346b672006905aedb8a3773018 100644
---- a/src/main/java/org/bukkit/entity/Raider.java
-+++ b/src/main/java/org/bukkit/entity/Raider.java
-@@ -57,4 +57,20 @@ public interface Raider extends Monster {
-      */
-     @NotNull
-     Sound getCelebrationSound();
-+
-+    // Paper start
-+    /**
-+     * Returns whether the raider is celebrating a raid victory.
-+     *
-+     * @return whether the raider is celebrating a raid victory
-+     */
-+    boolean isCelebrating();
-+
-+    /**
-+     * Sets whether the raider is celebrating a raid victory.
-+     *
-+     * @param celebrating whether the raider is celebrating a raid victory
-+     */
-+    void setCelebrating(boolean celebrating);
-+    // Paper end
- }
 diff --git a/src/main/java/org/bukkit/entity/Ravager.java b/src/main/java/org/bukkit/entity/Ravager.java
 index 4374d5206d4d15a4d8d228c137ed9a96821a1f02..0eb7214472f3a43641a3526000af6beeefb7b36f 100644
 --- a/src/main/java/org/bukkit/entity/Ravager.java
diff --git a/patches/api/0327-Add-player-health-update-API.patch b/patches/api/0327-Add-player-health-update-API.patch
deleted file mode 100644
index 0ded0646f9..0000000000
--- a/patches/api/0327-Add-player-health-update-API.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SamB440 <sam@islandearth.net>
-Date: Wed, 17 Nov 2021 12:30:36 +0000
-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 e897c373406aa0105b1060549469590585d5c78d..18e098920193438d171ca57e505e20c6c96742ae 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2118,6 +2118,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      */
-     public double getHealthScale();
- 
-+    // Paper start
-+    /**
-+     * Forcefully sends a health update to the player.
-+     * <p>This method can cause the client to display health values
-+     * different to their true server values. If the player takes damage or
-+     * causes an action to otherwise cause a health update, these values
-+     * will no longer be shown.</p>
-+     * Setting the visible health to 0 will result in the client seeing
-+     * the death screen, unable to press the respawn button.
-+     * @see #sendHealthUpdate()
-+     * @param health the health of the player
-+     * @param foodLevel the food level of the player
-+     * @param saturationLevel the saturation level of the player
-+     */
-+    public void sendHealthUpdate(final double health, final int foodLevel, final float saturationLevel);
-+    
-+    /**
-+     * Forcefully sends a health update to the player.
-+     * This uses the player's current health, saturation, and food level.
-+     * <p>Use after {@link #setHealth(double)} to show the heart animation
-+     * of gaining or losing health.</p>
-+     */
-+    public void sendHealthUpdate();
-+    // Paper end
-+    
-     /**
-      * Gets the entity which is followed by the camera when in
-      * {@link GameMode#SPECTATOR}.
diff --git a/patches/api/0328-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 92%
rename from patches/api/0328-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch
index f31c8284f6..0145865559 100644
--- a/patches/api/0328-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a6fef51a8435eced8c2981588ae98046c42d8ed4..e75da4494582594dfa8f21e6abd36fb345558127 100644
+index b21d1e8a53e4c51fa7742ee6211b4aedcd460a95..be9fbad7a60f58ef2d087cf5106f40d214b60175 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1943,6 +1943,24 @@ public final class Bukkit {
+@@ -1970,6 +1970,24 @@ public final class Bukkit {
          return server.createChunkData(world);
      }
  
@@ -34,10 +34,10 @@ index a6fef51a8435eced8c2981588ae98046c42d8ed4..e75da4494582594dfa8f21e6abd36fb3
       * Creates a boss bar instance to display to players. The progress
       * defaults to 1.0
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 529054834865813520ebe6784894e759c22ec4f4..b6e8dd95cc58f53e3e6ca64dd796ed6633630cf4 100644
+index 92db34d3ff29a84b29701de6b64a70413a440ce9..1e000b6ed16a2ea550094a1cbb432eb625899a9a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1638,6 +1638,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1661,6 +1661,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
  
diff --git a/patches/api/0329-Add-more-Campfire-API.patch b/patches/api/0328-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/api/0329-Add-more-Campfire-API.patch
rename to patches/api/0328-Add-more-Campfire-API.patch
diff --git a/patches/api/0330-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch
similarity index 100%
rename from patches/api/0330-Move-VehicleCollisionEvent-HandlerList-up.patch
rename to patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch
diff --git a/patches/api/0331-Improve-scoreboard-entries.patch b/patches/api/0330-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/api/0331-Improve-scoreboard-entries.patch
rename to patches/api/0330-Improve-scoreboard-entries.patch
diff --git a/patches/api/0332-Entity-powdered-snow-API.patch b/patches/api/0331-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/api/0332-Entity-powdered-snow-API.patch
rename to patches/api/0331-Entity-powdered-snow-API.patch
diff --git a/patches/api/0333-Add-API-for-item-entity-health.patch b/patches/api/0332-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/api/0333-Add-API-for-item-entity-health.patch
rename to patches/api/0332-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0334-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/api/0334-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0335-Bucketable-API.patch b/patches/api/0334-Bucketable-API.patch
similarity index 100%
rename from patches/api/0335-Bucketable-API.patch
rename to patches/api/0334-Bucketable-API.patch
diff --git a/patches/api/0336-System-prop-for-default-config-comment-parsing.patch b/patches/api/0335-System-prop-for-default-config-comment-parsing.patch
similarity index 100%
rename from patches/api/0336-System-prop-for-default-config-comment-parsing.patch
rename to patches/api/0335-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0337-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/api/0337-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0338-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/api/0338-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/api/0339-Multiple-Entries-with-Scoreboards.patch b/patches/api/0338-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/api/0339-Multiple-Entries-with-Scoreboards.patch
rename to patches/api/0338-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0340-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/api/0340-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0341-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0340-Warn-on-strange-EventHandler-return-types.patch
similarity index 100%
rename from patches/api/0341-Warn-on-strange-EventHandler-return-types.patch
rename to patches/api/0340-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0342-Multi-Block-Change-API.patch b/patches/api/0341-Multi-Block-Change-API.patch
similarity index 92%
rename from patches/api/0342-Multi-Block-Change-API.patch
rename to patches/api/0341-Multi-Block-Change-API.patch
index 91bef833ff..80dcae2503 100644
--- a/patches/api/0342-Multi-Block-Change-API.patch
+++ b/patches/api/0341-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 18e098920193438d171ca57e505e20c6c96742ae..505fdb8885b05be9fb51acda49530f8bf0e120ff 100644
+index 3b927832d91dab135da2c3e66d0894ef7a5e4675..0af6b1ad7d0449354fd0166d1d6e8484ab1bd73f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -686,6 +686,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -724,6 +724,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendBlockDamage(@NotNull Location loc, float progress);
  
diff --git a/patches/api/0343-Fix-NotePlayEvent.patch b/patches/api/0342-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/api/0343-Fix-NotePlayEvent.patch
rename to patches/api/0342-Fix-NotePlayEvent.patch
diff --git a/patches/api/0344-Freeze-Tick-Lock-API.patch b/patches/api/0343-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/api/0344-Freeze-Tick-Lock-API.patch
rename to patches/api/0343-Freeze-Tick-Lock-API.patch
diff --git a/patches/api/0345-Dolphin-API.patch b/patches/api/0344-Dolphin-API.patch
similarity index 100%
rename from patches/api/0345-Dolphin-API.patch
rename to patches/api/0344-Dolphin-API.patch
diff --git a/patches/api/0346-More-PotionEffectType-API.patch b/patches/api/0345-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/api/0346-More-PotionEffectType-API.patch
rename to patches/api/0345-More-PotionEffectType-API.patch
diff --git a/patches/api/0347-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 87%
rename from patches/api/0347-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch
index d9bb4574b2..3afcddddf9 100644
--- a/patches/api/0347-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for creating command sender which forwards feedback
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e75da4494582594dfa8f21e6abd36fb345558127..43f93aa0efc35488fab44cb55081cfc486c319f5 100644
+index be9fbad7a60f58ef2d087cf5106f40d214b60175..6103ff86cfc7f58b303ec1490fe74b82f6653796 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1432,6 +1432,20 @@ public final class Bukkit {
+@@ -1459,6 +1459,20 @@ public final class Bukkit {
          return server.getConsoleSender();
      }
  
@@ -30,10 +30,10 @@ index e75da4494582594dfa8f21e6abd36fb345558127..43f93aa0efc35488fab44cb55081cfc4
       * Gets the folder that contains all of the various {@link World}s.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b6e8dd95cc58f53e3e6ca64dd796ed6633630cf4..693e07b7e4aeef2ebc7fba5d20d6c6071762896c 100644
+index 1e000b6ed16a2ea550094a1cbb432eb625899a9a..e76ff3645fdf0ce34bfcd5214f0509d35a7b3088 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1202,6 +1202,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1225,6 +1225,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ConsoleCommandSender getConsoleSender();
  
diff --git a/patches/api/0348-Implement-regenerateChunk.patch b/patches/api/0347-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/api/0348-Implement-regenerateChunk.patch
rename to patches/api/0347-Implement-regenerateChunk.patch
diff --git a/patches/api/0349-Add-GameEvent-tags.patch b/patches/api/0348-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/api/0349-Add-GameEvent-tags.patch
rename to patches/api/0348-Add-GameEvent-tags.patch
diff --git a/patches/api/0350-Furnace-RecipesUsed-API.patch b/patches/api/0349-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/api/0350-Furnace-RecipesUsed-API.patch
rename to patches/api/0349-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0351-Configurable-sculk-sensor-listener-range.patch b/patches/api/0350-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/api/0351-Configurable-sculk-sensor-listener-range.patch
rename to patches/api/0350-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0352-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0351-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/api/0352-Add-missing-block-data-mins-and-maxes.patch
rename to patches/api/0351-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0353-Custom-Potion-Mixes.patch b/patches/api/0352-Custom-Potion-Mixes.patch
similarity index 94%
rename from patches/api/0353-Custom-Potion-Mixes.patch
rename to patches/api/0352-Custom-Potion-Mixes.patch
index a8c7167526..bef08bef17 100644
--- a/patches/api/0353-Custom-Potion-Mixes.patch
+++ b/patches/api/0352-Custom-Potion-Mixes.patch
@@ -102,10 +102,10 @@ index 0000000000000000000000000000000000000000..cb6d93526b637946aec311bef103ad30
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 43f93aa0efc35488fab44cb55081cfc486c319f5..ac6a49e39790aa9f12c7d98990f4cac297200cb0 100644
+index 6103ff86cfc7f58b303ec1490fe74b82f6653796..14ddb641d8a20ebd80cb2c5c8bef3062f813026d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2465,6 +2465,15 @@ public final class Bukkit {
+@@ -2492,6 +2492,15 @@ public final class Bukkit {
      public static io.papermc.paper.datapack.DatapackManager getDatapackManager() {
          return server.getDatapackManager();
      }
@@ -122,10 +122,10 @@ index 43f93aa0efc35488fab44cb55081cfc486c319f5..ac6a49e39790aa9f12c7d98990f4cac2
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 693e07b7e4aeef2ebc7fba5d20d6c6071762896c..18f4ae463f0e1406842c451b91f333a1bfabae69 100644
+index e76ff3645fdf0ce34bfcd5214f0509d35a7b3088..b6bdb945755a2c37b3cb2c3e2e91f7d769c517c4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2146,5 +2146,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2169,5 +2169,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      io.papermc.paper.datapack.DatapackManager getDatapackManager();
diff --git a/patches/api/0354-Expose-furnace-minecart-push-values.patch b/patches/api/0353-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/api/0354-Expose-furnace-minecart-push-values.patch
rename to patches/api/0353-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0355-More-Projectile-API.patch b/patches/api/0354-More-Projectile-API.patch
similarity index 100%
rename from patches/api/0355-More-Projectile-API.patch
rename to patches/api/0354-More-Projectile-API.patch
diff --git a/patches/api/0356-Add-getComputedBiome-API.patch b/patches/api/0355-Add-getComputedBiome-API.patch
similarity index 100%
rename from patches/api/0356-Add-getComputedBiome-API.patch
rename to patches/api/0355-Add-getComputedBiome-API.patch
diff --git a/patches/api/0357-Add-enchantWithLevels-API.patch b/patches/api/0356-Add-enchantWithLevels-API.patch
similarity index 100%
rename from patches/api/0357-Add-enchantWithLevels-API.patch
rename to patches/api/0356-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0358-Add-TameableDeathMessageEvent.patch b/patches/api/0357-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/api/0358-Add-TameableDeathMessageEvent.patch
rename to patches/api/0357-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0359-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch
similarity index 100%
rename from patches/api/0359-Allow-to-change-the-podium-of-the-EnderDragon.patch
rename to patches/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0359-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/api/0359-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0361-WorldCreator-keepSpawnLoaded.patch b/patches/api/0360-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/api/0361-WorldCreator-keepSpawnLoaded.patch
rename to patches/api/0360-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0361-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/api/0361-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0363-Add-PlayerStopUsingItemEvent.patch b/patches/api/0362-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/api/0363-Add-PlayerStopUsingItemEvent.patch
rename to patches/api/0362-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0364-FallingBlock-auto-expire-setting.patch b/patches/api/0363-FallingBlock-auto-expire-setting.patch
similarity index 87%
rename from patches/api/0364-FallingBlock-auto-expire-setting.patch
rename to patches/api/0363-FallingBlock-auto-expire-setting.patch
index 82ddf953e9..0a1e19afeb 100644
--- a/patches/api/0364-FallingBlock-auto-expire-setting.patch
+++ b/patches/api/0363-FallingBlock-auto-expire-setting.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] FallingBlock auto expire setting
 
 
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index bd87d1548faa2fb095adce9f156f24163995dbe7..ccb4517526819d974df861106aa786eb596189a3 100644
+index ae1ce2ee2deb82f3f4144ec54b3ba119b437c5e9..95e75f5a4ccdedd3b26f8639f37de9450ed63d6b 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
-@@ -103,4 +103,23 @@ public interface FallingBlock extends Entity {
+@@ -137,4 +137,23 @@ public interface FallingBlock extends Entity {
      default org.bukkit.Location getSourceLoc() {
          return this.getOrigin();
      }
diff --git a/patches/api/0365-Keyed-Cat-Type.patch b/patches/api/0364-Keyed-Cat-Type.patch
similarity index 100%
rename from patches/api/0365-Keyed-Cat-Type.patch
rename to patches/api/0364-Keyed-Cat-Type.patch
diff --git a/patches/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0365-Add-method-isTickingWorlds-to-Bukkit.patch
similarity index 91%
rename from patches/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch
rename to patches/api/0365-Add-method-isTickingWorlds-to-Bukkit.patch
index 57225f80c3..88a8e4f5f6 100644
--- a/patches/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0365-Add-method-isTickingWorlds-to-Bukkit.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit.
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ac6a49e39790aa9f12c7d98990f4cac297200cb0..ef36d793ab77c7b7208f8f5994815599cff470d1 100644
+index 14ddb641d8a20ebd80cb2c5c8bef3062f813026d..5635bd49107013faace6b79731c70ac1356ec357 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -774,12 +774,26 @@ public final class Bukkit {
+@@ -775,12 +775,26 @@ public final class Bukkit {
          return server.getWorlds();
      }
  
@@ -35,7 +35,7 @@ index ac6a49e39790aa9f12c7d98990f4cac297200cb0..ef36d793ab77c7b7208f8f5994815599
       *
       * @param creator the options to use when creating the world
       * @return newly created or loaded world
-@@ -791,6 +805,9 @@ public final class Bukkit {
+@@ -792,6 +806,9 @@ public final class Bukkit {
  
      /**
       * Unloads a world with the given name.
@@ -45,7 +45,7 @@ index ac6a49e39790aa9f12c7d98990f4cac297200cb0..ef36d793ab77c7b7208f8f5994815599
       *
       * @param name Name of the world to unload
       * @param save whether to save the chunks before unloading
-@@ -802,6 +819,9 @@ public final class Bukkit {
+@@ -803,6 +820,9 @@ public final class Bukkit {
  
      /**
       * Unloads the given world.
@@ -56,10 +56,10 @@ index ac6a49e39790aa9f12c7d98990f4cac297200cb0..ef36d793ab77c7b7208f8f5994815599
       * @param world the world to unload
       * @param save whether to save the chunks before unloading
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 18f4ae463f0e1406842c451b91f333a1bfabae69..5b225bbb128893d67251a96ab318035802a0cf76 100644
+index b6bdb945755a2c37b3cb2c3e2e91f7d769c517c4..5a388914d58eda63715fc0a6d0d4f507b6ca9672 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -647,34 +647,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -648,34 +648,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public List<World> getWorlds();
  
diff --git a/patches/api/0367-Add-WardenAngerChangeEvent.patch b/patches/api/0366-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/api/0367-Add-WardenAngerChangeEvent.patch
rename to patches/api/0366-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0368-Nameable-Banner-API.patch b/patches/api/0367-Nameable-Banner-API.patch
similarity index 100%
rename from patches/api/0368-Nameable-Banner-API.patch
rename to patches/api/0367-Nameable-Banner-API.patch
diff --git a/patches/api/0369-Add-Player-getFishHook.patch b/patches/api/0368-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/api/0369-Add-Player-getFishHook.patch
rename to patches/api/0368-Add-Player-getFishHook.patch
diff --git a/patches/api/0370-More-Teleport-API.patch b/patches/api/0369-More-Teleport-API.patch
similarity index 98%
rename from patches/api/0370-More-Teleport-API.patch
rename to patches/api/0369-More-Teleport-API.patch
index f96981646f..dba7c50dc1 100644
--- a/patches/api/0370-More-Teleport-API.patch
+++ b/patches/api/0369-More-Teleport-API.patch
@@ -165,10 +165,10 @@ index ab0ceaba9ddcbe20a8b8a1fc3ed19cb3c64ecd3d..97f0bc6573c8ba09de77061b6312b91c
       * Teleports this entity to the given location. If this entity is riding a
       * vehicle, it will be dismounted prior to teleportation.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 505fdb8885b05be9fb51acda49530f8bf0e120ff..d2f3114d2fe708553b638010394022d09bde39cf 100644
+index 0af6b1ad7d0449354fd0166d1d6e8484ab1bd73f..ba4f9a34b825f8d4700ab5c7ad108f802568a657 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2922,6 +2922,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2954,6 +2954,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  
diff --git a/patches/api/0371-Add-EntityPortalReadyEvent.patch b/patches/api/0370-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/api/0371-Add-EntityPortalReadyEvent.patch
rename to patches/api/0370-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0372-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch
similarity index 90%
rename from patches/api/0372-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch
index af41b642c9..548433171d 100644
--- a/patches/api/0372-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d2f3114d2fe708553b638010394022d09bde39cf..a175ec2744f6ae3e4823c3eaea52e7991b659851 100644
+index ba4f9a34b825f8d4700ab5c7ad108f802568a657..2018df5aff5042034b8d982844d28e71936700dc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2809,6 +2809,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2841,6 +2841,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException If the level is negative or greater than {@code 4} (i.e. not within {@code [0, 4]}).
       */
      void sendOpLevel(byte level);
diff --git a/patches/api/0373-Collision-API.patch b/patches/api/0372-Collision-API.patch
similarity index 100%
rename from patches/api/0373-Collision-API.patch
rename to patches/api/0372-Collision-API.patch
diff --git a/patches/api/0374-Block-Ticking-API.patch b/patches/api/0373-Block-Ticking-API.patch
similarity index 100%
rename from patches/api/0374-Block-Ticking-API.patch
rename to patches/api/0373-Block-Ticking-API.patch
diff --git a/patches/api/0375-Add-NamespacedKey-biome-methods.patch b/patches/api/0374-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/api/0375-Add-NamespacedKey-biome-methods.patch
rename to patches/api/0374-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0376-Also-load-resources-from-LibraryLoader.patch b/patches/api/0375-Also-load-resources-from-LibraryLoader.patch
similarity index 100%
rename from patches/api/0376-Also-load-resources-from-LibraryLoader.patch
rename to patches/api/0375-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0377-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0376-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/api/0377-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/api/0376-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0377-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/api/0377-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0378-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
similarity index 100%
rename from patches/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
rename to patches/api/0378-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0380-Add-getDrops-to-BlockState.patch b/patches/api/0379-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/api/0380-Add-getDrops-to-BlockState.patch
rename to patches/api/0379-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0381-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0380-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/api/0381-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/api/0380-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0382-Elder-Guardian-appearance-API.patch b/patches/api/0381-Elder-Guardian-appearance-API.patch
similarity index 87%
rename from patches/api/0382-Elder-Guardian-appearance-API.patch
rename to patches/api/0381-Elder-Guardian-appearance-API.patch
index 93aed9ed39..6c5cac6256 100644
--- a/patches/api/0382-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0381-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a175ec2744f6ae3e4823c3eaea52e7991b659851..489c2bc08aeeda90bf185abf6799bf8552aa459d 100644
+index 2018df5aff5042034b8d982844d28e71936700dc..4e43793a57ecf78a04972168b5a9a116ff18e30a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2988,6 +2988,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3020,6 +3020,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void lookAt(@NotNull org.bukkit.entity.Entity entity, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor, @NotNull io.papermc.paper.entity.LookAnchor entityAnchor);
      // Paper end - Teleport API
  
diff --git a/patches/api/0383-Allow-changing-bed-s-occupied-property.patch b/patches/api/0382-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/api/0383-Allow-changing-bed-s-occupied-property.patch
rename to patches/api/0382-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0384-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0383-Add-EquipmentSlot-convenience-methods.patch
similarity index 100%
rename from patches/api/0384-Add-EquipmentSlot-convenience-methods.patch
rename to patches/api/0383-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0384-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
similarity index 89%
rename from patches/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
rename to patches/api/0384-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index 1a53a5fcc5..8ba283e9b1 100644
--- a/patches/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0384-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 08167783b6e4e7d393779c92500793518ee346a6..68248bf3d6c84cb6debd9ddd3c0623353bed71f0 100644
+index 26f12a6e4b2aff8ec052342939435f1ae4c02e2d..930c328880708cea182ccb031d31305e7d1c529b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1056,5 +1056,23 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1089,5 +1089,23 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      @Deprecated
      void setHurtDirection(float hurtDirection);
diff --git a/patches/api/0386-Add-entity-knockback-API.patch b/patches/api/0385-Add-entity-knockback-API.patch
similarity index 88%
rename from patches/api/0386-Add-entity-knockback-API.patch
rename to patches/api/0385-Add-entity-knockback-API.patch
index f53aa9c293..3852612f24 100644
--- a/patches/api/0386-Add-entity-knockback-API.patch
+++ b/patches/api/0385-Add-entity-knockback-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 68248bf3d6c84cb6debd9ddd3c0623353bed71f0..84b78742f2bac07322e8a758ca9abc6b763ccc28 100644
+index 930c328880708cea182ccb031d31305e7d1c529b..14854e1325d61d0112cc928c8a5a92a8a45249d3 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1074,5 +1074,17 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1107,5 +1107,17 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
              this.swingOffHand();
          }
      }
diff --git a/patches/api/0387-Added-EntityToggleSitEvent.patch b/patches/api/0386-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/api/0387-Added-EntityToggleSitEvent.patch
rename to patches/api/0386-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0388-Add-Moving-Piston-API.patch b/patches/api/0387-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/api/0388-Add-Moving-Piston-API.patch
rename to patches/api/0387-Add-Moving-Piston-API.patch
diff --git a/patches/api/0389-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0388-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/api/0389-Add-PrePlayerAttackEntityEvent.patch
rename to patches/api/0388-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0390-Add-Player-Warden-Warning-API.patch b/patches/api/0389-Add-Player-Warden-Warning-API.patch
similarity index 93%
rename from patches/api/0390-Add-Player-Warden-Warning-API.patch
rename to patches/api/0389-Add-Player-Warden-Warning-API.patch
index 865e7e90e9..2df2999bc0 100644
--- a/patches/api/0390-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0389-Add-Player-Warden-Warning-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player Warden Warning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 489c2bc08aeeda90bf185abf6799bf8552aa459d..325dc75832564746566b92b77a51cf4c611c8963 100644
+index 4e43793a57ecf78a04972168b5a9a116ff18e30a..60206aaf1dfec3cf1f8911d7dce41a36a8675375 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3004,6 +3004,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3036,6 +3036,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param silent whether sound should be silenced
       */
      void showElderGuardian(boolean silent);
diff --git a/patches/api/0391-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0390-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/api/0391-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/api/0390-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0392-Add-paper-dumplisteners-command.patch b/patches/api/0391-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/api/0392-Add-paper-dumplisteners-command.patch
rename to patches/api/0391-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0393-ItemStack-damage-API.patch b/patches/api/0392-ItemStack-damage-API.patch
similarity index 96%
rename from patches/api/0393-ItemStack-damage-API.patch
rename to patches/api/0392-ItemStack-damage-API.patch
index 12c1e68439..ffdcd4b728 100644
--- a/patches/api/0393-ItemStack-damage-API.patch
+++ b/patches/api/0392-ItemStack-damage-API.patch
@@ -8,10 +8,10 @@ to simulate damage done to an itemstack and all
 the logic associated with damaging them
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 84b78742f2bac07322e8a758ca9abc6b763ccc28..5b0e14a7397d3de683d17ee2f1a805d289597a4b 100644
+index 14854e1325d61d0112cc928c8a5a92a8a45249d3..7889ec8e0954c98e9611a20811b1ddc5bcd93b7f 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1086,5 +1086,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1119,5 +1119,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param directionZ The relative z position of the knockback source direction
       */
      void knockback(double strength, double directionX, double directionZ);
diff --git a/patches/api/0394-Add-Tick-TemporalUnit.patch b/patches/api/0393-Add-Tick-TemporalUnit.patch
similarity index 100%
rename from patches/api/0394-Add-Tick-TemporalUnit.patch
rename to patches/api/0393-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0395-Friction-API.patch b/patches/api/0394-Friction-API.patch
similarity index 96%
rename from patches/api/0395-Friction-API.patch
rename to patches/api/0394-Friction-API.patch
index f4d3031506..47b4634d1f 100644
--- a/patches/api/0395-Friction-API.patch
+++ b/patches/api/0394-Friction-API.patch
@@ -59,7 +59,7 @@ index d0bef15785493b512ff0f7414c1d58d38fead581..58017fce436cdbda255f7172fbdadb72
      /**
       * Gets the item stack associated with this item drop.
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5b0e14a7397d3de683d17ee2f1a805d289597a4b..ec5fe22b8092c8fc837e5c36e4f17053e48a77a8 100644
+index 55518f6412d4d319df9cdab3bdff52c6e2bcb8c5..4fa02476bbcb0590171d5b20d25156ccb3cc9b6c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0396-Player-Entity-Tracking-Events.patch b/patches/api/0395-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/api/0396-Player-Entity-Tracking-Events.patch
rename to patches/api/0395-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0397-Add-missing-Fluid-type.patch b/patches/api/0396-Add-missing-Fluid-type.patch
similarity index 100%
rename from patches/api/0397-Add-missing-Fluid-type.patch
rename to patches/api/0396-Add-missing-Fluid-type.patch
diff --git a/patches/api/0398-fix-Instruments.patch b/patches/api/0397-fix-Instruments.patch
similarity index 96%
rename from patches/api/0398-fix-Instruments.patch
rename to patches/api/0397-fix-Instruments.patch
index 00386f987b..38cd1521f2 100644
--- a/patches/api/0398-fix-Instruments.patch
+++ b/patches/api/0397-fix-Instruments.patch
@@ -98,10 +98,10 @@ index de976be7132d05506fde7a839cac3954b0dd8da4..642feb8b4578e6dbd2bf78d859283d20
      public static Instrument getByType(final byte type) {
          return BY_DATA.get(type);
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index dbb208e2badea38a4058491650b773192fae80bc..b11d6e190407b0ab0d9ff25c2c13f04ae907f612 100644
+index 60206aaf1dfec3cf1f8911d7dce41a36a8675375..a0801ab1e7c91dfc6451338cfab414145c72a441 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -407,9 +407,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -445,9 +445,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void playNote(@NotNull Location loc, byte instrument, byte note);
  
      /**
diff --git a/patches/api/0399-Add-BlockLockCheckEvent.patch b/patches/api/0398-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/api/0399-Add-BlockLockCheckEvent.patch
rename to patches/api/0398-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0400-Add-Sneaking-API-for-Entities.patch b/patches/api/0399-Add-Sneaking-API-for-Entities.patch
similarity index 88%
rename from patches/api/0400-Add-Sneaking-API-for-Entities.patch
rename to patches/api/0399-Add-Sneaking-API-for-Entities.patch
index eb85a81295..8ad9168a83 100644
--- a/patches/api/0400-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0399-Add-Sneaking-API-for-Entities.patch
@@ -35,10 +35,10 @@ index 3f3ea5bb6b3ea6f55b5cd699f1c01ac159619add..a2a423d4e4c2702ba5967223cab0432d
       * Get the category of spawn to which this entity belongs.
       *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b11d6e190407b0ab0d9ff25c2c13f04ae907f612..14a8831aabe7c7f1803151b382e27c606e7a049f 100644
+index a0801ab1e7c91dfc6451338cfab414145c72a441..77b0e632f8fefb9165a5170f8620a117c3b71c04 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -310,6 +310,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -348,6 +348,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @return true if player is in sneak mode
       */
@@ -46,7 +46,7 @@ index b11d6e190407b0ab0d9ff25c2c13f04ae907f612..14a8831aabe7c7f1803151b382e27c60
      public boolean isSneaking();
  
      /**
-@@ -317,6 +318,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -355,6 +356,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param sneak true if player should appear sneaking
       */
diff --git a/patches/api/0401-Improve-PortalEvents.patch b/patches/api/0400-Improve-PortalEvents.patch
similarity index 100%
rename from patches/api/0401-Improve-PortalEvents.patch
rename to patches/api/0400-Improve-PortalEvents.patch
diff --git a/patches/api/0402-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/api/0401-Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/api/0402-Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/api/0401-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/api/0403-Flying-Fall-Damage-API.patch b/patches/api/0402-Flying-Fall-Damage-API.patch
similarity index 88%
rename from patches/api/0403-Flying-Fall-Damage-API.patch
rename to patches/api/0402-Flying-Fall-Damage-API.patch
index 4629c12d80..f98c4bae3b 100644
--- a/patches/api/0403-Flying-Fall-Damage-API.patch
+++ b/patches/api/0402-Flying-Fall-Damage-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 14a8831aabe7c7f1803151b382e27c606e7a049f..6cebd564b4262ae2145996612bc21e0de5356b84 100644
+index 77b0e632f8fefb9165a5170f8620a117c3b71c04..7e4d541e92d2e1cf47a4a50e451bc9e40dd15049 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1579,6 +1579,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1617,6 +1617,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void setAllowFlight(boolean flight);
  
diff --git a/patches/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/0403-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/api/0403-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0404-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
similarity index 100%
rename from patches/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
rename to patches/api/0404-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0406-Win-Screen-API.patch b/patches/api/0405-Win-Screen-API.patch
similarity index 94%
rename from patches/api/0406-Win-Screen-API.patch
rename to patches/api/0405-Win-Screen-API.patch
index 8d131d362e..2d1bbcb699 100644
--- a/patches/api/0406-Win-Screen-API.patch
+++ b/patches/api/0405-Win-Screen-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Win Screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6cebd564b4262ae2145996612bc21e0de5356b84..06f00d016f1e46edb8f4fe0c14eb8b364900c3ef 100644
+index 7e4d541e92d2e1cf47a4a50e451bc9e40dd15049..d0297f47f18cabf857cf4ce04c529b46525c0f75 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -946,6 +946,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -984,6 +984,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/patches/api/0407-Add-Entity-Body-Yaw-API.patch b/patches/api/0406-Add-Entity-Body-Yaw-API.patch
similarity index 85%
rename from patches/api/0407-Add-Entity-Body-Yaw-API.patch
rename to patches/api/0406-Add-Entity-Body-Yaw-API.patch
index 1d6aba7a15..05fecf4aed 100644
--- a/patches/api/0407-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0406-Add-Entity-Body-Yaw-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ec5fe22b8092c8fc837e5c36e4f17053e48a77a8..ffca32ae2464ea5a669029079a50585ca259a4f8 100644
+index f4c5ec3f7e5c29b1799eef6c4f76617e9f23c0d7..03490d35a24c056ed148e45eea27d1786a58c8fc 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1133,5 +1133,21 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1166,5 +1166,21 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param amount the amount of damage to do
       */
      void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount);
diff --git a/patches/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0407-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
similarity index 100%
rename from patches/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
rename to patches/api/0407-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0409-Add-EntityFertilizeEggEvent.patch b/patches/api/0408-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/api/0409-Add-EntityFertilizeEggEvent.patch
rename to patches/api/0408-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0409-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/api/0409-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0411-Add-Shearable-API.patch b/patches/api/0410-Add-Shearable-API.patch
similarity index 100%
rename from patches/api/0411-Add-Shearable-API.patch
rename to patches/api/0410-Add-Shearable-API.patch
diff --git a/patches/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0411-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/api/0411-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0413-Add-Mob-Experience-reward-API.patch b/patches/api/0412-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/api/0413-Add-Mob-Experience-reward-API.patch
rename to patches/api/0412-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0414-Expand-PlayerItemMendEvent.patch b/patches/api/0413-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/api/0414-Expand-PlayerItemMendEvent.patch
rename to patches/api/0413-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0415-Add-transient-modifier-API.patch b/patches/api/0414-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/api/0415-Add-transient-modifier-API.patch
rename to patches/api/0414-Add-transient-modifier-API.patch
diff --git a/patches/api/0417-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0415-Properly-remove-the-experimental-smithing-inventory-.patch
similarity index 81%
rename from patches/api/0417-Properly-remove-the-experimental-smithing-inventory-.patch
rename to patches/api/0415-Properly-remove-the-experimental-smithing-inventory-.patch
index 58275cea90..268785a112 100644
--- a/patches/api/0417-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/api/0415-Properly-remove-the-experimental-smithing-inventory-.patch
@@ -5,17 +5,14 @@ Subject: [PATCH] Properly remove the experimental smithing inventory type
 
 
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index b821fa535b23fe5af5884e536b1708460076ee40..daddb12947e61ee69c100b422f6d07d49f76d724 100644
+index 19ba2d948ad83baab2a14ae6f7b3ce43c3d4971f..cbce826add9dc2b3187c7bea00c27b785d7517df 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -146,9 +146,9 @@ public enum InventoryType {
-     /**
-      * The new smithing inventory, with 3 CRAFTING slots and 1 RESULT slot.
+@@ -147,7 +147,7 @@ public enum InventoryType {
       *
--     * @apiNote draft, experimental 1.20 API
-+     * @deprecated use {@link #SMITHING}
+      * @deprecated use {@link #SMITHING}
       */
--    @MinecraftExperimental
+-    @Deprecated
 +    @Deprecated(forRemoval = true) // Paper
      SMITHING_NEW(4, "Upgrade Gear"),
      ;
diff --git a/patches/api/0416-Add-API-for-waxed-signs.patch b/patches/api/0416-Add-API-for-waxed-signs.patch
deleted file mode 100644
index 38a844fdb2..0000000000
--- a/patches/api/0416-Add-API-for-waxed-signs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 8 Jun 2023 23:22:31 -0700
-Subject: [PATCH] Add API for waxed signs
-
-
-diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java
-index abefc7a96528c52434bd7d4eef3be63c5e31e770..dd4d8f24e684a9c3cb1e41e8d0bf615111a17ba3 100644
---- a/src/main/java/org/bukkit/block/Sign.java
-+++ b/src/main/java/org/bukkit/block/Sign.java
-@@ -95,7 +95,9 @@ public interface Sign extends TileState, Colorable {
-      * outside of this event is undefined.
-      *
-      * @return if this sign is currently editable
-+     * @deprecated use {@link #isWaxed()}
-      */
-+    @Deprecated // Paper
-     public boolean isEditable();
- 
-     /**
-@@ -106,9 +108,27 @@ public interface Sign extends TileState, Colorable {
-      * outside of this event is undefined.
-      *
-      * @param editable if this sign is currently editable
-+     * @deprecated use {@link #setWaxed(boolean)}
-      */
-+    @Deprecated // Paper
-     public void setEditable(boolean editable);
- 
-+    // Paper start
-+    /**
-+     * Gets whether the sign has been waxed and therefore prevents editing.
-+     *
-+     * @return true if waxed
-+     */
-+    boolean isWaxed();
-+
-+    /**
-+     * Sets whether the sign is waxed.
-+     *
-+     * @param waxed true to wax and therefore prevent editing
-+     */
-+    void setWaxed(boolean waxed);
-+    // Paper end
-+
-     /**
-      * Gets whether this sign has glowing text. Only affects the {@link Side#FRONT}.
-      *
diff --git a/patches/api/0418-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0416-Add-method-to-remove-all-active-potion-effects.patch
similarity index 85%
rename from patches/api/0418-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/api/0416-Add-method-to-remove-all-active-potion-effects.patch
index ebb66dfa7f..27d9d12401 100644
--- a/patches/api/0418-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0416-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ffca32ae2464ea5a669029079a50585ca259a4f8..9712f7140933d7fc87c5838c173e2d818b70cfde 100644
+index 7fe230a8e8894b375a52c68152c7a0665b6ae1b3..bc6702817516c14d90ab45eb0ebf8354e79564a5 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -565,6 +565,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -589,6 +589,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      @NotNull
      public Collection<PotionEffect> getActivePotionEffects();
  
diff --git a/patches/api/0419-Folia-scheduler-and-owned-region-API.patch b/patches/api/0417-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/api/0419-Folia-scheduler-and-owned-region-API.patch
rename to patches/api/0417-Folia-scheduler-and-owned-region-API.patch
index 17626be7ae..f00d7a30d9 100644
--- a/patches/api/0419-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0417-Folia-scheduler-and-owned-region-API.patch
@@ -499,10 +499,10 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ef36d793ab77c7b7208f8f5994815599cff470d1..1ab3d8aee3101ca08d9adf5d9ff9f83de911594c 100644
+index 5635bd49107013faace6b79731c70ac1356ec357..77113822dc579ce350a5410ed713996eaf5e917e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2496,6 +2496,141 @@ public final class Bukkit {
+@@ -2523,6 +2523,141 @@ public final class Bukkit {
      }
      // Paper end
  
@@ -645,10 +645,10 @@ index ef36d793ab77c7b7208f8f5994815599cff470d1..1ab3d8aee3101ca08d9adf5d9ff9f83d
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5b225bbb128893d67251a96ab318035802a0cf76..96a267a676b41dc10f7b18ead826e45c5f6db425 100644
+index 5a388914d58eda63715fc0a6d0d4f507b6ca9672..b885c1aaf96f7b8e2787f37c21d65308a0a31e7f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2175,4 +2175,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2198,4 +2198,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
diff --git a/patches/api/0420-Add-event-for-player-editing-sign.patch b/patches/api/0418-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/api/0420-Add-event-for-player-editing-sign.patch
rename to patches/api/0418-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index a7f476a346..4d03e74655 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -79,7 +79,7 @@ index f7d5f785f659aa905000d974f573e43f841e7fc0..59579c22db8e028782f284942fb1e4f9
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 58a237d85b05def8e52ca737869ee80c300d050c..f3412dbbb0f37d5625ab05cfd502189ab4a343c2 100644
+index 4849578ebb117e63a497a1f0365d25a140da4a3e..6c5c05efb58ba8ea919ea14a04ea7e9bc2d702b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -209,7 +209,7 @@ public class Main {
@@ -90,7 +90,7 @@ index 58a237d85b05def8e52ca737869ee80c300d050c..f3412dbbb0f37d5625ab05cfd502189a
 +                    Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index d984bde5a3..6107f32459 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -14,7 +14,7 @@ public org.spigotmc.SpigotWorldConfig getString(Ljava/lang/String;Ljava/lang/Str
 public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index cf7f17724f09606eccf040713965a51e72a9c9df..2cabc6126afe4ad83eed4c423ffa67b77fde7c2a 100644
+index 75ca9df9f74e41802ba102fa052dd3446f400785..d67bfb162d122f6944aa16219b754d8d6ee40fb8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,6 +13,7 @@ dependencies {
@@ -4592,10 +4592,10 @@ index cda55e481ddbcc1de5478125c5db20ebba168e7d..bacd4d875642cd93c3185f788745dd73
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 56ad43d30f5dfec7564edab364328d32313501db..84c9a7f5ecb47f6a95ca89ecfcdba663fef803ae 100644
+index 2f6568effdece27775cacfddf2c9657163aac6ad..81156003f28b68e420d992d6e8d57c5185a9543b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -910,6 +910,7 @@ public final class CraftServer implements Server {
+@@ -913,6 +913,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -4604,7 +4604,7 @@ index 56ad43d30f5dfec7564edab364328d32313501db..84c9a7f5ecb47f6a95ca89ecfcdba663
              world.serverLevelData.setDifficulty(config.difficulty);
              world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f3412dbbb0f37d5625ab05cfd502189ab4a343c2..60ca15373b489941555315bf6fb311326670e7de 100644
+index 6c5c05efb58ba8ea919ea14a04ea7e9bc2d702b1..2cd2456e73543490d98f0318883f51a7d9bcaa34 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -141,6 +141,19 @@ public class Main {
diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch
index 013b5023df..0e83ebd93c 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/server/0008-CB-fixes.patch
@@ -29,21 +29,6 @@ index 82435da47f0f7db73556310f84dc538a7c5f0809..ebae711991a3ae35e35c2cffa8d92867
          this.structureManager = new StructureManager(this, this.serverLevelData.worldGenOptions(), this.structureCheck); // CraftBukkit
          if ((this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END
              this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenOptions().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit
-diff --git a/src/main/java/net/minecraft/world/entity/Marker.java b/src/main/java/net/minecraft/world/entity/Marker.java
-index 299d0755b782a26af6c6acc00e3d8ab0269348a9..70791a052c1ec8f41d7f1e65c33eee4f0b1b53b2 100644
---- a/src/main/java/net/minecraft/world/entity/Marker.java
-+++ b/src/main/java/net/minecraft/world/entity/Marker.java
-@@ -49,8 +49,8 @@ public class Marker extends Entity {
-     }
- 
-     @Override
--    protected void addPassenger(Entity passenger) {
--        throw new IllegalStateException("Should never addPassenger without checking couldAcceptPassenger()");
-+    protected boolean addPassenger(Entity passenger) { // Paper - fix return type
-+        return false; // Paper
-     }
- 
-     @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 index 40cdff9eaa1e78e02060d970e477d96f960cfed3..c853123c451c41beb42209c7edc14a5dcffa2a50 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -83,10 +68,10 @@ index 161ad6ab1443b2ce33a2d7d91d189c855db0453b..15a9736a870055d639d03063c7cf67fd
          this.registryAccess = registryManager;
          this.structureTemplateManager = structureTemplateManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 84c9a7f5ecb47f6a95ca89ecfcdba663fef803ae..c3c30cbb74062fc25c1daf9b17c8956857766306 100644
+index 81156003f28b68e420d992d6e8d57c5185a9543b..d4ad78d3da64bda424d754f514af192543fb6f0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2340,7 +2340,13 @@ public final class CraftServer implements Server {
+@@ -2354,7 +2354,13 @@ public final class CraftServer implements Server {
          Preconditions.checkArgument(key != null, "NamespacedKey key cannot be null");
  
          LootDataManager registry = this.getServer().getLootData();
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index 5a0111aeda..57323a6c87 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -6641,7 +6641,7 @@ index 337e0a7b3c14e1b1a28744920e0dc0a69e0c5a87..f5829ae484d93b547a5437b85a962134
      @Override
      public void tell(R runnable) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ff52a7319c6d80528a44389178b947cf4d8f48dc..a4e5961991a6debff959d63d70b71b1ded76e72a 100644
+index 29a373eb8f520cf0575e277fdf6e698d711a9ca7..db308228303cac3c42d44d119259d546e42f5e9e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -323,6 +323,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -6657,10 +6657,10 @@ index ff52a7319c6d80528a44389178b947cf4d8f48dc..a4e5961991a6debff959d63d70b71b1d
      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 34d9f71b9d23ec60494d8567af3cc5966d6a2525..0a070ff26a1e9b2583e95adac0b2dd85b567c8d1 100644
+index d6d16f54ed22f8bc025ab6a5c7bd998ec1a44145..861f366e05af1c2bf5bbc8a4e752e3fb675747ae 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -259,6 +259,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -258,6 +258,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public boolean collides = true;
      public Set<UUID> collidableExemptions = new HashSet<>();
      public boolean bukkitPickUpLoot;
@@ -6706,10 +6706,10 @@ index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292
          super(type, world);
          this.xpReward = 5;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index a797c6dd17cf73feada7badccf47b4036f746405..6758e72177c0a407cf6c392b10263f095e4d06e8 100644
+index 6e0f74b8b59923e2ecddb6720dad2ca39de91fa6..c2b93eaf73ce038559611c272b6e3ecc2bcb903b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -788,6 +788,25 @@ public final class ItemStack {
+@@ -789,6 +789,25 @@ public final class ItemStack {
          return this.tag != null ? this.tag.getList("Enchantments", 10) : new ListTag();
      }
  
@@ -6735,7 +6735,7 @@ index a797c6dd17cf73feada7badccf47b4036f746405..6758e72177c0a407cf6c392b10263f09
      public void setTag(@Nullable CompoundTag nbt) {
          this.tag = nbt;
          if (this.getItem().canBeDepleted()) {
-@@ -1178,6 +1197,7 @@ public final class ItemStack {
+@@ -1179,6 +1198,7 @@ public final class ItemStack {
      // CraftBukkit start
      @Deprecated
      public void setItem(Item item) {
@@ -7307,7 +7307,7 @@ index 25156be63f91a1c41ef41154f675d04eb97459a8..47bab513feec217d875192afef61f3af
              return false;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ee22b5419098834c3b388bbf78d6bd6d7951964a..379b8a7d94c784db54ada01ad6bd04a54f8a089f 100644
+index 8adac67a9315186d1ef453eae827ea7f69856f7a..153143b06fc088f3142a8fa17f153d8a344169d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -242,8 +242,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 95cec40b68..dd3f743ecb 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -2387,7 +2387,7 @@ index ba89c0d7ae99e53350249365d0e035e6f14e1c5f..dc87e56cfcd59bc1505f5b3c0363038e
          // CraftBukkit end
          this.chatVisibility = packet.chatVisibility();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c77e561ab7598846cb3de2aaee3e59e34d48215f..9e47f748ff6ccdb5791828ac8c41684ba2682fbd 100644
+index ac24831757556215b0723d0fe7dc0ee0c47745db..e2c735f674db15dde5e5baea04af0a1bfb51b58c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -187,6 +187,8 @@ import net.minecraft.world.phys.shapes.VoxelShape;
@@ -2878,10 +2878,10 @@ index 614e567eb1ef10ac7514909a8425e29ac3627d3d..60596c4ac2ebb8caf19d65591624275b
                  }
                  collection = icons;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c3c30cbb74062fc25c1daf9b17c8956857766306..85867893da6bb4f24e86c32ea9fd5ff5b5684dbb 100644
+index d4ad78d3da64bda424d754f514af192543fb6f0b..1ad584aedc0212a1e65affcbb518162328042719 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -608,8 +608,10 @@ public final class CraftServer implements Server {
+@@ -611,8 +611,10 @@ public final class CraftServer implements Server {
      }
  
      @Override
@@ -2892,7 +2892,7 @@ index c3c30cbb74062fc25c1daf9b17c8956857766306..85867893da6bb4f24e86c32ea9fd5ff5
      }
  
      @Override
-@@ -1465,7 +1467,15 @@ public final class CraftServer implements Server {
+@@ -1468,7 +1470,15 @@ public final class CraftServer implements Server {
          return this.configuration.getInt("settings.spawn-radius", -1);
      }
  
@@ -2908,7 +2908,7 @@ index c3c30cbb74062fc25c1daf9b17c8956857766306..85867893da6bb4f24e86c32ea9fd5ff5
      public String getShutdownMessage() {
          return this.configuration.getString("settings.shutdown-message");
      }
-@@ -1633,7 +1643,20 @@ public final class CraftServer implements Server {
+@@ -1636,7 +1646,20 @@ public final class CraftServer implements Server {
      }
  
      @Override
@@ -2929,7 +2929,7 @@ index c3c30cbb74062fc25c1daf9b17c8956857766306..85867893da6bb4f24e86c32ea9fd5ff5
          Set<CommandSender> recipients = new HashSet<>();
          for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
              if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
-@@ -1641,14 +1664,14 @@ public final class CraftServer implements Server {
+@@ -1644,14 +1667,14 @@ public final class CraftServer implements Server {
              }
          }
  
@@ -2946,7 +2946,7 @@ index c3c30cbb74062fc25c1daf9b17c8956857766306..85867893da6bb4f24e86c32ea9fd5ff5
  
          for (CommandSender recipient : recipients) {
              recipient.sendMessage(message);
-@@ -1900,6 +1923,14 @@ public final class CraftServer implements Server {
+@@ -1914,6 +1937,14 @@ public final class CraftServer implements Server {
          return CraftInventoryCreator.INSTANCE.createInventory(owner, type);
      }
  
@@ -2961,7 +2961,7 @@ index c3c30cbb74062fc25c1daf9b17c8956857766306..85867893da6bb4f24e86c32ea9fd5ff5
      @Override
      public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
          Preconditions.checkArgument(type != null, "InventoryType cannot be null");
-@@ -1914,13 +1945,28 @@ public final class CraftServer implements Server {
+@@ -1928,13 +1959,28 @@ public final class CraftServer implements Server {
          return CraftInventoryCreator.INSTANCE.createInventory(owner, size);
      }
  
@@ -2990,7 +2990,7 @@ index c3c30cbb74062fc25c1daf9b17c8956857766306..85867893da6bb4f24e86c32ea9fd5ff5
      public Merchant createMerchant(String title) {
          return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
      }
-@@ -1985,6 +2031,17 @@ public final class CraftServer implements Server {
+@@ -1999,6 +2045,17 @@ public final class CraftServer implements Server {
          return Thread.currentThread().equals(console.serverThread) || this.console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog)
      }
  
@@ -3008,7 +3008,7 @@ index c3c30cbb74062fc25c1daf9b17c8956857766306..85867893da6bb4f24e86c32ea9fd5ff5
      @Override
      public String getMotd() {
          return this.console.getMotd();
-@@ -2419,4 +2476,53 @@ public final class CraftServer implements Server {
+@@ -2433,4 +2490,53 @@ public final class CraftServer implements Server {
          return this.spigot;
      }
      // Spigot end
@@ -3063,7 +3063,7 @@ index c3c30cbb74062fc25c1daf9b17c8956857766306..85867893da6bb4f24e86c32ea9fd5ff5
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 379b8a7d94c784db54ada01ad6bd04a54f8a089f..73f61f2b0c0aeefabb7b7bba7ca37914751dcc42 100644
+index 153143b06fc088f3142a8fa17f153d8a344169d8..d01388bbadf3069357cf52463f4104a1be4d2b56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -152,6 +152,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -3134,7 +3134,7 @@ index 379b8a7d94c784db54ada01ad6bd04a54f8a089f..73f61f2b0c0aeefabb7b7bba7ca37914
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 60ca15373b489941555315bf6fb311326670e7de..15b886634112b2a18b7952107b49ae1430376a3d 100644
+index 2cd2456e73543490d98f0318883f51a7d9bcaa34..a210752cbf3f97b3782f85b3330972e8becfd2f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -20,6 +20,12 @@ public class Main {
@@ -3244,7 +3244,7 @@ index 0beb96dc896f63003e1b1ae458b73902bdbe648a..102eb86bad3000f258775ac06ecd1a6d
      public String getCustomName() {
          EnchantmentTableBlockEntity enchant = this.getSnapshot();
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 116c127381fe95825e719f4af8dfdf36d11048e0..8ce466c19dae6534be828779639aedb687a94e68 100644
+index 833c1a96a956503d997a80364433c45bfa7c5a96..6ca423ca58f486eec05c55faf055e0cdbabde709 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -25,6 +25,23 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
@@ -3271,7 +3271,7 @@ index 116c127381fe95825e719f4af8dfdf36d11048e0..8ce466c19dae6534be828779639aedb6
      @Override
      public String[] getLines() {
          return this.front.getLines();
-@@ -104,6 +121,20 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
+@@ -114,6 +131,20 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
          ((CraftPlayer) player).getHandle().openTextEdit(handle, Side.FRONT == side);
      }
  
@@ -3653,10 +3653,10 @@ index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa
      public boolean isOp() {
          return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2a0b1b14b 100644
+index 14bb6b7555f4e9d69b50e0c54d50e770e21d6ed5..845288cc687e7cc8a7ec2cb632c8c679dcaa3d34 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -286,14 +286,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -292,14 +292,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getDisplayName() {
@@ -3696,7 +3696,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
      @Override
      public String getPlayerListName() {
          return this.getHandle().listName == null ? getName() : CraftChatMessage.fromComponent(this.getHandle().listName);
-@@ -312,42 +337,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -318,42 +343,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -3748,7 +3748,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
          this.getHandle().connection.send(packet);
      }
  
-@@ -379,6 +404,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -385,6 +410,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.disconnect(message == null ? "" : message);
      }
  
@@ -3772,7 +3772,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
      @Override
      public void setCompassTarget(Location loc) {
          Preconditions.checkArgument(loc != null, "Location cannot be null");
-@@ -673,6 +715,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -679,6 +721,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
@@ -3797,7 +3797,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
      @Override
      public void sendSignChange(Location loc, String[] lines) {
          this.sendSignChange(loc, lines, DyeColor.BLACK);
-@@ -696,6 +756,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -702,6 +762,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (this.getHandle().connection == null) return;
  
          Component[] components = CraftSign.sanitizeLines(lines);
@@ -3809,7 +3809,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
          SignBlockEntity sign = new SignBlockEntity(CraftLocation.toBlockPosition(loc), Blocks.OAK_SIGN.defaultBlockState());
          SignText text = sign.getFrontText();
          text = text.setColor(net.minecraft.world.item.DyeColor.byId(dyeColor.getWoolData()));
-@@ -705,7 +770,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -711,7 +776,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          sign.setText(text, true);
  
@@ -3819,7 +3819,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
      }
  
      @Override
-@@ -1606,7 +1672,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1636,7 +1702,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url) {
@@ -3828,7 +3828,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
      }
  
      @Override
-@@ -1621,7 +1687,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1651,7 +1717,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url, byte[] hash, boolean force) {
@@ -3837,7 +3837,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
      }
  
      @Override
-@@ -1637,6 +1703,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1667,6 +1733,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -3859,7 +3859,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
      public void addChannel(String channel) {
          Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
          channel = StandardMessenger.validateAndCorrectChannel(channel);
-@@ -2028,6 +2109,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2065,6 +2146,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (this.getHandle().clientViewDistance == null) ? Bukkit.getViewDistance() : this.getHandle().clientViewDistance;
      }
  
@@ -3872,7 +3872,7 @@ index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2
      @Override
      public int getPing() {
          return this.getHandle().latency;
-@@ -2078,6 +2165,252 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2115,6 +2202,252 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  
@@ -4148,10 +4148,10 @@ index 2becf197a5c2d94f23f72a9b20cb2cd05a0807df..99096c1e3f045e4a99335faedfb8e77e
      @Override
      public int getLineWidth() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index eb2b9aa73913ef6dde8e0909dbd4064f0147ead0..551fd24885cee87a3ca579f2f4bf0a18b9505e79 100644
+index 41dc65eeabcece351423209c6289890bfda4de5c..8c9e545b8508172be51c9f244d7067509d32aef9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -846,9 +846,9 @@ public class CraftEventFactory {
+@@ -851,9 +851,9 @@ public class CraftEventFactory {
          return event;
      }
  
@@ -4163,7 +4163,7 @@ index eb2b9aa73913ef6dde8e0909dbd4064f0147ead0..551fd24885cee87a3ca579f2f4bf0a18
          event.setKeepInventory(keepInventory);
          event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
          org.bukkit.World world = entity.getWorld();
-@@ -873,7 +873,7 @@ public class CraftEventFactory {
+@@ -878,7 +878,7 @@ public class CraftEventFactory {
       * Server methods
       */
      public static ServerListPingEvent callServerListPingEvent(Server craftServer, InetAddress address, String motd, int numPlayers, int maxPlayers) {
@@ -4173,7 +4173,7 @@ index eb2b9aa73913ef6dde8e0909dbd4064f0147ead0..551fd24885cee87a3ca579f2f4bf0a18
          return event;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 7cd70d53e5816938beab9019db40cd7faedba745..8ea031537c27b219c22316bff191670c48ebd602 100644
+index 51caf09aa96b6e1f3e856061050fd6128fa736d9..301e89f638e38ad216d545a3cb5b7375695e6fe6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 @@ -72,6 +72,13 @@ public class CraftContainer extends AbstractContainerMenu {
diff --git a/patches/server/0011-Paper-command.patch b/patches/server/0011-Paper-command.patch
index 145c4b9074..7be53c5664 100644
--- a/patches/server/0011-Paper-command.patch
+++ b/patches/server/0011-Paper-command.patch
@@ -615,10 +615,10 @@ index 2ac30ef2dd72582f2b7f6a05b1f94b12b44fafc9..a01d423f44b3e547b4fa4d6654f9df63
  
          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 85867893da6bb4f24e86c32ea9fd5ff5b5684dbb..de9e4fd6a11b06e685804e43657d8b6589c6ca1c 100644
+index 1ad584aedc0212a1e65affcbb518162328042719..c50f9e73d4301db8cc1043237ca8767fafea9828 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -934,6 +934,7 @@ public final class CraftServer implements Server {
+@@ -937,6 +937,7 @@ public final class CraftServer implements Server {
          this.commandMap.clearCommands();
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@@ -626,7 +626,7 @@ index 85867893da6bb4f24e86c32ea9fd5ff5b5684dbb..de9e4fd6a11b06e685804e43657d8b65
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2516,6 +2517,34 @@ public final class CraftServer implements Server {
+@@ -2530,6 +2531,34 @@ public final class CraftServer implements Server {
      // Paper end
  
      // Paper start
diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/server/0013-Paper-Plugins.patch
index 1fd125e2e7..cafc6f09bd 100644
--- a/patches/server/0013-Paper-Plugins.patch
+++ b/patches/server/0013-Paper-Plugins.patch
@@ -6972,10 +6972,10 @@ index 35e7f8e7b19c217fa5f3f55abb0f8b9cd6b16f18..72c2f0bf9434e09a0dd51294d3a2200f
              Bootstrap.validate();
              Util.startTimerHackThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index de9e4fd6a11b06e685804e43657d8b6589c6ca1c..5efe98cbcb44727fbbb195ff7007d01c823372b6 100644
+index c50f9e73d4301db8cc1043237ca8767fafea9828..533017ee385cd070178af14cffb4dc0e600b28d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -268,7 +268,8 @@ public final class CraftServer implements Server {
+@@ -271,7 +271,8 @@ public final class CraftServer implements Server {
      private final CraftCommandMap commandMap = new CraftCommandMap(this);
      private final SimpleHelpMap helpMap = new SimpleHelpMap(this);
      private final StandardMessenger messenger = new StandardMessenger();
@@ -6985,7 +6985,7 @@ index de9e4fd6a11b06e685804e43657d8b6589c6ca1c..5efe98cbcb44727fbbb195ff7007d01c
      private final StructureManager structureManager;
      protected final DedicatedServer console;
      protected final DedicatedPlayerList playerList;
-@@ -418,24 +419,7 @@ public final class CraftServer implements Server {
+@@ -421,24 +422,7 @@ public final class CraftServer implements Server {
      }
  
      public void loadPlugins() {
@@ -7011,7 +7011,7 @@ index de9e4fd6a11b06e685804e43657d8b6589c6ca1c..5efe98cbcb44727fbbb195ff7007d01c
      }
  
      public void enablePlugins(PluginLoadOrder type) {
-@@ -524,15 +508,17 @@ public final class CraftServer implements Server {
+@@ -527,15 +511,17 @@ public final class CraftServer implements Server {
      private void enablePlugin(Plugin plugin) {
          try {
              List<Permission> perms = plugin.getDescription().getPermissions();
@@ -7035,7 +7035,7 @@ index de9e4fd6a11b06e685804e43657d8b6589c6ca1c..5efe98cbcb44727fbbb195ff7007d01c
  
              this.pluginManager.enablePlugin(plugin);
          } catch (Throwable ex) {
-@@ -958,6 +944,7 @@ public final class CraftServer implements Server {
+@@ -961,6 +947,7 @@ public final class CraftServer implements Server {
                  "This plugin is not properly shutting down its async tasks when it is being reloaded.  This may cause conflicts with the newly loaded version of the plugin"
              ));
          }
diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch
index 3e98e72f47..88fb14354d 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/server/0014-Timings-v2.patch
@@ -1270,7 +1270,7 @@ index 7be97441aed66fa3a21d13ad2211b3e0e08120c0..7cb5abfa89f842194325d26c6e95b494
                  this.entityManager.saveAll();
              } else {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9e47f748ff6ccdb5791828ac8c41684ba2682fbd..73f3771fcd4325931ab354d14a1ddeeab2640e29 100644
+index e2c735f674db15dde5e5baea04af0a1bfb51b58c..6aa687542ee86b1c8273d9ed26bca0999a742c64 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -339,7 +339,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1341,7 +1341,7 @@ index d3dc7752aadf36985660d04dcb4377a69dfeddff..b922654c0b0b1b0d03beb20bb1944b81
  
      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 a4e5961991a6debff959d63d70b71b1ded76e72a..fd81979963c3a7e2e03a53d6493ec4e48cad3e70 100644
+index 923b9243d97f9a741009f443d2c126b638fbb753..bbc5ef297b740ab769e8c030e5af6f573259d953 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -134,7 +134,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@@ -1419,10 +1419,10 @@ index 1d40d2f70ad72aa392b3699d71f20f69d3820696..93a43ef867d0961b46f9ecadc2c7be6a
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0a070ff26a1e9b2583e95adac0b2dd85b567c8d1..3fa9f639a598294b4956c6525fc8a630ae10da2d 100644
+index 861f366e05af1c2bf5bbc8a4e752e3fb675747ae..5bdebdd16939480afac536ce7aaa4fe720021e74 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -141,7 +141,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
+@@ -140,7 +140,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
  import org.bukkit.event.player.PlayerItemConsumeEvent;
  // CraftBukkit end
  
@@ -1431,7 +1431,7 @@ index 0a070ff26a1e9b2583e95adac0b2dd85b567c8d1..3fa9f639a598294b4956c6525fc8a630
  
  public abstract class LivingEntity extends Entity implements Attackable {
  
-@@ -2844,7 +2844,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2834,7 +2834,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      @Override
      public void tick() {
@@ -1439,7 +1439,7 @@ index 0a070ff26a1e9b2583e95adac0b2dd85b567c8d1..3fa9f639a598294b4956c6525fc8a630
          super.tick();
          this.updatingUsingItem();
          this.updateSwimAmount();
-@@ -2886,9 +2885,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2876,9 +2875,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          if (!this.isRemoved()) {
@@ -1449,7 +1449,7 @@ index 0a070ff26a1e9b2583e95adac0b2dd85b567c8d1..3fa9f639a598294b4956c6525fc8a630
          }
  
          double d0 = this.getX() - this.xo;
-@@ -2970,8 +2967,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2960,8 +2957,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
          if (this.isSleeping()) {
              this.setXRot(0.0F);
          }
@@ -1458,7 +1458,7 @@ index 0a070ff26a1e9b2583e95adac0b2dd85b567c8d1..3fa9f639a598294b4956c6525fc8a630
      }
  
      public void detectEquipmentUpdates() {
-@@ -3149,7 +3144,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3139,7 +3134,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
          this.setDeltaMovement(d4, d5, d6);
          this.level().getProfiler().push("ai");
@@ -1466,7 +1466,7 @@ index 0a070ff26a1e9b2583e95adac0b2dd85b567c8d1..3fa9f639a598294b4956c6525fc8a630
          if (this.isImmobile()) {
              this.jumping = false;
              this.xxa = 0.0F;
-@@ -3159,7 +3153,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3149,7 +3143,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.serverAiStep();
              this.level().getProfiler().pop();
          }
@@ -1474,7 +1474,7 @@ index 0a070ff26a1e9b2583e95adac0b2dd85b567c8d1..3fa9f639a598294b4956c6525fc8a630
  
          this.level().getProfiler().pop();
          this.level().getProfiler().push("jump");
-@@ -3199,7 +3192,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3189,7 +3182,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.resetFallDistance();
          }
  
@@ -1482,7 +1482,7 @@ index 0a070ff26a1e9b2583e95adac0b2dd85b567c8d1..3fa9f639a598294b4956c6525fc8a630
          label104:
          {
              LivingEntity entityliving = this.getControllingPassenger();
-@@ -3215,7 +3207,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3205,7 +3197,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
              this.travel(vec3d1);
          }
@@ -1490,7 +1490,7 @@ index 0a070ff26a1e9b2583e95adac0b2dd85b567c8d1..3fa9f639a598294b4956c6525fc8a630
  
          this.level().getProfiler().pop();
          this.level().getProfiler().push("freezing");
-@@ -3242,9 +3233,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3232,9 +3223,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox());
          }
  
@@ -1632,10 +1632,10 @@ index 0eb09ce5c850d85ffd7229d27cf06b3e0edda11b..cc1d7626a82881c4410d65c6a33dadae
          };
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5efe98cbcb44727fbbb195ff7007d01c823372b6..3338b424ca228693c199d022c01a81f9e2f9af0b 100644
+index 533017ee385cd070178af14cffb4dc0e600b28d8..f5a973a54e9f194891aac409151933f1779b8d28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -368,7 +368,7 @@ public final class CraftServer implements Server {
+@@ -371,7 +371,7 @@ public final class CraftServer implements Server {
          this.saveCommandsConfig();
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -1644,7 +1644,7 @@ index 5efe98cbcb44727fbbb195ff7007d01c823372b6..3338b424ca228693c199d022c01a81f9
          this.overrideSpawnLimits();
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
          this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
-@@ -2433,12 +2433,31 @@ public final class CraftServer implements Server {
+@@ -2447,12 +2447,31 @@ public final class CraftServer implements Server {
      private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
      {
  
@@ -1846,10 +1846,10 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a513bef2e9b9329f129cc2d5028815e2a0b1b14b..ef25bfa8c9341104df5cc150eefada52c5353efa 100644
+index 845288cc687e7cc8a7ec2cb632c8c679dcaa3d34..57d714cc8724db1fe75ec5acf6cb0f20dc9bce12 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2486,6 +2486,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2523,6 +2523,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
              CraftPlayer.this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(components, position == net.md_5.bungee.api.ChatMessageType.ACTION_BAR));
          }
diff --git a/patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 61c2c430d5..7ca507dfa1 100644
--- a/patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3338b424ca228693c199d022c01a81f9e2f9af0b..e9c2d5fad36e38ff1f0b34cacb9ea32516667948 100644
+index f5a973a54e9f194891aac409151933f1779b8d28..a3bd22e4b37a03800e3261b769433d47d0c21ff7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -422,6 +422,35 @@ public final class CraftServer implements Server {
+@@ -425,6 +425,35 @@ public final class CraftServer implements Server {
          io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler.INSTANCE.enter(io.papermc.paper.plugin.entrypoint.Entrypoint.PLUGIN); // Paper - replace implementation
      }
  
@@ -47,7 +47,7 @@ index 3338b424ca228693c199d022c01a81f9e2f9af0b..e9c2d5fad36e38ff1f0b34cacb9ea325
          if (type == PluginLoadOrder.STARTUP) {
              this.helpMap.clear();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 15b886634112b2a18b7952107b49ae1430376a3d..47c3c7484687b808341937f7e4ef1c0c410fa59f 100644
+index a210752cbf3f97b3782f85b3330972e8becfd2f3..1d86415570b906ecf2f2c6915694ee26210d2219 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -159,6 +159,12 @@ public class Main {
diff --git a/patches/server/0019-Rewrite-chunk-system.patch b/patches/server/0019-Rewrite-chunk-system.patch
index aa47a8285d..3255d938e2 100644
--- a/patches/server/0019-Rewrite-chunk-system.patch
+++ b/patches/server/0019-Rewrite-chunk-system.patch
@@ -20467,7 +20467,7 @@ index e96a0ca47e4701ba187555bd92c968345bc85677..73b96f804079288e9c5fcc11da54e61e
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 73f3771fcd4325931ab354d14a1ddeeab2640e29..37b03e45546429b4c86b44ea6e7718d04b071670 100644
+index 6aa687542ee86b1c8273d9ed26bca0999a742c64..142ffdf61b8f69e9d948b75a424de97ee31e1a87 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -788,6 +788,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -20636,7 +20636,7 @@ index 12e72ad737b1219fcdf88d344d41621d9fd5feec..e0bfeebeaac1aaea64bc07cdfdf7790e
                          if (flag1) {
                              ++this.converted;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fd81979963c3a7e2e03a53d6493ec4e48cad3e70..5d3b3db5967cbc01fa73f9cc18c427e2d7be6ee2 100644
+index bbc5ef297b740ab769e8c030e5af6f573259d953..88a84f453c38040933071ea61debcbb196ef10cf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -327,6 +327,58 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -20712,7 +20712,7 @@ index fd81979963c3a7e2e03a53d6493ec4e48cad3e70..5d3b3db5967cbc01fa73f9cc18c427e2
          return false;
      }
  
-@@ -3571,6 +3623,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3561,6 +3613,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          };
      }
  
@@ -20729,7 +20729,7 @@ index fd81979963c3a7e2e03a53d6493ec4e48cad3e70..5d3b3db5967cbc01fa73f9cc18c427e2
      public boolean hasExactlyOnePlayerPassenger() {
          return this.getIndirectPassengersStream().filter((entity) -> {
              return entity instanceof Player;
-@@ -3902,6 +3964,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3892,6 +3954,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setPosRaw(double x, double y, double z) {
@@ -20742,7 +20742,7 @@ index fd81979963c3a7e2e03a53d6493ec4e48cad3e70..5d3b3db5967cbc01fa73f9cc18c427e2
          if (this.position.x != x || this.position.y != y || this.position.z != z) {
              this.position = new Vec3(x, y, z);
              int i = Mth.floor(x);
-@@ -4009,6 +4077,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3999,6 +4067,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      @Override
      public final void setRemoved(Entity.RemovalReason reason) {
@@ -20756,7 +20756,7 @@ index fd81979963c3a7e2e03a53d6493ec4e48cad3e70..5d3b3db5967cbc01fa73f9cc18c427e2
          if (this.removalReason == null) {
              this.removalReason = reason;
          }
-@@ -4017,7 +4092,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4007,7 +4082,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.stopRiding();
          }
  
@@ -20765,7 +20765,7 @@ index fd81979963c3a7e2e03a53d6493ec4e48cad3e70..5d3b3db5967cbc01fa73f9cc18c427e2
          this.levelCallback.onRemove(reason);
      }
  
-@@ -4032,7 +4107,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4022,7 +4097,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      @Override
      public boolean shouldBeSaved() {
@@ -22628,10 +22628,10 @@ index bf4b2f89d3a7133155c6272379c742318b2c1514..33677ec811ceab939c419bf7d31b9958
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e9c2d5fad36e38ff1f0b34cacb9ea32516667948..211e40fdd44f6a19ec6e0e98540ca963a2534995 100644
+index a3bd22e4b37a03800e3261b769433d47d0c21ff7..db1895c2227fd41d9d6ce3f8f0ca2ceb41610f9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1181,7 +1181,7 @@ public final class CraftServer implements Server {
+@@ -1184,7 +1184,7 @@ public final class CraftServer implements Server {
          this.console.addLevel(internal);
  
          this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal);
@@ -22640,7 +22640,7 @@ index e9c2d5fad36e38ff1f0b34cacb9ea32516667948..211e40fdd44f6a19ec6e0e98540ca963
  
          this.pluginManager.callEvent(new WorldLoadEvent(internal.getWorld()));
          return internal.getWorld();
-@@ -1225,7 +1225,7 @@ public final class CraftServer implements Server {
+@@ -1228,7 +1228,7 @@ public final class CraftServer implements Server {
              }
  
              handle.getChunkSource().close(save);
@@ -22649,7 +22649,7 @@ index e9c2d5fad36e38ff1f0b34cacb9ea32516667948..211e40fdd44f6a19ec6e0e98540ca963
              handle.convertable.close();
          } catch (Exception ex) {
              this.getLogger().log(Level.SEVERE, null, ex);
-@@ -2045,7 +2045,7 @@ public final class CraftServer implements Server {
+@@ -2059,7 +2059,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -22659,7 +22659,7 @@ index e9c2d5fad36e38ff1f0b34cacb9ea32516667948..211e40fdd44f6a19ec6e0e98540ca963
  
      // Paper start - Adventure
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 73f61f2b0c0aeefabb7b7bba7ca37914751dcc42..4a3593f24fc844a6a8b1b6c28ad2dc9c609c29ad 100644
+index d01388bbadf3069357cf52463f4104a1be4d2b56..b3dfa35bc41191883814c78693a0d958ff3bf19b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -322,10 +322,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -22778,10 +22778,10 @@ index 73f61f2b0c0aeefabb7b7bba7ca37914751dcc42..4a3593f24fc844a6a8b1b6c28ad2dc9c
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ef25bfa8c9341104df5cc150eefada52c5353efa..07934c6b9fc1412a404c8c1fdb704cf8adccfb08 100644
+index 57d714cc8724db1fe75ec5acf6cb0f20dc9bce12..5eb25bb87443b533029ac49dead86173b7ab55eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -187,6 +187,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -193,6 +193,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = System.currentTimeMillis();
      }
  
diff --git a/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 74395ba39c..855d87bf11 100644
--- a/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Drop falling block and tnt entities at the specified height
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index da6e806288cf3afc2c72228844d1d05eee8324a5..93e5e8294b6571a355432e728f7dd49ddcf70d3e 100644
+index 99bfbe282fe98f23cc73f082628dab740eda944b..2d32a2b41100b0e32ec64c8724734f22c7c883e2 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -140,6 +140,16 @@ public class FallingBlockEntity extends Entity {
+@@ -142,6 +142,16 @@ public class FallingBlockEntity extends Entity {
              }
  
              this.move(MoverType.SELF, this.getDeltaMovement());
@@ -27,10 +27,10 @@ index da6e806288cf3afc2c72228844d1d05eee8324a5..93e5e8294b6571a355432e728f7dd49d
                  BlockPos blockposition = this.blockPosition();
                  boolean flag = this.blockState.getBlock() instanceof ConcretePowderBlock;
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 320966e6e55dad3a96fee25fe0f69135d86ee8bc..221ce518464332a27c43850c8bc25cd2fe0a9921 100644
+index a290daaeebfc110428dd8201f144c2acb06fddfc..415b8822f0dfb14d49bccb2a10ac04025891ddf7 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -66,6 +66,12 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -69,6 +69,12 @@ public class PrimedTnt extends Entity implements TraceableEntity {
          }
  
          this.move(MoverType.SELF, this.getDeltaMovement());
diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 7b02cfa772..0b09e566b0 100644
--- a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -19,10 +19,10 @@ index bea4e947577ee2f5fd680eb932409283f8504ee7..b9a49f92e38daf4f80b6d3bf465eb9d2
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 211e40fdd44f6a19ec6e0e98540ca963a2534995..858b2d4557ec67a4818fcb389f6fa6053e638e61 100644
+index db1895c2227fd41d9d6ce3f8f0ca2ceb41610f9d..4a45d0d4d2e8d7bd0728225a70b9d469058bfa3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -259,7 +259,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+@@ -262,7 +262,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
  public final class CraftServer implements Server {
@@ -32,11 +32,11 @@ index 211e40fdd44f6a19ec6e0e98540ca963a2534995..858b2d4557ec67a4818fcb389f6fa605
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 47c3c7484687b808341937f7e4ef1c0c410fa59f..a20eaa9b1d030ccd7e1fc49df47acee46f4e7e20 100644
+index 1d86415570b906ecf2f2c6915694ee26210d2219..d9424ce7726eba4a352444b53d31c788d0923049 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -240,12 +240,25 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
                      if (buildDate.before(deadline.getTime())) {
                          System.err.println("*** Error, this build is outdated ***");
 -                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/server/0030-Player-affects-spawning-API.patch
index 5465f9efcb..b8c4e8dee4 100644
--- a/patches/server/0030-Player-affects-spawning-API.patch
+++ b/patches/server/0030-Player-affects-spawning-API.patch
@@ -47,10 +47,10 @@ index c7ab59aa0e2fd0f3e7252647ddb25b82ac604830..8f20239f3ef7ebe41fac8ee6e024c36d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 1d1bd8c8088e9dfbcbd7e9d2971b6241614fc5d6..d99923c355e50bfa4682dd147d83dd1cf58553f1 100644
+index 790a9671ad381335c14aac114877f8f6cbdc25a0..754bad0bd38b8a356403f4c90de26de445cbf3c7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -127,7 +127,7 @@ public class Silverfish extends Monster {
+@@ -130,7 +130,7 @@ public class Silverfish extends Monster {
          if (checkAnyLightMonsterSpawnRules(type, world, spawnReason, pos, random)) {
              Player entityhuman = world.getNearestPlayer((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, 5.0D, true);
  
@@ -137,10 +137,10 @@ index be6e3e21ad62da01e5e2dd78e300cbc8efdbeb42..ea98625fe7c00743b8df74a24e6d4b75
          for(Player player : this.players()) {
              if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 07934c6b9fc1412a404c8c1fdb704cf8adccfb08..824d78bacadecdf485cf5f07793e5e8a84af0ddb 100644
+index 5eb25bb87443b533029ac49dead86173b7ab55eb..7bcf858bf9a0ab97a89efc26a22376c46229d1ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2165,8 +2165,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2202,8 +2202,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return this.getHandle().locale;
diff --git a/patches/server/0031-Further-improve-server-tick-loop.patch b/patches/server/0031-Further-improve-server-tick-loop.patch
index 3805802cb5..f13069d771 100644
--- a/patches/server/0031-Further-improve-server-tick-loop.patch
+++ b/patches/server/0031-Further-improve-server-tick-loop.patch
@@ -145,10 +145,10 @@ index b9a49f92e38daf4f80b6d3bf465eb9d249606976..71c8bb318b2e99b7d0b91196ac0b1b5b
                  this.startMetricsRecordingTick();
                  this.profiler.push("tick");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 858b2d4557ec67a4818fcb389f6fa6053e638e61..9da9b5b4b92996240cc93be2db82bf3a931e76c1 100644
+index 4a45d0d4d2e8d7bd0728225a70b9d469058bfa3e..68692c36a0db6ac3048dcfac91c154974e5e917f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2458,6 +2458,17 @@ public final class CraftServer implements Server {
+@@ -2472,6 +2472,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
diff --git a/patches/server/0032-Only-refresh-abilities-if-needed.patch b/patches/server/0032-Only-refresh-abilities-if-needed.patch
index e3fa2cb4e4..d22500a8e2 100644
--- a/patches/server/0032-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0032-Only-refresh-abilities-if-needed.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 824d78bacadecdf485cf5f07793e5e8a84af0ddb..807a12703ba6b5f7189967c93aeb23ab9646a620 100644
+index 7bcf858bf9a0ab97a89efc26a22376c46229d1ca..908cff4daf9c4218c8f93fdb7df9e9fa65b06d6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1847,12 +1847,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1877,12 +1877,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
diff --git a/patches/server/0033-Entity-Origin-API.patch b/patches/server/0033-Entity-Origin-API.patch
index 294e046813..e31ff43a11 100644
--- a/patches/server/0033-Entity-Origin-API.patch
+++ b/patches/server/0033-Entity-Origin-API.patch
@@ -25,7 +25,7 @@ index 995be2fd84ce343d7430d9658f91868e653da43d..4af495424d60632b770cd1cb02157bbc
  
          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 5d3b3db5967cbc01fa73f9cc18c427e2d7be6ee2..b3e239df3528d149bf950a2c8a64df3444b0e013 100644
+index adef9ffbc7a42172d88004209b8a745254b58757..87dce3470b544d9095c9bb2fd54b79553212a122 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -312,7 +312,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -94,10 +94,10 @@ index 5d3b3db5967cbc01fa73f9cc18c427e2d7be6ee2..b3e239df3528d149bf950a2c8a64df34
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
              CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being loaded");
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 93e5e8294b6571a355432e728f7dd49ddcf70d3e..26ef917d401eb79466e246d82b5d689c7133c7a2 100644
+index 2d32a2b41100b0e32ec64c8724734f22c7c883e2..93c162fd126824ab0af39568efe0dec21d846810 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -341,6 +341,14 @@ public class FallingBlockEntity extends Entity {
+@@ -343,6 +343,14 @@ public class FallingBlockEntity extends Entity {
              this.blockState = Blocks.SAND.defaultBlockState();
          }
  
@@ -113,10 +113,10 @@ index 93e5e8294b6571a355432e728f7dd49ddcf70d3e..26ef917d401eb79466e246d82b5d689c
  
      public void setHurtsEntities(float fallHurtAmount, int fallHurtMax) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 221ce518464332a27c43850c8bc25cd2fe0a9921..50fa14b045a1f75d43d90741245cc4506ed666a0 100644
+index 415b8822f0dfb14d49bccb2a10ac04025891ddf7..89fd5d6b373d2705dccc2f22663048f4c2aaa60f 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -118,6 +118,14 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -119,6 +119,14 @@ public class PrimedTnt extends Entity implements TraceableEntity {
      @Override
      protected void readAdditionalSaveData(CompoundTag nbt) {
          this.setFuse(nbt.getShort("Fuse"));
diff --git a/patches/server/0041-Disable-explosion-knockback.patch b/patches/server/0041-Disable-explosion-knockback.patch
index 2ee815e6f4..9fa3529156 100644
--- a/patches/server/0041-Disable-explosion-knockback.patch
+++ b/patches/server/0041-Disable-explosion-knockback.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3fa9f639a598294b4956c6525fc8a630ae10da2d..fcc82ba0c632362285903bcdcc6c65069419f295 100644
+index 5bdebdd16939480afac536ce7aaa4fe720021e74..5dda05f7bf08dec8b48fe0b87aa227c3e0392c6f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1454,10 +1454,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1444,10 +1444,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  }
              }
  
@@ -21,7 +21,7 @@ index 3fa9f639a598294b4956c6525fc8a630ae10da2d..fcc82ba0c632362285903bcdcc6c6506
                      this.level().broadcastDamageEvent(this, source);
                  }
  
-@@ -1481,6 +1483,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1471,6 +1473,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  }
              }
  
diff --git a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
index e232726488..d6af279094 100644
--- a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
@@ -30,10 +30,10 @@ index 1ef48b8415242942f00c6a76faa1de2865e11358..bcf0d4cfbfbae254bc74ad6389af372a
          this.locale = packet.language;
          // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 807a12703ba6b5f7189967c93aeb23ab9646a620..83a5a1d39892206ba69ece47aa20811b1d71709e 100644
+index 908cff4daf9c4218c8f93fdb7df9e9fa65b06d6f..705734e2f26f8deab8ac9ad929d7b5e29181ace3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2165,8 +2165,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2202,8 +2202,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
diff --git a/patches/server/0052-Ensure-commands-are-not-ran-async.patch b/patches/server/0052-Ensure-commands-are-not-ran-async.patch
index f007b288e8..1c3081a40c 100644
--- a/patches/server/0052-Ensure-commands-are-not-ran-async.patch
+++ b/patches/server/0052-Ensure-commands-are-not-ran-async.patch
@@ -21,7 +21,7 @@ character.
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 37b03e45546429b4c86b44ea6e7718d04b071670..d7b522940dd062c81cd967773407ec7ab415ccb1 100644
+index 142ffdf61b8f69e9d948b75a424de97ee31e1a87..bd6b4a13b18bd13a6024c92a247503a87102e7c5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2044,7 +2044,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -74,10 +74,10 @@ index 37b03e45546429b4c86b44ea6e7718d04b071670..d7b522940dd062c81cd967773407ec7a
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9da9b5b4b92996240cc93be2db82bf3a931e76c1..c84e32f53783b2e00b829ce839894c0a3a73325e 100644
+index 68692c36a0db6ac3048dcfac91c154974e5e917f..06bb2fd95dd0193101f8ee4e9082df0c079a3dd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -882,6 +882,28 @@ public final class CraftServer implements Server {
+@@ -885,6 +885,28 @@ public final class CraftServer implements Server {
          Preconditions.checkArgument(commandLine != null, "commandLine cannot be null");
          org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot
  
@@ -107,10 +107,10 @@ index 9da9b5b4b92996240cc93be2db82bf3a931e76c1..c84e32f53783b2e00b829ce839894c0a
              return true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 83a5a1d39892206ba69ece47aa20811b1d71709e..aa3a11a4869678f1fcb126bfde3381e0470c8246 100644
+index 705734e2f26f8deab8ac9ad929d7b5e29181ace3..d96e0bb4277d83602d4062dc33e6e420a28bf2da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -484,7 +484,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -490,7 +490,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0054-Expose-server-CommandMap.patch b/patches/server/0054-Expose-server-CommandMap.patch
index a937de8515..630c4232a6 100644
--- a/patches/server/0054-Expose-server-CommandMap.patch
+++ b/patches/server/0054-Expose-server-CommandMap.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c84e32f53783b2e00b829ce839894c0a3a73325e..3d47994c861f70fc560a42dc524a773d9c15cfe0 100644
+index 06bb2fd95dd0193101f8ee4e9082df0c079a3dd7..bb7f5364a3aa9680cd0cef1bd3e12ccf69491358 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2020,6 +2020,7 @@ public final class CraftServer implements Server {
+@@ -2034,6 +2034,7 @@ public final class CraftServer implements Server {
          return this.helpMap;
      }
  
diff --git a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 1d2852b0ba..cc6788468d 100644
--- a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 92831e64cc5f93a13dfede82d44172b3b34a57e3..a112ee18b272e2d5a61ddbb2c884169b6c6d0aec 100644
+index 0c2dcaf8aac3c95f469ffef84bfd52fbc687129f..27830b5909660038a51ef7fc4ca78d9df64f562a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -100,7 +100,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -102,7 +102,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      @Override
      public void setHealth(double health) {
          health = (float) health;
diff --git a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
index 7c6eb038f2..0f3a1843f3 100644
--- a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aa3a11a4869678f1fcb126bfde3381e0470c8246..8b611525f74ed39601f64ad964aacffeebe503e8 100644
+index d96e0bb4277d83602d4062dc33e6e420a28bf2da..268cd764c1543a9a7e43013f47a81aaa5a55d108 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -73,7 +73,7 @@ index aa3a11a4869678f1fcb126bfde3381e0470c8246..8b611525f74ed39601f64ad964aacffe
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -326,6 +327,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -332,6 +333,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/patches/server/0057-Add-configurable-portal-search-radius.patch b/patches/server/0057-Add-configurable-portal-search-radius.patch
index 74e39c8fd3..9df3cbc263 100644
--- a/patches/server/0057-Add-configurable-portal-search-radius.patch
+++ b/patches/server/0057-Add-configurable-portal-search-radius.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d20722a79aa87cae72b1b3b9039d342c9ff9570a..faf60cc9c4a3bfd7c30b07bb1b3fbabaaffd1d6d 100644
+index 0d888e4c819d627119d1a97be8318027b95d46cb..03d5ea7094223be15c96c223ca81bdb8685cc1e7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3174,7 +3174,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3164,7 +3164,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  double d0 = DimensionType.getTeleportationScale(this.level().dimensionType(), destination.dimensionType());
                  BlockPos blockposition = worldborder.clampToBounds(this.getX() * d0, this.getY(), this.getZ() * d0);
                  // CraftBukkit start
diff --git a/patches/server/0058-Add-velocity-warnings.patch b/patches/server/0058-Add-velocity-warnings.patch
index 1440922180..9212f03f1f 100644
--- a/patches/server/0058-Add-velocity-warnings.patch
+++ b/patches/server/0058-Add-velocity-warnings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3d47994c861f70fc560a42dc524a773d9c15cfe0..bf9d7ae4366e44938306e3f8e94376796284a263 100644
+index bb7f5364a3aa9680cd0cef1bd3e12ccf69491358..bc8d567d549ae8fb3a972cb93b50de82daf9fb49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -295,6 +295,7 @@ public final class CraftServer implements Server {
+@@ -298,6 +298,7 @@ public final class CraftServer implements Server {
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
      public int reloadCount;
diff --git a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
index 3491448922..a6d5ccab2c 100644
--- a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
@@ -16,10 +16,10 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8b611525f74ed39601f64ad964aacffeebe503e8..a926c170fa1dbc4d8e16666ddd486f8c5ff5acf5 100644
+index 268cd764c1543a9a7e43013f47a81aaa5a55d108..78d31da062792c12f069e929ebe89ab5a624b7d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1152,7 +1152,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1158,7 +1158,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entity.connection.teleport(to);
          } else {
              // The respawn reason should never be used if the passed location is non null.
diff --git a/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
index 0fd0480405..4ec3ab1d5d 100644
--- a/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
@@ -11,10 +11,10 @@ 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 faf60cc9c4a3bfd7c30b07bb1b3fbabaaffd1d6d..47369a5cdf37872fa91daf6425f7cfacbbdeec69 100644
+index 03d5ea7094223be15c96c223ca81bdb8685cc1e7..3bd230370a956a557e0646cc5f92a9a171664876 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2805,6 +2805,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2795,6 +2795,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      @Nullable
      public Team getTeam() {
@@ -23,10 +23,10 @@ index faf60cc9c4a3bfd7c30b07bb1b3fbabaaffd1d6d..47369a5cdf37872fa91daf6425f7cfac
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fcc82ba0c632362285903bcdcc6c65069419f295..a8835f87a8961dd8c32dc9b17b8656ee12c23f96 100644
+index 5dda05f7bf08dec8b48fe0b87aa227c3e0392c6f..ddf083a54015f943e3e00ae6d5f73f8e127f6dc2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -834,6 +834,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -833,6 +833,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          if (nbt.contains("Team", 8)) {
              String s = nbt.getString("Team");
              PlayerTeam scoreboardteam = this.level().getScoreboard().getPlayerTeam(s);
diff --git a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 99be07e3cc..ecb763b1fc 100644
--- a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -7,10 +7,10 @@ Upstream added methods for this, original methods are now
 deprecated
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a112ee18b272e2d5a61ddbb2c884169b6c6d0aec..fcb07a5f8cac994b731e3345ba9e971faa482fa1 100644
+index 27830b5909660038a51ef7fc4ca78d9df64f562a..96095cc107d161cad7401725eb70f08203deac9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -265,9 +265,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -267,9 +267,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      }
  
      @Override
@@ -27,7 +27,7 @@ index a112ee18b272e2d5a61ddbb2c884169b6c6d0aec..fcb07a5f8cac994b731e3345ba9e971f
      }
  
      @Override
-@@ -761,4 +767,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -788,4 +794,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.getHandle().persistentInvisibility = invisible;
          this.getHandle().setSharedFlag(5, invisible);
      }
diff --git a/patches/server/0065-Complete-resource-pack-API.patch b/patches/server/0065-Complete-resource-pack-API.patch
index 4fc822316c..0c45491c5d 100644
--- a/patches/server/0065-Complete-resource-pack-API.patch
+++ b/patches/server/0065-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 d7b522940dd062c81cd967773407ec7ab415ccb1..b6e86042d050cf95c8c9a94809bcf49736e5bd9a 100644
+index bd6b4a13b18bd13a6024c92a247503a87102e7c5..f4972161eace2af0c857374a7fa36a98fa0fb857 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1758,8 +1758,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -23,10 +23,10 @@ index d7b522940dd062c81cd967773407ec7ab415ccb1..b6e86042d050cf95c8c9a94809bcf497
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a926c170fa1dbc4d8e16666ddd486f8c5ff5acf5..5da21912bc0a06b0fdeadb12a82b2938c209e394 100644
+index 78d31da062792c12f069e929ebe89ab5a624b7d8..c64bc467994609d6cc49c598435cac997ea619e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -181,6 +181,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -187,6 +187,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private double healthScale = 20;
      private CraftWorldBorder clientWorldBorder = null;
      private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
@@ -37,7 +37,7 @@ index a926c170fa1dbc4d8e16666ddd486f8c5ff5acf5..5da21912bc0a06b0fdeadb12a82b2938
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2288,6 +2292,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2325,6 +2329,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
diff --git a/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch
index ca99eb9d9e..016734009a 100644
--- a/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bf9d7ae4366e44938306e3f8e94376796284a263..43c2e3f0db683022179ae4c85703390be5bdb759 100644
+index bc8d567d549ae8fb3a972cb93b50de82daf9fb49..7ad781b0270b95bae7f28fdad1e94a1ea75090fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -456,6 +456,7 @@ public final class CraftServer implements Server {
+@@ -459,6 +459,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              this.helpMap.clear();
              this.helpMap.initializeGeneralTopics();
@@ -27,7 +27,7 @@ index bf9d7ae4366e44938306e3f8e94376796284a263..43c2e3f0db683022179ae4c85703390b
          }
  
          Plugin[] plugins = this.pluginManager.getPlugins();
-@@ -475,7 +476,7 @@ public final class CraftServer implements Server {
+@@ -478,7 +479,7 @@ public final class CraftServer implements Server {
              this.commandMap.registerServerAliases();
              DefaultPermissions.registerCorePermissions();
              CraftDefaultPermissions.registerCorePermissions();
diff --git a/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch
index a30ddc19c4..889bfaa12d 100644
--- a/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 43c2e3f0db683022179ae4c85703390be5bdb759..22d11ee1d782ba1218357ee16b05de3414924aeb 100644
+index 7ad781b0270b95bae7f28fdad1e94a1ea75090fc..89ba5fb4be6ae481b1765506ed6a0bd37faaa9b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2624,5 +2624,23 @@ public final class CraftServer implements Server {
+@@ -2638,5 +2638,23 @@ public final class CraftServer implements Server {
          }
          return this.adventure$audiences;
      }
diff --git a/patches/server/0068-Remove-Metadata-on-reload.patch b/patches/server/0068-Remove-Metadata-on-reload.patch
index 2f5734a37c..170bae4de0 100644
--- a/patches/server/0068-Remove-Metadata-on-reload.patch
+++ b/patches/server/0068-Remove-Metadata-on-reload.patch
@@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 22d11ee1d782ba1218357ee16b05de3414924aeb..83119de3ae3e38ba4bb77abf005043cfa82c4670 100644
+index 89ba5fb4be6ae481b1765506ed6a0bd37faaa9b6..05cb57584949679130bf7c5d7d3524463d6c9e7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -969,8 +969,16 @@ public final class CraftServer implements Server {
+@@ -972,8 +972,16 @@ public final class CraftServer implements Server {
              world.spigotConfig.init(); // Spigot
          }
  
diff --git a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch
index 2dda8ef42d..edebc4ad01 100644
--- a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 6758e72177c0a407cf6c392b10263f095e4d06e8..369f7d470fc6f7235fc5bd6b67e16c4182d5ed36 100644
+index c2b93eaf73ce038559611c272b6e3ecc2bcb903b..940caf9b7526019ace656ff88146f198ba6b62ed 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -156,6 +156,23 @@ public final class ItemStack {
@@ -53,7 +53,7 @@ index 6758e72177c0a407cf6c392b10263f095e4d06e8..369f7d470fc6f7235fc5bd6b67e16c41
              this.getItem().verifyTagAfterLoad(this.tag);
          }
  
-@@ -809,6 +827,7 @@ public final class ItemStack {
+@@ -810,6 +828,7 @@ public final class ItemStack {
  
      public void setTag(@Nullable CompoundTag nbt) {
          this.tag = nbt;
@@ -61,7 +61,7 @@ index 6758e72177c0a407cf6c392b10263f095e4d06e8..369f7d470fc6f7235fc5bd6b67e16c41
          if (this.getItem().canBeDepleted()) {
              this.setDamageValue(this.getDamageValue());
          }
-@@ -1106,6 +1125,7 @@ public final class ItemStack {
+@@ -1107,6 +1126,7 @@ public final class ItemStack {
          ListTag nbttaglist = this.tag.getList("Enchantments", 10);
  
          nbttaglist.add(EnchantmentHelper.storeEnchantment(EnchantmentHelper.getEnchantmentId(enchantment), (byte) level));
diff --git a/patches/server/0072-Custom-replacement-for-eaten-items.patch b/patches/server/0072-Custom-replacement-for-eaten-items.patch
index b1702d7b0a..a10c63f615 100644
--- a/patches/server/0072-Custom-replacement-for-eaten-items.patch
+++ b/patches/server/0072-Custom-replacement-for-eaten-items.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a8835f87a8961dd8c32dc9b17b8656ee12c23f96..1238da8b035a0b0dd3d00557ca0de7a82f5fdf53 100644
+index ddf083a54015f943e3e00ae6d5f73f8e127f6dc2..d8ecc90465dfc54319d7f2478979e9aaee42f5a2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3649,10 +3649,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3639,10 +3639,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      this.triggerItemUseEffects(this.useItem, 16);
                      // CraftBukkit start - fire PlayerItemConsumeEvent
                      ItemStack itemstack;
@@ -21,7 +21,7 @@ index a8835f87a8961dd8c32dc9b17b8656ee12c23f96..1238da8b035a0b0dd3d00557ca0de7a8
                          this.level().getCraftServer().getPluginManager().callEvent(event);
  
                          if (event.isCancelled()) {
-@@ -3666,6 +3667,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3656,6 +3657,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      } else {
                          itemstack = this.useItem.finishUsingItem(this.level(), this);
                      }
@@ -34,7 +34,7 @@ index a8835f87a8961dd8c32dc9b17b8656ee12c23f96..1238da8b035a0b0dd3d00557ca0de7a8
                      // CraftBukkit end
  
                      if (itemstack != this.useItem) {
-@@ -3673,6 +3680,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3663,6 +3670,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      }
  
                      this.stopUsingItem();
diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index a377d864b9..685c26f0e1 100644
--- a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1238da8b035a0b0dd3d00557ca0de7a82f5fdf53..5e40ee2695b7ed50fddc0e8226f0b1b4879cd510 100644
+index d8ecc90465dfc54319d7f2478979e9aaee42f5a2..45a93601ff9ec79db0ceefb92eecfc974a775aef 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -795,7 +795,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -794,7 +794,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      @Override
      public void readAdditionalSaveData(CompoundTag nbt) {
@@ -23,7 +23,7 @@ index 1238da8b035a0b0dd3d00557ca0de7a82f5fdf53..5e40ee2695b7ed50fddc0e8226f0b1b4
          if (nbt.contains("Attributes", 9) && this.level() != null && !this.level().isClientSide) {
              this.getAttributes().load(nbt.getList("Attributes", 10));
          }
-@@ -1313,6 +1319,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1312,6 +1318,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void setHealth(float health) {
@@ -34,7 +34,7 @@ index 1238da8b035a0b0dd3d00557ca0de7a82f5fdf53..5e40ee2695b7ed50fddc0e8226f0b1b4
          // CraftBukkit start - Handle scaled health
          if (this instanceof ServerPlayer) {
              org.bukkit.craftbukkit.entity.CraftPlayer player = ((ServerPlayer) this).getBukkitEntity();
-@@ -3482,7 +3492,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3472,7 +3482,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void setAbsorptionAmount(float amount) {
@@ -44,10 +44,10 @@ index 1238da8b035a0b0dd3d00557ca0de7a82f5fdf53..5e40ee2695b7ed50fddc0e8226f0b1b4
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5da21912bc0a06b0fdeadb12a82b2938c209e394..54fbc06216e1eec6976d6514d343345ee17b020c 100644
+index c64bc467994609d6cc49c598435cac997ea619e5..8b594be03e0627789e5b724cbc08329795ed46e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2092,6 +2092,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2122,6 +2122,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
diff --git a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch b/patches/server/0074-Use-a-Shared-Random-for-Entities.patch
index 59b330e61a..dd7a17617a 100644
--- a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/server/0074-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 47369a5cdf37872fa91daf6425f7cfacbbdeec69..713052e936d75173cd038b0565d94f9ff451168f 100644
+index 52cb6a57f73749ebebba12a05be56ae923249e5a..c47f727695112010163d6635550f0c5dd5b853f6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -162,6 +162,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -99,15 +99,15 @@ index 47369a5cdf37872fa91daf6425f7cfacbbdeec69..713052e936d75173cd038b0565d94f9f
          this.fluidHeight = new Object2DoubleArrayMap(2);
          this.fluidOnEyes = new HashSet();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 930df3e20f27e35054620018aaec08031e6d181a..b72006c4b2342ca9d9a81f54f89fa6d979c33c85 100644
+index 891d8b4c8cb73d5e310970066831ab3e2af14e91..f60c4cd0543fd5d50fa7e2c1a9e8381227adb540 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-@@ -46,7 +46,7 @@ public class Squid extends WaterAnimal {
+@@ -44,7 +44,7 @@ public class Squid extends WaterAnimal {
  
      public Squid(EntityType<? extends Squid> type, Level world) {
          super(type, world);
--        this.random.setSeed((long) this.getId());
-+        //this.random.setSeed((long) this.getId()); // Paper - we set the random to shared, do not clobber the seed
+-        this.random.setSeed((long)this.getId());
++        //this.random.setSeed((long)this.getId()); // Paper - we set the random to shared, do not clobber the seed
          this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
      }
  
diff --git a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
index e4e2e4d238..76c6502425 100644
--- a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5e40ee2695b7ed50fddc0e8226f0b1b4879cd510..323b3a561060eacaad37832f44d0cdb9e4a1a2dc 100644
+index 45a93601ff9ec79db0ceefb92eecfc974a775aef..c6a30c7558f444318eb4c913a0efdad48878653a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1292,10 +1292,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1291,10 +1291,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) {
diff --git a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch
index c9abcad3c0..1dc79976a1 100644
--- a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 04ff01ba9f1f869f90d39645edb7aba42885725e..5ec480397fb043717c63961651f7c62440e57201 100644
+index 7bcf878cbb10f4d99e9693532d02b87350da3b06..71219297a175ff9549a258985043df3ce7545ae6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -70,7 +70,7 @@ public class ServerEntity {
@@ -18,10 +18,10 @@ index 04ff01ba9f1f869f90d39645edb7aba42885725e..5ec480397fb043717c63961651f7c624
      public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
          this.trackedPlayers = trackedPlayers;
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 50fa14b045a1f75d43d90741245cc4506ed666a0..1251c704e3b83888133b83757e7773c3e3664e6e 100644
+index 89fd5d6b373d2705dccc2f22663048f4c2aaa60f..57f9bf73ee14bc8811d0192543caf2b02e890ee0 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -95,6 +95,27 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -98,6 +98,27 @@ public class PrimedTnt extends Entity implements TraceableEntity {
              }
          }
  
@@ -49,7 +49,7 @@ index 50fa14b045a1f75d43d90741245cc4506ed666a0..1251c704e3b83888133b83757e7773c3
      }
  
      private void explode() {
-@@ -146,4 +167,11 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -147,4 +168,11 @@ public class PrimedTnt extends Entity implements TraceableEntity {
      public int getFuse() {
          return (Integer) this.entityData.get(PrimedTnt.DATA_FUSE_ID);
      }
diff --git a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
index 4a8d18d1b8..702880edc6 100644
--- a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
@@ -43,10 +43,10 @@ index 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 83119de3ae3e38ba4bb77abf005043cfa82c4670..a392be8dee7eccc5f6a55edf02ec207bcb65b0a5 100644
+index 05cb57584949679130bf7c5d7d3524463d6c9e7b..a8b26d4360f57665afe8e39ab1ba87a7d6d15867 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1740,7 +1740,7 @@ public final class CraftServer implements Server {
+@@ -1743,7 +1743,7 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch
index 5655f89084..6b94eb3102 100644
--- a/patches/server/0109-Add-EntityZapEvent.patch
+++ b/patches/server/0109-Add-EntityZapEvent.patch
@@ -28,11 +28,11 @@ index f9704b20e71564ac721a24655b2792c689edf6ba..e04f3f1159c5d5fa2e3956a36e95f8af
                  entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
                  entitywitch.setNoAi(this.isNoAi());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 551fd24885cee87a3ca579f2f4bf0a18b9505e79..a6fa9f85835ca2ced58a0564b8f31527698885bb 100644
+index 8c9e545b8508172be51c9f244d7067509d32aef9..e9355d4594d1a3d1dbbdd7be5207f1a384546d5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1201,6 +1201,14 @@ public class CraftEventFactory {
-         return event;
+@@ -1212,6 +1212,14 @@ public class CraftEventFactory {
+         return !event.isCancelled();
      }
  
 +    // Paper start
@@ -43,6 +43,6 @@ index 551fd24885cee87a3ca579f2f4bf0a18b9505e79..a6fa9f85835ca2ced58a0564b8f31527
 +    }
 +    // Paper end
 +
-     public static HorseJumpEvent callHorseJumpEvent(Entity horse, float power) {
-         HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
-         horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
+     public static boolean callEntityChangeBlockEvent(Entity entity, BlockPos position, net.minecraft.world.level.block.state.BlockState newBlock) {
+         return CraftEventFactory.callEntityChangeBlockEvent(entity, position, newBlock, false);
+     }
diff --git a/patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch b/patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
index 7b05e6f24d..2772cd85eb 100644
--- a/patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
+++ b/patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Filter bad tile entity nbt data from falling blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 26ef917d401eb79466e246d82b5d689c7133c7a2..95bcd8f03a784287c5a6106c784448e54c4b531b 100644
+index 93c162fd126824ab0af39568efe0dec21d846810..5b37b5c45bad8d8d262f46a117e3fc858cb40485 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -332,7 +332,7 @@ public class FallingBlockEntity extends Entity {
+@@ -334,7 +334,7 @@ public class FallingBlockEntity extends Entity {
              this.dropItem = nbt.getBoolean("DropItem");
          }
  
diff --git a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
index 79b175b053..55dce61ef3 100644
--- a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a392be8dee7eccc5f6a55edf02ec207bcb65b0a5..9b45eed05bebc3957f54291fe59c87994bfdf00d 100644
+index a8b26d4360f57665afe8e39ab1ba87a7d6d15867..9acc18ca45cc4e55bcd8a1624f27245a7ae81096 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2650,5 +2650,24 @@ public final class CraftServer implements Server {
+@@ -2664,5 +2664,24 @@ public final class CraftServer implements Server {
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();
      }
diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
index af34f88564..f3b78dba30 100644
--- a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
@@ -18,10 +18,10 @@ index 93c83cfedc7d3a169ad0504aa6e63f600873501b..9dffdfe5bbd0517e9a2c6a6770eea07b
  
                  --this.count;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a6fa9f85835ca2ced58a0564b8f31527698885bb..e9094e0d5b84f9427353ab903da15c748e14a2c1 100644
+index e9355d4594d1a3d1dbbdd7be5207f1a384546d5d..5fe27d6aad6d904234543bd5fc8fe3d7c1852840 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1160,6 +1160,17 @@ public class CraftEventFactory {
+@@ -1165,6 +1165,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0114-Add-ProjectileCollideEvent.patch
index ab2d1ada57..594a0fd09b 100644
--- a/patches/server/0114-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0114-Add-ProjectileCollideEvent.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add ProjectileCollideEvent
 Deprecated now and replaced with ProjectileHitEvent
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e9094e0d5b84f9427353ab903da15c748e14a2c1..8e8401dec4d3157a05216b790db5481ec8e0495a 100644
+index 5fe27d6aad6d904234543bd5fc8fe3d7c1852840..515e8886d04668598b6725ba11f75f40ed35d4e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1304,6 +1304,17 @@ public class CraftEventFactory {
+@@ -1309,6 +1309,17 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
@@ -27,7 +27,7 @@ index e9094e0d5b84f9427353ab903da15c748e14a2c1..8e8401dec4d3157a05216b790db5481e
      public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) {
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
-@@ -1328,8 +1339,15 @@ public class CraftEventFactory {
+@@ -1333,8 +1344,15 @@ public class CraftEventFactory {
          if (position.getType() == HitResult.Type.ENTITY) {
              hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity();
          }
diff --git a/patches/server/0120-String-based-Action-Bar-API.patch b/patches/server/0120-String-based-Action-Bar-API.patch
index daa143038b..e4226df63e 100644
--- a/patches/server/0120-String-based-Action-Bar-API.patch
+++ b/patches/server/0120-String-based-Action-Bar-API.patch
@@ -26,10 +26,10 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 54fbc06216e1eec6976d6514d343345ee17b020c..a27d36b8dbdcec1ac2139fd7ab11ba7184b7d35c 100644
+index 8b594be03e0627789e5b724cbc08329795ed46e5..1ad53070a0725daa0622598de82382dd3e26624d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -332,6 +332,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -338,6 +338,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start
diff --git a/patches/server/0126-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0126-Don-t-allow-entities-to-ride-themselves-572.patch
deleted file mode 100644
index 9e87843997..0000000000
--- a/patches/server/0126-Don-t-allow-entities-to-ride-themselves-572.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alfie Cleveland <alfeh@me.com>
-Date: Sun, 8 Jan 2017 04:31:36 +0000
-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 b7b7500c580548fcdcfa2ba36137abf45b43ddf9..1546c13dd185ac10d573873d68658193fe110fb7 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2537,6 +2537,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
- 
-     protected boolean addPassenger(Entity entity) { // CraftBukkit
-+        if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
-         if (entity.getVehicle() != this) {
-             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
-         } else {
diff --git a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 96%
rename from patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 0b762868da..70925137ab 100644
--- a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 2de026fcf6323e69fcd1a7186644de318f85cd78..1c392cf6477d05c4d7f4e658250fc6652b26b40d 100644
+index 4814601e549b0b96e83ed64ee094ddaa825565de..16468dfd657501f6fd5eefa4c32682e24eaba22d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -427,7 +427,7 @@ public class ServerPlayerGameMode {
@@ -133,10 +133,10 @@ index 9dffdfe5bbd0517e9a2c6a6770eea07b43ef9b33..6de7fcccb6da757185a38b79b3a22821
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 323b3a561060eacaad37832f44d0cdb9e4a1a2dc..565d0349328b7ae5fcbdf1682dcedff937457f92 100644
+index c6a30c7558f444318eb4c913a0efdad48878653a..eac1baba1714a9cbfd27170b491788f254a73223 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1769,7 +1769,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1759,7 +1759,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
      protected void dropExperience() {
          // CraftBukkit start - Update getExpReward() above if the removed if() changes!
          if (true && !(this instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon)) { // CraftBukkit - SPIGOT-2420: Special case ender dragon will drop the xp over time
@@ -147,10 +147,10 @@ index 323b3a561060eacaad37832f44d0cdb9e4a1a2dc..565d0349328b7ae5fcbdf1682dcedff9
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
-index 18f560b8ea74b6b072264754708e9f67a178f99c..1430f598073aab7387cf5985a7b3a84d3f53548c 100644
+index dfccfde4484d4a495f796caaff31d243ed6cdddc..c2f61ed153260692c96af4f20bc5b7d55cbbc380 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
-@@ -258,12 +258,14 @@ public abstract class Animal extends AgeableMob {
+@@ -261,12 +261,14 @@ public abstract class Animal extends AgeableMob {
  
      public void finalizeSpawnChildFromBreeding(ServerLevel worldserver, Animal entityanimal, @Nullable AgeableMob entityageable, int experience) {
          // CraftBukkit end
@@ -169,7 +169,7 @@ index 18f560b8ea74b6b072264754708e9f67a178f99c..1430f598073aab7387cf5985a7b3a84d
          this.setAge(6000);
          entityanimal.setAge(6000);
          this.resetLove();
-@@ -272,7 +274,7 @@ public abstract class Animal extends AgeableMob {
+@@ -275,7 +277,7 @@ public abstract class Animal extends AgeableMob {
          if (worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
              // CraftBukkit start - use event experience
              if (experience > 0) {
@@ -179,7 +179,7 @@ index 18f560b8ea74b6b072264754708e9f67a178f99c..1430f598073aab7387cf5985a7b3a84d
              // CraftBukkit end
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 79b99311bcf318aa1aff78c0c905378d99147716..c2a87255178917a9555ec48ff7e705efef2da7ab 100644
+index 3e14e79847a0992687420ecb3bbeb742ee287714..44b6d232d940d4020fa7664e48a483c20959dde0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -898,7 +898,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -192,7 +192,7 @@ index 79b99311bcf318aa1aff78c0c905378d99147716..c2a87255178917a9555ec48ff7e705ef
                      // CraftBukkit end
                  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 6ab7ffe2b0da45c38edd46e9d29df603d3a0b0bc..fcd760cb88f84ff79811631612956fde79905132 100644
+index c9c9a7f75ab239829026f419774945341d364e66..3a3f5e567fdefad6887e42c8e9147194ae0c4d89 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -455,7 +455,7 @@ public class Turtle extends Animal {
@@ -324,7 +324,7 @@ index 9113fd7070596ecf504837f335022d5eb4ef9a77..d56a64b058d8848e405e33d9884a61ea
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 6a4e30365f015b6aaf7ca18d7b31ff1523ebdf0c..002875dc5ee549c5d192d90c6e4daf59c1f7c0ff 100644
+index 8e1d70bbc433780f264dde137aa7f37e7f6362cd..3dd759d030411420f93eb5ac51f2087ecbf2dc49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -942,7 +942,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0128-Cap-Entity-Collisions.patch b/patches/server/0127-Cap-Entity-Collisions.patch
similarity index 88%
rename from patches/server/0128-Cap-Entity-Collisions.patch
rename to patches/server/0127-Cap-Entity-Collisions.patch
index 5f80b9e089..6a1bdac3d0 100644
--- a/patches/server/0128-Cap-Entity-Collisions.patch
+++ b/patches/server/0127-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 1546c13dd185ac10d573873d68658193fe110fb7..5c616afddc9a0403787fd2ea2467220d81253541 100644
+index 5436ec263b56d0601432b46708025b725898b894..019f02d4c0f44155ae248fa04403a174fde65e51 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -387,6 +387,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,10 +24,10 @@ index 1546c13dd185ac10d573873d68658193fe110fb7..5c616afddc9a0403787fd2ea2467220d
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 565d0349328b7ae5fcbdf1682dcedff937457f92..e173f7f020bc25ba68bc5c4e82cbcb7abd6c7d75 100644
+index eac1baba1714a9cbfd27170b491788f254a73223..39c69fa6d164b1bcad97a9410953c8998e415d3c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3327,8 +3327,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3317,8 +3317,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      }
                  }
  
diff --git a/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0130-Do-not-let-armorstands-drown.patch b/patches/server/0129-Do-not-let-armorstands-drown.patch
similarity index 100%
rename from patches/server/0130-Do-not-let-armorstands-drown.patch
rename to patches/server/0129-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 96%
rename from patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 6c46d142ff..86d217d44d 100644
--- a/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -14,7 +14,7 @@ To be converted into a Paper-API event at some point in the future?
 public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 38d8a2d5fa3e911c99e3e06c99ea18afbe89c0b3..eaafaa184c0c85ae7d454cc0e6ca9550391adcde 100644
+index 7a4b763e4b7005cf7df75ca9217897faed433b39..c5df103a1addefb1c11132a4b406bcdf3e8f455f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2332,6 +2332,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 83%
rename from patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
index fe41683266..6913a31864 100644
--- a/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9b45eed05bebc3957f54291fe59c87994bfdf00d..85b8ae9b40d0f631c91e00a59ce6347fd915bcb5 100644
+index 9acc18ca45cc4e55bcd8a1624f27245a7ae81096..fd608bb0423b7dc2076035210cb816134c9ce4c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2669,5 +2669,10 @@ public final class CraftServer implements Server {
+@@ -2683,5 +2683,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
diff --git a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
index 26c9158e46..539a4105d5 100644
--- a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -389,10 +389,10 @@ index bc96f426d488d2a206b763dccdc4034fe24f269d..82db70c548336ada2af556251b8ae8d1
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 85b8ae9b40d0f631c91e00a59ce6347fd915bcb5..b91a06359b163b49c506d64b3da2e616e3d9fa40 100644
+index fd608bb0423b7dc2076035210cb816134c9ce4c0..059d43512dae19515abdeeb49c36c7e8b7f64cf5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -42,7 +42,6 @@ import java.util.logging.Level;
+@@ -43,7 +43,6 @@ import java.util.logging.Level;
  import java.util.logging.Logger;
  import java.util.stream.Collectors;
  import javax.imageio.ImageIO;
@@ -400,7 +400,7 @@ index 85b8ae9b40d0f631c91e00a59ce6347fd915bcb5..b91a06359b163b49c506d64b3da2e616
  import net.minecraft.advancements.Advancement;
  import net.minecraft.commands.CommandSourceStack;
  import net.minecraft.commands.Commands;
-@@ -1308,9 +1307,13 @@ public final class CraftServer implements Server {
+@@ -1311,9 +1310,13 @@ public final class CraftServer implements Server {
          return this.logger;
      }
  
@@ -415,7 +415,7 @@ index 85b8ae9b40d0f631c91e00a59ce6347fd915bcb5..b91a06359b163b49c506d64b3da2e616
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b96652b7bcad07c39a81858c1a2c285efbf67905..cb1f050efb85e3b31dba2063fb3a316db1e0430d 100644
+index b74b300fbb27fe93b150ecba874e05dfa57a1371..21b1636ca97865c05de26dfca7e4f86b8e66dee8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -13,7 +13,6 @@ import java.util.logging.Logger;
diff --git a/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 86%
rename from patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
index 6600f63f36..f21ade656c 100644
--- a/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 6bd17e28b2f081aa84e4aca138eb56a4c00d57f6..b1e583ff4c1a9019be2f5d037bb04e7ebcbe9ae5 100644
+index 25c4092d8d28b04b7ba5caee592b96530a08227c..6594d501f51d18f5850999cceb9febfe206ec596 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -285,7 +285,7 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -287,7 +287,7 @@ public class Creeper extends Monster implements PowerableMob {
      private void spawnLingeringCloud() {
          Collection<MobEffectInstance> collection = this.getActiveEffects();
  
diff --git a/patches/server/0136-Item-canEntityPickup.patch b/patches/server/0135-Item-canEntityPickup.patch
similarity index 93%
rename from patches/server/0136-Item-canEntityPickup.patch
rename to patches/server/0135-Item-canEntityPickup.patch
index 1e18f0b02c..5859d9186f 100644
--- a/patches/server/0136-Item-canEntityPickup.patch
+++ b/patches/server/0135-Item-canEntityPickup.patch
@@ -21,10 +21,10 @@ index 3500fd0045ad670de818dc170d9c68da643592e0..1f050f1c133e116e861e4e5f7e598753
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index dbe07ffbc6310828370be69081ac6d6f3085e4ac..1503d143429f0b73935004a7061d0409dcb24c2c 100644
+index 23c51152288d9616673ef544a09dd816dff44cf6..2d1b8d6e490e1dcde801feaae2518a59ed35e440 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -51,6 +51,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -52,6 +52,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
      public UUID target;
      public final float bobOffs;
      private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
diff --git a/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 82%
rename from patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 53e74468d0..055fdfe928 100644
--- a/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 1503d143429f0b73935004a7061d0409dcb24c2c..8357ef35c374c6a6602eb96d4281da0210aea757 100644
+index 2d1b8d6e490e1dcde801feaae2518a59ed35e440..0816b5fd4a384e5f8939c6d573666802dceb255c 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -399,6 +399,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -404,6 +404,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
              // CraftBukkit start - fire PlayerPickupItemEvent
              int canHold = player.getInventory().canHold(itemstack);
              int remaining = i - canHold;
@@ -16,8 +16,8 @@ index 1503d143429f0b73935004a7061d0409dcb24c2c..8357ef35c374c6a6602eb96d4281da02
  
              if (this.pickupDelay <= 0 && canHold > 0) {
                  itemstack.setCount(canHold);
-@@ -406,8 +407,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
-                 PlayerPickupItemEvent playerEvent = new PlayerPickupItemEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
+@@ -411,8 +412,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
+                 PlayerPickupItemEvent playerEvent = new PlayerPickupItemEvent((Player) player.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
                  playerEvent.setCancelled(!playerEvent.getPlayer().getCanPickupItems());
                  this.level().getCraftServer().getPluginManager().callEvent(playerEvent);
 +                flyAtPlayer = playerEvent.getFlyAtPlayer(); // Paper
@@ -31,7 +31,7 @@ index 1503d143429f0b73935004a7061d0409dcb24c2c..8357ef35c374c6a6602eb96d4281da02
                      return;
                  }
  
-@@ -437,6 +444,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -442,6 +449,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
              // CraftBukkit end
  
              if (this.pickupDelay == 0 && (this.target == null || this.target.equals(player.getUUID())) && player.getInventory().add(itemstack)) {
diff --git a/patches/server/0138-PlayerAttemptPickupItemEvent.patch b/patches/server/0137-PlayerAttemptPickupItemEvent.patch
similarity index 88%
rename from patches/server/0138-PlayerAttemptPickupItemEvent.patch
rename to patches/server/0137-PlayerAttemptPickupItemEvent.patch
index f195a6a62d..8ee62f6cc1 100644
--- a/patches/server/0138-PlayerAttemptPickupItemEvent.patch
+++ b/patches/server/0137-PlayerAttemptPickupItemEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 8357ef35c374c6a6602eb96d4281da0210aea757..3bd7f52030ea5b603bba5e4a8e1d28194f89fa7f 100644
+index 0816b5fd4a384e5f8939c6d573666802dceb255c..91eba1c571764c88489ea2598fb9b4736554d5cc 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -35,6 +35,7 @@ import net.minecraft.stats.Stats;
+@@ -36,6 +36,7 @@ import org.bukkit.entity.Player;
  import org.bukkit.event.entity.EntityPickupItemEvent;
  import org.bukkit.event.player.PlayerPickupItemEvent;
  // CraftBukkit end
@@ -16,7 +16,7 @@ index 8357ef35c374c6a6602eb96d4281da0210aea757..3bd7f52030ea5b603bba5e4a8e1d2819
  
  public class ItemEntity extends Entity implements TraceableEntity {
  
-@@ -401,6 +402,22 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -406,6 +407,22 @@ public class ItemEntity extends Entity implements TraceableEntity {
              int remaining = i - canHold;
              boolean flyAtPlayer = false; // Paper
  
diff --git a/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 98%
rename from patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index c382a8f740..20757105e9 100644
--- a/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
@@ -63,7 +63,7 @@ index 24ed280a31a10c822cb8b2d2e9bf43ad81d92924..a2fc2c0437999dd09f080eafe8ea466b
                          Property property = Iterables.getFirst(profilex.getProperties().get("textures"), (Property)null);
                          if (property == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
-index 3030c153725415802f68c144e0b577d919307058..3e40d47f504248cd7caeef6b841a8aa6f1976170 100644
+index aa4760ae56d3ba16779d1b04301f0fd75527f9ec..2375b0bac17dd73d6ee12a94b9e4a4143a2e1c65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 +++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 @@ -121,7 +121,7 @@ public final class CraftPlayerProfile implements PlayerProfile {
diff --git a/patches/server/0140-Add-UnknownCommandEvent.patch b/patches/server/0139-Add-UnknownCommandEvent.patch
similarity index 96%
rename from patches/server/0140-Add-UnknownCommandEvent.patch
rename to patches/server/0139-Add-UnknownCommandEvent.patch
index 489953e61a..170735d169 100644
--- a/patches/server/0140-Add-UnknownCommandEvent.patch
+++ b/patches/server/0139-Add-UnknownCommandEvent.patch
@@ -83,10 +83,10 @@ index 2fdfc17ef3daf9fb5cc32c807292c71e256d5356..e3394864e29357fec036f9e616472aea
  
                  b1 = 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b91a06359b163b49c506d64b3da2e616e3d9fa40..2e076affd9ee7e407e86586536d02cb8f6f20805 100644
+index 059d43512dae19515abdeeb49c36c7e8b7f64cf5..e72b64dd855a824a2bb8b8791df845f1d9f000e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -522,6 +522,7 @@ public final class CraftServer implements Server {
+@@ -525,6 +525,7 @@ public final class CraftServer implements Server {
                      }
                      node = clone;
                  }
@@ -94,7 +94,7 @@ index b91a06359b163b49c506d64b3da2e616e3d9fa40..2e076affd9ee7e407e86586536d02cb8
  
                  dispatcher.getDispatcher().getRoot().addChild(node);
              } else {
-@@ -911,7 +912,13 @@ public final class CraftServer implements Server {
+@@ -914,7 +915,13 @@ public final class CraftServer implements Server {
  
          // Spigot start
          if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
diff --git a/patches/server/0141-Basic-PlayerProfile-API.patch b/patches/server/0140-Basic-PlayerProfile-API.patch
similarity index 99%
rename from patches/server/0141-Basic-PlayerProfile-API.patch
rename to patches/server/0140-Basic-PlayerProfile-API.patch
index 79e093ddea..5af405ec62 100644
--- a/patches/server/0141-Basic-PlayerProfile-API.patch
+++ b/patches/server/0140-Basic-PlayerProfile-API.patch
@@ -631,10 +631,10 @@ index 4038bb76339d43f18770624bd7fecc79b8d7f2a9..2456edc11b29a92b1648937cd3dd6a9a
          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 2e076affd9ee7e407e86586536d02cb8f6f20805..bdee52f1bd2bb34fd0292d35b8b1e7194d7df716 100644
+index e72b64dd855a824a2bb8b8791df845f1d9f000e1..2bed3141b49789324e4e7bbec802f50ac3745edf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -257,6 +257,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+@@ -260,6 +260,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
  
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
@@ -644,7 +644,7 @@ index 2e076affd9ee7e407e86586536d02cb8f6f20805..bdee52f1bd2bb34fd0292d35b8b1e719
  public final class CraftServer implements Server {
      private final String serverName = "Paper"; // Paper
      private final String serverVersion;
-@@ -299,6 +302,7 @@ public final class CraftServer implements Server {
+@@ -302,6 +305,7 @@ public final class CraftServer implements Server {
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
          ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
@@ -652,7 +652,7 @@ index 2e076affd9ee7e407e86586536d02cb8f6f20805..bdee52f1bd2bb34fd0292d35b8b1e719
          CraftItemFactory.instance();
      }
  
-@@ -2684,5 +2688,37 @@ public final class CraftServer implements Server {
+@@ -2698,5 +2702,37 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return io.papermc.paper.configuration.GlobalConfiguration.get().commands.suggestPlayerNamesWhenNullTabCompletions;
      }
diff --git a/patches/server/0142-Shoulder-Entities-Release-API.patch b/patches/server/0141-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/server/0142-Shoulder-Entities-Release-API.patch
rename to patches/server/0141-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0143-Profile-Lookup-Events.patch b/patches/server/0142-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/0143-Profile-Lookup-Events.patch
rename to patches/server/0142-Profile-Lookup-Events.patch
diff --git a/patches/server/0144-Block-player-logins-during-server-shutdown.patch b/patches/server/0143-Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from patches/server/0144-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0143-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0145-Entity-fromMobSpawner.patch b/patches/server/0144-Entity-fromMobSpawner.patch
similarity index 97%
rename from patches/server/0145-Entity-fromMobSpawner.patch
rename to patches/server/0144-Entity-fromMobSpawner.patch
index ca0e39dd5e..b36c3e9bb5 100644
--- a/patches/server/0145-Entity-fromMobSpawner.patch
+++ b/patches/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 875516b17452968e53efda9d777676ec4bee0f79..16658764ddced4c8e5af6b9f86ad6e99a2b1adee 100644
+index 019f02d4c0f44155ae248fa04403a174fde65e51..841bcf08ae46911537f9567a450b130d2f6fbc59 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -388,6 +388,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0145-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
rename to patches/server/0145-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0147-Implement-ensureServerConversions-API.patch b/patches/server/0146-Implement-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/0147-Implement-ensureServerConversions-API.patch
rename to patches/server/0146-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0148-Implement-getI18NDisplayName.patch b/patches/server/0147-Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/0148-Implement-getI18NDisplayName.patch
rename to patches/server/0147-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0149-ProfileWhitelistVerifyEvent.patch b/patches/server/0148-ProfileWhitelistVerifyEvent.patch
similarity index 97%
rename from patches/server/0149-ProfileWhitelistVerifyEvent.patch
rename to patches/server/0148-ProfileWhitelistVerifyEvent.patch
index 24204b1026..cfe284e035 100644
--- a/patches/server/0149-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0148-ProfileWhitelistVerifyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 03ea44619bc3445956f3e4539fc0e2923a29a92d..493099d1a1df085ec909ed6cd65a250c24f28bd1 100644
+index 82db70c548336ada2af556251b8ae8d189417024..875b08503fbbac256fad1b3f3d9c742bf1cdced2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -646,9 +646,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0150-Fix-this-stupid-bullshit.patch b/patches/server/0149-Fix-this-stupid-bullshit.patch
similarity index 94%
rename from patches/server/0150-Fix-this-stupid-bullshit.patch
rename to patches/server/0149-Fix-this-stupid-bullshit.patch
index 2158ef6589..9bf2cda44e 100644
--- a/patches/server/0150-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0149-Fix-this-stupid-bullshit.patch
@@ -31,12 +31,12 @@ index 8ff786c366332588a2df053438f23cc9fb7e2b84..c887d34171f89c731d76c4ca92c70be2
              Bootstrap.isBootstrapped = true;
              Instant instant = Instant.now();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index cb1f050efb85e3b31dba2063fb3a316db1e0430d..f707537227a729a48f63b86b69bbeb22743435ac 100644
+index 21b1636ca97865c05de26dfca7e4f86b8e66dee8..65c7b9bd1f8dcbe87f75967f35ac91b6a2016844 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -257,10 +257,12 @@ public class Main {
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
                      if (buildDate.before(deadline.getTime())) {
 -                        System.err.println("*** Error, this build is outdated ***");
 +                        // Paper start - This is some stupid bullshit
diff --git a/patches/server/0151-LivingEntity-setKiller.patch b/patches/server/0150-LivingEntity-setKiller.patch
similarity index 89%
rename from patches/server/0151-LivingEntity-setKiller.patch
rename to patches/server/0150-LivingEntity-setKiller.patch
index e6e7fff121..51eb216ef5 100644
--- a/patches/server/0151-LivingEntity-setKiller.patch
+++ b/patches/server/0150-LivingEntity-setKiller.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] LivingEntity#setKiller
 public net.minecraft.world.entity.LivingEntity lastHurtByPlayerTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index fcb07a5f8cac994b731e3345ba9e971faa482fa1..0fb61f37da9ef3e33803b41bd72e0bda5425eceb 100644
+index 96095cc107d161cad7401725eb70f08203deac9a..303b066aa9dcdb82e7f67160e8ac901374138465 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -352,6 +352,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -365,6 +365,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().lastHurtByPlayer == null ? null : (Player) this.getHandle().lastHurtByPlayer.getBukkitEntity();
      }
  
diff --git a/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 90%
rename from patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
index e5de7e2efe..661fda5049 100644
--- a/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index 2d40564959570ddbcc952e41edd1a00e13624feb..8974c3cdae25bef239a908ce688e153d902c48c5 100644
+index 14b8b844af59ba84211fb029eb2470eb8044faf9..924ea172cab5178e5754bfe09cc7b83c1a66faa6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 @@ -133,7 +133,7 @@ public class Ocelot extends Animal {
diff --git a/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 100%
rename from patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 100%
rename from patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0157-Add-PlayerJumpEvent.patch b/patches/server/0156-Add-PlayerJumpEvent.patch
similarity index 96%
rename from patches/server/0157-Add-PlayerJumpEvent.patch
rename to patches/server/0156-Add-PlayerJumpEvent.patch
index fc9a3cd8b7..996b320854 100644
--- a/patches/server/0157-Add-PlayerJumpEvent.patch
+++ b/patches/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 054776624f6df25b69d1e3c480e8b7effbb592a7..6928d2fb7493206ab84bedc39434285f45d9dc38 100644
+index c5df103a1addefb1c11132a4b406bcdf3e8f455f..c720c85361110083b2dd622ab52791ded1f784a1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1292,7 +1292,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
similarity index 95%
rename from patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
rename to patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
index c95703690b..7855e7bce2 100644
--- a/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/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 1d135eca793b251139cce39b7fb26db547c98c2b..900fb8d501fb794cf620ce26ce96bd7914646c3a 100644
+index c720c85361110083b2dd622ab52791ded1f784a1..04bff597b77e37ee90abecc2dabf8919c1ef4082 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3111,14 +3111,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
similarity index 96%
rename from patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
index f2257c7278..aa06a97466 100644
--- a/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,10 +90,10 @@ index 77d7f070cce1a47e41b5d4f5a1cc8c778352a126..a3b610cb1ed97a635677bc46ccdf0463
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a27d36b8dbdcec1ac2139fd7ab11ba7184b7d35c..960ecbb361d0187ae6e418d79beb65c83b6bd087 100644
+index 1ad53070a0725daa0622598de82382dd3e26624d..afe1de50ef9123df5138f29b0cfc75a8a7923af1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -278,6 +278,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -284,6 +284,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/patches/server/0160-revert-serverside-behavior-of-keepalives.patch b/patches/server/0159-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from patches/server/0160-revert-serverside-behavior-of-keepalives.patch
rename to patches/server/0159-revert-serverside-behavior-of-keepalives.patch
index 93fbdc15ca..fff61a500a 100644
--- a/patches/server/0160-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/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 95256c095626f429315b80df86876b18112989bc..575ecae47633e7a30c8bca57d686dcfc0b31a0df 100644
+index 04bff597b77e37ee90abecc2dabf8919c1ef4082..e206753e5b34b6ab7bd241a77a67e0cdcfa662d1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -259,7 +259,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0162-Add-PlayerArmorChangeEvent.patch b/patches/server/0161-Add-PlayerArmorChangeEvent.patch
similarity index 91%
rename from patches/server/0162-Add-PlayerArmorChangeEvent.patch
rename to patches/server/0161-Add-PlayerArmorChangeEvent.patch
index e282030615..3f458457b1 100644
--- a/patches/server/0162-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0161-Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e173f7f020bc25ba68bc5c4e82cbcb7abd6c7d75..c3ad63e1882d53f4207f4f08b55088d175360e8d 100644
+index 39c69fa6d164b1bcad97a9410953c8998e415d3c..b2dc7a83d475c0fcdaec8d1e11bf5bdaac39acdf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1,5 +1,6 @@
@@ -15,7 +15,7 @@ index e173f7f020bc25ba68bc5c4e82cbcb7abd6c7d75..c3ad63e1882d53f4207f4f08b55088d1
  import com.google.common.base.Objects;
  import com.google.common.collect.ImmutableList;
  import com.google.common.collect.ImmutableMap;
-@@ -3026,6 +3027,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3016,6 +3017,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
              ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
  
              if (this.equipmentHasChanged(itemstack, itemstack1)) {
diff --git a/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 100%
rename from patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0167-AsyncTabCompleteEvent.patch b/patches/server/0166-AsyncTabCompleteEvent.patch
similarity index 97%
rename from patches/server/0167-AsyncTabCompleteEvent.patch
rename to patches/server/0166-AsyncTabCompleteEvent.patch
index 3c751453aa..a8ba5d754b 100644
--- a/patches/server/0167-AsyncTabCompleteEvent.patch
+++ b/patches/server/0166-AsyncTabCompleteEvent.patch
@@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent
 Co-authored-by: Aikar <aikar@aikar.co>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0b25c1df8a98b5b7aae65ad74fdd0213c07e0ee7..b4837600cdaf89c5a94499945a8089c3ac65702a 100644
+index e206753e5b34b6ab7bd241a77a67e0cdcfa662d1..1d593c32abbae6ca59bad0075993c58e18a01c72 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -788,12 +788,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -91,10 +91,10 @@ index 0b25c1df8a98b5b7aae65ad74fdd0213c07e0ee7..b4837600cdaf89c5a94499945a8089c3
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bdee52f1bd2bb34fd0292d35b8b1e7194d7df716..40090372a983b7064530e982a8ee1a9bc4913dfd 100644
+index 2bed3141b49789324e4e7bbec802f50ac3745edf..ffeaa65893c576203c7b342a8689a45d3d0722bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2134,7 +2134,7 @@ public final class CraftServer implements Server {
+@@ -2148,7 +2148,7 @@ public final class CraftServer implements Server {
              offers = this.tabCompleteChat(player, message);
          }
  
diff --git a/patches/server/0168-PlayerPickupExperienceEvent.patch b/patches/server/0167-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0168-PlayerPickupExperienceEvent.patch
rename to patches/server/0167-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
similarity index 94%
rename from patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
index fe8bd0fd8b..48a291d844 100644
--- a/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
@@ -14,10 +14,10 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 960ecbb361d0187ae6e418d79beb65c83b6bd087..b1afecec5c872c188b2d52e4b2784e2bb70faa62 100644
+index afe1de50ef9123df5138f29b0cfc75a8a7923af1..3abaf7072089b06287f959cbc356acc4c912605b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1476,7 +1476,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1506,7 +1506,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 98%
rename from patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
index 3ca5021685..5a63f111ca 100644
--- a/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
@@ -60,7 +60,7 @@ index b0687dcf8af84af627b67e7fbb68170a2fd28da0..5cb151a7d89c7281b03f24c5f79afb7e
  
              while (iterator1.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0cb86afa3732eaf04dd6369d7499bd628df7e12f..8b5b66c8f55660085ff3af824b8bf0c455be79bc 100644
+index 6051ad00973c80ad3478e2ff9063c268489f358b..dda3b911fcaa294ec7b8e9d696880fcb8325f69c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0172-PreCreatureSpawnEvent.patch b/patches/server/0171-PreCreatureSpawnEvent.patch
similarity index 99%
rename from patches/server/0172-PreCreatureSpawnEvent.patch
rename to patches/server/0171-PreCreatureSpawnEvent.patch
index e211931fe7..4da8e04bb8 100644
--- a/patches/server/0172-PreCreatureSpawnEvent.patch
+++ b/patches/server/0171-PreCreatureSpawnEvent.patch
@@ -97,7 +97,7 @@ index 68594d2621267f4b112b4d14d2bec3a0dd6a044a..73a5750dd47cf8869070f92594cfb926
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 8540905242fc84ab8a26cf0a8e875ef252bc3d5d..3294e5b5ed0288af08067c36ca34514d02d200d3 100644
+index 20c39481bcf05e0d43c97b7e841ec9f5f6a0d45d..fc7719d12b5f6011aec2e41a36b4bacd77672b6d 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -128,6 +128,27 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0173-Fill-Profile-Property-Events.patch b/patches/server/0172-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0173-Fill-Profile-Property-Events.patch
rename to patches/server/0172-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0175-Add-ArmorStand-Item-Meta.patch b/patches/server/0174-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0175-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0174-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0176-Extend-Player-Interact-cancellation.patch b/patches/server/0175-Extend-Player-Interact-cancellation.patch
similarity index 97%
rename from patches/server/0176-Extend-Player-Interact-cancellation.patch
rename to patches/server/0175-Extend-Player-Interact-cancellation.patch
index 472bdb1eca..6f00ca9f3f 100644
--- a/patches/server/0176-Extend-Player-Interact-cancellation.patch
+++ b/patches/server/0175-Extend-Player-Interact-cancellation.patch
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 2e3b1eb4c4303d40f12c2e80f0608f2308225e97..0d72be376615f84934b031243ef283b6efc0bd13 100644
+index 16468dfd657501f6fd5eefa4c32682e24eaba22d..7adf7d1248680e591638298f13f5ae88788f5e4c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -186,6 +186,11 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0177-Tameable-getOwnerUniqueId-API.patch b/patches/server/0176-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0177-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0176-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/server/0180-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0182-Player.setPlayerProfile-API.patch b/patches/server/0181-Player.setPlayerProfile-API.patch
similarity index 93%
rename from patches/server/0182-Player.setPlayerProfile-API.patch
rename to patches/server/0181-Player.setPlayerProfile-API.patch
index 32fa70528c..1c36c6a3f2 100644
--- a/patches/server/0182-Player.setPlayerProfile-API.patch
+++ b/patches/server/0181-Player.setPlayerProfile-API.patch
@@ -9,7 +9,7 @@ This can be useful for changing name or skins after a player has logged in.
 public-f net.minecraft.world.entity.player.Player gameProfile
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b4837600cdaf89c5a94499945a8089c3ac65702a..5cac531de81a38fa79826e65477c5e31f9af35cd 100644
+index 1d593c32abbae6ca59bad0075993c58e18a01c72..da4c4e917cb850d03a4eb51ec9777e93932b552c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1538,7 +1538,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -40,10 +40,10 @@ index 6b31b0894e52ad6fc397624e50587ec04e46c099..0c7f280bae81bbb492d5780a43e5ffda
                          playerName = gameProfile.getName();
                          uniqueId = gameProfile.getId();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index e7442952ef1f03969949014492a7ddc6d0796ba5..69a1852905dd4724c30ac8ab88c14251eee2c371 100644
+index f0a81fa99f5923813858b77c9a1c682418c928ff..712006c27570dcbcefe173484e74d1bb0763e926 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -76,8 +76,8 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -79,8 +79,8 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
      }
  
      @Override
@@ -55,10 +55,10 @@ index e7442952ef1f03969949014492a7ddc6d0796ba5..69a1852905dd4724c30ac8ab88c14251
  
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b1afecec5c872c188b2d52e4b2784e2bb70faa62..c2461f336048d284a139b74b17e44284e5d9b596 100644
+index 3abaf7072089b06287f959cbc356acc4c912605b..39bf1e520f54abdf83dd9fd16d2f1aec58cc551b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -83,6 +83,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
+@@ -86,6 +86,7 @@ import net.minecraft.world.food.FoodData;
  import net.minecraft.world.inventory.AbstractContainerMenu;
  import net.minecraft.world.level.GameType;
  import net.minecraft.world.level.block.Blocks;
@@ -66,7 +66,7 @@ index b1afecec5c872c188b2d52e4b2784e2bb70faa62..c2461f336048d284a139b74b17e44284
  import net.minecraft.world.level.block.entity.SignBlockEntity;
  import net.minecraft.world.level.block.entity.SignText;
  import net.minecraft.world.level.border.BorderChangeListener;
-@@ -261,11 +262,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -267,11 +268,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return server.getPlayer(getUniqueId()) != null;
      }
  
@@ -78,7 +78,7 @@ index b1afecec5c872c188b2d52e4b2784e2bb70faa62..c2461f336048d284a139b74b17e44284
      @Override
      public InetSocketAddress getAddress() {
          if (this.getHandle().connection == null) return null;
-@@ -1626,8 +1622,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1656,8 +1652,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      private void untrackAndHideEntity(org.bukkit.entity.Entity entity) {
          // Remove this entity from the hidden player's EntityTrackerEntry
@@ -95,7 +95,7 @@ index b1afecec5c872c188b2d52e4b2784e2bb70faa62..c2461f336048d284a139b74b17e44284
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
          if (entry != null) {
              entry.removePlayer(this.getHandle());
-@@ -1640,8 +1643,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1670,8 +1673,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.getHandle().connection.send(new ClientboundPlayerInfoRemovePacket(List.of(otherPlayer.getUUID())));
              }
          }
@@ -104,7 +104,7 @@ index b1afecec5c872c188b2d52e4b2784e2bb70faa62..c2461f336048d284a139b74b17e44284
      }
  
      void resetAndHideEntity(org.bukkit.entity.Entity entity) {
-@@ -1718,8 +1719,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1748,8 +1749,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
              entry.updatePlayer(this.getHandle());
          }
@@ -144,7 +144,7 @@ index b1afecec5c872c188b2d52e4b2784e2bb70faa62..c2461f336048d284a139b74b17e44284
      }
  
      void resetAndShowEntity(org.bukkit.entity.Entity entity) {
-@@ -1732,6 +1763,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1762,6 +1793,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              this.trackAndShowEntity(entity);
          }
      }
diff --git a/patches/server/0183-getPlayerUniqueId-API.patch b/patches/server/0182-getPlayerUniqueId-API.patch
similarity index 90%
rename from patches/server/0183-getPlayerUniqueId-API.patch
rename to patches/server/0182-getPlayerUniqueId-API.patch
index fd7b2501e2..43e520a130 100644
--- a/patches/server/0183-getPlayerUniqueId-API.patch
+++ b/patches/server/0182-getPlayerUniqueId-API.patch
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 40090372a983b7064530e982a8ee1a9bc4913dfd..23407ccc0482f67db46947cbcc56c5488c42cf93 100644
+index ffeaa65893c576203c7b342a8689a45d3d0722bb..78a2fdb466c56d75568af5f7d5398baf4ba8532c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1743,6 +1743,25 @@ public final class CraftServer implements Server {
+@@ -1746,6 +1746,25 @@ public final class CraftServer implements Server {
          return recipients.size();
      }
  
diff --git a/patches/server/0184-Improved-Async-Task-Scheduler.patch b/patches/server/0183-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0184-Improved-Async-Task-Scheduler.patch
rename to patches/server/0183-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0185-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0185-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0187-Flag-to-disable-the-channel-limit.patch b/patches/server/0186-Flag-to-disable-the-channel-limit.patch
similarity index 88%
rename from patches/server/0187-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0186-Flag-to-disable-the-channel-limit.patch
index 4de306ac98..8f153348d9 100644
--- a/patches/server/0187-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0186-Flag-to-disable-the-channel-limit.patch
@@ -9,10 +9,10 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c2461f336048d284a139b74b17e44284e5d9b596..2072778d96fc5616ec6e6b85b29585fbb43775bb 100644
+index 39bf1e520f54abdf83dd9fd16d2f1aec58cc551b..b89714e6f136cb661b962911988c04481ddb0801 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -185,6 +185,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -191,6 +191,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper start
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
@@ -20,7 +20,7 @@ index c2461f336048d284a139b74b17e44284e5d9b596..2072778d96fc5616ec6e6b85b29585fb
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -2001,7 +2002,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2031,7 +2032,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper end
  
      public void addChannel(String channel) {
diff --git a/patches/server/0188-Add-openSign-method-to-HumanEntity.patch b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
similarity index 91%
rename from patches/server/0188-Add-openSign-method-to-HumanEntity.patch
rename to patches/server/0187-Add-openSign-method-to-HumanEntity.patch
index 7136d8c252..00dc3cdb02 100644
--- a/patches/server/0188-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add openSign method to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 8ce466c19dae6534be828779639aedb687a94e68..a74a585a270e4a4c12f025b35a7f104f21e4705c 100644
+index 6ca423ca58f486eec05c55faf055e0cdbabde709..f48b5204e59ab0c840fc08ecb9abf5facbae9be1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-@@ -110,7 +110,7 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
+@@ -120,7 +120,7 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
          super.applyTo(sign);
      }
  
@@ -17,7 +17,7 @@ index 8ce466c19dae6534be828779639aedb687a94e68..a74a585a270e4a4c12f025b35a7f104f
          Preconditions.checkArgument(sign != null, "sign == null");
          Preconditions.checkArgument(side != null, "side == null");
          Preconditions.checkArgument(sign.isPlaced(), "Sign must be placed");
-@@ -118,7 +118,8 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
+@@ -128,7 +128,8 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
  
          SignBlockEntity handle = ((CraftSign<?>) sign).getTileEntity();
  
diff --git a/patches/server/0189-Configurable-sprint-interruption-on-attack.patch b/patches/server/0188-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0189-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0188-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0190-EndermanEscapeEvent.patch b/patches/server/0189-EndermanEscapeEvent.patch
similarity index 84%
rename from patches/server/0190-EndermanEscapeEvent.patch
rename to patches/server/0189-EndermanEscapeEvent.patch
index a70e6c8bb2..72e0e222e7 100644
--- a/patches/server/0190-EndermanEscapeEvent.patch
+++ b/patches/server/0189-EndermanEscapeEvent.patch
@@ -8,11 +8,11 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 045f9d569305786b882db915e431cb45f6aa3375..9df51c1108f4e9a3d8391783b7394286d6e1eb24 100644
+index 084a9bb8ca0ec57fad1efbc540e4b58eacb61970..d2dd4537f8a81d02a4d3570834549d7e27b749b9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -118,6 +118,12 @@ public class EnderMan extends Monster implements NeutralMob {
-         this.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.UNKNOWN, true);
+@@ -122,6 +122,12 @@ public class EnderMan extends Monster implements NeutralMob {
+         this.setTarget(target, EntityTargetEvent.TargetReason.UNKNOWN, true);
      }
  
 +    // Paper start
@@ -22,9 +22,9 @@ index 045f9d569305786b882db915e431cb45f6aa3375..9df51c1108f4e9a3d8391783b7394286
 +    // Paper end
 +
      @Override
-     public boolean setTarget(LivingEntity entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fireEvent) {
+     public boolean setTarget(LivingEntity entityliving, EntityTargetEvent.TargetReason reason, boolean fireEvent) {
          if (!super.setTarget(entityliving, reason, fireEvent)) {
-@@ -272,7 +278,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -276,7 +282,7 @@ public class EnderMan extends Monster implements NeutralMob {
          if (this.level().isDay() && this.tickCount >= this.targetChangeTime + 600) {
              float f = this.getLightLevelDependentMagicValue();
  
@@ -33,7 +33,7 @@ index 045f9d569305786b882db915e431cb45f6aa3375..9df51c1108f4e9a3d8391783b7394286
                  this.setTarget((LivingEntity) null);
                  this.teleport();
              }
-@@ -398,11 +404,13 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -402,11 +408,13 @@ public class EnderMan extends Monster implements NeutralMob {
              } else {
                  flag1 = flag && this.hurtWithCleanWater(source, (ThrownPotion) source.getDirectEntity(), amount);
  
diff --git a/patches/server/0191-Enderman.teleportRandomly.patch b/patches/server/0190-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0191-Enderman.teleportRandomly.patch
rename to patches/server/0190-Enderman.teleportRandomly.patch
diff --git a/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 97%
rename from patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
index cd8a1df970..831872ddf5 100644
--- a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -34,7 +34,7 @@ index f2eefdeab44ad4f7c0abd0e55e688e74a83abfff..68257f257dd3b167e237482c8d149590
  
              if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 04a12be27ea3f7b8c0dd2bb2c8f4f0a4b90de1b2..5f8ce418d0a906f576622c3387d15c3969812611 100644
+index d348ca56ae452dc80d5dabe874d9f8d72970fc4d..0476f00719d180d28a2a4bab3f4152b00a1e4e67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1863,11 +1863,17 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 94%
rename from patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 1c7e757649..066ac570cb 100644
--- a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0193-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/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index a778d53bba0f9678a47ce6c3d94449ae7cd1c527..41861cb1e303213b2963e90fac6b4cbbfbbe36f7 100644
+index 8b26e90c0e7affb23fe8f92d757fe3a690b858ec..ccd426d1b8511bf8edab0e7f2b04f127c8767f4d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -203,9 +203,9 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0196-EndermanAttackPlayerEvent.patch b/patches/server/0195-EndermanAttackPlayerEvent.patch
similarity index 89%
rename from patches/server/0196-EndermanAttackPlayerEvent.patch
rename to patches/server/0195-EndermanAttackPlayerEvent.patch
index e8780b4150..453c973fb4 100644
--- a/patches/server/0196-EndermanAttackPlayerEvent.patch
+++ b/patches/server/0195-EndermanAttackPlayerEvent.patch
@@ -8,10 +8,10 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 67dab95d562f4d1acc2a78bb9d45cba92cb6d38b..acd41b474fadee12c571f390b937f455cbe393ad 100644
+index d2dd4537f8a81d02a4d3570834549d7e27b749b9..06a0a06f3f4ed20f151ddac35ae7d56852e191ae 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -230,7 +230,15 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -234,7 +234,15 @@ public class EnderMan extends Monster implements NeutralMob {
          this.readPersistentAngerSaveData(this.level(), nbt);
      }
  
diff --git a/patches/server/0197-WitchConsumePotionEvent.patch b/patches/server/0196-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0197-WitchConsumePotionEvent.patch
rename to patches/server/0196-WitchConsumePotionEvent.patch
diff --git a/patches/server/0198-WitchThrowPotionEvent.patch b/patches/server/0197-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0198-WitchThrowPotionEvent.patch
rename to patches/server/0197-WitchThrowPotionEvent.patch
diff --git a/patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 93%
rename from patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 5d2bb7facd..3b48a91189 100644
--- a/patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 002875dc5ee549c5d192d90c6e4daf59c1f7c0ff..bdc752631136a4abe903e7a8f182e9eda480fcb6 100644
+index 3dd759d030411420f93eb5ac51f2087ecbf2dc49..4dc5c75d1fa0748b6e7e95d90b92a865b2f6362e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -592,6 +592,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0200-WitchReadyPotionEvent.patch b/patches/server/0199-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0200-WitchReadyPotionEvent.patch
rename to patches/server/0199-WitchReadyPotionEvent.patch
diff --git a/patches/server/0201-ItemStack-getMaxItemUseDuration.patch b/patches/server/0200-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0201-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0200-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 78%
rename from patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 2fe36d3db1..ca3c8f8d69 100644
--- a/patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index b1e583ff4c1a9019be2f5d037bb04e7ebcbe9ae5..2480c128f6b7c4ba7af1f06f4e01b972587c08ba 100644
+index 6594d501f51d18f5850999cceb9febfe206ec596..17ce05e7f9d2615be28a095ef6d3126885df8771 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -276,6 +276,7 @@ public class Creeper extends Monster implements PowerableMob {
-                 this.spawnLingeringCloud();
+@@ -278,6 +278,7 @@ public class Creeper extends Monster implements PowerableMob {
+             // CraftBukkit start
              } else {
                  this.swell = 0;
 +                this.entityData.set(DATA_IS_IGNITED, Boolean.valueOf(false)); // Paper
diff --git a/patches/server/0204-Fix-CraftEntity-hashCode.patch b/patches/server/0203-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0204-Fix-CraftEntity-hashCode.patch
rename to patches/server/0203-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0207-Make-shield-blocking-delay-configurable.patch b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
similarity index 87%
rename from patches/server/0207-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0206-Make-shield-blocking-delay-configurable.patch
index 5d4a6a2ef0..78e602ba0d 100644
--- a/patches/server/0207-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c3ad63e1882d53f4207f4f08b55088d175360e8d..f894ffb7c9575d7337353ab8aaaf0b9607a92146 100644
+index b2dc7a83d475c0fcdaec8d1e11bf5bdaac39acdf..de63f8883ae2786030cb9e5a5fb72fadffe133ee 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3760,12 +3760,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3750,12 +3750,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
          if (this.isUsingItem() && !this.useItem.isEmpty()) {
              Item item = this.useItem.getItem();
  
@@ -35,10 +35,10 @@ index c3ad63e1882d53f4207f4f08b55088d175360e8d..f894ffb7c9575d7337353ab8aaaf0b96
          return this.isShiftKeyDown();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0fb61f37da9ef3e33803b41bd72e0bda5425eceb..b02d668243478c2cdc3d0212cec6f2e12a80414f 100644
+index 303b066aa9dcdb82e7f67160e8ac901374138465..00d4e95cee47ee9a6932a8a8ab18d45d7d5e001d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -788,5 +788,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -815,5 +815,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setArrowsStuck(final int arrows) {
          this.getHandle().setArrowCount(arrows);
      }
diff --git a/patches/server/0208-Improve-EntityShootBowEvent.patch b/patches/server/0207-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0208-Improve-EntityShootBowEvent.patch
rename to patches/server/0207-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0209-PlayerReadyArrowEvent.patch b/patches/server/0208-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0209-PlayerReadyArrowEvent.patch
rename to patches/server/0208-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
similarity index 95%
rename from patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
rename to patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
index bd1c306d4b..1b0928f576 100644
--- a/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
+++ b/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
@@ -9,7 +9,7 @@ Co-authored-by: aerulion <aerulion@gmail.com>
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7232c22ca7f0ed995934db3937861e562525e906..05c595c710541c2f4f68a391764fec3cc1fdfd7a 100644
+index 841bcf08ae46911537f9567a450b130d2f6fbc59..a12509461dd5b35ebae5eecde4a870b6f263c4d5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1894,8 +1894,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -33,10 +33,10 @@ index 7232c22ca7f0ed995934db3937861e562525e906..05c595c710541c2f4f68a391764fec3c
  
      protected void markHurt() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f894ffb7c9575d7337353ab8aaaf0b9607a92146..221fa0ca2f1c6e099da5b47ba42548262132d6de 100644
+index de63f8883ae2786030cb9e5a5fb72fadffe133ee..fee4567b670ceda5e1004957567ad8f99adad3f3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1494,7 +1494,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1484,7 +1484,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                          d0 = (Math.random() - Math.random()) * 0.01D;
                      }
  
@@ -45,7 +45,7 @@ index f894ffb7c9575d7337353ab8aaaf0b9607a92146..221fa0ca2f1c6e099da5b47ba4254826
                      if (!flag) {
                          this.indicateDamage(d0, d1);
                      }
-@@ -1543,7 +1543,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1533,7 +1533,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      protected void blockedByShield(LivingEntity target) {
@@ -54,7 +54,7 @@ index f894ffb7c9575d7337353ab8aaaf0b9607a92146..221fa0ca2f1c6e099da5b47ba4254826
      }
  
      private boolean checkTotemDeathProtection(DamageSource source) {
-@@ -1803,6 +1803,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1793,6 +1793,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void knockback(double strength, double x, double z) {
@@ -66,7 +66,7 @@ index f894ffb7c9575d7337353ab8aaaf0b9607a92146..221fa0ca2f1c6e099da5b47ba4254826
          strength *= 1.0D - this.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE);
          if (strength > 0.0D) {
              this.hasImpulse = true;
-@@ -1810,6 +1815,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1800,6 +1805,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
              Vec3 vec3d1 = (new Vec3(x, 0.0D, z)).normalize().scale(strength);
  
              this.setDeltaMovement(vec3d.x / 2.0D - vec3d1.x, this.onGround() ? Math.min(0.4D, vec3d.y / 2.0D + strength) : vec3d.y, vec3d.z / 2.0D - vec3d1.z);
@@ -135,10 +135,10 @@ index 0f39550f82aa1646dd5e4a887e33c414160ee7d9..9d5d03a913366c0f60557e39523c30df
                      entity.hurt(this.damageSources().mobAttack(this), 5.0F);
                      this.doEnchantDamageEffects(this, entity);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 4e9cf63f363f7bba12b0a298230e3c7825512631..243397de3b0a843ec95c6b721d7fc654bfc78448 100644
+index 63ee0f07114e75201a1bcc2741512e3da54893ea..02f962eed1d85e8c532264f63666d26401d6a8f2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -274,7 +274,7 @@ public class Ravager extends Raider {
+@@ -282,7 +282,7 @@ public class Ravager extends Raider {
          double d1 = entity.getZ() - this.getZ();
          double d2 = Math.max(d0 * d0 + d1 * d1, 0.001D);
  
diff --git a/patches/server/0211-Expand-Explosions-API.patch b/patches/server/0210-Expand-Explosions-API.patch
similarity index 94%
rename from patches/server/0211-Expand-Explosions-API.patch
rename to patches/server/0210-Expand-Explosions-API.patch
index 98ca885cf2..dd2e5a5e4a 100644
--- a/patches/server/0211-Expand-Explosions-API.patch
+++ b/patches/server/0210-Expand-Explosions-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5f8ce418d0a906f576622c3387d15c3969812611..4a64fda12ef5e5d07fe0b28c755a5b9fd96358e6 100644
+index 0476f00719d180d28a2a4bab3f4152b00a1e4e67..905cf3c98c363c4cd8b236e557572d8cc2ab88a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -716,6 +716,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 90%
rename from patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
index 4d12e9763e..c4a44d3236 100644
--- a/patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b02d668243478c2cdc3d0212cec6f2e12a80414f..6c4ff1acbf09987f8d6a4b4b2c62fce264430706 100644
+index 00d4e95cee47ee9a6932a8a8ab18d45d7d5e001d..2139f10af54f0a2e2101145fa7b21a3b1af4b9a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -798,5 +798,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -825,5 +825,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setShieldBlockingDelay(int delay) {
          getHandle().setShieldBlockingDelay(delay);
      }
diff --git a/patches/server/0213-RangedEntity-API.patch b/patches/server/0212-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0213-RangedEntity-API.patch
rename to patches/server/0212-RangedEntity-API.patch
diff --git a/patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0215-Implement-World.getEntity-UUID-API.patch b/patches/server/0214-Implement-World.getEntity-UUID-API.patch
similarity index 91%
rename from patches/server/0215-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0214-Implement-World.getEntity-UUID-API.patch
index 91b154cf4e..aa6c2223d8 100644
--- a/patches/server/0215-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0214-Implement-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4a64fda12ef5e5d07fe0b28c755a5b9fd96358e6..b003de51df51bbe31c76289dcdf1f52051b20d35 100644
+index 905cf3c98c363c4cd8b236e557572d8cc2ab88a8..58f261162627c3065bb1b518e0e99f5c822c022c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1040,6 +1040,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0216-InventoryCloseEvent-Reason-API.patch b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
similarity index 96%
rename from patches/server/0216-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0215-InventoryCloseEvent-Reason-API.patch
index fd0e67f902..6dfe8b2c54 100644
--- a/patches/server/0216-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
@@ -75,7 +75,7 @@ index dda3b911fcaa294ec7b8e9d696880fcb8325f69c..8e2340ca473c8cacfe9d888091834986
          this.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5cac531de81a38fa79826e65477c5e31f9af35cd..925ef9f0f8b6d65a206c1b301f39a2571d3d4c82 100644
+index da4c4e917cb850d03a4eb51ec9777e93932b552c..c6a1b0b23d6591c482fc63abc15e5cdbce072a28 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -220,6 +220,7 @@ import org.bukkit.event.inventory.ClickType;
@@ -173,10 +173,10 @@ index f59733b6918dcbbb2190f76d8b8841a2d8818cdf..ba6105a970381d642cd7955754cc4713
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2072778d96fc5616ec6e6b85b29585fbb43775bb..0561e8cf242d9da126779d3beba46cbc7d59a7a0 100644
+index b89714e6f136cb661b962911988c04481ddb0801..3bdb53c3a41da6d4d3a641f790741a3c79e1734a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1182,7 +1182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1188,7 +1188,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
@@ -186,10 +186,10 @@ index 2072778d96fc5616ec6e6b85b29585fbb43775bb..0561e8cf242d9da126779d3beba46cbc
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8e8401dec4d3157a05216b790db5481ec8e0495a..6cf79ea58448853a6e8f26609b1b8987d30588a6 100644
+index 515e8886d04668598b6725ba11f75f40ed35d4e7..251f09a79092cce312dc107c9f2f712cbb287ce9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1273,7 +1273,7 @@ public class CraftEventFactory {
+@@ -1278,7 +1278,7 @@ public class CraftEventFactory {
  
      public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) {
          if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
@@ -198,7 +198,7 @@ index 8e8401dec4d3157a05216b790db5481ec8e0495a..6cf79ea58448853a6e8f26609b1b8987
          }
  
          CraftServer server = player.level().getCraftServer();
-@@ -1447,8 +1447,18 @@ public class CraftEventFactory {
+@@ -1452,8 +1452,18 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0217-Vex-get-setSummoner-API.patch b/patches/server/0216-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0217-Vex-get-setSummoner-API.patch
rename to patches/server/0216-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 94%
rename from patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 61f3c0cea1..02d467825c 100644
--- a/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/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 925ef9f0f8b6d65a206c1b301f39a2571d3d4c82..92403d84a691d57bbeaa57df3243efa3f2da656b 100644
+index c6a1b0b23d6591c482fc63abc15e5cdbce072a28..c0c9c45dd550a323ae6c6dbe72de90a7d1258878 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2564,6 +2564,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 100%
rename from patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0220-add-more-information-to-Entity.toString.patch b/patches/server/0219-add-more-information-to-Entity.toString.patch
similarity index 91%
rename from patches/server/0220-add-more-information-to-Entity.toString.patch
rename to patches/server/0219-add-more-information-to-Entity.toString.patch
index 12a2609c58..57fb7c2c24 100644
--- a/patches/server/0220-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0219-add-more-information-to-Entity.toString.patch
@@ -6,10 +6,10 @@ 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 05c595c710541c2f4f68a391764fec3cc1fdfd7a..231a2644f7150abebcbbe7464a24cccdf1fcd561 100644
+index a12509461dd5b35ebae5eecde4a870b6f263c4d5..0f4d3a883fe54b102d1b2dc696a02310493b7f00 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3148,7 +3148,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3137,7 +3137,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public String toString() {
          String s = this.level() == null ? "~NULL~" : this.level().toString();
  
diff --git a/patches/server/0221-EnderDragon-Events.patch b/patches/server/0220-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0221-EnderDragon-Events.patch
rename to patches/server/0220-EnderDragon-Events.patch
diff --git a/patches/server/0222-PlayerElytraBoostEvent.patch b/patches/server/0221-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0222-PlayerElytraBoostEvent.patch
rename to patches/server/0221-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0223-PlayerLaunchProjectileEvent.patch b/patches/server/0222-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0223-PlayerLaunchProjectileEvent.patch
rename to patches/server/0222-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0224-Improve-BlockPosition-inlining.patch b/patches/server/0223-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0224-Improve-BlockPosition-inlining.patch
rename to patches/server/0223-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0224-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/server/0225-Vanished-players-don-t-have-rights.patch
similarity index 97%
rename from patches/server/0226-Vanished-players-don-t-have-rights.patch
rename to patches/server/0225-Vanished-players-don-t-have-rights.patch
index c21faa773c..bc2cfbc658 100644
--- a/patches/server/0226-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0225-Vanished-players-don-t-have-rights.patch
@@ -89,10 +89,10 @@ index 1beff41c02fb4c22b5474da7c514be2f50f16055..8a53284a5846b25864352e18a5e6b2de
      public boolean isClientSide() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6cf79ea58448853a6e8f26609b1b8987d30588a6..dff2623112aa09a585d5110e9039c2034b5f0928 100644
+index 251f09a79092cce312dc107c9f2f712cbb287ce9..6c64de07bda20df15809dadc69d0d8ad05028677 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1310,6 +1310,14 @@ public class CraftEventFactory {
+@@ -1315,6 +1315,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/patches/server/0227-Allow-disabling-armour-stand-ticking.patch b/patches/server/0226-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/server/0227-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0226-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0228-SkeletonHorse-Additions.patch b/patches/server/0227-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0228-SkeletonHorse-Additions.patch
rename to patches/server/0227-SkeletonHorse-Additions.patch
diff --git a/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0230-Implement-Expanded-ArmorStand-API.patch b/patches/server/0229-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0230-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0229-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0231-AnvilDamageEvent.patch b/patches/server/0230-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0231-AnvilDamageEvent.patch
rename to patches/server/0230-AnvilDamageEvent.patch
diff --git a/patches/server/0232-Add-TNTPrimeEvent.patch b/patches/server/0231-Add-TNTPrimeEvent.patch
similarity index 98%
rename from patches/server/0232-Add-TNTPrimeEvent.patch
rename to patches/server/0231-Add-TNTPrimeEvent.patch
index 81283d9054..dc4f10faff 100644
--- a/patches/server/0232-Add-TNTPrimeEvent.patch
+++ b/patches/server/0231-Add-TNTPrimeEvent.patch
@@ -46,7 +46,7 @@ index 49df94d8a5d1d4020e7e9f5457f117ebaa581b43..945d8b0f58f6a5b2281f136d3afbba3b
              }
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/TntBlock.java b/src/main/java/net/minecraft/world/level/block/TntBlock.java
-index dab8fdee6a3165a0e0a8aa3e381526cb7c174a88..1a8215b4fe6b12e53d2a83c866bc06dec229b4f8 100644
+index e9c04432c0252a019644f439e513e89fd01837a3..ed90d126e317612f40b101b559a94aabf9ad7ee2 100644
 --- a/src/main/java/net/minecraft/world/level/block/TntBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TntBlock.java
 @@ -42,6 +42,12 @@ public class TntBlock extends Block {
diff --git a/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch
index 8320863636..5687cfb843 100644
--- a/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0232-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 8a2f8b48b23ddfc86746696021e62b96016afa2f..c1558f261e80d1fbb5dc66e6db741c140c5e99b8 100644
+index c0c9c45dd550a323ae6c6dbe72de90a7d1258878..7e9955db343f2539210c4f89cf566db1e4e3600d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -265,6 +265,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0234-Fix-NBT-type-issues.patch b/patches/server/0233-Fix-NBT-type-issues.patch
similarity index 100%
rename from patches/server/0234-Fix-NBT-type-issues.patch
rename to patches/server/0233-Fix-NBT-type-issues.patch
diff --git a/patches/server/0235-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0234-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0235-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0234-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 98%
rename from patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index c0853a577d..d101f1770b 100644
--- a/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -72,7 +72,7 @@ index 33ce550ea68d4862e0966ed827200cf426909d85..6b157b362cffedae26133fc0f0af1094
              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 231a2644f7150abebcbbe7464a24cccdf1fcd561..caeaa3907c1455726a0eeda7e473aacd9f8c3937 100644
+index 0f4d3a883fe54b102d1b2dc696a02310493b7f00..0cddb74633ebcf85f019c6015767719a07f1c9a7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -238,6 +238,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 97%
rename from patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
index dff466e366..6236ac5d34 100644
--- a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -33,10 +33,10 @@ index 24f62f9c4d288297d7a324e806745cc1449d7b4c..29eadf85e11c2261218fa406b29455da
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 23407ccc0482f67db46947cbcc56c5488c42cf93..537a5e19c9566dfbefa913a66183ec4ef31844c1 100644
+index 78a2fdb466c56d75568af5f7d5398baf4ba8532c..b4df2dccee19bc529bcd76698ce0009e35bc271d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -931,6 +931,7 @@ public final class CraftServer implements Server {
+@@ -934,6 +934,7 @@ public final class CraftServer implements Server {
  
      @Override
      public void reload() {
@@ -44,7 +44,7 @@ index 23407ccc0482f67db46947cbcc56c5488c42cf93..537a5e19c9566dfbefa913a66183ec4e
          this.reloadCount++;
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
-@@ -1020,6 +1021,7 @@ public final class CraftServer implements Server {
+@@ -1023,6 +1024,7 @@ public final class CraftServer implements Server {
          this.enablePlugins(PluginLoadOrder.STARTUP);
          this.enablePlugins(PluginLoadOrder.POSTWORLD);
          this.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));
diff --git a/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 90%
rename from patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch
index d30a099146..a49e8eb825 100644
--- a/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch
@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 233e79c71e2c46f4220dd7423ac421be9742f53e..a9930382c39e20f30a3d613eb3c27144637c033b 100644
+index e00c1916202a4e0550cc19c9cb279448a9fcdd1e..2bccba03bb12cf17a82c1e54c2bb10535b7c8964 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -649,7 +649,7 @@ public abstract class PlayerList {
@@ -36,10 +36,10 @@ index 233e79c71e2c46f4220dd7423ac421be9742f53e..a9930382c39e20f30a3d613eb3c27144
  
              ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned_ip.reason", ipbanentry.getReason());
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 097a25fd4ae5438161158a1018c707886cfbb959..91899909abd83611ac63633fef701be542cf64bf 100644
+index 58ebac3ddf8a59cee8fd87b9106d068507768992..08173a6e0b7e46c041a81d6b51d77a0aea182525 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -13,6 +13,8 @@ import java.io.BufferedReader;
+@@ -14,6 +14,8 @@ import java.io.BufferedReader;
  import java.io.BufferedWriter;
  import java.io.File;
  import java.io.IOException;
@@ -48,7 +48,7 @@ index 097a25fd4ae5438161158a1018c707886cfbb959..91899909abd83611ac63633fef701be5
  import java.nio.charset.StandardCharsets;
  import java.util.Collection;
  import java.util.Iterator;
-@@ -30,7 +32,22 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -31,7 +33,22 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
      private static final Logger LOGGER = LogUtils.getLogger();
      private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create();
      private final File file;
@@ -72,7 +72,7 @@ index 097a25fd4ae5438161158a1018c707886cfbb959..91899909abd83611ac63633fef701be5
  
      public StoredUserList(File file) {
          this.file = file;
-@@ -53,8 +70,13 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -54,8 +71,13 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
  
      @Nullable
      public V get(K key) {
@@ -88,8 +88,8 @@ index 097a25fd4ae5438161158a1018c707886cfbb959..91899909abd83611ac63633fef701be5
      }
  
      public void remove(K key) {
-@@ -83,7 +105,8 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
-     // CraftBukkit end
+@@ -78,7 +100,8 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+     }
  
      public boolean isEmpty() {
 -        return this.map.size() < 1;
@@ -98,7 +98,7 @@ index 097a25fd4ae5438161158a1018c707886cfbb959..91899909abd83611ac63633fef701be5
      }
  
      protected String getKeyForUser(K profile) {
-@@ -95,14 +118,14 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -90,14 +113,14 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
      }
  
      private void removeExpired() {
@@ -116,7 +116,7 @@ index 097a25fd4ae5438161158a1018c707886cfbb959..91899909abd83611ac63633fef701be5
              }
          }
  
-@@ -111,9 +134,11 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -106,9 +129,11 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
          while (iterator.hasNext()) {
              K k0 = (K) iterator.next(); // CraftBukkit - decompile error
  
@@ -130,7 +130,7 @@ index 097a25fd4ae5438161158a1018c707886cfbb959..91899909abd83611ac63633fef701be5
      }
  
      protected abstract StoredUserEntry<K> createEntry(JsonObject json);
-@@ -123,6 +148,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -118,6 +143,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
      }
  
      public void save() throws IOException {
diff --git a/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0241-Optimize-BlockPosition-helper-methods.patch b/patches/server/0240-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0241-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0240-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 100%
rename from patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0243-Slime-Pathfinder-Events.patch b/patches/server/0242-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0243-Slime-Pathfinder-Events.patch
rename to patches/server/0242-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0243-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0243-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0245-Optimize-CraftBlockData-Creation.patch b/patches/server/0244-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0245-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0244-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0246-Optimize-MappedRegistry.patch b/patches/server/0245-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0246-Optimize-MappedRegistry.patch
rename to patches/server/0245-Optimize-MappedRegistry.patch
diff --git a/patches/server/0247-Add-PhantomPreSpawnEvent.patch b/patches/server/0246-Add-PhantomPreSpawnEvent.patch
similarity index 98%
rename from patches/server/0247-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0246-Add-PhantomPreSpawnEvent.patch
index 4e43264e12..4109cb52be 100644
--- a/patches/server/0247-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0246-Add-PhantomPreSpawnEvent.patch
@@ -48,7 +48,7 @@ index 7582efc69928718a164f704a54bce026ad6f7dd9..9bd6e71ea38bf050832f0f7bbed4a5db
  
          CIRCLE, SWOOP;
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index 61ba99d99cc4e7782450ee6aa8b6c87b1a42cb3a..a18e6296d1f50c53291d41192a1009605a1b3583 100644
+index 61ba99d99cc4e7782450ee6aa8b6c87b1a42cb3a..94ee9c399f59e0198b4d9bc2a4255e8b821bcd36 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 @@ -70,9 +70,19 @@ public class PhantomSpawner implements CustomSpawner {
diff --git a/patches/server/0248-Add-More-Creeper-API.patch b/patches/server/0247-Add-More-Creeper-API.patch
similarity index 93%
rename from patches/server/0248-Add-More-Creeper-API.patch
rename to patches/server/0247-Add-More-Creeper-API.patch
index 6ff6e633ec..54515a5898 100644
--- a/patches/server/0248-Add-More-Creeper-API.patch
+++ b/patches/server/0247-Add-More-Creeper-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 2480c128f6b7c4ba7af1f06f4e01b972587c08ba..71587510ef1b6cbd95cb55556cd93c6c194ea5f5 100644
+index 17ce05e7f9d2615be28a095ef6d3126885df8771..7fe90ebc8eced53f72c7f935e40745075f02421b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -132,7 +132,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -17,7 +17,7 @@ index 2480c128f6b7c4ba7af1f06f4e01b972587c08ba..71587510ef1b6cbd95cb55556cd93c6c
          }
  
      }
-@@ -313,7 +313,18 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -315,7 +315,18 @@ public class Creeper extends Monster implements PowerableMob {
      }
  
      public void ignite() {
diff --git a/patches/server/0249-Inventory-removeItemAnySlot.patch b/patches/server/0248-Inventory-removeItemAnySlot.patch
similarity index 96%
rename from patches/server/0249-Inventory-removeItemAnySlot.patch
rename to patches/server/0248-Inventory-removeItemAnySlot.patch
index f8c275581d..1b771b629d 100644
--- a/patches/server/0249-Inventory-removeItemAnySlot.patch
+++ b/patches/server/0248-Inventory-removeItemAnySlot.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 41a15ecba33c40c01f0ffdcfae687b96c03731da..287b17ba34f1261a708b9fbf41f6422d92d9c37b 100644
+index 89706da0940ac6bbb3c34f0a8815783edd6cd772..e97c7809fa6572695377e5ca63bf86e5515ef531 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
diff --git a/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 92%
rename from patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 1f243711dc..93cc33f22f 100644
--- a/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b003de51df51bbe31c76289dcdf1f52051b20d35..e7aa0e6d78765836a31965ef9c518bfef17e2b03 100644
+index 58f261162627c3065bb1b518e0e99f5c822c022c..57f9324aa73be4fcbb9668ef7be6b6e64d57800e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -400,7 +400,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 90%
rename from patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch
index dc6af195b8..d6743543f7 100644
--- a/patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 221fa0ca2f1c6e099da5b47ba42548262132d6de..f3af1c540b59819375f70ffbda6135601802cdbc 100644
+index fee4567b670ceda5e1004957567ad8f99adad3f3..48f8a506326b8978f6d933e008c3c7464e61d9d9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3781,6 +3781,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3771,6 +3771,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      // Paper start
@@ -30,10 +30,10 @@ index 221fa0ca2f1c6e099da5b47ba42548262132d6de..f3af1c540b59819375f70ffbda613560
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 6c4ff1acbf09987f8d6a4b4b2c62fce264430706..bc40c64f8c9ace7dec8f966193f41c626ac14e22 100644
+index 2139f10af54f0a2e2101145fa7b21a3b1af4b9a2..adb1aced3e1a0bd3a4f286b5708fc020b1c35c4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -199,6 +199,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -201,6 +201,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return blocks.get(0);
      }
  
diff --git a/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch
similarity index 86%
rename from patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch
index c435e92049..e04153cbce 100644
--- a/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0561e8cf242d9da126779d3beba46cbc7d59a7a0..56b7d7fb2a317a1a7a7f461ddb6667e01117ec90 100644
+index 3bdb53c3a41da6d4d3a641f790741a3c79e1734a..3421f446849bd4feded248406bd4748416e4d9fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2748,6 +2748,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2785,6 +2785,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          return this.adventure$pointers;
      }
diff --git a/patches/server/0253-Improve-death-events.patch b/patches/server/0252-Improve-death-events.patch
similarity index 94%
rename from patches/server/0253-Improve-death-events.patch
rename to patches/server/0252-Improve-death-events.patch
index a2b22fc36f..b3412cc1cf 100644
--- a/patches/server/0253-Improve-death-events.patch
+++ b/patches/server/0252-Improve-death-events.patch
@@ -70,10 +70,10 @@ index 8e2340ca473c8cacfe9d888091834986bad101ce..0282a467268564c55d9d6e10b0602f95
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f3af1c540b59819375f70ffbda6135601802cdbc..b712f505fd092e0366ffc74ff59345a7f8c701be 100644
+index 48f8a506326b8978f6d933e008c3c7464e61d9d9..ddc21b706136459cbcb9a29750a6806a6fa5329e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -261,6 +261,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public Set<UUID> collidableExemptions = new HashSet<>();
      public boolean bukkitPickUpLoot;
      public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
@@ -81,7 +81,7 @@ index f3af1c540b59819375f70ffbda6135601802cdbc..b712f505fd092e0366ffc74ff59345a7
  
      @Override
      public float getBukkitYaw() {
-@@ -1504,13 +1505,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1494,13 +1495,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
              if (knockbackCancelled) this.level().broadcastEntityEvent(this, (byte) 2); // Paper - Disable explosion knockback
              if (this.isDeadOrDying()) {
                  if (!this.checkTotemDeathProtection(source)) {
@@ -99,7 +99,7 @@ index f3af1c540b59819375f70ffbda6135601802cdbc..b712f505fd092e0366ffc74ff59345a7
                  }
              } else if (flag1) {
                  this.playHurtSound(source);
-@@ -1662,7 +1662,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1652,7 +1652,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          if (!this.isRemoved() && !this.dead) {
              Entity entity = damageSource.getEntity();
              LivingEntity entityliving = this.getKillCredit();
@@ -108,7 +108,7 @@ index f3af1c540b59819375f70ffbda6135601802cdbc..b712f505fd092e0366ffc74ff59345a7
              if (this.deathScore >= 0 && entityliving != null) {
                  entityliving.awardKillScore(this, this.deathScore, damageSource);
              }
-@@ -1674,24 +1674,59 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1664,24 +1664,59 @@ public abstract class LivingEntity extends Entity implements Attackable {
              if (!this.level().isClientSide && this.hasCustomName()) {
                  if (org.spigotmc.SpigotConfig.logNamedDeaths) LivingEntity.LOGGER.info("Named entity {} died: {}", this, this.getCombatTracker().getDeathMessage().getString()); // Spigot
              }
@@ -173,7 +173,7 @@ index f3af1c540b59819375f70ffbda6135601802cdbc..b712f505fd092e0366ffc74ff59345a7
          }
      }
  
-@@ -1699,7 +1734,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1689,7 +1724,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          if (!this.level().isClientSide) {
              boolean flag = false;
  
@@ -182,7 +182,7 @@ index f3af1c540b59819375f70ffbda6135601802cdbc..b712f505fd092e0366ffc74ff59345a7
                  if (this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
                      BlockPos blockposition = this.blockPosition();
                      BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
-@@ -1728,7 +1763,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1718,7 +1753,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
      }
  
@@ -195,7 +195,7 @@ index f3af1c540b59819375f70ffbda6135601802cdbc..b712f505fd092e0366ffc74ff59345a7
          Entity entity = source.getEntity();
          int i;
  
-@@ -1743,18 +1782,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1733,18 +1772,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.dropEquipment(); // CraftBukkit - from below
          if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
              this.dropFromLootTable(source, flag);
@@ -243,7 +243,7 @@ index e1f2bb40ca7868671a869745de66f87ef3a49408..d7f24c26b0981184f43a16a27a0c5d5a
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index c2a87255178917a9555ec48ff7e705efef2da7ab..1526ca0063da0962ae781b7aa877d8cf5e1ffd73 100644
+index 44b6d232d940d4020fa7664e48a483c20959dde0..24ae11d300d0856350f185f03552ba592f3d218a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -706,15 +706,25 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -392,16 +392,16 @@ index 719f68f96e58ddcdd3592131c691d21263c81915..a35a0952ce8e1fc42e92734786d531c7
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 56b7d7fb2a317a1a7a7f461ddb6667e01117ec90..dc0802c35836009d2411135d91a25de0746e64e6 100644
+index 3421f446849bd4feded248406bd4748416e4d9fa..7db1f6ae9ee30293086f6b0d5fe86965f278c87e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2248,7 +2248,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     }
- 
+@@ -2285,7 +2285,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+     @Override
      public void sendHealthUpdate() {
--        this.getHandle().connection.send(new ClientboundSetHealthPacket(this.getScaledHealth(), this.getHandle().getFoodData().getFoodLevel(), this.getHandle().getFoodData().getSaturationLevel()));
+         FoodData foodData = this.getHandle().getFoodData();
+-        this.sendHealthUpdate(this.getScaledHealth(), foodData.getFoodLevel(), foodData.getSaturationLevel());
 +        // Paper start - cancellable death event
-+        ClientboundSetHealthPacket packet = new ClientboundSetHealthPacket(this.getScaledHealth(), this.getHandle().getFoodData().getFoodLevel(), this.getHandle().getFoodData().getSaturationLevel());
++        ClientboundSetHealthPacket packet = new ClientboundSetHealthPacket(this.getScaledHealth(), foodData.getFoodLevel(), foodData.getSaturationLevel());
 +        if (this.getHandle().queueHealthUpdatePacket) {
 +            this.getHandle().queuedHealthUpdatePacket = packet;
 +        } else {
@@ -412,10 +412,10 @@ index 56b7d7fb2a317a1a7a7f461ddb6667e01117ec90..dc0802c35836009d2411135d91a25de0
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index dff2623112aa09a585d5110e9039c2034b5f0928..3ab9346bfd4efc27abdaed69fba365c3fa262d47 100644
+index 6c64de07bda20df15809dadc69d0d8ad05028677..9064f07fcbe0067c4b78cde026e58ae68f1aa4b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -832,9 +832,16 @@ public class CraftEventFactory {
+@@ -837,9 +837,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -432,7 +432,7 @@ index dff2623112aa09a585d5110e9039c2034b5f0928..3ab9346bfd4efc27abdaed69fba365c3
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -851,8 +858,15 @@ public class CraftEventFactory {
+@@ -856,8 +863,15 @@ public class CraftEventFactory {
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage, stringDeathMessage); // Paper - Adventure
          event.setKeepInventory(keepInventory);
          event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
@@ -448,7 +448,7 @@ index dff2623112aa09a585d5110e9039c2034b5f0928..3ab9346bfd4efc27abdaed69fba365c3
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -869,6 +883,31 @@ public class CraftEventFactory {
+@@ -874,6 +888,31 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0253-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 91%
rename from patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0253-Allow-chests-to-be-placed-with-NBT-data.patch
index cb39a02032..6ccfe198c9 100644
--- a/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0253-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 4b19057fba6c6645dc79f6572a3fb01cb2c4c26c..cbda9f0fd0b14062c5b0290b2da571cff2df13e5 100644
+index 940caf9b7526019ace656ff88146f198ba6b62ed..7d80eded30109982fd3a1b815ba5dff4b699689a 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -376,6 +376,7 @@ public final class ItemStack {
+@@ -377,6 +377,7 @@ public final class ItemStack {
                      enuminteractionresult = InteractionResult.FAIL; // cancel placement
                      // PAIL: Remove this when MC-99075 fixed
                      placeEvent.getPlayer().updateInventory();
diff --git a/patches/server/0255-Mob-Pathfinding-API.patch b/patches/server/0254-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0255-Mob-Pathfinding-API.patch
rename to patches/server/0254-Mob-Pathfinding-API.patch
diff --git a/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 88%
rename from patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 630be390a8..398cfb3792 100644
--- a/patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/patches/server/0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
-index 61afe72beb9f17a6c2b09d2aed9dd6aa4c36a816..0035461aff86fa3f44c860e7d77589b974446048 100644
+index e3d070d46729c023d594699619a4b3f8658edbce..509317a26c79f453335df1c19dc4c9ec570046af 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
-@@ -129,7 +129,9 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
+@@ -126,7 +126,9 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
  
      @Nullable
      private BlockPos getPosWithBlock(BlockPos pos, BlockGetter world) {
@@ -19,7 +19,7 @@ index 61afe72beb9f17a6c2b09d2aed9dd6aa4c36a816..0035461aff86fa3f44c860e7d77589b9
              return pos;
          } else {
              BlockPos[] ablockposition = new BlockPos[]{pos.below(), pos.west(), pos.east(), pos.north(), pos.south(), pos.below().below()};
-@@ -139,7 +141,8 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
+@@ -136,7 +138,8 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
              for (int j = 0; j < i; ++j) {
                  BlockPos blockposition1 = ablockposition1[j];
  
@@ -29,7 +29,7 @@ index 61afe72beb9f17a6c2b09d2aed9dd6aa4c36a816..0035461aff86fa3f44c860e7d77589b9
                      return blockposition1;
                  }
              }
-@@ -150,7 +153,7 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
+@@ -147,7 +150,7 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
  
      @Override
      protected boolean isValidTarget(LevelReader world, BlockPos pos) {
diff --git a/patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0257-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0257-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0258-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0258-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0260-Honor-EntityAgeable.ageLock.patch b/patches/server/0259-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0260-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0259-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0261-Configurable-connection-throttle-kick-message.patch b/patches/server/0260-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0261-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0260-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0261-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0261-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0263-Hook-into-CB-plugin-rewrites.patch b/patches/server/0262-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0263-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0262-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0264-PreSpawnerSpawnEvent.patch b/patches/server/0263-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from patches/server/0264-PreSpawnerSpawnEvent.patch
rename to patches/server/0263-PreSpawnerSpawnEvent.patch
index c1f27a722a..f9634b126c 100644
--- a/patches/server/0264-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0263-PreSpawnerSpawnEvent.patch
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 3294e5b5ed0288af08067c36ca34514d02d200d3..b5d605feff68181269f23d95d60a3ed555133d85 100644
+index fc7719d12b5f6011aec2e41a36b4bacd77672b6d..a9be524edb03c51300bc45d424fcf87c7491a8c0 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -134,11 +134,11 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0265-Add-LivingEntity-getTargetEntity.patch b/patches/server/0264-Add-LivingEntity-getTargetEntity.patch
similarity index 93%
rename from patches/server/0265-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0264-Add-LivingEntity-getTargetEntity.patch
index e82a8ec813..008ec7fdd5 100644
--- a/patches/server/0265-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0264-Add-LivingEntity-getTargetEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b712f505fd092e0366ffc74ff59345a7f8c701be..6718b4159b1c670e0a15020ee5dba67566d2adc1 100644
+index ddc21b706136459cbcb9a29750a6806a6fa5329e..6aa312638e3b934fc9b107daea66664ddc776700 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -117,6 +117,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
+@@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
  import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
  import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
  import net.minecraft.world.phys.AABB;
@@ -16,7 +16,7 @@ index b712f505fd092e0366ffc74ff59345a7f8c701be..6718b4159b1c670e0a15020ee5dba675
  import net.minecraft.world.phys.HitResult;
  import net.minecraft.world.phys.Vec3;
  import net.minecraft.world.scores.PlayerTeam;
-@@ -3843,6 +3844,38 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3833,6 +3834,38 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.level().clip(raytrace);
      }
  
@@ -56,7 +56,7 @@ index b712f505fd092e0366ffc74ff59345a7f8c701be..6718b4159b1c670e0a15020ee5dba675
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index bc40c64f8c9ace7dec8f966193f41c626ac14e22..0c3ac380b9092ff961bce761ddfc835f4bd66544 100644
+index adb1aced3e1a0bd3a4f286b5708fc020b1c35c4c..5a721647807f455e73e862a1244520787ebee76d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1,5 +1,6 @@
@@ -66,7 +66,7 @@ index bc40c64f8c9ace7dec8f966193f41c626ac14e22..0c3ac380b9092ff961bce761ddfc835f
  import com.google.common.base.Preconditions;
  import com.google.common.collect.Sets;
  import java.util.ArrayList;
-@@ -224,6 +225,39 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -226,6 +227,39 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
          return null;
      }
diff --git a/patches/server/0266-Add-sun-related-API.patch b/patches/server/0265-Add-sun-related-API.patch
similarity index 94%
rename from patches/server/0266-Add-sun-related-API.patch
rename to patches/server/0265-Add-sun-related-API.patch
index c1cdee93e6..46beb73be4 100644
--- a/patches/server/0266-Add-sun-related-API.patch
+++ b/patches/server/0265-Add-sun-related-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add sun related API
 public net.minecraft.world.entity.Mob isSunBurnTick()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e7aa0e6d78765836a31965ef9c518bfef17e2b03..b005c956311612bc16b57e0ec9a4f832d9243dce 100644
+index 57f9324aa73be4fcbb9668ef7be6b6e64d57800e..be17e1a4afc2fd5490a59aa7bcb199fb61643d35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -692,6 +692,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0268-Turtle-API.patch b/patches/server/0267-Turtle-API.patch
similarity index 87%
rename from patches/server/0268-Turtle-API.patch
rename to patches/server/0267-Turtle-API.patch
index e2997b3063..f510a062bb 100644
--- a/patches/server/0268-Turtle-API.patch
+++ b/patches/server/0267-Turtle-API.patch
@@ -25,10 +25,10 @@ index 60e291abb3ebdf8676c13a2138d8eb436d033fa2..d27e5f9dac4703b839ab8444f6b54bf5
      private final int searchRange;
      private final int verticalSearchRange;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index fcd760cb88f84ff79811631612956fde79905132..99fc97051c61ac8d08afdc0ea4845e96705e243b 100644
+index 3a3f5e567fdefad6887e42c8e9147194ae0c4d89..fd6ce6e8a3a7c889276e06fb427e0d17ed093149 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-@@ -487,15 +487,18 @@ public class Turtle extends Animal {
+@@ -487,14 +487,18 @@ public class Turtle extends Animal {
  
              if (!this.turtle.isInWater() && this.isReachedTarget()) {
                  if (this.turtle.layEggCounter < 1) {
@@ -37,12 +37,12 @@ index fcd760cb88f84ff79811631612956fde79905132..99fc97051c61ac8d08afdc0ea4845e96
                  } else if (this.turtle.layEggCounter > this.adjustedTickDelay(200)) {
                      Level world = this.turtle.level();
  
-                     // CraftBukkit start
--                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.turtle, this.blockPos.above(), (BlockState) Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, this.turtle.random.nextInt(4) + 1)).isCancelled()) {
+-                    if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.turtle, this.blockPos.above(), (BlockState) Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, this.turtle.random.nextInt(4) + 1))) { // CraftBukkit
++                    // CraftBukkit start
 +                    // Paper start
 +                    int eggCount = this.turtle.random.nextInt(4) + 1;
 +                    com.destroystokyo.paper.event.entity.TurtleLayEggEvent layEggEvent = new com.destroystokyo.paper.event.entity.TurtleLayEggEvent((org.bukkit.entity.Turtle) this.turtle.getBukkitEntity(), io.papermc.paper.util.MCUtil.toLocation(this.turtle.level(), this.blockPos.above()), eggCount);
-+                    if (layEggEvent.callEvent() && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.turtle, this.blockPos.above(), Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, layEggEvent.getEggCount())).isCancelled()) {
++                    if (layEggEvent.callEvent() && org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.turtle, this.blockPos.above(), Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, layEggEvent.getEggCount()))) {
                      world.playSound((Player) null, blockposition, SoundEvents.TURTLE_LAY_EGG, SoundSource.BLOCKS, 0.3F, 0.9F + world.random.nextFloat() * 0.2F);
                      BlockPos blockposition1 = this.blockPos.above();
 -                    BlockState iblockdata = (BlockState) Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, this.turtle.random.nextInt(4) + 1);
@@ -50,7 +50,7 @@ index fcd760cb88f84ff79811631612956fde79905132..99fc97051c61ac8d08afdc0ea4845e96
  
                      world.setBlock(blockposition1, iblockdata, 3);
                      world.gameEvent(GameEvent.BLOCK_PLACE, blockposition1, GameEvent.Context.of(this.turtle, iblockdata));
-@@ -566,7 +569,7 @@ public class Turtle extends Animal {
+@@ -564,7 +568,7 @@ public class Turtle extends Animal {
  
          @Override
          public boolean canUse() {
diff --git a/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 96%
rename from patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch
index 6af02e37e6..f172bc5382 100644
--- a/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch
@@ -19,7 +19,7 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2b4c0042b1971a9d922c8d32aa74c7f2e4c43341..323ed570882a3cd9b7e8bfdc1390f02e155c2448 100644
+index 0282a467268564c55d9d6e10b0602f952b2ca7ae..c151777af839ef237c004a1dd1cd0e849e402f5b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1978,6 +1978,19 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0271-Add-more-Witch-API.patch b/patches/server/0270-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0271-Add-more-Witch-API.patch
rename to patches/server/0270-Add-more-Witch-API.patch
diff --git a/patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0271-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0271-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 98%
rename from patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 916144eb4f..34528efa33 100644
--- a/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0272-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 c1558f261e80d1fbb5dc66e6db741c140c5e99b8..d05d088a5294f092f921961ec38053c8ccd6b6bd 100644
+index 7e9955db343f2539210c4f89cf566db1e4e3600d..9a6caf7b445b033c30f8972ebcc9947b99fa44ef 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -567,9 +567,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0274-Reset-players-airTicks-on-respawn.patch b/patches/server/0273-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/0274-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0273-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0277-Optimize-World-Time-Updates.patch b/patches/server/0276-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0277-Optimize-World-Time-Updates.patch
rename to patches/server/0276-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0278-Restore-custom-InventoryHolder-support.patch b/patches/server/0277-Restore-custom-InventoryHolder-support.patch
similarity index 98%
rename from patches/server/0278-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0277-Restore-custom-InventoryHolder-support.patch
index 6cfc768685..47ca419c2a 100644
--- a/patches/server/0278-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0277-Restore-custom-InventoryHolder-support.patch
@@ -161,7 +161,7 @@ index 0000000000000000000000000000000000000000..224d4b2cc45b0d02230a76caee9c8857
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 8ea031537c27b219c22316bff191670c48ebd602..bdaa739aa18a95894a165e9333a3e9d596fd7dc3 100644
+index 301e89f638e38ad216d545a3cb5b7375695e6fe6..081e6c7ce4a0185ba75e48bbb581fd531cdb10a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 @@ -49,7 +49,7 @@ public class CraftContainer extends AbstractContainerMenu {
@@ -194,7 +194,7 @@ index 8ea031537c27b219c22316bff191670c48ebd602..bdaa739aa18a95894a165e9333a3e9d5
  
          // SPIGOT-4598 - we should still delegate the shift click handler
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 41c6bb644749b350c2e3552bbd0913b10fcb0abd..8018ad8e5952c714f1bd445c91b4d5c846b9ba7a 100644
+index e97c7809fa6572695377e5ca63bf86e5515ef531..c064022d248ff3e0b52c0e815ab90527f9132fb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -492,6 +492,10 @@ public class CraftInventory implements Inventory {
@@ -209,7 +209,7 @@ index 41c6bb644749b350c2e3552bbd0913b10fcb0abd..8018ad8e5952c714f1bd445c91b4d5c8
              return InventoryType.ENDER_CHEST;
          } else if (this.inventory instanceof MerchantContainer) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
-index f3ebaefd949ae73afad3dcb69b8d9c632cc782f7..08f8ea0716ef8fa850f1f2f7b8a6e636f57ae872 100644
+index fc0e1212022d1aa3506699b60ef338196eb54eba..da1c1fe0faf6819b15a81d6ad53370948e5f984f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
 @@ -15,6 +15,11 @@ import org.bukkit.event.inventory.InventoryType;
diff --git a/patches/server/0279-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0278-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0279-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0278-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0280-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0279-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0280-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0279-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 96%
rename from patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch
index eeb9c9ec60..93d7118207 100644
--- a/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 7c1502fba55155020e9ebcf9fe13c0db55382244..fc1f55e53d9c8f1a5711f4062eb3ba343f3f7438 100644
+index 7adf7d1248680e591638298f13f5ae88788f5e4c..bdf11a98614c9c12d3112f437651be81d0d9872a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -119,8 +119,8 @@ public class ServerPlayerGameMode {
@@ -59,7 +59,7 @@ index 7c1502fba55155020e9ebcf9fe13c0db55382244..fc1f55e53d9c8f1a5711f4062eb3ba34
  
                  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 841b35cfbb3a8bfefef411af87d37c48baabd432..3a49d929f506c74041b5b5286ea9b532f5ae2c17 100644
+index 9a6caf7b445b033c30f8972ebcc9947b99fa44ef..42ef3a732ae94502ad921b881f55d6882de2199c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1662,6 +1662,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0282-Make-the-default-permission-message-configurable.patch b/patches/server/0281-Make-the-default-permission-message-configurable.patch
similarity index 92%
rename from patches/server/0282-Make-the-default-permission-message-configurable.patch
rename to patches/server/0281-Make-the-default-permission-message-configurable.patch
index 6dbccd2fed..c63565225d 100644
--- a/patches/server/0282-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0281-Make-the-default-permission-message-configurable.patch
@@ -18,10 +18,10 @@ index e3467aaf6d0c8d486b84362e3c20b3fe631b50ff..8f16640fc2f1233c10392d7e32a54d78
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 537a5e19c9566dfbefa913a66183ec4ef31844c1..bf5e68463882f59d16550313b698156404ae90c1 100644
+index b4df2dccee19bc529bcd76698ce0009e35bc271d..d8f53e9cefcd286687f092fd09714a62263567f1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2710,6 +2710,16 @@ public final class CraftServer implements Server {
+@@ -2724,6 +2724,16 @@ public final class CraftServer implements Server {
          return io.papermc.paper.configuration.GlobalConfiguration.get().commands.suggestPlayerNamesWhenNullTabCompletions;
      }
  
diff --git a/patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0282-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0282-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0284-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0283-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0284-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0283-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0285-force-entity-dismount-during-teleportation.patch b/patches/server/0284-force-entity-dismount-during-teleportation.patch
similarity index 90%
rename from patches/server/0285-force-entity-dismount-during-teleportation.patch
rename to patches/server/0284-force-entity-dismount-during-teleportation.patch
index c5b4421ae9..82749f4f35 100644
--- a/patches/server/0285-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0284-force-entity-dismount-during-teleportation.patch
@@ -20,10 +20,10 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 541de453e67dce21543a24d1f4544d84a813e3cb..9780ebabd27def10b09deebc5be2043d063de9f3 100644
+index 0cddb74633ebcf85f019c6015767719a07f1c9a7..7507ab77d379533196e27aaf1ad28632292bffb2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2542,11 +2542,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2564,11 +2564,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void removeVehicle() {
@@ -41,8 +41,8 @@ index 541de453e67dce21543a24d1f4544d84a813e3cb..9780ebabd27def10b09deebc5be2043d
          }
  
      }
-@@ -2610,7 +2615,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         return true; // CraftBukkit
+@@ -2599,7 +2604,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+         }
      }
  
 -    protected boolean removePassenger(Entity entity) { // CraftBukkit
@@ -53,7 +53,7 @@ index 541de453e67dce21543a24d1f4544d84a813e3cb..9780ebabd27def10b09deebc5be2043d
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2620,7 +2628,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2609,7 +2617,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (this.getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                  VehicleExitEvent event = new VehicleExitEvent(
                          (Vehicle) this.getBukkitEntity(),
@@ -62,7 +62,7 @@ index 541de453e67dce21543a24d1f4544d84a813e3cb..9780ebabd27def10b09deebc5be2043d
                  );
                  // Suppress during worldgen
                  if (this.valid) {
-@@ -2634,7 +2642,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2623,7 +2631,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
              // CraftBukkit end
              // Spigot start
@@ -72,10 +72,10 @@ index 541de453e67dce21543a24d1f4544d84a813e3cb..9780ebabd27def10b09deebc5be2043d
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6718b4159b1c670e0a15020ee5dba67566d2adc1..232e50c36e4c6dc719cc0e07cbe8ec0fd54fee6d 100644
+index 6aa312638e3b934fc9b107daea66664ddc776700..0275c797aafa4778573b8e283319a5eb2c697105 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3448,9 +3448,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3438,9 +3438,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      @Override
      public void stopRiding() {
diff --git a/patches/server/0286-Add-more-Zombie-API.patch b/patches/server/0285-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0286-Add-more-Zombie-API.patch
rename to patches/server/0285-Add-more-Zombie-API.patch
diff --git a/patches/server/0287-Book-Size-Limits.patch b/patches/server/0286-Book-Size-Limits.patch
similarity index 96%
rename from patches/server/0287-Book-Size-Limits.patch
rename to patches/server/0286-Book-Size-Limits.patch
index df4b84fad7..e53230aea8 100644
--- a/patches/server/0287-Book-Size-Limits.patch
+++ b/patches/server/0286-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 024b5fe3eb90c447522141454d3f733e5381bb24..ee150e432cb8ca69749dc20c8d2140c2b49bcdc2 100644
+index 42ef3a732ae94502ad921b881f55d6882de2199c..5b99f5147ae44b3e9f0310a2a133d8b1d6ab5614 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1124,6 +1124,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0288-Add-PlayerConnectionCloseEvent.patch b/patches/server/0287-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0288-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0287-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0289-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0288-Prevent-Enderman-from-loading-chunks.patch
similarity index 90%
rename from patches/server/0289-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0288-Prevent-Enderman-from-loading-chunks.patch
index 9b632446b0..21afd49aab 100644
--- a/patches/server/0289-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/server/0288-Prevent-Enderman-from-loading-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent Enderman from loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index acd41b474fadee12c571f390b937f455cbe393ad..fd608b1461ef28a5181ed3beb31f356272f8328f 100644
+index 06a0a06f3f4ed20f151ddac35ae7d56852e191ae..f7ad34f38d26ab08bb5dd788bc70ba01b53fc1a1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -506,7 +506,8 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -510,7 +510,8 @@ public class EnderMan extends Monster implements NeutralMob {
              int j = Mth.floor(this.enderman.getY() + randomsource.nextDouble() * 2.0D);
              int k = Mth.floor(this.enderman.getZ() - 1.0D + randomsource.nextDouble() * 2.0D);
              BlockPos blockposition = new BlockPos(i, j, k);
@@ -18,7 +18,7 @@ index acd41b474fadee12c571f390b937f455cbe393ad..fd608b1461ef28a5181ed3beb31f3562
              BlockPos blockposition1 = blockposition.below();
              BlockState iblockdata1 = world.getBlockState(blockposition1);
              BlockState iblockdata2 = this.enderman.getCarriedBlock();
-@@ -552,7 +553,8 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -554,7 +555,8 @@ public class EnderMan extends Monster implements NeutralMob {
              int j = Mth.floor(this.enderman.getY() + randomsource.nextDouble() * 3.0D);
              int k = Mth.floor(this.enderman.getZ() - 2.0D + randomsource.nextDouble() * 4.0D);
              BlockPos blockposition = new BlockPos(i, j, k);
diff --git a/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 92%
rename from patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index b29880b7d7..74747f2574 100644
--- a/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -40,10 +40,10 @@ index 2bccba03bb12cf17a82c1e54c2bb10535b7c8964..5657493e215a17f3132f9d4114248751
          GameProfileCache usercache = this.server.getProfileCache();
          String s;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 69a1852905dd4724c30ac8ab88c14251eee2c371..17b3d5de58a9ef3acc67624c46cd6bbd96394f87 100644
+index 712006c27570dcbcefe173484e74d1bb0763e926..ef48315b98aa39ed245fb7619cf594bfb767931a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -250,6 +250,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -249,6 +249,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
          return this.getData() != null;
      }
  
@@ -106,10 +106,10 @@ index 69a1852905dd4724c30ac8ab88c14251eee2c371..17b3d5de58a9ef3acc67624c46cd6bbd
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dc0802c35836009d2411135d91a25de0746e64e6..7f595b559afc1fe0bc1159d2555050bd87b81983 100644
+index 7db1f6ae9ee30293086f6b0d5fe86965f278c87e..7afaa37d1d6d98fa79f91493897cfe68daf4698c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -186,6 +186,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -192,6 +192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
@@ -117,7 +117,7 @@ index dc0802c35836009d2411135d91a25de0746e64e6..7f595b559afc1fe0bc1159d2555050bd
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -1873,6 +1874,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1903,6 +1904,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index dc0802c35836009d2411135d91a25de0746e64e6..7f595b559afc1fe0bc1159d2555050bd
      public void readExtraData(CompoundTag nbttagcompound) {
          this.hasPlayedBefore = true;
          if (nbttagcompound.contains("bukkit")) {
-@@ -1895,6 +1908,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1925,6 +1938,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(CompoundTag nbttagcompound) {
@@ -145,7 +145,7 @@ index dc0802c35836009d2411135d91a25de0746e64e6..7f595b559afc1fe0bc1159d2555050bd
          if (!nbttagcompound.contains("bukkit")) {
              nbttagcompound.put("bukkit", new CompoundTag());
          }
-@@ -1909,6 +1924,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1939,6 +1954,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("firstPlayed", this.getFirstPlayed());
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());
diff --git a/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 91%
rename from patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 990ec84f7e..b3fddc1ffa 100644
--- a/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 47b3a068e1e8759648b24b362a34a0454f21c42d..49760077e2cfd346cc3cb4be5a60a3ea3df148ca 100644
+index 7cb4f05a8d23a60a89dd4934ccb99bb89bb44141..a2b26c5dc446b896736cf478b282e0ee8845dda7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1644,6 +1644,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 90%
rename from patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch
index e754c83bf4..006d672e57 100644
--- a/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7f595b559afc1fe0bc1159d2555050bd87b81983..4bfd0c4f7c898d6333e7e33cecd22b928b4de152 100644
+index 7afaa37d1d6d98fa79f91493897cfe68daf4698c..de73f58180c083557a73078c45e57dbabf5429e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2795,6 +2795,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2832,6 +2832,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetAttackStrengthTicker();
      }
diff --git a/patches/server/0293-BlockDestroyEvent.patch b/patches/server/0292-BlockDestroyEvent.patch
similarity index 100%
rename from patches/server/0293-BlockDestroyEvent.patch
rename to patches/server/0292-BlockDestroyEvent.patch
diff --git a/patches/server/0294-Async-command-map-building.patch b/patches/server/0293-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0294-Async-command-map-building.patch
rename to patches/server/0293-Async-command-map-building.patch
diff --git a/patches/server/0295-Implement-Brigadier-Mojang-API.patch b/patches/server/0294-Implement-Brigadier-Mojang-API.patch
similarity index 99%
rename from patches/server/0295-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0294-Implement-Brigadier-Mojang-API.patch
index c232a693ab..e6f44bc5b0 100644
--- a/patches/server/0295-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0294-Implement-Brigadier-Mojang-API.patch
@@ -131,7 +131,7 @@ index b7f1569c662df13f278fc704cabec0400ba7c382..87ce129e1d592bcf68169feb559f44d5
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2b29f260c23121da1ab3a14b843f0500281b373b..b4eaa5142e70e9ba16f0386c10dae30b4a3da31b 100644
+index 5b99f5147ae44b3e9f0310a2a133d8b1d6ab5614..1dceea00a4299904b7205ef38f8993d092f5ff69 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -840,8 +840,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0296-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0295-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0296-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0295-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0297-Limit-Client-Sign-length-more.patch b/patches/server/0296-Limit-Client-Sign-length-more.patch
similarity index 97%
rename from patches/server/0297-Limit-Client-Sign-length-more.patch
rename to patches/server/0296-Limit-Client-Sign-length-more.patch
index b36503dbce..3d62de6f3b 100644
--- a/patches/server/0297-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0296-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 b4eaa5142e70e9ba16f0386c10dae30b4a3da31b..afb3ed1e265a1a078a933fac4c1d9fe26797d062 100644
+index 1dceea00a4299904b7205ef38f8993d092f5ff69..417852dd515f436aabb89468a2b282b044e5de06 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -300,6 +300,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0297-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0297-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0300-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 88%
rename from patches/server/0300-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 8e092efed4..3da6a62965 100644
--- a/patches/server/0300-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d3a4de9d140440eb9dda9138bd73e8bd481d0139..888547c662b99193af8f803817bc830ab3cc9378 100644
+index 5657493e215a17f3132f9d411424875160fda6d9..e038240042366e1c491c04016982c91c91ee86cd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1157,6 +1157,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0301-Entity-getEntitySpawnReason.patch b/patches/server/0300-Entity-getEntitySpawnReason.patch
similarity index 98%
rename from patches/server/0301-Entity-getEntitySpawnReason.patch
rename to patches/server/0300-Entity-getEntitySpawnReason.patch
index f6ea5a4b86..daef34b1fb 100644
--- a/patches/server/0301-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0300-Entity-getEntitySpawnReason.patch
@@ -47,7 +47,7 @@ index e038240042366e1c491c04016982c91c91ee86cd..cccaf594392a0283f00986f182cc89d5
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9780ebabd27def10b09deebc5be2043d063de9f3..7be82f903e5f65d00b68dc7ee7c1cb4b2be1dc8d 100644
+index 7507ab77d379533196e27aaf1ad28632292bffb2..e8c4d27cd8403776873d8a492a61023d60ad158c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -234,6 +234,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0302-Fire-event-on-GS4-query.patch b/patches/server/0301-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0302-Fire-event-on-GS4-query.patch
rename to patches/server/0301-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0303-Implement-PlayerPostRespawnEvent.patch b/patches/server/0302-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from patches/server/0303-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0302-Implement-PlayerPostRespawnEvent.patch
index 702c26f8f3..410baaf9d7 100644
--- a/patches/server/0303-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0302-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6151563936d5863bd44487da6fc6c0341e25df14..bbc2cbc4e08f0cd7d82233f5168abda81d583d0b 100644
+index cccaf594392a0283f00986f182cc89d56181bc40..94a0d17a0339249c1c97e36d6e13b5958cfa2e49 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -758,9 +758,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 86%
rename from patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index d4b616316a..29a3edd78d 100644
--- a/patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 3bd7f52030ea5b603bba5e4a8e1d28194f89fa7f..21773aea4d5e5f3946202e03afdc00f7bb109618 100644
+index 91eba1c571764c88489ea2598fb9b4736554d5cc..fda34d93a5b75919c840d3bc0efa0651e5eb4843 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -121,6 +121,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -122,6 +122,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
              // CraftBukkit start - Use wall time for pickup and despawn timers
              int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
              if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
@@ -17,7 +17,7 @@ index 3bd7f52030ea5b603bba5e4a8e1d28194f89fa7f..21773aea4d5e5f3946202e03afdc00f7
              if (this.age != -32768) this.age += elapsedTicks;
              this.lastTick = MinecraftServer.currentTick;
              // CraftBukkit end
-@@ -207,6 +208,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -208,6 +209,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
          // CraftBukkit start - Use wall time for pickup and despawn timers
          int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
          if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
diff --git a/patches/server/0305-Server-Tick-Events.patch b/patches/server/0304-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0305-Server-Tick-Events.patch
rename to patches/server/0304-Server-Tick-Events.patch
diff --git a/patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
index 1e8e32c427..7960fa6a1c 100644
--- a/patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
@@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 49760077e2cfd346cc3cb4be5a60a3ea3df148ca..ca0be3e09e19925176185736007db633a97b42ec 100644
+index a2b26c5dc446b896736cf478b282e0ee8845dda7..488b32a6c09102ccc041dde9ed7294a90753c1bb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -847,6 +847,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0308-Add-Heightmap-API.patch b/patches/server/0307-Add-Heightmap-API.patch
similarity index 95%
rename from patches/server/0308-Add-Heightmap-API.patch
rename to patches/server/0307-Add-Heightmap-API.patch
index 3e482f7785..5b16046d3a 100644
--- a/patches/server/0308-Add-Heightmap-API.patch
+++ b/patches/server/0307-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b005c956311612bc16b57e0ec9a4f832d9243dce..944f673c4537a44afbdf43e7540835a25b4dece7 100644
+index be17e1a4afc2fd5490a59aa7bcb199fb61643d35..537e63ff97afc2ae73e25d3699d249a66f13ba16 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -219,6 +219,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0309-Mob-Spawner-API-Enhancements.patch b/patches/server/0308-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0309-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0308-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch
index b23c6532ef..e71d2edf34 100644
--- a/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0309-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 ebd48880cd7256c8f26b9a2565a756efd0188746..4a92305dd0ac5db459f0a716b4ac8d6a0aa2c437 100644
+index 417852dd515f436aabb89468a2b282b044e5de06..bd70158d200f0bd9e52e46c9b5c8c7261a1646f5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -515,7 +515,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0312-Implement-CraftBlockSoundGroup.patch b/patches/server/0311-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0312-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0311-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 45e2ade11a..20ed1d5897 100644
--- a/patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -191,7 +191,7 @@ index 4d2348df25410a0b5364eec066880326d6667dad..286aad3205ef8a9e21a47ef07893844f
          this.maxCount = i * i;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 944f673c4537a44afbdf43e7540835a25b4dece7..66eabbe916994e96f67e2039e6b291447753900f 100644
+index 537e63ff97afc2ae73e25d3699d249a66f13ba16..e0f38ef295e1958b45fc05395cd4c57194928338 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1350,15 +1350,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0315-Expose-the-internal-current-tick.patch b/patches/server/0314-Expose-the-internal-current-tick.patch
similarity index 83%
rename from patches/server/0315-Expose-the-internal-current-tick.patch
rename to patches/server/0314-Expose-the-internal-current-tick.patch
index 55a6b69199..140456ee75 100644
--- a/patches/server/0315-Expose-the-internal-current-tick.patch
+++ b/patches/server/0314-Expose-the-internal-current-tick.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bf5e68463882f59d16550313b698156404ae90c1..9d477eaa1015b6337a644f1baafd7cba67bb0e4a 100644
+index d8f53e9cefcd286687f092fd09714a62263567f1..7aa2682a8f6086550a3f27072dc7ec2425b3c116 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2751,5 +2751,10 @@ public final class CraftServer implements Server {
+@@ -2765,5 +2765,10 @@ public final class CraftServer implements Server {
          profile.getProperties().putAll(((CraftPlayer)player).getHandle().getGameProfile().getProperties());
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(profile);
      }
diff --git a/patches/server/0316-Fix-World-isChunkGenerated-calls.patch b/patches/server/0315-Fix-World-isChunkGenerated-calls.patch
similarity index 99%
rename from patches/server/0316-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0315-Fix-World-isChunkGenerated-calls.patch
index ceb1869c90..f8c2a5674b 100644
--- a/patches/server/0316-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0315-Fix-World-isChunkGenerated-calls.patch
@@ -156,7 +156,7 @@ index 96f129cb13642dc9667464b58c025fa0ed700cfd..29da08c58200c24fd03003937d30eb41
              } catch (Throwable throwable) {
                  if (dataoutputstream != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 66eabbe916994e96f67e2039e6b291447753900f..ad272693251141f60ef68c50cf27f3f005b0acbd 100644
+index e0f38ef295e1958b45fc05395cd4c57194928338..f259f6609cd87a210451ddf4ea00a72718d1efd0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -307,9 +307,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0319-Configurable-projectile-relative-velocity.patch b/patches/server/0318-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0319-Configurable-projectile-relative-velocity.patch
rename to patches/server/0318-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0320-offset-item-frame-ticking.patch b/patches/server/0319-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0320-offset-item-frame-ticking.patch
rename to patches/server/0319-offset-item-frame-ticking.patch
diff --git a/patches/server/0321-Fix-MC-158900.patch b/patches/server/0320-Fix-MC-158900.patch
similarity index 94%
rename from patches/server/0321-Fix-MC-158900.patch
rename to patches/server/0320-Fix-MC-158900.patch
index dae886600a..daca6f31cc 100644
--- a/patches/server/0321-Fix-MC-158900.patch
+++ b/patches/server/0320-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bbc2cbc4e08f0cd7d82233f5168abda81d583d0b..8371a95cf3c4b8df73e8bfb68e45291da80fac0d 100644
+index 94a0d17a0339249c1c97e36d6e13b5958cfa2e49..2848e657209a699b12fc0e1fd2bde54d661f07f0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -642,8 +642,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch
similarity index 88%
rename from patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch
index f1acb74fdd..744743c59a 100644
--- a/patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 232e50c36e4c6dc719cc0e07cbe8ec0fd54fee6d..901ac163042322de70d008634cb2a99227bbf6e3 100644
+index 0275c797aafa4778573b8e283319a5eb2c697105..e673b4777a0b2bbc56b3183a44fc7e470a81e388 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3661,9 +3661,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3651,9 +3651,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void startUsingItem(InteractionHand hand) {
@@ -24,7 +24,7 @@ index 232e50c36e4c6dc719cc0e07cbe8ec0fd54fee6d..901ac163042322de70d008634cb2a992
              this.useItem = itemstack;
              this.useItemRemaining = itemstack.getUseDuration();
              if (!this.level().isClientSide) {
-@@ -3743,6 +3748,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3733,6 +3738,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  this.releaseUsingItem();
              } else {
                  if (!this.useItem.isEmpty() && this.isUsingItem()) {
@@ -32,7 +32,7 @@ index 232e50c36e4c6dc719cc0e07cbe8ec0fd54fee6d..901ac163042322de70d008634cb2a992
                      this.triggerItemUseEffects(this.useItem, 16);
                      // CraftBukkit start - fire PlayerItemConsumeEvent
                      ItemStack itemstack;
-@@ -3777,8 +3783,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3767,8 +3773,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      }
  
                      this.stopUsingItem();
diff --git a/patches/server/0323-Dont-send-unnecessary-sign-update.patch b/patches/server/0322-Dont-send-unnecessary-sign-update.patch
similarity index 92%
rename from patches/server/0323-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0322-Dont-send-unnecessary-sign-update.patch
index 8166668d42..99b917ef46 100644
--- a/patches/server/0323-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0322-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/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 41861cb1e303213b2963e90fac6b4cbbfbbe36f7..4fe156701cf0664d0ab9472f5599fd87ee4ddeb2 100644
+index ccd426d1b8511bf8edab0e7f2b04f127c8767f4d..4b9d326458fb3029f19e58b77ef0156b26b9c88b 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -186,6 +186,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0324-Add-option-to-disable-pillager-patrols.patch b/patches/server/0323-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0324-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0323-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0325-Flat-bedrock-generator-settings.patch b/patches/server/0324-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0325-Flat-bedrock-generator-settings.patch
rename to patches/server/0324-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0328-Duplicate-UUID-Resolve-Option.patch b/patches/server/0327-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0328-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0327-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
similarity index 91%
rename from patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
index 6631be458f..a542430630 100644
--- a/patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ca0be3e09e19925176185736007db633a97b42ec..4d0e586aef645af40ef0f8715796190cbddbfda8 100644
+index 488b32a6c09102ccc041dde9ed7294a90753c1bb..5ea537b98fc038798ada3d60570aaf908571d6b9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -967,7 +967,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 86%
rename from patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch
index 735de5103e..0fe70d9166 100644
--- a/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent bees loading chunks checking hive position
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 17d8332356c9611d6a4b1ea2c8e160b46fa704ba..b4d5a33bfc5616d69a3570c99ea0af52397f8ffb 100644
+index 407788ef7b0076e3bc5ec565af0470f1ab4865fa..4111ac5efa63c8063734646d0a8a8154f52f653d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -497,6 +497,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -502,6 +502,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          } else if (this.isTooFarAway(this.hivePos)) {
              return false;
          } else {
diff --git a/patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 100%
rename from patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0333-Fix-items-not-falling-correctly.patch b/patches/server/0332-Fix-items-not-falling-correctly.patch
similarity index 89%
rename from patches/server/0333-Fix-items-not-falling-correctly.patch
rename to patches/server/0332-Fix-items-not-falling-correctly.patch
index 6f2bb185e1..db8b4a2a96 100644
--- a/patches/server/0333-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0332-Fix-items-not-falling-correctly.patch
@@ -15,10 +15,10 @@ This patch resolves the conflict by offsetting checking Spigot's entity
 activation range check from an item's move method.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 21773aea4d5e5f3946202e03afdc00f7bb109618..080b574d28b07e59b234a927a50ba8972d410664 100644
+index fda34d93a5b75919c840d3bc0efa0651e5eb4843..cecd7bd4a6dd66cfb2d632a232ff469e5fdcba44 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -149,7 +149,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -150,7 +150,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  }
              }
  
@@ -28,7 +28,7 @@ index 21773aea4d5e5f3946202e03afdc00f7bb109618..080b574d28b07e59b234a927a50ba897
                  float f1 = 0.98F;
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a526816f261de2a75a04be82596a7d8d674ead4a..0bdd57e214a8652c2ce7c923c28fc17e52624fb5 100644
+index 1d9ce6dae17ff572d4528971c69c63d0f85b313c..305d9772f2af22e8bdf73235cdb15ea01ac2c3b3 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -257,7 +257,7 @@ public class ActivationRange
diff --git a/patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0337-Entity-Activation-Range-2.0.patch b/patches/server/0336-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from patches/server/0337-Entity-Activation-Range-2.0.patch
rename to patches/server/0336-Entity-Activation-Range-2.0.patch
index 6c4d053816..6684bee7cc 100644
--- a/patches/server/0337-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0336-Entity-Activation-Range-2.0.patch
@@ -112,7 +112,7 @@ index 0efc377743e93a0120843cab192753d037e88a73..b12e9da3eebda396769b30f4b7e37a78
          } 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 7be82f903e5f65d00b68dc7ee7c1cb4b2be1dc8d..e35a8e118db04143b29b4c8e56b6fae277e18ca3 100644
+index e8c4d27cd8403776873d8a492a61023d60ad158c..2224b0bd593717656875f391e0717fcb11579d5a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -390,6 +390,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0338-Implement-alternative-item-despawn-rate.patch b/patches/server/0337-Implement-alternative-item-despawn-rate.patch
similarity index 81%
rename from patches/server/0338-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0337-Implement-alternative-item-despawn-rate.patch
index b0715097b4..d3859bd120 100644
--- a/patches/server/0338-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0337-Implement-alternative-item-despawn-rate.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Implement alternative item-despawn-rate
 Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 080b574d28b07e59b234a927a50ba8972d410664..7678199278324cce4ce736197cb8766c134a0f87 100644
+index cecd7bd4a6dd66cfb2d632a232ff469e5fdcba44..5d742d072d2cc532ce86bff3de15a5f0f381d1c5 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -53,6 +53,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -54,6 +54,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
      public final float bobOffs;
      private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
      public boolean canMobPickup = true; // Paper
@@ -17,16 +17,16 @@ index 080b574d28b07e59b234a927a50ba8972d410664..7678199278324cce4ce736197cb8766c
  
      public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
          super(type, world);
-@@ -189,7 +190,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -190,7 +191,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  }
              }
  
 -            if (!this.level().isClientSide && this.age >= this.level().spigotConfig.itemDespawnRate) { // Spigot
 +            if (!this.level().isClientSide && this.age >= this.despawnRate) { // Spigot // Paper
                  // CraftBukkit start - fire ItemDespawnEvent
-                 if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
+                 if (CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
                      this.age = 0;
-@@ -213,7 +214,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -214,7 +215,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
          this.lastTick = MinecraftServer.currentTick;
          // CraftBukkit end
  
@@ -35,7 +35,7 @@ index 080b574d28b07e59b234a927a50ba8972d410664..7678199278324cce4ce736197cb8766c
              // CraftBukkit start - fire ItemDespawnEvent
              if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
                  this.age = 0;
-@@ -269,7 +270,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -270,7 +271,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
      private boolean isMergable() {
          ItemStack itemstack = this.getItem();
  
@@ -44,15 +44,15 @@ index 080b574d28b07e59b234a927a50ba8972d410664..7678199278324cce4ce736197cb8766c
      }
  
      private void tryToMerge(ItemEntity other) {
-@@ -509,6 +510,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -513,6 +514,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+     public void setItem(ItemStack stack) {
          com.google.common.base.Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); // CraftBukkit
          this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
-         this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty
 +        this.despawnRate = this.level().paperConfig().entities.spawning.altItemDespawnRate.enabled ? this.level().paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), this.level().spigotConfig.itemDespawnRate) : this.level().spigotConfig.itemDespawnRate; // Paper
      }
  
      @Override
-@@ -562,7 +564,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -566,7 +568,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
      public void makeFakeItem() {
          this.setNeverPickUp();
diff --git a/patches/server/0339-Lag-compensate-eating.patch b/patches/server/0338-Lag-compensate-eating.patch
similarity index 88%
rename from patches/server/0339-Lag-compensate-eating.patch
rename to patches/server/0338-Lag-compensate-eating.patch
index 7885bf78f2..72f8f2015a 100644
--- a/patches/server/0339-Lag-compensate-eating.patch
+++ b/patches/server/0338-Lag-compensate-eating.patch
@@ -7,10 +7,10 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 901ac163042322de70d008634cb2a99227bbf6e3..d322efe93e056f6272221b00b737fd9b6d290404 100644
+index e673b4777a0b2bbc56b3183a44fc7e470a81e388..2a81303109bb3fd34c9cf5ff9cc9d2cb5c331eb8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3604,6 +3604,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3594,6 +3594,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return ((Byte) this.entityData.get(LivingEntity.DATA_LIVING_ENTITY_FLAGS) & 2) > 0 ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
      }
  
@@ -22,7 +22,7 @@ index 901ac163042322de70d008634cb2a99227bbf6e3..d322efe93e056f6272221b00b737fd9b
      private void updatingUsingItem() {
          if (this.isUsingItem()) {
              if (ItemStack.isSameItem(this.getItemInHand(this.getUsedItemHand()), this.useItem)) {
-@@ -3622,7 +3627,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3612,7 +3617,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.triggerItemUseEffects(stack, 5);
          }
  
@@ -36,7 +36,7 @@ index 901ac163042322de70d008634cb2a99227bbf6e3..d322efe93e056f6272221b00b737fd9b
              this.completeUsingItem();
          }
  
-@@ -3670,7 +3680,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3660,7 +3670,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
          if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper use override flag
              this.useItem = itemstack;
@@ -48,7 +48,7 @@ index 901ac163042322de70d008634cb2a99227bbf6e3..d322efe93e056f6272221b00b737fd9b
              if (!this.level().isClientSide) {
                  this.setLivingEntityFlag(1, true);
                  this.setLivingEntityFlag(2, hand == InteractionHand.OFF_HAND);
-@@ -3695,7 +3708,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3685,7 +3698,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  }
              } else if (!this.isUsingItem() && !this.useItem.isEmpty()) {
                  this.useItem = ItemStack.EMPTY;
@@ -60,7 +60,7 @@ index 901ac163042322de70d008634cb2a99227bbf6e3..d322efe93e056f6272221b00b737fd9b
              }
          }
  
-@@ -3828,7 +3844,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3818,7 +3834,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          this.useItem = ItemStack.EMPTY;
diff --git a/patches/server/0340-Tracking-Range-Improvements.patch b/patches/server/0339-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0340-Tracking-Range-Improvements.patch
rename to patches/server/0339-Tracking-Range-Improvements.patch
diff --git a/patches/server/0341-Fix-items-vanishing-through-end-portal.patch b/patches/server/0340-Fix-items-vanishing-through-end-portal.patch
similarity index 89%
rename from patches/server/0341-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0340-Fix-items-vanishing-through-end-portal.patch
index 97c6bc8bff..4c7186ddd0 100644
--- a/patches/server/0341-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0340-Fix-items-vanishing-through-end-portal.patch
@@ -13,10 +13,10 @@ 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 948ea6e93170902a771950a56f0ce1a41e2bffd7..f0f1aee5f2613f81d8f600ecb9137856b09e2319 100644
+index 2224b0bd593717656875f391e0717fcb11579d5a..92d052bd70514fbcce511a6d674cc14901d6d230 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3353,6 +3353,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3342,6 +3342,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (flag1) {
                  blockposition1 = ServerLevel.END_SPAWN_POINT;
              } else {
diff --git a/patches/server/0342-implement-optional-per-player-mob-spawns.patch b/patches/server/0341-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from patches/server/0342-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0341-implement-optional-per-player-mob-spawns.patch
index 9425f87cb9..b287591270 100644
--- a/patches/server/0342-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0341-implement-optional-per-player-mob-spawns.patch
@@ -362,7 +362,7 @@ index 5cb151a7d89c7281b03f24c5f79afb7edf7cbfea..d9743139d1cb932c6aac56da85f073e4
  
              this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4d0e586aef645af40ef0f8715796190cbddbfda8..95ba44eb591e963663b18ae73ca42679ca5fddfe 100644
+index 5ea537b98fc038798ada3d60570aaf908571d6b9..9e4e2a23891031589a03a5e8dc3e67091acd360b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -248,6 +248,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0343-Anti-Xray.patch b/patches/server/0342-Anti-Xray.patch
similarity index 99%
rename from patches/server/0343-Anti-Xray.patch
rename to patches/server/0342-Anti-Xray.patch
index 7ce0515045..8a99efafe2 100644
--- a/patches/server/0343-Anti-Xray.patch
+++ b/patches/server/0342-Anti-Xray.patch
@@ -1148,7 +1148,7 @@ index b12e9da3eebda396769b30f4b7e37a78f3bcb060..62ea2bb2fdd1f2de31b08c8819388798
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index fc1f55e53d9c8f1a5711f4062eb3ba343f3f7438..f004f1cd6ecfecc91c691665233ee547aa88c64a 100644
+index bdf11a98614c9c12d3112f437651be81d0d9872a..58a1a54b676922ef0862dcab98e7aada5de80311 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
@@ -1573,10 +1573,10 @@ index b738e1f7debac7d70910d5ac908ca9d4f60640d5..269ebe8e8826a0c89e471cb59b503900
  
      public CraftChunk(net.minecraft.world.level.chunk.LevelChunk chunk) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9d477eaa1015b6337a644f1baafd7cba67bb0e4a..f7d2193f7e182e64cd51d3f909e4f0505a388f48 100644
+index 7aa2682a8f6086550a3f27072dc7ec2425b3c116..3ad73272d67c1ffc0cdb1f119132490318c79abf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2280,7 +2280,7 @@ public final class CraftServer implements Server {
+@@ -2294,7 +2294,7 @@ public final class CraftServer implements Server {
      public ChunkGenerator.ChunkData createChunkData(World world) {
          Preconditions.checkArgument(world != null, "World cannot be null");
          ServerLevel handle = ((CraftWorld) world).getHandle();
@@ -1586,7 +1586,7 @@ index 9d477eaa1015b6337a644f1baafd7cba67bb0e4a..f7d2193f7e182e64cd51d3f909e4f050
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ad272693251141f60ef68c50cf27f3f005b0acbd..e3308c3e93abf80022a16166c3cc522da8221f34 100644
+index f259f6609cd87a210451ddf4ea00a72718d1efd0..b34067a6bc3bf61ca94929bb8e9677deef686077 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -418,11 +418,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 91%
rename from patches/server/0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 1efcad5df7..21d913fee7 100644
--- a/patches/server/0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index b4d5a33bfc5616d69a3570c99ea0af52397f8ffb..8feb4192eac41a27e683ad391503a1480c7516de 100644
+index 4111ac5efa63c8063734646d0a8a8154f52f653d..644a0e9858b61d0032ea2919fab40c444bc84f85 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -142,7 +142,22 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -147,7 +147,22 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      public Bee(EntityType<? extends Bee> type, Level world) {
          super(type, world);
          this.remainingCooldownBeforeLocatingNewFlower = Mth.nextInt(this.random, 20, 60);
diff --git a/patches/server/0345-Improve-Block-breakNaturally-API.patch b/patches/server/0344-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0345-Improve-Block-breakNaturally-API.patch
rename to patches/server/0344-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0347-Add-debug-for-sync-chunk-loads.patch b/patches/server/0346-Add-debug-for-sync-chunk-loads.patch
similarity index 100%
rename from patches/server/0347-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0346-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0348-Remove-garbage-Java-version-check.patch b/patches/server/0347-Remove-garbage-Java-version-check.patch
similarity index 91%
rename from patches/server/0348-Remove-garbage-Java-version-check.patch
rename to patches/server/0347-Remove-garbage-Java-version-check.patch
index c2266d3860..5dd6961d0f 100644
--- a/patches/server/0348-Remove-garbage-Java-version-check.patch
+++ b/patches/server/0347-Remove-garbage-Java-version-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove garbage Java version check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f707537227a729a48f63b86b69bbeb22743435ac..24607ed5f60ce68aeda7380c433a8b416ed885c4 100644
+index 65c7b9bd1f8dcbe87f75967f35ac91b6a2016844..1dc2c4552df65c355d8711b2a492c307d29180e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -205,10 +205,6 @@ public class Main {
diff --git a/patches/server/0349-Add-ThrownEggHatchEvent.patch b/patches/server/0348-Add-ThrownEggHatchEvent.patch
similarity index 65%
rename from patches/server/0349-Add-ThrownEggHatchEvent.patch
rename to patches/server/0348-Add-ThrownEggHatchEvent.patch
index f5f3ef81ce..1ba4eabb97 100644
--- a/patches/server/0349-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0348-Add-ThrownEggHatchEvent.patch
@@ -7,21 +7,19 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem
 (dispensers can throw eggs to hatch them, too).
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
-index 7a56c884cb144f8982466872ed2e0937bebf7fe8..6fd803f831cab088a67062ce8624b30338771d8e 100644
+index 88e8ce770ddc61702fc87cd8dcee498183dc1032..4aca131fe774c54b5cc274000d825687a1373b3f 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
-@@ -76,6 +76,14 @@ public class ThrownEgg extends ThrowableItemProjectile {
-                     hatchingType = event.getHatchingType();
+@@ -82,6 +82,12 @@ public class ThrownEgg extends ThrowableItemProjectile {
+                     }
                  }
- 
+                 // CraftBukkit end
 +                // Paper start
 +                com.destroystokyo.paper.event.entity.ThrownEggHatchEvent event = new com.destroystokyo.paper.event.entity.ThrownEggHatchEvent((org.bukkit.entity.Egg) getBukkitEntity(), hatching, b0, hatchingType);
 +                event.callEvent();
-+
 +                b0 = event.getNumHatches();
-+                hatching = event.isHatching();
 +                hatchingType = event.getHatchingType();
 +                // Paper end
-                 if (hatching) {
-                     for (int i = 0; i < b0; ++i) {
-                         Entity entity = this.level().getWorld().createEntity(new org.bukkit.Location(this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F), hatchingType.getEntityClass());
+ 
+                 for (int i = 0; i < b0; ++i) {
+                     Entity entitychicken = this.level().getWorld().createEntity(new org.bukkit.Location(this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F), hatchingType.getEntityClass()); // CraftBukkit
diff --git a/patches/server/0350-Entity-Jump-API.patch b/patches/server/0349-Entity-Jump-API.patch
similarity index 84%
rename from patches/server/0350-Entity-Jump-API.patch
rename to patches/server/0349-Entity-Jump-API.patch
index 4c1f5f0426..8238fe1d73 100644
--- a/patches/server/0350-Entity-Jump-API.patch
+++ b/patches/server/0349-Entity-Jump-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d322efe93e056f6272221b00b737fd9b6d290404..ba1e09e310e48d10be86d2679f6853c0cdc603c4 100644
+index 2a81303109bb3fd34c9cf5ff9cc9d2cb5c331eb8..e5bc7ad4f9c3b02dd8a572750ed833b200fbecd4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3265,8 +3265,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3255,8 +3255,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
              } else if (this.isInLava() && (!this.onGround() || d7 > d8)) {
                  this.jumpInLiquid(FluidTags.LAVA);
              } else if ((this.onGround() || flag && d7 <= d8) && this.noJumpDelay == 0) {
@@ -20,10 +20,10 @@ index d322efe93e056f6272221b00b737fd9b6d290404..ba1e09e310e48d10be86d2679f6853c0
          } else {
              this.noJumpDelay = 0;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index f8a59afbe0f95a06e9ae6972fc664d0a0860c951..7f4ff9658b0eca2034333810fd2b199a3d186e72 100644
+index 278a9842455a222ed9102fc7a95585755dfd5d7b..a190826d87ca5e05c408ef488986a29280b1b3d2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -521,7 +521,9 @@ public class Panda extends Animal {
+@@ -524,7 +524,9 @@ public class Panda extends Animal {
              Panda entitypanda = (Panda) iterator.next();
  
              if (!entitypanda.isBaby() && entitypanda.onGround() && !entitypanda.isInWater() && entitypanda.canPerformAction()) {
@@ -34,10 +34,10 @@ index f8a59afbe0f95a06e9ae6972fc664d0a0860c951..7f4ff9658b0eca2034333810fd2b199a
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 243397de3b0a843ec95c6b721d7fc654bfc78448..aad1fb5cf231b400dc8c192871aa4429536d53ee 100644
+index 02f962eed1d85e8c532264f63666d26401d6a8f2..c245acdbaa84cc795e341ed042a0d8d90383f070 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -176,7 +176,9 @@ public class Ravager extends Raider {
+@@ -184,7 +184,9 @@ public class Ravager extends Raider {
                  }
  
                  if (!flag && this.onGround()) {
@@ -48,10 +48,10 @@ index 243397de3b0a843ec95c6b721d7fc654bfc78448..aad1fb5cf231b400dc8c192871aa4429
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0c3ac380b9092ff961bce761ddfc835f4bd66544..6bf1b3a9ee029feafa054f40291078c79f28c5f4 100644
+index 5a721647807f455e73e862a1244520787ebee76d..65fbc8b10c536f3258a455950263bd97dd6e30e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -884,5 +884,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -911,5 +911,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public org.bukkit.inventory.EquipmentSlot getHandRaised() {
          return getHandle().getUsedItemHand() == net.minecraft.world.InteractionHand.MAIN_HAND ? org.bukkit.inventory.EquipmentSlot.HAND : org.bukkit.inventory.EquipmentSlot.OFF_HAND;
      }
diff --git a/patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 96%
rename from patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 2cf3485746..a2072c3144 100644
--- a/patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0350-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 f0f1aee5f2613f81d8f600ecb9137856b09e2319..8619d3d81c9ce9b85fcfee37de564630f5ae0be6 100644
+index 92d052bd70514fbcce511a6d674cc14901d6d230..2249c2a7c9cfad758c8d235347c6c8aff29fae60 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -392,6 +392,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0352-Make-the-GUI-graph-fancier.patch b/patches/server/0351-Make-the-GUI-graph-fancier.patch
similarity index 99%
rename from patches/server/0352-Make-the-GUI-graph-fancier.patch
rename to patches/server/0351-Make-the-GUI-graph-fancier.patch
index b97ce20f84..2768fc5d7c 100644
--- a/patches/server/0352-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0351-Make-the-GUI-graph-fancier.patch
@@ -384,7 +384,7 @@ index 0000000000000000000000000000000000000000..c3e54da4ab6440811aab2f9dd1e21880
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index 75083eeb9b413e6dd5375007360dce6857a08fff..66464c10a6b33414c6d1b67b926a66c343d5f887 100644
+index d292fdb165436f0b9b46b32110f5e09ad0e517a1..2e93eec8733c5b548a15269a322fe4dd1f189b7d 100644
 --- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 +++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 @@ -95,7 +95,7 @@ public class MinecraftServerGui extends JComponent {
diff --git a/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 89%
rename from patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch
index ac4409c49c..4539f1ff9f 100644
--- a/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3ab9346bfd4efc27abdaed69fba365c3fa262d47..7b46cf7f39f77d593bbf1a4abe500077ab580166 100644
+index 9064f07fcbe0067c4b78cde026e58ae68f1aa4b9..2739c8424da929642d5ae029bfd75f8c302ac767 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -369,13 +369,18 @@ public class CraftEventFactory {
+@@ -374,13 +374,18 @@ public class CraftEventFactory {
          }
  
          org.bukkit.inventory.ItemStack item;
diff --git a/patches/server/0354-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0353-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0354-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0353-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0356-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0356-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0357-Optimise-Chunk-getFluid.patch b/patches/server/0356-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0357-Optimise-Chunk-getFluid.patch
rename to patches/server/0356-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0358-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0358-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0359-Add-tick-times-API-and-mspt-command.patch b/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from patches/server/0359-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0358-Add-tick-times-API-and-mspt-command.patch
index 80ac508d51..b605afbe92 100644
--- a/patches/server/0359-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
@@ -184,10 +184,10 @@ index cd57953e31c1f0f51553be113d84760f24b061b0..36112a1ab7306deb3cc38b103f22f7c1
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f7d2193f7e182e64cd51d3f909e4f0505a388f48..6e1618f32f1b5a896fa647d857eed4356115dcdd 100644
+index 3ad73272d67c1ffc0cdb1f119132490318c79abf..286eb9b9618798e0937fc73c846b92b1d64bb8f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2535,6 +2535,16 @@ public final class CraftServer implements Server {
+@@ -2549,6 +2549,16 @@ public final class CraftServer implements Server {
                  net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
          };
      }
diff --git a/patches/server/0360-Expose-MinecraftServer-isRunning.patch b/patches/server/0359-Expose-MinecraftServer-isRunning.patch
similarity index 83%
rename from patches/server/0360-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0359-Expose-MinecraftServer-isRunning.patch
index 5dec3ef5cf..3bf1e4f1e8 100644
--- a/patches/server/0360-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0359-Expose-MinecraftServer-isRunning.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6e1618f32f1b5a896fa647d857eed4356115dcdd..f87a6248a9e920d0e64d7971b0f056d06bc222e8 100644
+index 286eb9b9618798e0937fc73c846b92b1d64bb8f3..97474f1835bb92446b2d63db40791310676d936c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2766,5 +2766,10 @@ public final class CraftServer implements Server {
+@@ -2780,5 +2780,10 @@ public final class CraftServer implements Server {
      public int getCurrentTick() {
          return net.minecraft.server.MinecraftServer.currentTick;
      }
diff --git a/patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 67be08c3ea..27efec7f20 100644
--- a/patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 95ba44eb591e963663b18ae73ca42679ca5fddfe..b712690fd011533d6d55718f96a94f6a9a25ad8d 100644
+index 9e4e2a23891031589a03a5e8dc3e67091acd360b..0642fbe2e2fa5ab3e0919f71903e6545bd7121fe 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -244,6 +244,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 85%
rename from patches/server/0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 978542bf9f..ad483cccb6 100644
--- a/patches/server/0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Do not allow bees to load chunks for beehives
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 8feb4192eac41a27e683ad391503a1480c7516de..2824792295dab6e52015b479a77c61efb1150041 100644
+index 644a0e9858b61d0032ea2919fab40c444bc84f85..9c7c59d1230110010033a9c9959b375eac3ebc2b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -408,6 +408,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -413,6 +413,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          if (this.hivePos == null) {
              return false;
          } else {
@@ -16,7 +16,7 @@ index 8feb4192eac41a27e683ad391503a1480c7516de..2824792295dab6e52015b479a77c61ef
              BlockEntity tileentity = this.level().getBlockEntity(this.hivePos);
  
              return tileentity instanceof BeehiveBlockEntity && ((BeehiveBlockEntity) tileentity).isFireNearby();
-@@ -441,6 +442,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -446,6 +447,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      }
  
      private boolean doesHiveHaveSpace(BlockPos pos) {
@@ -24,7 +24,7 @@ index 8feb4192eac41a27e683ad391503a1480c7516de..2824792295dab6e52015b479a77c61ef
          BlockEntity tileentity = this.level().getBlockEntity(pos);
  
          return tileentity instanceof BeehiveBlockEntity ? !((BeehiveBlockEntity) tileentity).isFull() : false;
-@@ -918,6 +920,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -922,6 +924,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          @Override
          public boolean canBeeUse() {
              if (Bee.this.hasHive() && Bee.this.wantsToEnterHive() && Bee.this.hivePos.closerToCenterThan(Bee.this.position(), 2.0D)) {
@@ -32,7 +32,7 @@ index 8feb4192eac41a27e683ad391503a1480c7516de..2824792295dab6e52015b479a77c61ef
                  BlockEntity tileentity = Bee.this.level().getBlockEntity(Bee.this.hivePos);
  
                  if (tileentity instanceof BeehiveBlockEntity) {
-@@ -941,6 +944,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -945,6 +948,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
  
          @Override
          public void start() {
diff --git a/patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0366-Don-t-tick-dead-players.patch b/patches/server/0365-Don-t-tick-dead-players.patch
similarity index 91%
rename from patches/server/0366-Don-t-tick-dead-players.patch
rename to patches/server/0365-Don-t-tick-dead-players.patch
index 9396dd66c9..b84a5ebc65 100644
--- a/patches/server/0366-Don-t-tick-dead-players.patch
+++ b/patches/server/0365-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b712690fd011533d6d55718f96a94f6a9a25ad8d..1d322c8d7e072cea923edcb92e28fa82de8daba8 100644
+index 0642fbe2e2fa5ab3e0919f71903e6545bd7121fe..2d51abce5d5de66bbf6daaf699931bb9d3afc397 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -724,7 +724,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0367-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0367-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0368-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0367-Optimize-Collision-to-not-load-chunks.patch
similarity index 97%
rename from patches/server/0368-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0367-Optimize-Collision-to-not-load-chunks.patch
index 6ea667dd23..5549bc717d 100644
--- a/patches/server/0368-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0367-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8371a95cf3c4b8df73e8bfb68e45291da80fac0d..6eb33551b05152a5ea98f047f072ea4d663d72d8 100644
+index 2848e657209a699b12fc0e1fd2bde54d661f07f0..9c3ab91555f60a1a3cd8a89e883cfbdedc53f3f8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -827,6 +827,7 @@ public abstract class PlayerList {
@@ -26,7 +26,7 @@ index 8371a95cf3c4b8df73e8bfb68e45291da80fac0d..6eb33551b05152a5ea98f047f072ea4d
              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 8619d3d81c9ce9b85fcfee37de564630f5ae0be6..fb6f5c43f2e06824b1e78404f422bee29ca40293 100644
+index 2249c2a7c9cfad758c8d235347c6c8aff29fae60..eb17af78a39feb6fca38a0622cbbb86c227c05f1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -237,6 +237,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch
similarity index 92%
rename from patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch
index 0c044d867e..c7c861c0ec 100644
--- a/patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch
@@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1d322c8d7e072cea923edcb92e28fa82de8daba8..e8a1aff3ddd94925e1c0f554cc8e7ff9e9864242 100644
+index 2d51abce5d5de66bbf6daaf699931bb9d3afc397..6ad3b7e7c7808cb40697e2eb6185f431fc431a20 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -377,7 +377,7 @@ public class ServerPlayer extends Player {
@@ -35,7 +35,7 @@ index 1d322c8d7e072cea923edcb92e28fa82de8daba8..e8a1aff3ddd94925e1c0f554cc8e7ff9
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6eb33551b05152a5ea98f047f072ea4d663d72d8..5b3e8adde28d11aec4ea526ebba61d561ec06cb6 100644
+index 9c3ab91555f60a1a3cd8a89e883cfbdedc53f3f8..5b8b345ade30012371bdda744ba82c585f74db07 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -236,6 +236,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0371-Improved-Watchdog-Support.patch b/patches/server/0370-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0371-Improved-Watchdog-Support.patch
rename to patches/server/0370-Improved-Watchdog-Support.patch
index 680307abd1..cb6c54fefb 100644
--- a/patches/server/0371-Improved-Watchdog-Support.patch
+++ b/patches/server/0370-Improved-Watchdog-Support.patch
@@ -319,7 +319,7 @@ index c3760f22fcc56ccb25e3315823054416c2172386..246606164117e8140ab0892ec1326503
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 24607ed5f60ce68aeda7380c433a8b416ed885c4..203a25a2a8d843c33440d849a94b85e2c717d2a0 100644
+index 1dc2c4552df65c355d8711b2a492c307d29180e3..645cbf447fd1b77cbd1ae3e35ed47aebbd52e27e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -178,6 +178,36 @@ public class Main {
diff --git a/patches/server/0372-Optimize-Pathfinding.patch b/patches/server/0371-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0372-Optimize-Pathfinding.patch
rename to patches/server/0371-Optimize-Pathfinding.patch
diff --git a/patches/server/0373-Reduce-Either-Optional-allocation.patch b/patches/server/0372-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0373-Reduce-Either-Optional-allocation.patch
rename to patches/server/0372-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0375-Prevent-opening-inventories-when-frozen.patch b/patches/server/0374-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0375-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0374-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 93%
rename from patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch
index 5e2751c910..4e64237a13 100644
--- a/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,10 +12,10 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ba1e09e310e48d10be86d2679f6853c0cdc603c4..5132df70d5ef092030db43275b6526b8ac465d1f 100644
+index e5bc7ad4f9c3b02dd8a572750ed833b200fbecd4..494fd7da86979b9a584c8c38b495bb4cbdded078 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3380,10 +3380,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3370,10 +3370,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
          if (this.level().isClientSide()) {
              this.level().getEntities(EntityTypeTest.forClass(net.minecraft.world.entity.player.Player.class), this.getBoundingBox(), EntitySelector.pushableBy(this)).forEach(this::doPush);
          } else {
diff --git a/patches/server/0377-Implement-Player-Client-Options-API.patch b/patches/server/0376-Implement-Player-Client-Options-API.patch
similarity index 98%
rename from patches/server/0377-Implement-Player-Client-Options-API.patch
rename to patches/server/0376-Implement-Player-Client-Options-API.patch
index 10cf997579..8f1008004a 100644
--- a/patches/server/0377-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0376-Implement-Player-Client-Options-API.patch
@@ -116,10 +116,10 @@ index 65d17836785774d0f196321ba741ffd05a9db36e..fd34a2ace2efc819b06674ceab44ff78
          if (getMainArm() != packet.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4bfd0c4f7c898d6333e7e33cecd22b928b4de152..8b5ac878b2bab96543fc7483d6613c317c918161 100644
+index de73f58180c083557a73078c45e57dbabf5429e8..0e5ff317d541a077f822bc0229e71915c2faf3c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -595,6 +595,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -601,6 +601,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message);
          }
      }
diff --git a/patches/server/0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 96%
rename from patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index db0c03d70f..6442bd23eb 100644
--- a/patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -43,7 +43,7 @@ index a8c4c7298e127e5b60a3b43ad168976d29901bc5..48586780da5d260894fe59efaa97cb1f
          if (!(entity instanceof EnderDragonPart)) {
              EntityType<?> entitytypes = entity.getType();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cc3ebc15e25e132870bbc336e68216459a4545da..af6b92056d924f7cb9a7a583fd089025c95f88ad 100644
+index fd34a2ace2efc819b06674ceab44ff78ec11f805..6dcac005b57234983d0ed05fe825a16c98eb4557 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -267,6 +267,7 @@ public class ServerPlayer extends Player {
@@ -55,7 +55,7 @@ index cc3ebc15e25e132870bbc336e68216459a4545da..af6b92056d924f7cb9a7a583fd089025
      public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 95356cfb36f2103889a21d6c360d29a318c871dd..8a67971d67230b30b769eea5745919946d868bd8 100644
+index 0d100788312a234616c1401656f09835458e79f6..97199ae30edfaaacb9ea9d29846ee131395815e6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -311,6 +311,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 93%
rename from patches/server/0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index e39c1d0ec7..28f7bdb42b 100644
--- a/patches/server/0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0379-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 fb6f5c43f2e06824b1e78404f422bee29ca40293..997f73e86d62b546e363382a3126bc43b4b17b7f 100644
+index eb17af78a39feb6fca38a0622cbbb86c227c05f1..e1e9bc47e2e666ac5355d3b6a91a1a2dbd46e691 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2319,9 +2319,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 92%
rename from patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch
index fc8311b28f..472f968350 100644
--- a/patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5132df70d5ef092030db43275b6526b8ac465d1f..02f5992f859163ea3fa77b3607bc9a0a29c17723 100644
+index 494fd7da86979b9a584c8c38b495bb4cbdded078..b0f6fbd6bb18d49d1a637fb08767c7ba13d1cd3b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2172,7 +2172,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2162,7 +2162,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
              EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption);
              if (damagesource.getEntity() instanceof net.minecraft.world.entity.player.Player) {
diff --git a/patches/server/0382-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0382-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0383-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch
similarity index 97%
rename from patches/server/0383-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch
index edb2d58386..a305607379 100644
--- a/patches/server/0383-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch
@@ -29,7 +29,7 @@ index 9bd6e71ea38bf050832f0f7bbed4a5db6ddcef71..ab639cb2faaafaeb33be91bfe99ffad6
                              return true;
                          }
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index a18e6296d1f50c53291d41192a1009605a1b3583..8c767aba1e800c41412e92afe9cb09cfab1c6ffc 100644
+index 94ee9c399f59e0198b4d9bc2a4255e8b821bcd36..b1fc786970b5288a02cc3a46e3fe7784ac566c07 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 @@ -49,7 +49,7 @@ public class PhantomSpawner implements CustomSpawner {
diff --git a/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 92%
rename from patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index de1606e60e..8480bfdbdb 100644
--- a/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0383-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 595f58d9eb74fd934009bc1e4aa459074678ee94..077466f62bb09cc1bf0c101f6a1fbdc1519590bb 100644
+index e1e9bc47e2e666ac5355d3b6a91a1a2dbd46e691..f5c1de9671bf823a7f2fa78acfa8f9065d6eb517 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2449,11 +2449,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -34,7 +34,7 @@ index 595f58d9eb74fd934009bc1e4aa459074678ee94..077466f62bb09cc1bf0c101f6a1fbdc1
  
              entityitem.setDefaultPickUpDelay();
              // CraftBukkit start
-@@ -3238,6 +3239,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3227,6 +3228,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      @Nullable
      public Entity teleportTo(ServerLevel worldserver, PositionImpl location) {
          // CraftBukkit end
@@ -47,7 +47,7 @@ index 595f58d9eb74fd934009bc1e4aa459074678ee94..077466f62bb09cc1bf0c101f6a1fbdc1
          if (this.level() instanceof ServerLevel && !this.isRemoved()) {
              this.level().getProfiler().push("changeDimension");
              // CraftBukkit start
-@@ -3264,6 +3271,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3253,6 +3260,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  // CraftBukkit end
  
                  this.level().getProfiler().popPush("reloading");
@@ -59,7 +59,7 @@ index 595f58d9eb74fd934009bc1e4aa459074678ee94..077466f62bb09cc1bf0c101f6a1fbdc1
                  Entity entity = this.getType().create(worldserver);
  
                  if (entity != null) {
-@@ -3277,10 +3289,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3266,10 +3278,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      // CraftBukkit start - Forward the CraftEntity to the new entity
                      this.getBukkitEntity().setHandle(entity);
                      entity.bukkitEntity = this.getBukkitEntity();
@@ -70,7 +70,7 @@ index 595f58d9eb74fd934009bc1e4aa459074678ee94..077466f62bb09cc1bf0c101f6a1fbdc1
                      // CraftBukkit end
                  }
  
-@@ -3401,7 +3409,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3390,7 +3398,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean canChangeDimensions() {
@@ -80,10 +80,10 @@ index 595f58d9eb74fd934009bc1e4aa459074678ee94..077466f62bb09cc1bf0c101f6a1fbdc1
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 02f5992f859163ea3fa77b3607bc9a0a29c17723..f8c2ff77f8db6f3e31eb2ef4d8638a736fcc0295 100644
+index b0f6fbd6bb18d49d1a637fb08767c7ba13d1cd3b..59c82af8f2a9471830c3d5f7a44c817fbabf1acf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1688,9 +1688,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1678,9 +1678,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  // Paper start
                  org.bukkit.event.entity.EntityDeathEvent deathEvent = this.dropAllDeathLoot(damageSource);
                  if (deathEvent == null || !deathEvent.isCancelled()) {
@@ -96,7 +96,7 @@ index 02f5992f859163ea3fa77b3607bc9a0a29c17723..f8c2ff77f8db6f3e31eb2ef4d8638a73
                      // Paper start - clear equipment if event is not cancelled
                      if (this instanceof Mob) {
                          for (EquipmentSlot slot : this.clearedEquipmentSlots) {
-@@ -1791,8 +1791,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1781,8 +1781,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.dropCustomDeathLoot(source, i, flag);
              this.clearEquipmentSlots = prev; // Paper
          }
@@ -135,10 +135,10 @@ index a35a0952ce8e1fc42e92734786d531c7e10b34d7..498c6664fcfb028111031691348bfa2e
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7b46cf7f39f77d593bbf1a4abe500077ab580166..a6b0433b36c9b21871166384cee734a9c0dfbe82 100644
+index 2739c8424da929642d5ae029bfd75f8c302ac767..9a9896e9424298c564a11a541448b54198461e62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -835,6 +835,11 @@ public class CraftEventFactory {
+@@ -840,6 +840,11 @@ public class CraftEventFactory {
      }
  
      public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim, List<org.bukkit.inventory.ItemStack> drops) {
@@ -150,7 +150,7 @@ index 7b46cf7f39f77d593bbf1a4abe500077ab580166..a6b0433b36c9b21871166384cee734a9
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
          populateFields(victim, event); // Paper - make cancellable
-@@ -848,11 +853,13 @@ public class CraftEventFactory {
+@@ -853,11 +858,13 @@ public class CraftEventFactory {
          playDeathSound(victim, event);
          // Paper end
          victim.expToDrop = event.getDroppedExp();
diff --git a/patches/server/0385-Villager-Restocks-API.patch b/patches/server/0384-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0385-Villager-Restocks-API.patch
rename to patches/server/0384-Villager-Restocks-API.patch
diff --git a/patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 95%
rename from patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch
index c5e06fdba4..500133b919 100644
--- a/patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0385-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 4a92305dd0ac5db459f0a716b4ac8d6a0aa2c437..1bf4ed4878f900730f66e2245106e66bd1927a5f 100644
+index bd70158d200f0bd9e52e46c9b5c8c7261a1646f5..fbc5b78c0356d2bbe7a5eb48424e9d701251ac25 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -967,7 +967,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0387-Expose-game-version.patch b/patches/server/0386-Expose-game-version.patch
similarity index 82%
rename from patches/server/0387-Expose-game-version.patch
rename to patches/server/0386-Expose-game-version.patch
index 5fd69af924..bc91dbb336 100644
--- a/patches/server/0387-Expose-game-version.patch
+++ b/patches/server/0386-Expose-game-version.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f87a6248a9e920d0e64d7971b0f056d06bc222e8..af3c77a26a054c65f2f17037879fc54ada478848 100644
+index 97474f1835bb92446b2d63db40791310676d936c..d0545e5543f60ca30ca885407cca442365644e84 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -576,6 +576,13 @@ public final class CraftServer implements Server {
+@@ -579,6 +579,13 @@ public final class CraftServer implements Server {
          return this.bukkitVersion;
      }
  
diff --git a/patches/server/0388-Optimize-Voxel-Shape-Merging.patch b/patches/server/0387-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0388-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0387-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index e21322dfbe..386a76af00 100644
--- a/patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 203a25a2a8d843c33440d849a94b85e2c717d2a0..9f1b363e1a6fa4925dc4560654af8426e6908c9d 100644
+index 645cbf447fd1b77cbd1ae3e35ed47aebbd52e27e..800c70f022aee593ff35f05a86ddeba864567f2d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -26,6 +26,7 @@ public class Main {
diff --git a/patches/server/0390-misc-debugging-dumps.patch b/patches/server/0389-misc-debugging-dumps.patch
similarity index 96%
rename from patches/server/0390-misc-debugging-dumps.patch
rename to patches/server/0389-misc-debugging-dumps.patch
index 8a66975bcd..a6b7eb769d 100644
--- a/patches/server/0390-misc-debugging-dumps.patch
+++ b/patches/server/0389-misc-debugging-dumps.patch
@@ -74,10 +74,10 @@ index 0c7f280bae81bbb492d5780a43e5ffda0f58756a..238a7bc87ab49da1f0fa3c733dd512fd
                  this.connection.send(new ClientboundDisconnectPacket(ichatmutablecomponent));
                  this.connection.disconnect(ichatmutablecomponent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index af3c77a26a054c65f2f17037879fc54ada478848..1b5197752992ed7c7a8ea6d01e5efa90347e8ddd 100644
+index d0545e5543f60ca30ca885407cca442365644e84..11a254484d078769085b278eb338d320d30b5a5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1022,6 +1022,7 @@ public final class CraftServer implements Server {
+@@ -1025,6 +1025,7 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getFullName(),
                  "This plugin is not properly shutting down its async tasks when it is being reloaded.  This may cause conflicts with the newly loaded version of the plugin"
              ));
diff --git a/patches/server/0391-Prevent-teleporting-dead-entities.patch b/patches/server/0390-Prevent-teleporting-dead-entities.patch
similarity index 92%
rename from patches/server/0391-Prevent-teleporting-dead-entities.patch
rename to patches/server/0390-Prevent-teleporting-dead-entities.patch
index b679450eea..a19b886516 100644
--- a/patches/server/0391-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0390-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 1aa57ffc056f8e19613fc377e6f0be1ecab9f89c..c51ce79c8ada65b2702165fcd99a50f49a7b16b2 100644
+index fbc5b78c0356d2bbe7a5eb48424e9d701251ac25..5257f7f32f5fea130fb391e32300d803a7fbb3a8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1615,6 +1615,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 100%
rename from patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0393-Implement-Mob-Goal-API.patch b/patches/server/0392-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0393-Implement-Mob-Goal-API.patch
rename to patches/server/0392-Implement-Mob-Goal-API.patch
index 3cf28c5e8f..0cc6e5c1f4 100644
--- a/patches/server/0393-Implement-Mob-Goal-API.patch
+++ b/patches/server/0392-Implement-Mob-Goal-API.patch
@@ -792,10 +792,10 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1b5197752992ed7c7a8ea6d01e5efa90347e8ddd..057a7df7daba35debe470116c28a5984e4e8132f 100644
+index 11a254484d078769085b278eb338d320d30b5a5a..94f938225f665a9b75e910ae2c8bb4617191d0aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2779,5 +2779,11 @@ public final class CraftServer implements Server {
+@@ -2793,5 +2793,11 @@ public final class CraftServer implements Server {
      public boolean isStopping() {
          return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }
diff --git a/patches/server/0394-Add-villager-reputation-API.patch b/patches/server/0393-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0394-Add-villager-reputation-API.patch
rename to patches/server/0393-Add-villager-reputation-API.patch
diff --git a/patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 94%
rename from patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch
index 65da6f15f8..4758b635d4 100644
--- a/patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a6b0433b36c9b21871166384cee734a9c0dfbe82..c3a524da52b9588746a13f2107bfbef2af1a5d50 100644
+index 9a9896e9424298c564a11a541448b54198461e62..274c88c8bc2b1936e4db003709c17bcc73cf6b27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -656,16 +656,30 @@ public class CraftEventFactory {
+@@ -661,16 +661,30 @@ public class CraftEventFactory {
              net.minecraft.world.entity.ExperienceOrb xp = (net.minecraft.world.entity.ExperienceOrb) entity;
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {
diff --git a/patches/server/0396-ExperienceOrbMergeEvent.patch b/patches/server/0395-ExperienceOrbMergeEvent.patch
similarity index 91%
rename from patches/server/0396-ExperienceOrbMergeEvent.patch
rename to patches/server/0395-ExperienceOrbMergeEvent.patch
index 5ea88275be..ba42e31bb5 100644
--- a/patches/server/0396-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0395-ExperienceOrbMergeEvent.patch
@@ -9,10 +9,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c3a524da52b9588746a13f2107bfbef2af1a5d50..7d1c551e92b6f2eb183bbb206bd3b19af907c31b 100644
+index 274c88c8bc2b1936e4db003709c17bcc73cf6b27..722160b12bbeb2f4ffe1c0a2916042f5a0bad6d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -666,7 +666,7 @@ public class CraftEventFactory {
+@@ -671,7 +671,7 @@ public class CraftEventFactory {
                      if (e instanceof net.minecraft.world.entity.ExperienceOrb) {
                          net.minecraft.world.entity.ExperienceOrb loopItem = (net.minecraft.world.entity.ExperienceOrb) e;
                          // Paper start
diff --git a/patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 87%
rename from patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch
index 296215abfc..468af977e3 100644
--- a/patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 6bf1b3a9ee029feafa054f40291078c79f28c5f4..2f6ba5525a014dfb3ce2efae765e501e8cd1c1c1 100644
+index 65fbc8b10c536f3258a455950263bd97dd6e30e3..6819e9ba64e5083ec37c50c274990311336d7b7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -430,7 +430,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -443,7 +443,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
  
      @Override
      public boolean addPotionEffect(PotionEffect effect, boolean force) {
diff --git a/patches/server/0398-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0397-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0398-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0397-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0399-Potential-bed-API.patch b/patches/server/0398-Potential-bed-API.patch
similarity index 95%
rename from patches/server/0399-Potential-bed-API.patch
rename to patches/server/0398-Potential-bed-API.patch
index cf11492434..7f753c1b92 100644
--- a/patches/server/0399-Potential-bed-API.patch
+++ b/patches/server/0398-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index c31c9ccbefb1f6ed1e3f56c7ca445813ec635a12..35ef23db3e135c8057ea00ef0930628bced54779 100644
+index 82314358220b064a0f8a29cc1d663cc266c13916..55a3035516552f4d429ae5f36bacb1b4c4d5666c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 94%
rename from patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
index fe1354b419..7ba39bcc93 100644
--- a/patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,10 +22,10 @@ index f4ad35b55cacd5c1c3e4d81d4a9cf9675349ce79..53876c0d957e2d151e93744eff606060
          // CraftBukkit end
          if (this.getConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 057a7df7daba35debe470116c28a5984e4e8132f..3062d9bc3582d7468000ec3b51bf47acfc628e71 100644
+index 94f938225f665a9b75e910ae2c8bb4617191d0aa..3f94c9aa16ba5a6bba0f7711acf6eae3201666fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1032,6 +1032,31 @@ public final class CraftServer implements Server {
+@@ -1035,6 +1035,31 @@ public final class CraftServer implements Server {
          org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
      }
  
diff --git a/patches/server/0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 97%
rename from patches/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 3995f55aad..580c91b235 100644
--- a/patches/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -38,7 +38,7 @@ index 48586780da5d260894fe59efaa97cb1facfe73fe..dadf403ac91887f0fae87889170deb6d
                  boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player);
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 5ec480397fb043717c63961651f7c62440e57201..3f3c7ced3a43e2b0eb451930c09188e3706a1bee 100644
+index 71219297a175ff9549a258985043df3ce7545ae6..f578bfa3a2ae7f29999f9e551f687ae820bbbb80 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -161,7 +161,13 @@ public class ServerEntity {
diff --git a/patches/server/0404-Ensure-safe-gateway-teleport.patch b/patches/server/0403-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0404-Ensure-safe-gateway-teleport.patch
rename to patches/server/0403-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0405-Add-option-for-console-having-all-permissions.patch b/patches/server/0404-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0405-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0404-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0406-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0405-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0406-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0405-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0407-Maps-shouldn-t-load-chunks.patch b/patches/server/0406-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0407-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0406-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0408-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0408-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0409-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0409-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0410-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0410-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0411-Fix-sand-duping.patch b/patches/server/0410-Fix-sand-duping.patch
similarity index 86%
rename from patches/server/0411-Fix-sand-duping.patch
rename to patches/server/0410-Fix-sand-duping.patch
index 258cb04f53..08ec481929 100644
--- a/patches/server/0411-Fix-sand-duping.patch
+++ b/patches/server/0410-Fix-sand-duping.patch
@@ -7,10 +7,10 @@ If the falling block dies during teleportation (entity#move), then we need
 to detect that by placing a check after the move.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 95bcd8f03a784287c5a6106c784448e54c4b531b..4a44109df0aece6661567dac5ebf6355de5d58c7 100644
+index 5b37b5c45bad8d8d262f46a117e3fc858cb40485..562462729d0262bac5968583b064124167437449 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -129,6 +129,11 @@ public class FallingBlockEntity extends Entity {
+@@ -131,6 +131,11 @@ public class FallingBlockEntity extends Entity {
  
      @Override
      public void tick() {
@@ -22,7 +22,7 @@ index 95bcd8f03a784287c5a6106c784448e54c4b531b..4a44109df0aece6661567dac5ebf6355
          if (this.blockState.isAir()) {
              this.discard();
          } else {
-@@ -140,6 +145,13 @@ public class FallingBlockEntity extends Entity {
+@@ -142,6 +147,13 @@ public class FallingBlockEntity extends Entity {
              }
  
              this.move(MoverType.SELF, this.getDeltaMovement());
diff --git a/patches/server/0412-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0412-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 94%
rename from patches/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch
index 55653050e7..ed135cb3c3 100644
--- a/patches/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0412-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 817db930347b0a83f3cea8cbcbd823622c1be7c0..23d576cebf10bc0f35b9fb99df7b323a744dd111 100644
+index 5257f7f32f5fea130fb391e32300d803a7fbb3a8..ae91463a28de87f939ad7dde1674dcb1139ef197 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1441,6 +1441,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
index c295c91a7e..31e31f918e 100644
--- a/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
@@ -279,7 +279,7 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..93dea79180ebaef3ffb6abffd47f0026
              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 909d0c96840724033bd907560db46d4cbb7f41aa..a9a845f6a7967d306ec935c4f32414053da591f0 100644
+index f5c1de9671bf823a7f2fa78acfa8f9065d6eb517..c683b5b35ff2bf850283f002c97a28bb6cf223bd 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/0415-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0414-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 92%
rename from patches/server/0415-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0414-Inventory-getHolder-method-without-block-snapshot.patch
index a15244c105..f930fed575 100644
--- a/patches/server/0415-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0414-Inventory-getHolder-method-without-block-snapshot.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Inventory getHolder method without block snapshot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 7bdb2e52d36feb9e0ce517ae95f5edb28ddc67d6..01b38b5a515c7dd0f0c79141c270d618bf3c56eb 100644
+index c064022d248ff3e0b52c0e815ab90527f9132fb7..3680f101036d98814fe47b707baeeb8e55bfc4b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -540,6 +540,13 @@ public class CraftInventory implements Inventory {
+@@ -538,6 +538,13 @@ public class CraftInventory implements Inventory {
          return this.inventory.getOwner();
      }
  
diff --git a/patches/server/0416-Improve-Arrow-API.patch b/patches/server/0415-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0416-Improve-Arrow-API.patch
rename to patches/server/0415-Improve-Arrow-API.patch
diff --git a/patches/server/0417-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 95%
rename from patches/server/0417-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 9e5a7560aa..59a4e9be18 100644
--- a/patches/server/0417-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0416-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 9d2d68534833b813a3e0ff53f8778452015119dd..1eb351c202fb72f675c30082fd74c1eab74a3774 100644
+index ae91463a28de87f939ad7dde1674dcb1139ef197..d48dfd41d81ccd0931a410b9e2b9a11b604a451b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3117,9 +3117,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0418-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0417-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0418-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0417-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0419-Add-permission-for-command-blocks.patch b/patches/server/0418-Add-permission-for-command-blocks.patch
similarity index 97%
rename from patches/server/0419-Add-permission-for-command-blocks.patch
rename to patches/server/0418-Add-permission-for-command-blocks.patch
index 72df584e4a..81c928a4ad 100644
--- a/patches/server/0419-Add-permission-for-command-blocks.patch
+++ b/patches/server/0418-Add-permission-for-command-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for command blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 84ffc86e2eba089d0200183847e879d638e8460d..6a45cd61d2590aa25b9cb38028d2dcf3d93952fe 100644
+index 58a1a54b676922ef0862dcab98e7aada5de80311..cf47536a2e37d53406fc9cb3f09095e034af8e15 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -404,7 +404,7 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index 84ffc86e2eba089d0200183847e879d638e8460d..6a45cd61d2590aa25b9cb38028d2dcf3
                  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 4f43f6ff06ab3b68631b8e9c8dd1e9d4a5e76880..04a9cef0a80aaa401ce0ed560a16f3ada6e6a953 100644
+index d48dfd41d81ccd0931a410b9e2b9a11b604a451b..bd7407f9c294fc5157ec2644e9440f799a19935e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -878,7 +878,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0420-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0419-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 90%
rename from patches/server/0420-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0419-Ensure-Entity-AABB-s-are-never-invalid.patch
index 8532475e71..a9c848f405 100644
--- a/patches/server/0420-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0419-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 a9a845f6a7967d306ec935c4f32414053da591f0..886db1055c69f2b0ce7a5bf61e53d3b1119d2c19 100644
+index c683b5b35ff2bf850283f002c97a28bb6cf223bd..a40aa3e70b5d38fb2be4c916fcb6f7fded5e5ccc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -721,8 +721,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -19,7 +19,7 @@ index a9a845f6a7967d306ec935c4f32414053da591f0..886db1055c69f2b0ce7a5bf61e53d3b1
      }
  
      protected AABB makeBoundingBox() {
-@@ -4207,6 +4207,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4196,6 +4196,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setPosRaw(double x, double y, double z) {
@@ -31,7 +31,7 @@ index a9a845f6a7967d306ec935c4f32414053da591f0..886db1055c69f2b0ce7a5bf61e53d3b1
          // Paper start - rewrite chunk system
          if (this.updatingSectionStatus) {
              LOGGER.error("Refusing to update position for entity " + this + " to position " + new Vec3(x, y, z) + " since it is processing a section status update", new Throwable());
-@@ -4230,6 +4235,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4219,6 +4224,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.levelCallback.onMove();
          }
  
diff --git a/patches/server/0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 96%
rename from patches/server/0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 09da081dea..10a3d145c0 100644
--- a/patches/server/0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -89,7 +89,7 @@ index 6dcac005b57234983d0ed05fe825a16c98eb4557..2040b2defecb484ee7b46a885e924483
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 561ae2c7d28046f66aea261bb3cd866ad53f5f05..6923522b71a07606f2de5dc8a6dd6a21de0bac04 100644
+index bd7407f9c294fc5157ec2644e9440f799a19935e..087278f151c5ae45b64cf3b7318528bd90155b24 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3355,7 +3355,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -102,10 +102,10 @@ index 561ae2c7d28046f66aea261bb3cd866ad53f5f05..6923522b71a07606f2de5dc8a6dd6a21
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3062d9bc3582d7468000ec3b51bf47acfc628e71..7d6e44ca0a373ad1ee46bc1fc3162585cfa0d747 100644
+index 3f94c9aa16ba5a6bba0f7711acf6eae3201666fd..0135e667fc745015882a00248a523396814093e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -971,8 +971,8 @@ public final class CraftServer implements Server {
+@@ -974,8 +974,8 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          for (ServerLevel world : this.console.getAllLevels()) {
@@ -117,7 +117,7 @@ index 3062d9bc3582d7468000ec3b51bf47acfc628e71..7d6e44ca0a373ad1ee46bc1fc3162585
              for (SpawnCategory spawnCategory : SpawnCategory.values()) {
                  if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e3308c3e93abf80022a16166c3cc522da8221f34..f186be0b65808247077f075c2a2d3af6daa40711 100644
+index b34067a6bc3bf61ca94929bb8e9677deef686077..eb7a3a89ad7174e57d8ce98a67725c0d329b5d88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1150,7 +1150,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0422-Paper-dumpitem-command.patch b/patches/server/0421-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0422-Paper-dumpitem-command.patch
rename to patches/server/0421-Paper-dumpitem-command.patch
diff --git a/patches/server/0423-Improve-Legacy-Component-serialization-size.patch b/patches/server/0422-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0423-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0422-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0424-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0423-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0424-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0423-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 95%
rename from patches/server/0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index e01eace066..27f64b8902 100644
--- a/patches/server/0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,10 +22,10 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7d6e44ca0a373ad1ee46bc1fc3162585cfa0d747..925079abb26fc658770c97961fb247e12b3bb216 100644
+index 0135e667fc745015882a00248a523396814093e6..bc809752e187b3b2e5ecdc514e19596a5ec4c338 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -376,7 +376,7 @@ public final class CraftServer implements Server {
+@@ -379,7 +379,7 @@ public final class CraftServer implements Server {
          this.overrideSpawnLimits();
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
          this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
@@ -34,7 +34,7 @@ index 7d6e44ca0a373ad1ee46bc1fc3162585cfa0d747..925079abb26fc658770c97961fb247e1
          this.minimumAPI = this.configuration.getString("settings.minimum-api");
          this.loadIcon();
  
-@@ -951,7 +951,7 @@ public final class CraftServer implements Server {
+@@ -954,7 +954,7 @@ public final class CraftServer implements Server {
          this.console.setMotd(config.motd);
          this.overrideSpawnLimits();
          this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
@@ -44,7 +44,7 @@ index 7d6e44ca0a373ad1ee46bc1fc3162585cfa0d747..925079abb26fc658770c97961fb247e1
          this.printSaveWarning = false;
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f186be0b65808247077f075c2a2d3af6daa40711..c00a76408b6c800bf81b2de9565c95111940c365 100644
+index eb7a3a89ad7174e57d8ce98a67725c0d329b5d88..328bc95dd9298c1f666c35836ea157367f7ef1cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -279,7 +279,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0426-incremental-chunk-and-player-saving.patch b/patches/server/0425-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/0426-incremental-chunk-and-player-saving.patch
rename to patches/server/0425-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0427-Support-old-UUID-format-for-NBT.patch b/patches/server/0426-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0427-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0426-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0428-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0428-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0429-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0429-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0430-Remove-some-streams-from-structures.patch b/patches/server/0429-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0430-Remove-some-streams-from-structures.patch
rename to patches/server/0429-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0431-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0431-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0432-Support-components-in-ItemMeta.patch b/patches/server/0431-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0432-Support-components-in-ItemMeta.patch
rename to patches/server/0431-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0433-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0433-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0434-Add-entity-liquid-API.patch b/patches/server/0433-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0434-Add-entity-liquid-API.patch
rename to patches/server/0433-Add-entity-liquid-API.patch
diff --git a/patches/server/0435-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
similarity index 97%
rename from patches/server/0435-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
index c8f81c40b4..09c79dec73 100644
--- a/patches/server/0435-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index cbda9f0fd0b14062c5b0290b2da571cff2df13e5..22bc138601247d4f14d84b54771020143920fc38 100644
+index 7d80eded30109982fd3a1b815ba5dff4b699689a..dcb01c399d2b30d907bfc51584215d9300b6d23e 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -171,6 +171,44 @@ public final class ItemStack {
diff --git a/patches/server/0436-Spawn-player-in-correct-world-on-login.patch b/patches/server/0435-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from patches/server/0436-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0435-Spawn-player-in-correct-world-on-login.patch
index 3ce67aea63..9eca8932f2 100644
--- a/patches/server/0436-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0435-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3c98a55a1b9eee854d8c48af449b876d3a46501f..0cd93062ffc2bf824e99f8776254a5269e9117c3 100644
+index a8dcd1a07b835f665c74a8a531fef84435716b13..abfd8510c726e17d7a0c99d13cfe065615583fcd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -212,7 +212,18 @@ public abstract class PlayerList {
diff --git a/patches/server/0437-Add-PrepareResultEvent.patch b/patches/server/0436-Add-PrepareResultEvent.patch
similarity index 97%
rename from patches/server/0437-Add-PrepareResultEvent.patch
rename to patches/server/0436-Add-PrepareResultEvent.patch
index 35927da451..531bf60a72 100644
--- a/patches/server/0437-Add-PrepareResultEvent.patch
+++ b/patches/server/0436-Add-PrepareResultEvent.patch
@@ -70,7 +70,7 @@ index edc8da447a531cec3a0590ee39811f0949ca7dda..c4766df6d64b484375e5e3474e97dee1
              this.resultSlot.set(ItemStack.EMPTY);
              this.selectablePatterns = List.of();
 diff --git a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
-index a56061fe2a12254827209b17fb0b9d89032649ba..dbfd36859010a1f950769708fbc5fc604c0754a9 100644
+index c63250e04cf7ea5ec2067438735b53e83d851a31..947f7f7e87534872660442947bb24ef5a806a972 100644
 --- a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
 @@ -114,6 +114,7 @@ public class SmithingMenu extends ItemCombinerMenu {
@@ -94,10 +94,10 @@ index 8734a129244271b370f965fcbf488a14ce04684a..00f01ab2eff69c18b50ec07b7623af66
  
      private void setupRecipeList(Container input, ItemStack stack) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7d1c551e92b6f2eb183bbb206bd3b19af907c31b..5d5b1c2ec06680516fd6058a1b22ba7169dd50d4 100644
+index 722160b12bbeb2f4ffe1c0a2916042f5a0bad6d5..ad14e77c163c52e57bd21a60aee4cc729ed1236d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1636,26 +1636,53 @@ public class CraftEventFactory {
+@@ -1641,26 +1641,53 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0438-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 85%
rename from patches/server/0438-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 95fcc2e68f..cadcfeb56f 100644
--- a/patches/server/0438-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f8c2ff77f8db6f3e31eb2ef4d8638a736fcc0295..4ebe18685bdbdb11e29537342c2a74ce5202db6d 100644
+index 59c82af8f2a9471830c3d5f7a44c817fbabf1acf..5ea6ffe3a2c250ea3f6f7bdd1d17645500d1795f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3487,7 +3487,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3477,7 +3477,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          Entity entity = this.getVehicle();
  
          super.stopRiding(suppressCancellation); // Paper - suppress
diff --git a/patches/server/0439-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0439-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0440-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0440-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0441-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0441-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0442-Fix-SPIGOT-5989.patch b/patches/server/0441-Fix-SPIGOT-5989.patch
similarity index 97%
rename from patches/server/0442-Fix-SPIGOT-5989.patch
rename to patches/server/0441-Fix-SPIGOT-5989.patch
index dd3c399748..431e528ce9 100644
--- a/patches/server/0442-Fix-SPIGOT-5989.patch
+++ b/patches/server/0441-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0cd93062ffc2bf824e99f8776254a5269e9117c3..36715e8bc9047962a2ced70d6838672159665771 100644
+index abfd8510c726e17d7a0c99d13cfe065615583fcd..31e6da864b0ddf2f65ecc43ce8ef74d6c4e9d0aa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -794,6 +794,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0443-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0443-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0444-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0444-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0445-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0445-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0446-Fix-some-rails-connecting-improperly.patch b/patches/server/0445-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0446-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0445-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0447-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0447-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0449-Brand-support.patch b/patches/server/0448-Brand-support.patch
similarity index 93%
rename from patches/server/0449-Brand-support.patch
rename to patches/server/0448-Brand-support.patch
index f3aeca47f6..e184ab9da4 100644
--- a/patches/server/0449-Brand-support.patch
+++ b/patches/server/0448-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 6923522b71a07606f2de5dc8a6dd6a21de0bac04..43e543531fe6dd4d9ebf11b132d2e5dcbdcfec4b 100644
+index 087278f151c5ae45b64cf3b7318528bd90155b24..435f02e4189754c60f589d13feae8fbc138e4afc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -302,6 +302,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -56,10 +56,10 @@ index 6923522b71a07606f2de5dc8a6dd6a21de0bac04..43e543531fe6dd4d9ebf11b132d2e5dc
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8b5ac878b2bab96543fc7483d6613c317c918161..18c5ea78a4a985ba328cdc62df4b99a6d3d1ccd5 100644
+index 0e5ff317d541a077f822bc0229e71915c2faf3c0..d6bf91d33b4491a051ae977d24f90c68dcfb433c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2912,6 +2912,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2949,6 +2949,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/server/0450-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 83%
rename from patches/server/0450-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch
index c2a653b423..b52d3e8533 100644
--- a/patches/server/0450-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2f6ba5525a014dfb3ce2efae765e501e8cd1c1c1..97286605e33436f3e4a7b7ad319d2b2870d7029a 100644
+index 6819e9ba64e5083ec37c50c274990311336d7b7f..cf17cb842212af53d70b8dced4dcbc04dac6a41d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -898,5 +898,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -925,5 +925,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              ((Mob) getHandle()).getJumpControl().jump();
          }
      }
diff --git a/patches/server/0451-Don-t-require-FACING-data.patch b/patches/server/0450-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0451-Don-t-require-FACING-data.patch
rename to patches/server/0450-Don-t-require-FACING-data.patch
diff --git a/patches/server/0452-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 96%
rename from patches/server/0452-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index f2e60fe1de..3ce60a511b 100644
--- a/patches/server/0452-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -21,7 +21,7 @@ index 02ba7e25c649832aba2e742cb76be9d2b6b6f954..babc90ed1a85756545ac2b7631853d09
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c00a76408b6c800bf81b2de9565c95111940c365..133a5b30b4cdca091f7eae9fccc5bb7d03ace432 100644
+index 328bc95dd9298c1f666c35836ea157367f7ef1cd..e754bb3ce28c3bd253698e2065121aafdfe94230 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -259,12 +259,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0453-Add-moon-phase-API.patch b/patches/server/0452-Add-moon-phase-API.patch
similarity index 90%
rename from patches/server/0453-Add-moon-phase-API.patch
rename to patches/server/0452-Add-moon-phase-API.patch
index 4fb9522173..ce85e5101a 100644
--- a/patches/server/0453-Add-moon-phase-API.patch
+++ b/patches/server/0452-Add-moon-phase-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index bdc752631136a4abe903e7a8f182e9eda480fcb6..a9cad569f9c71f9818d1b831983f71aae367d98e 100644
+index 4dc5c75d1fa0748b6e7e95d90b92a865b2f6362e..0452a59d6eec947589b4791c977327046f7b0d6e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -980,4 +980,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0454-Prevent-headless-pistons-from-being-created.patch b/patches/server/0453-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0454-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0453-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0455-Add-BellRingEvent.patch b/patches/server/0454-Add-BellRingEvent.patch
similarity index 90%
rename from patches/server/0455-Add-BellRingEvent.patch
rename to patches/server/0454-Add-BellRingEvent.patch
index 1fdfe17e72..5d94e91a63 100644
--- a/patches/server/0455-Add-BellRingEvent.patch
+++ b/patches/server/0454-Add-BellRingEvent.patch
@@ -7,10 +7,10 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5d5b1c2ec06680516fd6058a1b22ba7169dd50d4..6ea51428a8abfdceff1eb0ae1469ef05c88803ee 100644
+index ad14e77c163c52e57bd21a60aee4cc729ed1236d..0104ccb2bede7c2297261c022e04ffec6327eb85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -335,10 +335,11 @@ public class CraftEventFactory {
+@@ -340,10 +340,11 @@ public class CraftEventFactory {
          return tradeSelectEvent;
      }
  
diff --git a/patches/server/0456-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0455-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0456-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0455-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0457-Buffer-joins-to-world.patch b/patches/server/0456-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0457-Buffer-joins-to-world.patch
rename to patches/server/0456-Buffer-joins-to-world.patch
diff --git a/patches/server/0458-Eigencraft-redstone-implementation.patch b/patches/server/0457-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0458-Eigencraft-redstone-implementation.patch
rename to patches/server/0457-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0459-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0459-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0460-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 97%
rename from patches/server/0460-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch
index 547748ff51..d4898a5e3e 100644
--- a/patches/server/0460-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 3fa4c8f51d3914fe6bfc2b99ea496560e7a47759..226d024f222affba83479d44a7163d29207ae8f1 100644
+index dcb01c399d2b30d907bfc51584215d9300b6d23e..5ebc5e760ac43b88678977ced06b8d72f8358a68 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -447,7 +447,7 @@ public final class ItemStack {
+@@ -448,7 +448,7 @@ public final class ItemStack {
                          net.minecraft.world.level.block.state.BlockState block = world.getBlockState(newblockposition);
  
                          if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
 -                            block.getBlock().onPlace(block, world, newblockposition, oldBlock, true);
-+                            block.getBlock().onPlace(block, world, newblockposition, oldBlock, true, itemactioncontext); // Paper - pass itemactioncontext
++                            block.getBlock().onPlace(block, world, newblockposition, oldBlock, true, context); // Paper - pass context
                          }
  
                          world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
diff --git a/patches/server/0461-Add-more-Evoker-API.patch b/patches/server/0460-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0461-Add-more-Evoker-API.patch
rename to patches/server/0460-Add-more-Evoker-API.patch
diff --git a/patches/server/0462-Add-methods-to-get-translation-keys.patch b/patches/server/0461-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0462-Add-methods-to-get-translation-keys.patch
rename to patches/server/0461-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0463-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0462-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0463-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0462-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0464-Cache-block-data-strings.patch b/patches/server/0463-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0464-Cache-block-data-strings.patch
rename to patches/server/0463-Cache-block-data-strings.patch
diff --git a/patches/server/0465-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 96%
rename from patches/server/0465-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index c846af193b..9334e3beb9 100644
--- a/patches/server/0465-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0464-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 43e543531fe6dd4d9ebf11b132d2e5dcbdcfec4b..186d92d1bb9019809a26fc89b00f847bcbcd69cb 100644
+index 435f02e4189754c60f589d13feae8fbc138e4afc..be4e9a35b8bf557d254ca63376ec3a0d2882a807 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -760,7 +760,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -31,7 +31,7 @@ index 43e543531fe6dd4d9ebf11b132d2e5dcbdcfec4b..186d92d1bb9019809a26fc89b00f847b
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5a1959a16070a49e935bfd7a43fbf3fabdd2b1e6..11675a7611a42277ed0625509aa98a2f69611698 100644
+index a40aa3e70b5d38fb2be4c916fcb6f7fded5e5ccc..4cac7ae766e71fedfd2be8d17741ffd40ae1cee4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -159,6 +159,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0466-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0465-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0466-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0465-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0467-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0466-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0467-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0466-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0468-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0467-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 96%
rename from patches/server/0468-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0467-Extend-block-drop-capture-to-capture-all-items-added.patch
index 51aaf68e3e..aa2bd79094 100644
--- a/patches/server/0468-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0467-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -23,7 +23,7 @@ index babc90ed1a85756545ac2b7631853d09f37125f2..838907e8ae95d72797d01188836a05bf
              if (spawnReason != null && !CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 39c24bce0b6e04817c293c82c1864a435637ab21..df0d66e148688aa8c22536376f660e4614271d4c 100644
+index cf47536a2e37d53406fc9cb3f09095e034af8e15..c256423e9dc9d1837b847da44fb2920c58842c8b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -436,10 +436,12 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0469-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0468-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 90%
rename from patches/server/0469-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0468-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index f761190a9f..aa382e5af5 100644
--- a/patches/server/0469-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0468-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,10 +6,10 @@ 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 11675a7611a42277ed0625509aa98a2f69611698..bda94c9c34c7f1f6b56103de5be253c619b576b2 100644
+index 4cac7ae766e71fedfd2be8d17741ffd40ae1cee4..b8f49e7b8727c757950a74c834eed4871de0e4ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4444,4 +4444,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4433,4 +4433,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          void accept(Entity entity, double x, double y, double z);
      }
diff --git a/patches/server/0470-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0469-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0470-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0469-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0471-Entity-isTicking.patch b/patches/server/0470-Entity-isTicking.patch
similarity index 89%
rename from patches/server/0471-Entity-isTicking.patch
rename to patches/server/0470-Entity-isTicking.patch
index b0c393fba7..d1a3ffc59c 100644
--- a/patches/server/0471-Entity-isTicking.patch
+++ b/patches/server/0470-Entity-isTicking.patch
@@ -5,10 +5,10 @@ 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 bda94c9c34c7f1f6b56103de5be253c619b576b2..30c955cb8b1cb767e62964fea897870a88b4f310 100644
+index b8f49e7b8727c757950a74c834eed4871de0e4ce..a0718a0cc2ed15a5350b1ee77747d93c6a92048d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4449,5 +4449,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4438,5 +4438,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
diff --git a/patches/server/0472-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0471-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0472-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0471-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0473-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0472-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0473-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0472-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0474-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0473-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0474-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0473-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0475-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0474-Fix-for-large-move-vectors-crashing-server.patch
similarity index 98%
rename from patches/server/0475-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0474-Fix-for-large-move-vectors-crashing-server.patch
index e95ee4da6a..e2509eb52e 100644
--- a/patches/server/0475-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0474-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 186d92d1bb9019809a26fc89b00f847bcbcd69cb..7f0a05d31cd004f99edf6a3cd8d2a4b3b89aaf10 100644
+index be4e9a35b8bf557d254ca63376ec3a0d2882a807..20ab6c5736abeb6978c8f09ce0ff624a4ba3a978 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -567,9 +567,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0476-Optimise-getType-calls.patch b/patches/server/0475-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0476-Optimise-getType-calls.patch
rename to patches/server/0475-Optimise-getType-calls.patch
diff --git a/patches/server/0477-Villager-resetOffers.patch b/patches/server/0476-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0477-Villager-resetOffers.patch
rename to patches/server/0476-Villager-resetOffers.patch
diff --git a/patches/server/0478-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0477-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0478-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0477-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0479-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0478-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0479-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0478-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0480-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0479-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0480-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0479-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0481-Player-elytra-boost-API.patch b/patches/server/0480-Player-elytra-boost-API.patch
similarity index 90%
rename from patches/server/0481-Player-elytra-boost-API.patch
rename to patches/server/0480-Player-elytra-boost-API.patch
index 33d6f79091..9f36308d6e 100644
--- a/patches/server/0481-Player-elytra-boost-API.patch
+++ b/patches/server/0480-Player-elytra-boost-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 18c5ea78a4a985ba328cdc62df4b99a6d3d1ccd5..82ce5f37538d9e3dfb64d7e41f28eeddaf76bfe4 100644
+index d6bf91d33b4491a051ae977d24f90c68dcfb433c..aae9a897ce3abd045fb2d17f565ef2e38490257a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -617,6 +617,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -623,6 +623,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          throw new RuntimeException("Unknown settings type");
      }
diff --git a/patches/server/0482-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0481-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0482-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0481-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0483-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0482-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0483-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0482-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0484-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0483-Add-getOfflinePlayerIfCached-String.patch
similarity index 89%
rename from patches/server/0484-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0483-Add-getOfflinePlayerIfCached-String.patch
index 3836224d13..c60b3e54b4 100644
--- a/patches/server/0484-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0483-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 925079abb26fc658770c97961fb247e12b3bb216..b6c9dd5b3fd746ef7e863c27fd581c9f23a795a2 100644
+index bc809752e187b3b2e5ecdc514e19596a5ec4c338..62d44490887480b522d811befb4c104e1cee9663 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1827,6 +1827,28 @@ public final class CraftServer implements Server {
+@@ -1830,6 +1830,28 @@ public final class CraftServer implements Server {
          return result;
      }
  
diff --git a/patches/server/0485-Add-ignore-discounts-API.patch b/patches/server/0484-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0485-Add-ignore-discounts-API.patch
rename to patches/server/0484-Add-ignore-discounts-API.patch
diff --git a/patches/server/0486-Toggle-for-removing-existing-dragon.patch b/patches/server/0485-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0486-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0485-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0487-Fix-client-lag-on-advancement-loading.patch b/patches/server/0486-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0487-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0486-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0488-Item-no-age-no-player-pickup.patch b/patches/server/0487-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0488-Item-no-age-no-player-pickup.patch
rename to patches/server/0487-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0489-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0488-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0489-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0488-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0490-Beacon-API-custom-effect-ranges.patch b/patches/server/0489-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0490-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0489-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0491-Add-API-for-quit-reason.patch b/patches/server/0490-Add-API-for-quit-reason.patch
similarity index 98%
rename from patches/server/0491-Add-API-for-quit-reason.patch
rename to patches/server/0490-Add-API-for-quit-reason.patch
index 12e68bfb03..e332954472 100644
--- a/patches/server/0491-Add-API-for-quit-reason.patch
+++ b/patches/server/0490-Add-API-for-quit-reason.patch
@@ -37,7 +37,7 @@ index c22acc5e6333f8cc9b734bff48bb9ff7a00bfd4d..abde8074da754667d65f3894097ad225
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
      public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7f0a05d31cd004f99edf6a3cd8d2a4b3b89aaf10..a451f7c42f4e768619a0fa487863928550e85001 100644
+index 20ab6c5736abeb6978c8f09ce0ff624a4ba3a978..f5850d85aa5c3917ed058b41cfeb32089f9d392e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -507,6 +507,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0492-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0491-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0492-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0491-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0493-Expose-world-spawn-angle.patch b/patches/server/0492-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0493-Expose-world-spawn-angle.patch
rename to patches/server/0492-Expose-world-spawn-angle.patch
diff --git a/patches/server/0494-Add-Destroy-Speed-API.patch b/patches/server/0493-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0494-Add-Destroy-Speed-API.patch
rename to patches/server/0493-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0495-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 89%
rename from patches/server/0495-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index bcc0b205b2..49268e0324 100644
--- a/patches/server/0495-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 82ce5f37538d9e3dfb64d7e41f28eeddaf76bfe4..94c3fe30679be2004b92b542b4be9766c0e77b9d 100644
+index aae9a897ce3abd045fb2d17f565ef2e38490257a..6c6e5e296f000ff031efe8ec2e334edaf9630210 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2441,7 +2441,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2478,7 +2478,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null) {
              Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
          }
diff --git a/patches/server/0496-Add-LivingEntity-clearActiveItem.patch b/patches/server/0495-Add-LivingEntity-clearActiveItem.patch
similarity index 84%
rename from patches/server/0496-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0495-Add-LivingEntity-clearActiveItem.patch
index 3fc9e55552..4651be5e46 100644
--- a/patches/server/0496-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0495-Add-LivingEntity-clearActiveItem.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 97286605e33436f3e4a7b7ad319d2b2870d7029a..4bdb06c18824c99475ea7a9cc4237b0879e705a8 100644
+index cf17cb842212af53d70b8dced4dcbc04dac6a41d..d7e36c2f44303b5ca053e3a7d5fbf18bb02e1ddb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -865,6 +865,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -892,6 +892,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return getHandle().getUseItem().asBukkitMirror();
      }
  
diff --git a/patches/server/0497-Add-PlayerItemCooldownEvent.patch b/patches/server/0496-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0497-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0496-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0498-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0497-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0498-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0497-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0499-More-lightning-API.patch b/patches/server/0498-More-lightning-API.patch
similarity index 100%
rename from patches/server/0499-More-lightning-API.patch
rename to patches/server/0498-More-lightning-API.patch
diff --git a/patches/server/0500-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 89%
rename from patches/server/0500-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch
index fadf118f7b..dac4a4af6f 100644
--- a/patches/server/0500-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0499-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 30c955cb8b1cb767e62964fea897870a88b4f310..2e5a20e65a7475d39c789b89955dfa06d5923b53 100644
+index a0718a0cc2ed15a5350b1ee77747d93c6a92048d..57b85654c5af2e3c3681e3a03c11d5a02703749d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2049,6 +2049,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -45,10 +45,10 @@ index d15e62da0307728a7c2be191a27f87da1bb29f49..de06ae3e8757c923a6f3f475a34885d2
              } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4ebe18685bdbdb11e29537342c2a74ce5202db6d..77fe0eaadaf7c79b441d1f5ca3bc0da01261ebba 100644
+index 5ea6ffe3a2c250ea3f6f7bdd1d17645500d1795f..b9162e3d7ad429b0c18dde43e449e4716da2c4bd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3408,7 +3408,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3398,7 +3398,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  return;
              }
              // Paper end - don't run getEntities if we're not going to use its result
@@ -57,7 +57,7 @@ index 4ebe18685bdbdb11e29537342c2a74ce5202db6d..77fe0eaadaf7c79b441d1f5ca3bc0da0
  
              if (!list.isEmpty()) {
                  // Paper - moved up
-@@ -3568,9 +3568,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3558,9 +3558,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return !this.isRemoved() && this.collides; // CraftBukkit
      }
  
@@ -76,10 +76,10 @@ index 4ebe18685bdbdb11e29537342c2a74ce5202db6d..77fe0eaadaf7c79b441d1f5ca3bc0da0
  
      // CraftBukkit start - collidable API
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index 8aae860fae71570d88453d0d56d40a519f889326..940cd932e74bc2e6754186731d7aa6f10d56eb68 100644
+index 867717f130b6fcd48f39d40b10b3f514dbb8798c..5beaa849a250ea005733250ad3edfa8382224667 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-@@ -85,7 +85,7 @@ public class Bat extends AmbientCreature {
+@@ -87,7 +87,7 @@ public class Bat extends AmbientCreature {
      }
  
      @Override
@@ -89,7 +89,7 @@ index 8aae860fae71570d88453d0d56d40a519f889326..940cd932e74bc2e6754186731d7aa6f1
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index a32845854d9575ae950c47179ceff4ac149ebc01..3cc7af656433117991547476c118b58cff95e8e2 100644
+index 2f5056b00e4475906ffb1f1938cacb191169809d..e1874aaa0065a6e8e6ae043713c22f08b58b5e21 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 @@ -381,8 +381,8 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -104,10 +104,10 @@ index a32845854d9575ae950c47179ceff4ac149ebc01..3cc7af656433117991547476c118b58c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index d4c874f4ba924f9f2067e22846a41699ad190a60..bb2a75f25a2959c8d387836f806b544b73e2e7c7 100644
+index 9c58a60adad7e72ca6bbc5093836d7ebc584add4..07116849e39ef891182fe603d34d7fd8aee6c046 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -281,7 +281,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -284,7 +284,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
      }
  
      @Override
@@ -117,7 +117,7 @@ index d4c874f4ba924f9f2067e22846a41699ad190a60..bb2a75f25a2959c8d387836f806b544b
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 101e3a1f0f52b67b55c99c2619cc43298d92a3f2..8a8b9e8983be1acad66ad875c901be5bbdeabb1f 100644
+index 498c6664fcfb028111031691348bfa2eb21d605b..5c6e060a54ffb13c37ff5711992e964bdd59643d 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -343,7 +343,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0501-Added-missing-default-perms-for-commands.patch b/patches/server/0500-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0501-Added-missing-default-perms-for-commands.patch
rename to patches/server/0500-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0502-Add-PlayerShearBlockEvent.patch b/patches/server/0501-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0502-Add-PlayerShearBlockEvent.patch
rename to patches/server/0501-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0503-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0502-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0503-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0502-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0504-Limit-recipe-packets.patch b/patches/server/0503-Limit-recipe-packets.patch
similarity index 96%
rename from patches/server/0504-Limit-recipe-packets.patch
rename to patches/server/0503-Limit-recipe-packets.patch
index 9e06686433..68ca8f357c 100644
--- a/patches/server/0504-Limit-recipe-packets.patch
+++ b/patches/server/0503-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 a451f7c42f4e768619a0fa487863928550e85001..52ecf1d430cf7539cbc185013747fdabfb14d2c6 100644
+index f5850d85aa5c3917ed058b41cfeb32089f9d392e..15e98935d333a5538438ed239fe8f4a590d4fe97 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -266,6 +266,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0505-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0504-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0505-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0504-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0506-Player-Chunk-Load-Unload-Events.patch b/patches/server/0505-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0506-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0505-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0507-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0506-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0507-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0506-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0508-Expose-LivingEntity-hurt-direction.patch b/patches/server/0507-Expose-LivingEntity-hurt-direction.patch
similarity index 93%
rename from patches/server/0508-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0507-Expose-LivingEntity-hurt-direction.patch
index bb3e6f8b6b..f287602b71 100644
--- a/patches/server/0508-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0507-Expose-LivingEntity-hurt-direction.patch
@@ -36,10 +36,10 @@ index b0d2038cf2622c8ee7f810026ed735ff954d7ad0..a8aa176b8afd45fada9529d4d0b92000
      public int getSleepTicks() {
          return this.getHandle().sleepCounter;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4bdb06c18824c99475ea7a9cc4237b0879e705a8..c74a6df6a9c3c7745daae4c0558948ea4a31d7a6 100644
+index d7e36c2f44303b5ca053e3a7d5fbf18bb02e1ddb..9a8802a893013c32480e463c1959e56ecab4e50c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -910,5 +910,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -937,5 +937,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void playPickupItemAnimation(org.bukkit.entity.Item item, int quantity) {
          getHandle().take(((CraftItem) item).getHandle(), quantity);
      }
diff --git a/patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 86%
rename from patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 14cb165548..5b29675101 100644
--- a/patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6ea51428a8abfdceff1eb0ae1469ef05c88803ee..98db6ecab2ae7adf24d415e743c78731d9cd03f7 100644
+index 0104ccb2bede7c2297261c022e04ffec6327eb85..f92346b735967b488bc19ac5727338df75186248 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -270,6 +270,10 @@ public class CraftEventFactory {
+@@ -275,6 +275,10 @@ public class CraftEventFactory {
                          return BedEnterResult.TOO_FAR_AWAY;
                      case NOT_SAFE:
                          return BedEnterResult.NOT_SAFE;
diff --git a/patches/server/0510-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0509-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0510-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0509-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0511-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0510-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0511-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0510-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0512-Implement-TargetHitEvent.patch b/patches/server/0511-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0512-Implement-TargetHitEvent.patch
rename to patches/server/0511-Implement-TargetHitEvent.patch
diff --git a/patches/server/0513-MC-4-Fix-item-position-desync.patch b/patches/server/0512-MC-4-Fix-item-position-desync.patch
similarity index 93%
rename from patches/server/0513-MC-4-Fix-item-position-desync.patch
rename to patches/server/0512-MC-4-Fix-item-position-desync.patch
index 08006ae1e7..9cc14419e4 100644
--- a/patches/server/0513-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0512-MC-4-Fix-item-position-desync.patch
@@ -28,10 +28,10 @@ index 5ca3ad7b3d7606accd0a58b3c708fadb349608f7..4b6e0fe2fabcc55007fd8979e81f66df
  
      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 2e5a20e65a7475d39c789b89955dfa06d5923b53..e5dc024ac2dcb39ccc4f72b90e0f9b9000dd818d 100644
+index 57b85654c5af2e3c3681e3a03c11d5a02703749d..7d244133234c35f8f5f3769d8fd8aacba9a65998 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4232,6 +4232,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4221,6 +4221,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              return;
          }
          // Paper end - rewrite chunk system
diff --git a/patches/server/0514-Additional-Block-Material-API-s.patch b/patches/server/0513-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0514-Additional-Block-Material-API-s.patch
rename to patches/server/0513-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0515-Fix-harming-potion-dupe.patch b/patches/server/0514-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0515-Fix-harming-potion-dupe.patch
rename to patches/server/0514-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0516-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0516-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0517-Cache-burn-durations.patch b/patches/server/0516-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0517-Cache-burn-durations.patch
rename to patches/server/0516-Cache-burn-durations.patch
diff --git a/patches/server/0518-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0517-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0518-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0517-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0519-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0518-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0519-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0518-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0520-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0519-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0520-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0519-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0521-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0520-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 95%
rename from patches/server/0521-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0520-Fix-interact-event-not-being-called-in-adventure.patch
index d27731c650..6e764be370 100644
--- a/patches/server/0521-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0520-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 52ecf1d430cf7539cbc185013747fdabfb14d2c6..6e96f75f16636d5f117d00d5f0aff4bb7f24f23b 100644
+index 15e98935d333a5538438ed239fe8f4a590d4fe97..d52c0a729a98cac6250d40232cea816f050599f1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1837,7 +1837,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0522-Zombie-API-breaking-doors.patch b/patches/server/0521-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0522-Zombie-API-breaking-doors.patch
rename to patches/server/0521-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0523-Fix-nerfed-slime-when-splitting.patch b/patches/server/0522-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0523-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0522-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0524-Add-EntityLoadCrossbowEvent.patch b/patches/server/0523-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0524-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0523-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0525-Added-WorldGameRuleChangeEvent.patch b/patches/server/0524-Added-WorldGameRuleChangeEvent.patch
similarity index 98%
rename from patches/server/0525-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0524-Added-WorldGameRuleChangeEvent.patch
index ef56270b86..c0cc1dd4f6 100644
--- a/patches/server/0525-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0524-Added-WorldGameRuleChangeEvent.patch
@@ -64,7 +64,7 @@ index 4a0321f56ef80aa4991e61f586ddd3f6b45e499b..de713f1ca1d61a6b1fca2b66de916255
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 133a5b30b4cdca091f7eae9fccc5bb7d03ace432..9351b3b8d4d9c7069ea4ae11a49a1f7b70ffbce9 100644
+index e754bb3ce28c3bd253698e2065121aafdfe94230..3e5ba6392c25e2bf9503a5429e96ffb04147ac99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1845,8 +1845,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0526-Added-ServerResourcesReloadedEvent.patch b/patches/server/0525-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0526-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0525-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0527-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0527-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0528-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0527-Implemented-BlockFailedDispenseEvent.patch
similarity index 92%
rename from patches/server/0528-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0527-Implemented-BlockFailedDispenseEvent.patch
index 068438410c..9767db1a25 100644
--- a/patches/server/0528-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0527-Implemented-BlockFailedDispenseEvent.patch
@@ -32,12 +32,12 @@ index 1415ad60163f6584619cc7caa61f1848d6ebaa93..801c4c120e98584bcf218a4ef9bd66d7
          } else {
              ItemStack itemstack = tileentitydispenser.getItem(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 98db6ecab2ae7adf24d415e743c78731d9cd03f7..acc292bd5f22e0d20279f5abcb4f12eae84649e0 100644
+index f92346b735967b488bc19ac5727338df75186248..a7a58cd44238f2eb9d472667abe9e230cad8e9bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1928,4 +1928,12 @@ public class CraftEventFactory {
- 
-         return !event.isCancelled();
+@@ -1962,4 +1962,12 @@ public class CraftEventFactory {
+         Bukkit.getPluginManager().callEvent(event);
+         return event;
      }
 +
 +    // Paper start
diff --git a/patches/server/0529-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0528-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0529-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0528-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0530-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0529-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0530-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0529-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0531-Configurable-door-breaking-difficulty.patch b/patches/server/0530-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0531-Configurable-door-breaking-difficulty.patch
rename to patches/server/0530-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0532-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0531-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0532-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0531-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0533-Remove-stale-POIs.patch b/patches/server/0532-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0533-Remove-stale-POIs.patch
rename to patches/server/0532-Remove-stale-POIs.patch
diff --git a/patches/server/0534-Fix-villager-boat-exploit.patch b/patches/server/0533-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0534-Fix-villager-boat-exploit.patch
rename to patches/server/0533-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0535-Add-sendOpLevel-API.patch b/patches/server/0534-Add-sendOpLevel-API.patch
similarity index 93%
rename from patches/server/0535-Add-sendOpLevel-API.patch
rename to patches/server/0534-Add-sendOpLevel-API.patch
index d521837944..d64b8c3468 100644
--- a/patches/server/0535-Add-sendOpLevel-API.patch
+++ b/patches/server/0534-Add-sendOpLevel-API.patch
@@ -32,10 +32,10 @@ index 13e2fb9e48ed8722b68b2ce2994d9d84bb22cee4..600bb44d97b477960108ea8cd84a8e73
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 94c3fe30679be2004b92b542b4be9766c0e77b9d..aa14be1871aa069b45004829912392e9fbf27990 100644
+index 6c6e5e296f000ff031efe8ec2e334edaf9630210..7a11d68ee2a1f0f57d9e1f9e98b704e05f5d773c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -631,6 +631,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -637,6 +637,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              ? (org.bukkit.entity.Firework) entity.getBukkitEntity()
              : null;
      }
diff --git a/patches/server/0536-TODO-Registry-Modification-API.patch b/patches/server/0535-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0536-TODO-Registry-Modification-API.patch
rename to patches/server/0535-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0537-Add-StructuresLocateEvent.patch b/patches/server/0536-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0537-Add-StructuresLocateEvent.patch
rename to patches/server/0536-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0538-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0537-Collision-option-for-requiring-a-player-participant.patch
similarity index 96%
rename from patches/server/0538-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0537-Collision-option-for-requiring-a-player-participant.patch
index 90c1aec77e..c03d27744d 100644
--- a/patches/server/0538-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0537-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 e5dc024ac2dcb39ccc4f72b90e0f9b9000dd818d..44d8e9659e111e6f9ca4e403ff4cb4e57c712ea4 100644
+index 7d244133234c35f8f5f3769d8fd8aacba9a65998..5f93c2fa9be835825d9a3c5fbd85ab285eced34d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1919,6 +1919,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0539-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0539-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0540-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0540-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0541-Make-schedule-command-per-world.patch b/patches/server/0540-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0541-Make-schedule-command-per-world.patch
rename to patches/server/0540-Make-schedule-command-per-world.patch
diff --git a/patches/server/0542-Configurable-max-leash-distance.patch b/patches/server/0541-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0542-Configurable-max-leash-distance.patch
rename to patches/server/0541-Configurable-max-leash-distance.patch
diff --git a/patches/server/0543-Implement-BlockPreDispenseEvent.patch b/patches/server/0542-Implement-BlockPreDispenseEvent.patch
similarity index 93%
rename from patches/server/0543-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0542-Implement-BlockPreDispenseEvent.patch
index b9fac44ca0..0289f22d94 100644
--- a/patches/server/0543-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0542-Implement-BlockPreDispenseEvent.patch
@@ -17,10 +17,10 @@ index 9ec043ff2cd38e589066a3eb7f42834e4e7592cf..4720b884e1e311f44a012f1219fe648a
                  tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index acc292bd5f22e0d20279f5abcb4f12eae84649e0..f37ec9043069bc683485a2c766168a1c1979e208 100644
+index a7a58cd44238f2eb9d472667abe9e230cad8e9bd..215aec90e2915a5ab38d6b3c612f90dc1f42730c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1935,5 +1935,11 @@ public class CraftEventFactory {
+@@ -1969,5 +1969,11 @@ public class CraftEventFactory {
          io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
          return event.callEvent();
      }
diff --git a/patches/server/0544-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0544-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0545-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0545-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0546-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0546-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0547-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 98%
rename from patches/server/0547-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index ca8874c501..41c6f9f0ca 100644
--- a/patches/server/0547-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -122,10 +122,10 @@ index 16784fcc853e23689a854e7dc6c03ed8182a164e..4eb97572a97a8d98af37c4223f42fc63
                              flag1 = true;
                          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f37ec9043069bc683485a2c766168a1c1979e208..381ff70e1b5af9dbe084292bc44d0f4d9d077702 100644
+index 215aec90e2915a5ab38d6b3c612f90dc1f42730c..4010be07b2cd47e12081bfc8bbb18b274742eec0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1559,8 +1559,10 @@ public class CraftEventFactory {
+@@ -1564,8 +1564,10 @@ public class CraftEventFactory {
          return itemInHand;
      }
  
diff --git a/patches/server/0548-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0547-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0548-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0547-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0549-add-DragonEggFormEvent.patch b/patches/server/0548-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0549-add-DragonEggFormEvent.patch
rename to patches/server/0548-add-DragonEggFormEvent.patch
diff --git a/patches/server/0550-EntityMoveEvent.patch b/patches/server/0549-EntityMoveEvent.patch
similarity index 95%
rename from patches/server/0550-EntityMoveEvent.patch
rename to patches/server/0549-EntityMoveEvent.patch
index 81419d42b7..bd77503cfc 100644
--- a/patches/server/0550-EntityMoveEvent.patch
+++ b/patches/server/0549-EntityMoveEvent.patch
@@ -29,10 +29,10 @@ index fb256e7c60f4e82b028f6768f591098882e27dd1..cfd0e75ac4e7edbd219cc0f5fb802e37
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 77fe0eaadaf7c79b441d1f5ca3bc0da01261ebba..1efe051326b83354c4e72c1d25054f27f1f84cf1 100644
+index b9162e3d7ad429b0c18dde43e449e4716da2c4bd..430df61e8b9e871312edd9cabcb57527d534e2c1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3343,6 +3343,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3333,6 +3333,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
          this.pushEntities();
          this.level().getProfiler().pop();
diff --git a/patches/server/0551-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0551-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0552-Inline-shift-direction-fields.patch b/patches/server/0551-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0552-Inline-shift-direction-fields.patch
rename to patches/server/0551-Inline-shift-direction-fields.patch
diff --git a/patches/server/0553-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 92%
rename from patches/server/0553-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch
index 17b8d4564a..09853a2cb3 100644
--- a/patches/server/0553-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 381ff70e1b5af9dbe084292bc44d0f4d9d077702..440edfe374b44e6da34975398db1ece28b7a0afc 100644
+index 4010be07b2cd47e12081bfc8bbb18b274742eec0..f7d078f557b0be8db0b2ef7e5ff2094909686047 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -419,13 +419,30 @@ public class CraftEventFactory {
+@@ -424,13 +424,30 @@ public class CraftEventFactory {
      }
  
      public static void handleBlockDropItemEvent(Block block, BlockState state, ServerPlayer player, List<ItemEntity> items) {
diff --git a/patches/server/0554-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0554-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0555-living-entity-allow-attribute-registration.patch b/patches/server/0554-living-entity-allow-attribute-registration.patch
similarity index 94%
rename from patches/server/0555-living-entity-allow-attribute-registration.patch
rename to patches/server/0554-living-entity-allow-attribute-registration.patch
index 4c2d5f8c84..b08ad5de90 100644
--- a/patches/server/0555-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0554-living-entity-allow-attribute-registration.patch
@@ -41,10 +41,10 @@ index 233e372ba5d785352c9ac12dac37395bac63315c..0e61caa5c9f21788fbeaa90ed75d23e1
          return BuiltInRegistries.ATTRIBUTE.get(CraftNamespacedKey.toMinecraft(attribute.getKey()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c74a6df6a9c3c7745daae4c0558948ea4a31d7a6..63a1522071ec6e9a550598b04c1a901ff76a5c78 100644
+index 9a8802a893013c32480e463c1959e56ecab4e50c..04816027a7affebb6b3a8e4d1988d56a3d071312 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -702,6 +702,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -715,6 +715,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().craftAttributes.getAttribute(attribute);
      }
  
diff --git a/patches/server/0556-fix-dead-slime-setSize-invincibility.patch b/patches/server/0555-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0556-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0555-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0557-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0557-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0558-Expose-Tracked-Players.patch b/patches/server/0557-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0558-Expose-Tracked-Players.patch
rename to patches/server/0557-Expose-Tracked-Players.patch
diff --git a/patches/server/0559-Remove-streams-from-SensorNearest.patch b/patches/server/0558-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0559-Remove-streams-from-SensorNearest.patch
rename to patches/server/0558-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0560-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 85%
rename from patches/server/0560-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..981f61ef05 100644
--- a/patches/server/0560-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Throw proper exception on empty JsonList file
 
 
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 91899909abd83611ac63633fef701be542cf64bf..4fd709a550bf8da1e996894a1ca6b91206c31e9e 100644
+index 08173a6e0b7e46c041a81d6b51d77a0aea182525..9e8112fbc40a1d89c0f73ea4452e0fa1bb459bf4 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -187,6 +187,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -182,6 +182,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
  
              try {
                  JsonArray jsonarray = (JsonArray) StoredUserList.GSON.fromJson(bufferedreader, JsonArray.class);
diff --git a/patches/server/0561-Improve-ServerGUI.patch b/patches/server/0560-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0561-Improve-ServerGUI.patch
rename to patches/server/0560-Improve-ServerGUI.patch
diff --git a/patches/server/0562-fix-converting-txt-to-json-file.patch b/patches/server/0561-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0562-fix-converting-txt-to-json-file.patch
rename to patches/server/0561-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0563-Add-worldborder-events.patch b/patches/server/0562-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0563-Add-worldborder-events.patch
rename to patches/server/0562-Add-worldborder-events.patch
diff --git a/patches/server/0564-added-PlayerNameEntityEvent.patch b/patches/server/0563-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0564-added-PlayerNameEntityEvent.patch
rename to patches/server/0563-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0565-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0564-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0565-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0564-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0566-Add-recipe-to-cook-events.patch b/patches/server/0565-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0566-Add-recipe-to-cook-events.patch
rename to patches/server/0565-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0567-Add-Block-isValidTool.patch b/patches/server/0566-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0567-Add-Block-isValidTool.patch
rename to patches/server/0566-Add-Block-isValidTool.patch
diff --git a/patches/server/0568-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0567-Allow-using-signs-inside-spawn-protection.patch
similarity index 94%
rename from patches/server/0568-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0567-Allow-using-signs-inside-spawn-protection.patch
index 924685b66c..d01c202ac6 100644
--- a/patches/server/0568-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0567-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 6e96f75f16636d5f117d00d5f0aff4bb7f24f23b..40e7a897033bd66ffe07a5bf875dc66a478591fd 100644
+index d52c0a729a98cac6250d40232cea816f050599f1..a45ff8591eb87c228f6cc535bef3e8d88537916f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1829,7 +1829,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0569-Expand-world-key-API.patch b/patches/server/0568-Expand-world-key-API.patch
similarity index 91%
rename from patches/server/0569-Expand-world-key-API.patch
rename to patches/server/0568-Expand-world-key-API.patch
index 4f0094406b..b9a2b26e88 100644
--- a/patches/server/0569-Expand-world-key-API.patch
+++ b/patches/server/0568-Expand-world-key-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index a9cad569f9c71f9818d1b831983f71aae367d98e..4e85e98d12d5ee4cabb6d449bcf3134f353932fb 100644
+index 0452a59d6eec947589b4791c977327046f7b0d6e..f50d48d737aa7a6561a8868a607a68dc39c51042 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -986,5 +986,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -20,10 +20,10 @@ index a9cad569f9c71f9818d1b831983f71aae367d98e..4e85e98d12d5ee4cabb6d449bcf3134f
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b6c9dd5b3fd746ef7e863c27fd581c9f23a795a2..ed6125d52eb0e406e44a2c3ded1ed1d1b19bf5c5 100644
+index 62d44490887480b522d811befb4c104e1cee9663..8fd06d9ad547ba45b46674e6e432b6a28abbcfe2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1153,9 +1153,15 @@ public final class CraftServer implements Server {
+@@ -1156,9 +1156,15 @@ public final class CraftServer implements Server {
          File folder = new File(this.getWorldContainer(), name);
          World world = this.getWorld(name);
  
@@ -41,7 +41,7 @@ index b6c9dd5b3fd746ef7e863c27fd581c9f23a795a2..ed6125d52eb0e406e44a2c3ded1ed1d1
  
          if (folder.exists()) {
              Preconditions.checkArgument(folder.isDirectory(), "File (%s) exists and isn't a folder", name);
-@@ -1242,7 +1248,7 @@ public final class CraftServer implements Server {
+@@ -1245,7 +1251,7 @@ public final class CraftServer implements Server {
          } else if (name.equals(levelName + "_the_end")) {
              worldKey = net.minecraft.world.level.Level.END;
          } else {
@@ -50,7 +50,7 @@ index b6c9dd5b3fd746ef7e863c27fd581c9f23a795a2..ed6125d52eb0e406e44a2c3ded1ed1d1
          }
  
          ServerLevel internal = (ServerLevel) new ServerLevel(this.console, console.executor, worldSession, worlddata, worldKey, worlddimension, this.getServer().progressListenerFactory.create(11),
-@@ -1334,6 +1340,15 @@ public final class CraftServer implements Server {
+@@ -1337,6 +1343,15 @@ public final class CraftServer implements Server {
          return null;
      }
  
diff --git a/patches/server/0570-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0570-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0571-Item-Rarity-API.patch b/patches/server/0570-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0571-Item-Rarity-API.patch
rename to patches/server/0570-Item-Rarity-API.patch
diff --git a/patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0573-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0572-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0573-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0572-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index e1945be586..f4f8bb0888 100644
--- a/patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0573-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 40e7a897033bd66ffe07a5bf875dc66a478591fd..a06eaaa38406ad8c7ec46a0283a340990b157002 100644
+index a45ff8591eb87c228f6cc535bef3e8d88537916f..b78ce824bba3ce690a41059af0929c443e91fa12 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1290,7 +1290,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0575-Expose-protocol-version.patch b/patches/server/0574-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0575-Expose-protocol-version.patch
rename to patches/server/0574-Expose-protocol-version.patch
diff --git a/patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 88%
rename from patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index a873a9e9da..fbb9b9edd3 100644
--- a/patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,10 +9,10 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1efe051326b83354c4e72c1d25054f27f1f84cf1..bce63453fb04db09b10550197f749c959b30a37e 100644
+index 430df61e8b9e871312edd9cabcb57527d534e2c1..b9a2da15a49b1ddfd550ea26091990d495664484 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3827,6 +3827,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3817,6 +3817,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                          this.level().getCraftServer().getPluginManager().callEvent(event);
  
                          if (event.isCancelled()) {
diff --git a/patches/server/0578-Add-bypass-host-check.patch b/patches/server/0577-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0578-Add-bypass-host-check.patch
rename to patches/server/0577-Add-bypass-host-check.patch
diff --git a/patches/server/0579-Set-area-affect-cloud-rotation.patch b/patches/server/0578-Set-area-affect-cloud-rotation.patch
similarity index 92%
rename from patches/server/0579-Set-area-affect-cloud-rotation.patch
rename to patches/server/0578-Set-area-affect-cloud-rotation.patch
index 4441d7b847..90f20e7220 100644
--- a/patches/server/0579-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0578-Set-area-affect-cloud-rotation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set area affect cloud rotation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 4e85e98d12d5ee4cabb6d449bcf3134f353932fb..9160fc90afce3c589cf6a3ddb829d56e045b20fa 100644
+index f50d48d737aa7a6561a8868a607a68dc39c51042..5a17e89435a02c9b25e0891b83e82b2ed1ff8ee5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -952,6 +952,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch
index 865c11354d..4522f422b5 100644
--- a/patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0583-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 a06eaaa38406ad8c7ec46a0283a340990b157002..073be5bda93aa32613f0f4994e5e266a3e7872a4 100644
+index b78ce824bba3ce690a41059af0929c443e91fa12..2f9fe15fe34f44825d21ae840708fcbd89b76732 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2043,6 +2043,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0585-Added-PlayerDeepSleepEvent.patch b/patches/server/0584-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0585-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0584-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0586-More-World-API.patch b/patches/server/0585-More-World-API.patch
similarity index 97%
rename from patches/server/0586-More-World-API.patch
rename to patches/server/0585-More-World-API.patch
index dd016744ab..e37650b54c 100644
--- a/patches/server/0586-More-World-API.patch
+++ b/patches/server/0585-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9351b3b8d4d9c7069ea4ae11a49a1f7b70ffbce9..f5de2359af2a7dc3c2f9cd4daec3aeae86fae153 100644
+index 3e5ba6392c25e2bf9503a5429e96ffb04147ac99..47f8ad80011142aac611441029d71787c85450f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2088,6 +2088,69 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0587-Added-PlayerBedFailEnterEvent.patch b/patches/server/0586-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0587-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0586-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0588-Entity-load-save-limit-per-chunk.patch b/patches/server/0587-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0588-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0587-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0589-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0589-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0590-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0590-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0591-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0590-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0591-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0590-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0592-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from patches/server/0592-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 55730dad91..a3cd1e99ed 100644
--- a/patches/server/0592-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0591-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 073be5bda93aa32613f0f4994e5e266a3e7872a4..1375e48ed01bdd627c204938fed816e9e6b437c4 100644
+index 2f9fe15fe34f44825d21ae840708fcbd89b76732..1f0b8f875a46a025fb387e79cf31d1e329a2e152 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2783,7 +2783,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0593-Add-Channel-initialization-listeners.patch b/patches/server/0592-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0593-Add-Channel-initialization-listeners.patch
rename to patches/server/0592-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0594-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0594-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0595-Add-more-WanderingTrader-API.patch b/patches/server/0594-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0595-Add-more-WanderingTrader-API.patch
rename to patches/server/0594-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0596-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0595-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0596-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0595-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0597-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0597-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0598-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0598-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0599-Inventory-close.patch b/patches/server/0598-Inventory-close.patch
similarity index 90%
rename from patches/server/0599-Inventory-close.patch
rename to patches/server/0598-Inventory-close.patch
index 31cb3eaa08..9e9df237f4 100644
--- a/patches/server/0599-Inventory-close.patch
+++ b/patches/server/0598-Inventory-close.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Inventory#close
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 01b38b5a515c7dd0f0c79141c270d618bf3c56eb..bfac13ec6c316caa65db4a51b77f0a7045ad88ff 100644
+index 3680f101036d98814fe47b707baeeb8e55bfc4b7..471ae4458e7ea7c29d7551b32cec98180fbccd4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -450,6 +450,14 @@ public class CraftInventory implements Inventory {
diff --git a/patches/server/0600-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0600-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0601-Fix-CraftPotionBrewer-cache.patch b/patches/server/0600-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0601-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0600-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0602-Add-basic-Datapack-API.patch b/patches/server/0601-Add-basic-Datapack-API.patch
similarity index 94%
rename from patches/server/0602-Add-basic-Datapack-API.patch
rename to patches/server/0601-Add-basic-Datapack-API.patch
index c0687f2e96..05edf9cc94 100644
--- a/patches/server/0602-Add-basic-Datapack-API.patch
+++ b/patches/server/0601-Add-basic-Datapack-API.patch
@@ -92,10 +92,10 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ed6125d52eb0e406e44a2c3ded1ed1d1b19bf5c5..532c4f79e0926e029e78bc796238e54fd5f63023 100644
+index 8fd06d9ad547ba45b46674e6e432b6a28abbcfe2..46ce9117dc88b2b32d4914dc22547ed36f48c3cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -297,6 +297,7 @@ public final class CraftServer implements Server {
+@@ -300,6 +300,7 @@ public final class CraftServer implements Server {
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
      public int reloadCount;
@@ -103,7 +103,7 @@ index ed6125d52eb0e406e44a2c3ded1ed1d1b19bf5c5..532c4f79e0926e029e78bc796238e54f
      public static Exception excessiveVelEx; // Paper - Velocity warnings
  
      static {
-@@ -384,6 +385,7 @@ public final class CraftServer implements Server {
+@@ -387,6 +388,7 @@ public final class CraftServer implements Server {
          if (this.configuration.getBoolean("settings.use-map-color-cache")) {
              MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
          }
@@ -111,7 +111,7 @@ index ed6125d52eb0e406e44a2c3ded1ed1d1b19bf5c5..532c4f79e0926e029e78bc796238e54f
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -2847,5 +2849,11 @@ public final class CraftServer implements Server {
+@@ -2861,5 +2863,11 @@ public final class CraftServer implements Server {
      public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return mobGoals;
      }
diff --git a/patches/server/0603-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0602-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0603-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0602-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0604-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch
similarity index 96%
rename from patches/server/0604-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch
index 54e1c9faa3..1c13d78f17 100644
--- a/patches/server/0604-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch
@@ -94,7 +94,7 @@ index fba3ac571fafd5c738d0dcfd5492112817c443e3..a340a190b223efb6fafba3c7c9e99681
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index df0d66e148688aa8c22536376f660e4614271d4c..a09df00d0be1621012466d6ea46a19e0087a6fa6 100644
+index c256423e9dc9d1837b847da44fb2920c58842c8b..0cb9803e30702de1cc530c1205fe9bbb4dcb2c08 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -73,21 +73,28 @@ public class ServerPlayerGameMode {
@@ -131,7 +131,7 @@ index df0d66e148688aa8c22536376f660e4614271d4c..a09df00d0be1621012466d6ea46a19e0
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1375e48ed01bdd627c204938fed816e9e6b437c4..322cea4cd9b5d9e01984a6c986bb89350b0c7d12 100644
+index 1f0b8f875a46a025fb387e79cf31d1e329a2e152..0f3f1a9ac004127e58fe18958158826bd648bac9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2792,7 +2792,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -144,10 +144,10 @@ index 1375e48ed01bdd627c204938fed816e9e6b437c4..322cea4cd9b5d9e01984a6c986bb8935
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aa14be1871aa069b45004829912392e9fbf27990..116eabbe59132736273ba29678fd027fce8cc4ad 100644
+index 7a11d68ee2a1f0f57d9e1f9e98b704e05f5d773c..a31e3681d76c114165a32de521380698c01656e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1501,7 +1501,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1531,7 +1531,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(mode != null, "GameMode cannot be null");
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0605-ItemStack-repair-check-API.patch b/patches/server/0604-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0605-ItemStack-repair-check-API.patch
rename to patches/server/0604-ItemStack-repair-check-API.patch
diff --git a/patches/server/0606-More-Enchantment-API.patch b/patches/server/0605-More-Enchantment-API.patch
similarity index 97%
rename from patches/server/0606-More-Enchantment-API.patch
rename to patches/server/0605-More-Enchantment-API.patch
index afd4dec304..6e3b652e1b 100644
--- a/patches/server/0606-More-Enchantment-API.patch
+++ b/patches/server/0605-More-Enchantment-API.patch
@@ -66,10 +66,10 @@ index 57decf4156f176ebcc988478c17856cbc555c5e4..3d0ce0803e1da8a2681a3cb41096ac94
  
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 63a1522071ec6e9a550598b04c1a901ff76a5c78..d7499a2ffdc21ded42f7973e35ace340ff276f5a 100644
+index 04816027a7affebb6b3a8e4d1988d56a3d071312..af4d84e35c8f28589edbac9824d8a5770c60552b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -927,5 +927,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -954,5 +954,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setHurtDirection(float hurtDirection) {
          throw new UnsupportedOperationException("Cannot set the hurt direction on a non player");
      }
diff --git a/patches/server/0607-Move-range-check-for-block-placing-up.patch b/patches/server/0606-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0607-Move-range-check-for-block-placing-up.patch
rename to patches/server/0606-Move-range-check-for-block-placing-up.patch
index 62a9967384..64e172aeba 100644
--- a/patches/server/0607-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0606-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 322cea4cd9b5d9e01984a6c986bb89350b0c7d12..d38d1827e1180781ad25e4580ce25c6dfa217453 100644
+index 0f3f1a9ac004127e58fe18958158826bd648bac9..8a5a8da2962b51e0a8c83ce045eb8e86929c820d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1815,6 +1815,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0608-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch
similarity index 98%
rename from patches/server/0608-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0607-Fix-and-optimise-world-force-upgrading.patch
index dae741c23f..64b71f7df2 100644
--- a/patches/server/0608-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch
@@ -362,10 +362,10 @@ index 29da08c58200c24fd03003937d30eb41234cabc9..d3d4d10a77af51cff4da201201bac325
      public synchronized RegionFile getRegionFileIfLoaded(ChunkPos chunkcoordintpair) {
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 532c4f79e0926e029e78bc796238e54fd5f63023..95f2490000e3f49644d6795a4c4c67ee0674fbf9 100644
+index 46ce9117dc88b2b32d4914dc22547ed36f48c3cb..dae06c2e4da219000f532293a0d31902d81ab187 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1230,9 +1230,7 @@ public final class CraftServer implements Server {
+@@ -1233,9 +1233,7 @@ public final class CraftServer implements Server {
          worlddata.checkName(name);
          worlddata.setModdedInfo(this.console.getServerModName(), this.console.getModdedStatus().shouldReportAsModified());
  
@@ -376,7 +376,7 @@ index 532c4f79e0926e029e78bc796238e54fd5f63023..95f2490000e3f49644d6795a4c4c67ee
  
          long j = BiomeManager.obfuscateSeed(creator.seed());
          List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
-@@ -1243,6 +1241,13 @@ public final class CraftServer implements Server {
+@@ -1246,6 +1244,13 @@ public final class CraftServer implements Server {
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
  
diff --git a/patches/server/0609-Add-Mob-lookAt-API.patch b/patches/server/0608-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0609-Add-Mob-lookAt-API.patch
rename to patches/server/0608-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0610-Add-Unix-domain-socket-support.patch b/patches/server/0609-Add-Unix-domain-socket-support.patch
similarity index 98%
rename from patches/server/0610-Add-Unix-domain-socket-support.patch
rename to patches/server/0609-Add-Unix-domain-socket-support.patch
index ef9e8b230d..ddbd4f1293 100644
--- a/patches/server/0610-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0609-Add-Unix-domain-socket-support.patch
@@ -91,7 +91,7 @@ index 29a0a720f22f56ca3d844efef1ecde3980fb1c12..838244e3680ea6020701e10bafbde7f5
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d38d1827e1180781ad25e4580ce25c6dfa217453..1b8a09769f2f896c81ce89bd52d3eb1547dcb26a 100644
+index 8a5a8da2962b51e0a8c83ce045eb8e86929c820d..814ee49e8953afb40f16a4f4db4668a3aa9f612d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2627,6 +2627,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0611-Add-EntityInsideBlockEvent.patch b/patches/server/0610-Add-EntityInsideBlockEvent.patch
similarity index 96%
rename from patches/server/0611-Add-EntityInsideBlockEvent.patch
rename to patches/server/0610-Add-EntityInsideBlockEvent.patch
index 96a5c26841..3b92f58b4e 100644
--- a/patches/server/0611-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0610-Add-EntityInsideBlockEvent.patch
@@ -29,7 +29,7 @@ index b51e18d01fa9a06a3478694884f465f12dd89b8a..ee4b3ac212483995bb8ae990bebfb8aa
              int i = this.getSignalForState(state);
  
 diff --git a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
-index 2a3cf17cdf7ec5eb9a6326a9ca93ad0b756ca0a7..7455847cf8a05ed237d2df84ae2d9b1d2f2d7176 100644
+index 6b1692368df4165f4170380e58a6c2f93db39449..5921f7ebb56e1d5d3004ae327271873093cff357 100644
 --- a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
 @@ -170,6 +170,7 @@ public class BigDripleafBlock extends HorizontalDirectionalBlock implements Bone
@@ -89,7 +89,7 @@ index dffd1a48e54b4b15195ba066dc9d73c7a91650ea..219c87dcf065e86512f330fbeec59e55
              org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = CraftBlock.at(world, pos); // CraftBukkit
              entity.hurt(world.damageSources().inFire(), (float) this.fireDamage);
 diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-index 90aeb66e0ed95485774707afc64d7383d51150aa..448c958a7a40258132add92da74fa689cf2ac046 100644
+index 4ad158fd18ba9d6723d8e1b697147e8488c71abb..08d442713bf0cc4f01f693c9a2fbd1a17a6fa348 100644
 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
 @@ -163,6 +163,7 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
@@ -97,7 +97,7 @@ index 90aeb66e0ed95485774707afc64d7383d51150aa..448c958a7a40258132add92da74fa689
      @Override
      public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
 +        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper
-         if (entity instanceof Ravager && !CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState(), !world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)).isCancelled()) { // CraftBukkit
+         if (entity instanceof Ravager && CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState(), !world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // CraftBukkit
              world.destroyBlock(pos, true, entity);
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
@@ -209,7 +209,7 @@ index 94e0bf98753d3dee5ad275e4783682025f687ddf..593eae04ecf6dee86c9c3664ddcdc3f8
              world.destroyBlock(pos, true, entity);
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
-index 47f54002654d198a56a85884de34e305e545eb4b..518d3832c36c9ecf1ed9267ffc1f926dc84b7989 100644
+index 8a71ef8422be64154dc79eb670def635492fb06a..7e04ecba2a14be0f0d47c917368abd2a2bd64a05 100644
 --- a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
 @@ -55,6 +55,7 @@ public class PowderSnowBlock extends Block implements BucketPickup {
@@ -245,17 +245,17 @@ index 5e1133bf2cba55a6ec5559d8db41e1a3db582d06..4e2fb4ee8e46b3c363992ff23e26f5a6
              if (!(Boolean) state.getValue(TripWireBlock.POWERED)) {
                  this.checkPressed(world, pos);
 diff --git a/src/main/java/net/minecraft/world/level/block/WaterlilyBlock.java b/src/main/java/net/minecraft/world/level/block/WaterlilyBlock.java
-index 2b09aa352d484ac6e23360af55784b1a317ee803..9f364f6d3bfc87337aec6efd70d293f6f8429235 100644
+index 63e3e6653938069557e8f6a01d5e7d4b6700345d..b13d89b1516130507402cd3b4bdb9f3c2a36e807 100644
 --- a/src/main/java/net/minecraft/world/level/block/WaterlilyBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/WaterlilyBlock.java
-@@ -24,6 +24,7 @@ public class WaterlilyBlock extends BushBlock {
+@@ -27,6 +27,7 @@ public class WaterlilyBlock extends BushBlock {
      @Override
      public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
          super.entityInside(state, world, pos, entity);
 +        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper
-         if (world instanceof ServerLevel && entity instanceof Boat && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState()).isCancelled()) { // CraftBukkit
-             world.destroyBlock(new BlockPos(pos), true, entity);
-         }
+         if (world instanceof ServerLevel && entity instanceof Boat) {
+             // CraftBukkit start
+             if (!CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState())) {
 diff --git a/src/main/java/net/minecraft/world/level/block/WebBlock.java b/src/main/java/net/minecraft/world/level/block/WebBlock.java
 index 6964308822ebf8a7027ce426062ba43a70c20c15..763fa221c562e96c2abd09c7055e91a86ac03d43 100644
 --- a/src/main/java/net/minecraft/world/level/block/WebBlock.java
diff --git a/patches/server/0612-Attributes-API-for-item-defaults.patch b/patches/server/0611-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0612-Attributes-API-for-item-defaults.patch
rename to patches/server/0611-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0613-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 98%
rename from patches/server/0613-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch
index 3b0c93464b..a1eb1bd220 100644
--- a/patches/server/0613-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -95,7 +95,7 @@ index 626b861ef2f323a5fc50ab5178d3e108e0f9cc25..31c31a9138cb5f6e41de01a6210f84e7
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f5de2359af2a7dc3c2f9cd4daec3aeae86fae153..139265ff015bba7517ccbbcc890610d00362142e 100644
+index 47f8ad80011142aac611441029d71787c85450f2..af8cf7c594dc1c099785559f11f3ed7415676895 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1186,7 +1186,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0614-More-Lidded-Block-API.patch b/patches/server/0613-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0614-More-Lidded-Block-API.patch
rename to patches/server/0613-More-Lidded-Block-API.patch
diff --git a/patches/server/0615-Limit-item-frame-cursors-on-maps.patch b/patches/server/0614-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0615-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0614-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0616-Add-PlayerKickEvent-causes.patch b/patches/server/0615-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0616-Add-PlayerKickEvent-causes.patch
rename to patches/server/0615-Add-PlayerKickEvent-causes.patch
index fcefe340e4..18245e7e16 100644
--- a/patches/server/0616-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0615-Add-PlayerKickEvent-causes.patch
@@ -88,7 +88,7 @@ index c68bac4727f6b2ca95fc8c438303097af14286f2..bb629ec263959c8268de88ca807bddb6
                  return Component.translatable("commands.kick.success", serverPlayer.getDisplayName(), reason);
              }, true);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1b8a09769f2f896c81ce89bd52d3eb1547dcb26a..9761fdca1f991d2d3714de425584c4cfcb83e894 100644
+index 814ee49e8953afb40f16a4f4db4668a3aa9f612d..d71ccba82dd3ce23c10b519290d80cf42accc748 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -362,7 +362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -491,10 +491,10 @@ index 984c288abf94d9fe47fada33722fea035b832f3b..addd20237b87c9a87bb09fd7addb101a
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 116eabbe59132736273ba29678fd027fce8cc4ad..948feffe63d23f6f3a8a85adc6e6d579c07a0fd4 100644
+index a31e3681d76c114165a32de521380698c01656e9..4d469a85d573493e2fe972e060165e9776ce74f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -577,7 +577,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -583,7 +583,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          org.spigotmc.AsyncCatcher.catchOp("player kick"); // Spigot
          if (this.getHandle().connection == null) return;
  
@@ -503,7 +503,7 @@ index 116eabbe59132736273ba29678fd027fce8cc4ad..948feffe63d23f6f3a8a85adc6e6d579
      }
  
      // Paper start
-@@ -589,10 +589,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -595,10 +595,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void kick(final net.kyori.adventure.text.Component message) {
@@ -520,7 +520,7 @@ index 116eabbe59132736273ba29678fd027fce8cc4ad..948feffe63d23f6f3a8a85adc6e6d579
          }
      }
  
-@@ -663,7 +668,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -669,7 +674,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Paper start - improve chat handling
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(msg)) {
diff --git a/patches/server/0617-Add-PufferFishStateChangeEvent.patch b/patches/server/0616-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0617-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0616-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0618-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0618-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0619-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0619-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0620-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
similarity index 90%
rename from patches/server/0620-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
index ca8770c5bd..250023ae1d 100644
--- a/patches/server/0620-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 7678199278324cce4ce736197cb8766c134a0f87..8a2c135ee7c6fe60a2debf7a7b02fb9ffc3d2c2f 100644
+index 5d742d072d2cc532ce86bff3de15a5f0f381d1c5..d1085e6f2de19b380c09a32b31d53374f2785488 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -257,6 +257,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -258,6 +258,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  ItemEntity entityitem = (ItemEntity) iterator.next();
  
                  if (entityitem.isMergable()) {
diff --git a/patches/server/0621-Add-BellRevealRaiderEvent.patch b/patches/server/0620-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0621-Add-BellRevealRaiderEvent.patch
rename to patches/server/0620-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0622-Fix-invulnerable-end-crystals.patch b/patches/server/0621-Fix-invulnerable-end-crystals.patch
similarity index 97%
rename from patches/server/0622-Fix-invulnerable-end-crystals.patch
rename to patches/server/0621-Fix-invulnerable-end-crystals.patch
index b023697625..a01365c22b 100644
--- a/patches/server/0622-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0621-Fix-invulnerable-end-crystals.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix invulnerable end crystals
 MC-108513
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-index e6d137cd6d89ac8cca76105edbab75c506c966d6..5465711d486e5f265a26042031e895fb09e30608 100644
+index cc3f1532a2108ea915d0e8c840e87bc56ab60a65..ffc5b68c4246a7111845230a75552bb15875a209 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 @@ -29,6 +29,7 @@ public class EndCrystal extends Entity {
diff --git a/patches/server/0623-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0622-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0623-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0622-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0624-Fix-dangerous-end-portal-logic.patch b/patches/server/0623-Fix-dangerous-end-portal-logic.patch
similarity index 96%
rename from patches/server/0624-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0623-Fix-dangerous-end-portal-logic.patch
index a28edf1edc..8c79c69825 100644
--- a/patches/server/0624-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0623-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 44d8e9659e111e6f9ca4e403ff4cb4e57c712ea4..6a7b3a54a29b1632061c241b89058729c2b3e036 100644
+index 5f93c2fa9be835825d9a3c5fbd85ab285eced34d..205be31a06f97678aea0da06bc13f5a18b6eb903 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -515,6 +515,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -51,7 +51,7 @@ index 44d8e9659e111e6f9ca4e403ff4cb4e57c712ea4..6a7b3a54a29b1632061c241b89058729
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -2850,6 +2880,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2839,6 +2869,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0625-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0625-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0626-Make-item-validations-configurable.patch b/patches/server/0625-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0626-Make-item-validations-configurable.patch
rename to patches/server/0625-Make-item-validations-configurable.patch
diff --git a/patches/server/0627-Line-Of-Sight-Changes.patch b/patches/server/0626-Line-Of-Sight-Changes.patch
similarity index 91%
rename from patches/server/0627-Line-Of-Sight-Changes.patch
rename to patches/server/0626-Line-Of-Sight-Changes.patch
index e58b9a605f..d605e46e7b 100644
--- a/patches/server/0627-Line-Of-Sight-Changes.patch
+++ b/patches/server/0626-Line-Of-Sight-Changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bce63453fb04db09b10550197f749c959b30a37e..62e8586d30950eed81868ccbb48212a426774da3 100644
+index b9a2da15a49b1ddfd550ea26091990d495664484..80a59b869c898e40083607db5aa92115c7801010 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3558,7 +3558,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3548,7 +3548,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
              Vec3 vec3d = new Vec3(this.getX(), this.getEyeY(), this.getZ());
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
  
@@ -19,7 +19,7 @@ index bce63453fb04db09b10550197f749c959b30a37e..62e8586d30950eed81868ccbb48212a4
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 9160fc90afce3c589cf6a3ddb829d56e045b20fa..248c8abf6620ac78b8a4fd1476d7b20862c6125b 100644
+index 5a17e89435a02c9b25e0891b83e82b2ed1ff8ee5..bb383c090ea6948a19cf8609b76ba517689b1562 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -992,5 +992,16 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -40,10 +40,10 @@ index 9160fc90afce3c589cf6a3ddb829d56e045b20fa..248c8abf6620ac78b8a4fd1476d7b208
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d7499a2ffdc21ded42f7973e35ace340ff276f5a..b56504c3e5c457bfe83bbc864dc217c2f0cc9d18 100644
+index af4d84e35c8f28589edbac9824d8a5770c60552b..afcf10fa6a4446698cd00ac94dded0f61297880c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -575,6 +575,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -588,6 +588,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().hasLineOfSight(((CraftEntity) other).getHandle());
      }
  
diff --git a/patches/server/0628-add-per-world-spawn-limits.patch b/patches/server/0627-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0628-add-per-world-spawn-limits.patch
rename to patches/server/0627-add-per-world-spawn-limits.patch
index 8b6813991f..a018ec3c53 100644
--- a/patches/server/0628-add-per-world-spawn-limits.patch
+++ b/patches/server/0627-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 139265ff015bba7517ccbbcc890610d00362142e..7edcc68a24bd812f50d9ce441fab568906061da3 100644
+index af8cf7c594dc1c099785559f11f3ed7415676895..78ba220b74c1cca26e3b1243622a317eb1e4e78b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -212,6 +212,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0629-Fix-potions-splash-events.patch b/patches/server/0628-Fix-potions-splash-events.patch
similarity index 98%
rename from patches/server/0629-Fix-potions-splash-events.patch
rename to patches/server/0628-Fix-potions-splash-events.patch
index ac9546298b..54862cd186 100644
--- a/patches/server/0629-Fix-potions-splash-events.patch
+++ b/patches/server/0628-Fix-potions-splash-events.patch
@@ -8,7 +8,7 @@ Fixes SPIGOT-6221: https://hub.spigotmc.org/jira/projects/SPIGOT/issues/SPIGOT-6
 Fix splash events cancellation that still show particles/sound
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
-index 8b245d69f2d7935bb52e3ddff0757afa95c8e329..bc8cc9ced3fd32ff916c42e8ae95a95414dd1f25 100644
+index 089b5fbb240d494bf86a05078d534165bfc2f7ee..135cd9c154a90d5c2351d8bdd8217134114af5a0 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
 @@ -104,56 +104,77 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
diff --git a/patches/server/0630-Add-more-LimitedRegion-API.patch b/patches/server/0629-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0630-Add-more-LimitedRegion-API.patch
rename to patches/server/0629-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0631-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0631-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0632-Missing-Entity-Behavior-API.patch b/patches/server/0631-Missing-Entity-Behavior-API.patch
similarity index 96%
rename from patches/server/0632-Missing-Entity-Behavior-API.patch
rename to patches/server/0631-Missing-Entity-Behavior-API.patch
index 91ea359d06..32157bf810 100644
--- a/patches/server/0632-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0631-Missing-Entity-Behavior-API.patch
@@ -121,10 +121,10 @@ index 39ed3ca76d6b64ef3917280ec822721cc02afada..86b437836cb4b1f6e8ca9acd5f1f93b9
          this.leader = null;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 2824792295dab6e52015b479a77c61efb1150041..c2f56c44e824e3d4f169691b557483a4f0f5b3c6 100644
+index 9c7c59d1230110010033a9c9959b375eac3ebc2b..7c81c6ebe200a029a5944b65827223e81ab08938 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -541,11 +541,13 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -546,11 +546,13 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          this.setFlag(4, hasStung);
      }
  
@@ -199,10 +199,10 @@ index 71a08510a928d4570822282bb31f14013ec3834a..4aeab90e778629c355189dfe79c39c4b
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index bb2a75f25a2959c8d387836f806b544b73e2e7c7..64b1668856bb2afda3707f7ccc11764fab33ae9f 100644
+index 07116849e39ef891182fe603d34d7fd8aee6c046..6bab94ac458081e9ed6e1999a9a3f884dd710604 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -693,6 +693,15 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -696,6 +696,15 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
  
      }
  
@@ -218,7 +218,7 @@ index bb2a75f25a2959c8d387836f806b544b73e2e7c7..64b1668856bb2afda3707f7ccc11764f
      @Override
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
          if (!this.isVehicle() && !this.isBaby()) {
-@@ -735,6 +744,11 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -738,6 +747,11 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
          this.setFlag(16, eatingGrass);
      }
  
@@ -231,7 +231,7 @@ index bb2a75f25a2959c8d387836f806b544b73e2e7c7..64b1668856bb2afda3707f7ccc11764f
          if (angry) {
              this.setEating(false);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 80ba55e9bbbc69dab0d420a5cd846aa78424bbe4..4033945cb992e2c9bf42b8a7eda581319a6c6917 100644
+index e710d529a8b92e9b11efc9955947b72788aa542b..7379e99c4d599aa0119bae9ebdc5e2058ada10cb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -72,7 +72,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -244,7 +244,7 @@ index 80ba55e9bbbc69dab0d420a5cd846aa78424bbe4..4033945cb992e2c9bf42b8a7eda58131
      public Llama(EntityType<? extends Llama> type, Level world) {
          super(type, world);
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 4576c96f85fe5a614a78e53926dfbc2705618423..9adff51029781795c2cdf479a89111b3a1f102c0 100644
+index c23f05f0d951e0036fe2cf524989747fe236730b..cd59500565a305757872aaf41b03b49ffc005af5 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -84,6 +84,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -269,10 +269,10 @@ index 4576c96f85fe5a614a78e53926dfbc2705618423..9adff51029781795c2cdf479a89111b3
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 58c52872d07130825922bcde32011647d46e171f..5519ccf558c09f32e19b35f4b403fc9ed966ed65 100644
+index f7ad34f38d26ab08bb5dd788bc70ba01b53fc1a1..39eb9301626b191958ce42daa34b1ff3241cea80 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -446,6 +446,16 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -450,6 +450,16 @@ public class EnderMan extends Monster implements NeutralMob {
          this.entityData.set(EnderMan.DATA_STARED_AT, true);
      }
  
@@ -358,7 +358,7 @@ index 61d4877b4f74362e38104bfeacb7d66534ad798e..454dd67920826b8b62c2654abfd43fc0
      @Override
      protected EntityHitResult findHitEntity(Vec3 currentPosition, Vec3 nextPosition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 248c8abf6620ac78b8a4fd1476d7b20862c6125b..7318209de454b233e22c20b176cb207de7f86674 100644
+index bb383c090ea6948a19cf8609b76ba517689b1562..49d6ae8465397c4210a6f9599d14008518c30cd0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -828,14 +828,19 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -941,12 +941,12 @@ index da1488c9cae53bd554727c850da2192adda2478a..30a0eac179c86b0fe94a2a40b5bfcd3e
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
-index 3bdcc754a5afb6506178bd5c0d4f9c6e02bc24da..3cb4860fea30bfaf2147b4f29a34336b6e417d6c 100644
+index beeff3c0ce623973f7be523957a2856bba397421..3cd6052ae1e2db15d26157679506ba63a9a59a2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
-@@ -48,4 +48,15 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
- 
-         entity.setVariant(net.minecraft.world.entity.animal.Rabbit.Variant.values()[type.ordinal()]);
+@@ -36,4 +36,15 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
+     public void setRabbitType(Type type) {
+         this.getHandle().setVariant(net.minecraft.world.entity.animal.Rabbit.Variant.values()[type.ordinal()]);
      }
 +    // Paper start
 +    @Override
@@ -958,27 +958,6 @@ index 3bdcc754a5afb6506178bd5c0d4f9c6e02bc24da..3cb4860fea30bfaf2147b4f29a34336b
 +    public int getMoreCarrotTicks() {
 +        return this.getHandle().moreCarrotTicks;
 +    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java
-index 7345a644b57c8022d9e326575419c87551c4e8fc..f0b061979f9acdce6d06f70b651692c841418d96 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java
-@@ -63,4 +63,16 @@ public abstract class CraftRaider extends CraftMonster implements Raider {
-     public Sound getCelebrationSound() {
-         return CraftSound.getBukkit(this.getHandle().getCelebrateSound());
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean isCelebrating() {
-+        return this.getHandle().isCelebrating();
-+    }
-+
-+    @Override
-+    public void setCelebrating(boolean celebrating) {
-+        this.getHandle().setCelebrating(celebrating);
-+    }
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java
diff --git a/patches/server/0633-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0633-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 899394ba12..b08d7c49e9 100644
--- a/patches/server/0633-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0632-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 9761fdca1f991d2d3714de425584c4cfcb83e894..63a3c5626e89ed4e3c436f203c9e917a8d02eab5 100644
+index d71ccba82dd3ce23c10b519290d80cf42accc748..463759c91432294701954c49d5978b9e26607b4d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1209,7 +1209,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0634-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0634-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0635-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0635-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0636-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0636-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0637-Adds-PlayerArmSwingEvent.patch b/patches/server/0636-Adds-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0637-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0636-Adds-PlayerArmSwingEvent.patch
index 94274862fe..f3edb29e30 100644
--- a/patches/server/0637-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0636-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 63a3c5626e89ed4e3c436f203c9e917a8d02eab5..c36b0203121ddcb4582b72521cc2f76b7373fedd 100644
+index 463759c91432294701954c49d5978b9e26607b4d..482655fb5d6b84cd7969b1443a8dcd247dd5c9c4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2494,7 +2494,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0638-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 98%
rename from patches/server/0638-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch
index ac500514a1..01f0b23ee1 100644
--- a/patches/server/0638-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index 7d5de33442fe4ba53c51cc7356323622c2c3022f..478dbba3519f8d2fdd4b203756403761
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c36b0203121ddcb4582b72521cc2f76b7373fedd..aaf1146f89f1150a97472a259cda12169e23d1cf 100644
+index 482655fb5d6b84cd7969b1443a8dcd247dd5c9c4..e2870dbcd41063d0386e14576a12acaa8b21976a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -514,7 +514,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0639-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 93%
rename from patches/server/0639-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
index 004b00f0db..4d99038c65 100644
--- a/patches/server/0639-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 62e8586d30950eed81868ccbb48212a426774da3..9cc26c870d3785c7ab798cf53f10ad8fd942bfb0 100644
+index 80a59b869c898e40083607db5aa92115c7801010..15bc39170f06bd4ea5da770bd0fe3d8d08366c48 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1163,7 +1163,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          if (this.getMobType() == MobType.UNDEAD) {
              MobEffect mobeffectlist = effect.getEffect();
  
@@ -18,7 +18,7 @@ index 62e8586d30950eed81868ccbb48212a426774da3..9cc26c870d3785c7ab798cf53f10ad8f
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 9adff51029781795c2cdf479a89111b3a1f102c0..de97ded68bca375d81c77e30afa6622e74a299b7 100644
+index cd59500565a305757872aaf41b03b49ffc005af5..703068eaff84bcce83f61d805afa6cc0fef909b1 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -605,7 +605,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/0640-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0639-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0640-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0639-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0641-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0641-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0640-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0642-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0642-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0643-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 95%
rename from patches/server/0643-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch
index cbd167929b..e2efc9755e 100644
--- a/patches/server/0643-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch
@@ -19,10 +19,10 @@ index ac0cfdef53ec82665acf362235842de4f17bfdd1..05c1e8c9f013547d4fcdbbd299329166
  
              }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 7f4ff9658b0eca2034333810fd2b199a3d186e72..a0933b8467bf81333dc103055e73bb75069dcb36 100644
+index a190826d87ca5e05c408ef488986a29280b1b3d2..4f03e50d8d9d67aa9a62fbb3bdb14f5ba851e08a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -528,7 +528,9 @@ public class Panda extends Animal {
+@@ -531,7 +531,9 @@ public class Panda extends Animal {
          }
  
          if (!this.level().isClientSide() && this.random.nextInt(700) == 0 && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -32,7 +32,7 @@ index 7f4ff9658b0eca2034333810fd2b199a3d186e72..a0933b8467bf81333dc103055e73bb75
          }
  
      }
-@@ -652,7 +654,9 @@ public class Panda extends Animal {
+@@ -655,7 +657,9 @@ public class Panda extends Animal {
                  ItemStack itemstack1 = this.getItemBySlot(EquipmentSlot.MAINHAND);
  
                  if (!itemstack1.isEmpty() && !player.getAbilities().instabuild) {
@@ -42,7 +42,7 @@ index 7f4ff9658b0eca2034333810fd2b199a3d186e72..a0933b8467bf81333dc103055e73bb75
                  }
  
                  this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(itemstack.getItem(), 1));
-@@ -929,7 +933,9 @@ public class Panda extends Animal {
+@@ -932,7 +936,9 @@ public class Panda extends Animal {
              ItemStack itemstack = Panda.this.getItemBySlot(EquipmentSlot.MAINHAND);
  
              if (!itemstack.isEmpty()) {
diff --git a/patches/server/0644-Stinger-API.patch b/patches/server/0643-Stinger-API.patch
similarity index 89%
rename from patches/server/0644-Stinger-API.patch
rename to patches/server/0643-Stinger-API.patch
index 49ac5ef4ef..2ff2986a81 100644
--- a/patches/server/0644-Stinger-API.patch
+++ b/patches/server/0643-Stinger-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b56504c3e5c457bfe83bbc864dc217c2f0cc9d18..084bf9ab43c322f8856dc8f600a18ae166aaa5ef 100644
+index afcf10fa6a4446698cd00ac94dded0f61297880c..dc82cc9f6ab09224a82c2a03e9e49b8f1f527733 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -336,7 +336,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -338,7 +338,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
          // Paper end
      }
diff --git a/patches/server/0645-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0645-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0646-Add-System.out-err-catcher.patch b/patches/server/0645-Add-System.out-err-catcher.patch
similarity index 97%
rename from patches/server/0646-Add-System.out-err-catcher.patch
rename to patches/server/0645-Add-System.out-err-catcher.patch
index 0d16af6e4f..89031ed58b 100644
--- a/patches/server/0646-Add-System.out-err-catcher.patch
+++ b/patches/server/0645-Add-System.out-err-catcher.patch
@@ -105,10 +105,10 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 95f2490000e3f49644d6795a4c4c67ee0674fbf9..46a4a9e18299060fa0050e2bd0e5a01716a6bce0 100644
+index dae06c2e4da219000f532293a0d31902d81ab187..f7f37c9dc14d87c0d2fa89a0f6e0e47dc51abcea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -299,6 +299,7 @@ public final class CraftServer implements Server {
+@@ -302,6 +302,7 @@ public final class CraftServer implements Server {
      public int reloadCount;
      private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
      public static Exception excessiveVelEx; // Paper - Velocity warnings
diff --git a/patches/server/0647-Fix-test-not-bootstrapping.patch b/patches/server/0646-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0647-Fix-test-not-bootstrapping.patch
rename to patches/server/0646-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0648-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0648-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0649-Improve-boat-collision-performance.patch b/patches/server/0648-Improve-boat-collision-performance.patch
similarity index 93%
rename from patches/server/0649-Improve-boat-collision-performance.patch
rename to patches/server/0648-Improve-boat-collision-performance.patch
index 4836f8e064..b2dc68aa68 100644
--- a/patches/server/0649-Improve-boat-collision-performance.patch
+++ b/patches/server/0648-Improve-boat-collision-performance.patch
@@ -17,10 +17,10 @@ index 7354711e194ab58b11b68f447c1fc795fe611a65..5579dad0ba8f2e4ce43883e7d36059c2
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9cc26c870d3785c7ab798cf53f10ad8fd942bfb0..0378b20decc9f22a480f68e8062c3b60d01d966e 100644
+index 15bc39170f06bd4ea5da770bd0fe3d8d08366c48..cef1fa35e3ec613cdea32785fa7848bd39d830d4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1383,7 +1383,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1382,7 +1382,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  if (!source.is(DamageTypeTags.IS_PROJECTILE)) {
                      Entity entity = source.getDirectEntity();
  
@@ -29,7 +29,7 @@ index 9cc26c870d3785c7ab798cf53f10ad8fd942bfb0..0378b20decc9f22a480f68e8062c3b60
                          LivingEntity entityliving = (LivingEntity) entity;
  
                          this.blockUsingShield(entityliving);
-@@ -1488,11 +1488,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1478,11 +1478,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  }
  
                  if (entity1 != null && !source.is(DamageTypeTags.IS_EXPLOSION)) {
@@ -44,7 +44,7 @@ index 9cc26c870d3785c7ab798cf53f10ad8fd942bfb0..0378b20decc9f22a480f68e8062c3b60
                          d0 = (Math.random() - Math.random()) * 0.01D;
                      }
  
-@@ -2223,7 +2224,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2213,7 +2214,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
                  Entity entity = damagesource.getDirectEntity();
  
diff --git a/patches/server/0650-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0650-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch
index f4429575f4..4bf9873939 100644
--- a/patches/server/0650-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0649-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 aaf1146f89f1150a97472a259cda12169e23d1cf..d8dfe272ae044f55158748b817dd266f0d47b21b 100644
+index e2870dbcd41063d0386e14576a12acaa8b21976a..9d6107e014e424dc786f33c3d3685e36746799e2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -431,7 +431,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0651-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0651-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0652-Add-PlayerSetSpawnEvent.patch b/patches/server/0651-Add-PlayerSetSpawnEvent.patch
similarity index 98%
rename from patches/server/0652-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0651-Add-PlayerSetSpawnEvent.patch
index 3b26620999..fe57c76d30 100644
--- a/patches/server/0652-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0651-Add-PlayerSetSpawnEvent.patch
@@ -187,10 +187,10 @@ index 1a27b7faa22e6b3dc5fce329ed06425de56c4315..b9903c29bdea8d1e3b6fce0e97be6bd9
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 948feffe63d23f6f3a8a85adc6e6d579c07a0fd4..fdd2539576df733424fcd68a8ff7612f5dc39db8 100644
+index 4d469a85d573493e2fe972e060165e9776ce74f9..002ea991ba890d4e2f2485b3da75b53d7127c89c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1314,9 +1314,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1320,9 +1320,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void setBedSpawnLocation(Location location, boolean override) {
          if (location == null) {
diff --git a/patches/server/0653-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0653-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0654-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0653-Optimize-entity-tracker-passenger-checks.patch
similarity index 90%
rename from patches/server/0654-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0653-Optimize-entity-tracker-passenger-checks.patch
index b832093f21..80e615822e 100644
--- a/patches/server/0654-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0653-Optimize-entity-tracker-passenger-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize entity tracker passenger checks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 3f3c7ced3a43e2b0eb451930c09188e3706a1bee..3a7a0e24e1c12ae044a455ee4f85216508e97d21 100644
+index f578bfa3a2ae7f29999f9e551f687ae820bbbb80..e0477658849c9e9c6aebed621e8b11c32db86af8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -76,7 +76,7 @@ public class ServerEntity {
diff --git a/patches/server/0655-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0654-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0655-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0654-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0656-Added-EntityDamageItemEvent.patch b/patches/server/0655-Added-EntityDamageItemEvent.patch
similarity index 90%
rename from patches/server/0656-Added-EntityDamageItemEvent.patch
rename to patches/server/0655-Added-EntityDamageItemEvent.patch
index af2ee1d973..ebccfbe78e 100644
--- a/patches/server/0656-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0655-Added-EntityDamageItemEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added EntityDamageItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 226d024f222affba83479d44a7163d29207ae8f1..487f16f64ac3d4c22538032029925ed156cf119c 100644
+index 5ebc5e760ac43b88678977ced06b8d72f8358a68..037d9a64772b42ab3852a1a1d8b3532cbb0d161f 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -591,7 +591,7 @@ public final class ItemStack {
+@@ -592,7 +592,7 @@ public final class ItemStack {
          return this.getItem().getMaxDamage();
      }
  
@@ -17,7 +17,7 @@ index 226d024f222affba83479d44a7163d29207ae8f1..487f16f64ac3d4c22538032029925ed1
          if (!this.isDamageableItem()) {
              return false;
          } else {
-@@ -609,8 +609,8 @@ public final class ItemStack {
+@@ -610,8 +610,8 @@ public final class ItemStack {
  
                  amount -= k;
                  // CraftBukkit start
@@ -28,7 +28,7 @@ index 226d024f222affba83479d44a7163d29207ae8f1..487f16f64ac3d4c22538032029925ed1
                      event.getPlayer().getServer().getPluginManager().callEvent(event);
  
                      if (amount != event.getDamage() || event.isCancelled()) {
-@@ -621,6 +621,14 @@ public final class ItemStack {
+@@ -622,6 +622,14 @@ public final class ItemStack {
                      }
  
                      amount = event.getDamage();
@@ -43,7 +43,7 @@ index 226d024f222affba83479d44a7163d29207ae8f1..487f16f64ac3d4c22538032029925ed1
                  }
                  // CraftBukkit end
                  if (amount <= 0) {
-@@ -628,8 +636,8 @@ public final class ItemStack {
+@@ -629,8 +637,8 @@ public final class ItemStack {
                  }
              }
  
@@ -54,7 +54,7 @@ index 226d024f222affba83479d44a7163d29207ae8f1..487f16f64ac3d4c22538032029925ed1
              }
  
              j = this.getDamageValue() + amount;
-@@ -641,7 +649,7 @@ public final class ItemStack {
+@@ -642,7 +650,7 @@ public final class ItemStack {
      public <T extends LivingEntity> void hurtAndBreak(int amount, T entity, Consumer<T> breakCallback) {
          if (!entity.level().isClientSide && (!(entity instanceof net.minecraft.world.entity.player.Player) || !((net.minecraft.world.entity.player.Player) entity).getAbilities().instabuild)) {
              if (this.isDamageableItem()) {
diff --git a/patches/server/0657-Optimize-indirect-passenger-iteration.patch b/patches/server/0656-Optimize-indirect-passenger-iteration.patch
similarity index 90%
rename from patches/server/0657-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0656-Optimize-indirect-passenger-iteration.patch
index 67debf687d..d9ce7834c4 100644
--- a/patches/server/0657-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0656-Optimize-indirect-passenger-iteration.patch
@@ -5,10 +5,10 @@ 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 6a7b3a54a29b1632061c241b89058729c2b3e036..19365914976b7af0e85d9dbf1e5995f082e1a754 100644
+index 205be31a06f97678aea0da06bc13f5a18b6eb903..f99feb964e4da1bcb49fc643e207115fe4c3c68b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3893,20 +3893,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3882,20 +3882,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Stream<Entity> getIndirectPassengersStream() {
@@ -43,7 +43,7 @@ index 6a7b3a54a29b1632061c241b89058729c2b3e036..19365914976b7af0e85d9dbf1e5995f0
          return () -> {
              return this.getIndirectPassengersStream().iterator();
          };
-@@ -3923,6 +3937,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3912,6 +3926,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // Paper end - rewrite chunk system
  
      public boolean hasExactlyOnePlayerPassenger() {
diff --git a/patches/server/0658-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 93%
rename from patches/server/0658-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch
index 898bee5973..88b526e1cf 100644
--- a/patches/server/0658-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 3a7a0e24e1c12ae044a455ee4f85216508e97d21..c41f06c82d2db758d8a91317ef21eb2f5eb76a49 100644
+index e0477658849c9e9c6aebed621e8b11c32db86af8..f56291dae2fdf4b54dd673e1b98dc39a94f42a9e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -114,7 +114,7 @@ public class ServerEntity {
diff --git a/patches/server/0659-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0658-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0659-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0658-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0660-Clear-bucket-NBT-after-dispense.patch b/patches/server/0659-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0660-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0659-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0661-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0661-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0662-Add-BlockBreakBlockEvent.patch b/patches/server/0661-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0662-Add-BlockBreakBlockEvent.patch
rename to patches/server/0661-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0663-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0663-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0664-More-CommandBlock-API.patch b/patches/server/0663-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0664-More-CommandBlock-API.patch
rename to patches/server/0663-More-CommandBlock-API.patch
diff --git a/patches/server/0665-Add-missing-team-sidebar-display-slots.patch b/patches/server/0664-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0665-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0664-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0666-Add-back-EntityPortalExitEvent.patch b/patches/server/0665-Add-back-EntityPortalExitEvent.patch
similarity index 93%
rename from patches/server/0666-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0665-Add-back-EntityPortalExitEvent.patch
index 6696b7bb2b..6700625dcf 100644
--- a/patches/server/0666-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0665-Add-back-EntityPortalExitEvent.patch
@@ -5,10 +5,10 @@ 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 19365914976b7af0e85d9dbf1e5995f082e1a754..719f97ff0c6a6b2480c249a3517bc27757d1c01b 100644
+index f99feb964e4da1bcb49fc643e207115fe4c3c68b..304f7c1fe35e18f6331de02a3db2b8c84e22eaa2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3340,6 +3340,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3329,6 +3329,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              } else {
                  // CraftBukkit start
                  worldserver = shapedetectorshape.world;
@@ -32,7 +32,7 @@ index 19365914976b7af0e85d9dbf1e5995f082e1a754..719f97ff0c6a6b2480c249a3517bc277
                  if (worldserver == this.level) {
                      // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in
                      this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot);
-@@ -3359,8 +3376,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3348,8 +3365,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
                  if (entity != null) {
                      entity.restoreFrom(this);
diff --git a/patches/server/0667-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 96%
rename from patches/server/0667-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch
index ea10046bcc..41be75300d 100644
--- a/patches/server/0667-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -31,7 +31,7 @@ index bc7daf89e30152a3bcb215e91b30c9680be5c343..e809a959d69197ecdec768a2d4f348c7
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7edcc68a24bd812f50d9ce441fab568906061da3..8bdcf37f7e0adbf6be73a44bdbda8e69e105c2e3 100644
+index 78ba220b74c1cca26e3b1243622a317eb1e4e78b..e5eb25bb1b29b8fa7b97da935a9189ac43c21c71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -698,6 +698,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0668-Get-entity-default-attributes.patch b/patches/server/0667-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0668-Get-entity-default-attributes.patch
rename to patches/server/0667-Get-entity-default-attributes.patch
diff --git a/patches/server/0669-Left-handed-API.patch b/patches/server/0668-Left-handed-API.patch
similarity index 100%
rename from patches/server/0669-Left-handed-API.patch
rename to patches/server/0668-Left-handed-API.patch
diff --git a/patches/server/0670-Add-more-advancement-API.patch b/patches/server/0669-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0670-Add-more-advancement-API.patch
rename to patches/server/0669-Add-more-advancement-API.patch
diff --git a/patches/server/0671-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0671-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0672-Add-critical-damage-API.patch b/patches/server/0671-Add-critical-damage-API.patch
similarity index 96%
rename from patches/server/0672-Add-critical-damage-API.patch
rename to patches/server/0671-Add-critical-damage-API.patch
index 6953c3944a..ba7fd6474f 100644
--- a/patches/server/0672-Add-critical-damage-API.patch
+++ b/patches/server/0671-Add-critical-damage-API.patch
@@ -71,10 +71,10 @@ index a0d688128a1268fa1acf7c339cde15df5dce1c82..372b9ec0c8eddf4a01b4b8203a88401d
          int k = entity.getRemainingFireTicks();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 440edfe374b44e6da34975398db1ece28b7a0afc..9201e143ff520126c27a649bba62b359a01669c4 100644
+index f7d078f557b0be8db0b2ef7e5ff2094909686047..f40ff2f248e3cacc924d90e9f90692b5bde7ea53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -985,7 +985,7 @@ public class CraftEventFactory {
+@@ -990,7 +990,7 @@ public class CraftEventFactory {
                  } else {
                      damageCause = DamageCause.ENTITY_EXPLOSION;
                  }
@@ -83,7 +83,7 @@ index 440edfe374b44e6da34975398db1ece28b7a0afc..9201e143ff520126c27a649bba62b359
              }
              event.setCancelled(cancelled);
  
-@@ -1017,7 +1017,7 @@ public class CraftEventFactory {
+@@ -1022,7 +1022,7 @@ public class CraftEventFactory {
                  cause = DamageCause.SONIC_BOOM;
              }
  
@@ -92,7 +92,7 @@ index 440edfe374b44e6da34975398db1ece28b7a0afc..9201e143ff520126c27a649bba62b359
          } else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) {
              EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions);
              event.setCancelled(cancelled);
-@@ -1087,7 +1087,7 @@ public class CraftEventFactory {
+@@ -1092,7 +1092,7 @@ public class CraftEventFactory {
              } else {
                  throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.getMsgId()));
              }
@@ -101,7 +101,7 @@ index 440edfe374b44e6da34975398db1ece28b7a0afc..9201e143ff520126c27a649bba62b359
              event.setCancelled(cancelled);
              CraftEventFactory.callEvent(event);
              if (!event.isCancelled()) {
-@@ -1136,20 +1136,28 @@ public class CraftEventFactory {
+@@ -1141,20 +1141,28 @@ public class CraftEventFactory {
          }
  
          if (cause != null) {
diff --git a/patches/server/0673-Fix-issues-with-mob-conversion.patch b/patches/server/0672-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0673-Fix-issues-with-mob-conversion.patch
rename to patches/server/0672-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0674-Add-isCollidable-methods-to-various-places.patch b/patches/server/0673-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0674-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0673-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0675-Goat-ram-API.patch b/patches/server/0674-Goat-ram-API.patch
similarity index 93%
rename from patches/server/0675-Goat-ram-API.patch
rename to patches/server/0674-Goat-ram-API.patch
index 2d8433a918..3bdb40bb53 100644
--- a/patches/server/0675-Goat-ram-API.patch
+++ b/patches/server/0674-Goat-ram-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Goat ram API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 923ac08708de02c0e83a5745b65e901965000d65..316823ea978b9c9b6656a01254c201fdd8c11797 100644
+index cf56577ca3de81d3e44eb6f65ff9890011666ac5..a3a5dbaed7a7647249747154ac0c024bddd7eb13 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -384,4 +384,15 @@ public class Goat extends Animal {
+@@ -385,4 +385,15 @@ public class Goat extends Animal {
      public static boolean checkGoatSpawnRules(EntityType<? extends Animal> entityType, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
          return world.getBlockState(pos.below()).is(BlockTags.GOATS_SPAWNABLE_ON) && isBrightEnoughToSpawn(world, pos);
      }
diff --git a/patches/server/0676-Add-API-for-resetting-a-single-score.patch b/patches/server/0675-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0676-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0675-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0677-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch
similarity index 98%
rename from patches/server/0677-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch
index b547dbbbe9..8e3234eecc 100644
--- a/patches/server/0677-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 719f97ff0c6a6b2480c249a3517bc27757d1c01b..266cdbadbf40959ef2214d30ddba945802b9d6ef 100644
+index 304f7c1fe35e18f6331de02a3db2b8c84e22eaa2..d28c3834aeefc8ab553c366a037549f46fb7cfc3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2138,6 +2138,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0678-Vanilla-command-permission-fixes.patch b/patches/server/0677-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0678-Vanilla-command-permission-fixes.patch
rename to patches/server/0677-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0679-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0679-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0680-Fix-GameProfileCache-concurrency.patch b/patches/server/0679-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0680-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0679-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0681-Improve-and-expand-AsyncCatcher.patch b/patches/server/0680-Improve-and-expand-AsyncCatcher.patch
similarity index 96%
rename from patches/server/0681-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0680-Improve-and-expand-AsyncCatcher.patch
index 89a2de4bd2..88f2cca0de 100644
--- a/patches/server/0681-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0680-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d8dfe272ae044f55158748b817dd266f0d47b21b..b40bcdfaac568b248c67036de6e9d0969da38ae4 100644
+index 9d6107e014e424dc786f33c3d3685e36746799e2..a1114ae100a5216883756822b8d0f2df077b819d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1656,6 +1656,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -29,10 +29,10 @@ index d8dfe272ae044f55158748b817dd266f0d47b21b..b40bcdfaac568b248c67036de6e9d096
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0378b20decc9f22a480f68e8062c3b60d01d966e..dd95550877d67d8521a96f1e31994cff894502e1 100644
+index cef1fa35e3ec613cdea32785fa7848bd39d830d4..9f4e33bbd8d86707d50c280d1b9fc0f8538f7700 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1120,7 +1120,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1119,7 +1119,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public boolean addEffect(MobEffectInstance mobeffect, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause) {
@@ -166,10 +166,10 @@ index 47bab513feec217d875192afef61f3af95b93d24..d3fb277878adb26c7d80cf21f2707038
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 084bf9ab43c322f8856dc8f600a18ae166aaa5ef..4590764ec62938e2b601f9f8339d5c4ea183e5e2 100644
+index dc82cc9f6ab09224a82c2a03e9e49b8f1f527733..c29067c513531b819e4d48cd8cab3ed036ae1668 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -451,6 +451,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -464,6 +464,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
  
      @Override
      public boolean addPotionEffect(PotionEffect effect, boolean force) {
diff --git a/patches/server/0682-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 98%
rename from patches/server/0682-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 4ff6d7fef3..afc492a031 100644
--- a/patches/server/0682-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -278,10 +278,10 @@ index a3461824fd2162d509facf6f64c5008e3f0fd42b..d4f99f4592a86e2d8344bc2c44711fef
          // 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 46a4a9e18299060fa0050e2bd0e5a01716a6bce0..dfb3aef5fdc4fea0975c7f27ceaf895f1094f8a5 100644
+index f7f37c9dc14d87c0d2fa89a0f6e0e47dc51abcea..18feaee5cbc2ad9440e8183b19cb5dbb2b24df25 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2186,6 +2186,11 @@ public final class CraftServer implements Server {
+@@ -2200,6 +2200,11 @@ public final class CraftServer implements Server {
  
      @Override
      public int getSpawnLimit(SpawnCategory spawnCategory) {
@@ -294,7 +294,7 @@ index 46a4a9e18299060fa0050e2bd0e5a01716a6bce0..dfb3aef5fdc4fea0975c7f27ceaf895f
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8bdcf37f7e0adbf6be73a44bdbda8e69e105c2e3..dbdae5af24f762c7c2678754eb688c0de9ca5215 100644
+index e5eb25bb1b29b8fa7b97da935a9189ac43c21c71..dfcf7748ef45d35538e65f655f3a892f582435ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1704,9 +1704,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0683-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0682-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0683-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0682-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0684-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0683-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0684-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0683-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0685-Optimise-general-POI-access.patch b/patches/server/0684-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0685-Optimise-general-POI-access.patch
rename to patches/server/0684-Optimise-general-POI-access.patch
diff --git a/patches/server/0686-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 100%
rename from patches/server/0686-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0687-Optimise-chunk-tick-iteration.patch b/patches/server/0686-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0687-Optimise-chunk-tick-iteration.patch
rename to patches/server/0686-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0688-Execute-chunk-tasks-mid-tick.patch b/patches/server/0687-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0688-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0687-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0690-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0689-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0690-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0689-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0691-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0690-Detail-more-information-in-watchdog-dumps.patch
similarity index 98%
rename from patches/server/0691-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0690-Detail-more-information-in-watchdog-dumps.patch
index 7c18ec69e5..4b1105d9b7 100644
--- a/patches/server/0691-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0690-Detail-more-information-in-watchdog-dumps.patch
@@ -122,7 +122,7 @@ index 1d0f87185a8a74394bc2da29828407fd4210754c..d6429d721116aac2a4df8d0b217e9efc
  
      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 266cdbadbf40959ef2214d30ddba945802b9d6ef..f1101d91b3c0e2ce05e69591a7740aa914ff5331 100644
+index d28c3834aeefc8ab553c366a037549f46fb7cfc3..b421f4f8f32dd3df97ba465e6d865d23fc0afda8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1024,7 +1024,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -182,7 +182,7 @@ index 266cdbadbf40959ef2214d30ddba945802b9d6ef..f1101d91b3c0e2ce05e69591a7740aa9
      }
  
      private boolean isStateClimbable(BlockState state) {
-@@ -4230,7 +4272,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4219,7 +4261,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void setDeltaMovement(Vec3 velocity) {
@@ -192,7 +192,7 @@ index 266cdbadbf40959ef2214d30ddba945802b9d6ef..f1101d91b3c0e2ce05e69591a7740aa9
      }
  
      public void addDeltaMovement(Vec3 velocity) {
-@@ -4316,7 +4360,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4305,7 +4349,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
          // Paper end - fix MC-4
          if (this.position.x != x || this.position.y != y || this.position.z != z) {
diff --git a/patches/server/0692-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0691-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0692-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0691-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0693-Distance-manager-tick-timings.patch b/patches/server/0692-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0693-Distance-manager-tick-timings.patch
rename to patches/server/0692-Distance-manager-tick-timings.patch
diff --git a/patches/server/0694-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0693-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0694-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0693-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0695-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0694-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0695-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0694-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0696-Add-packet-limiter-config.patch b/patches/server/0695-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0696-Add-packet-limiter-config.patch
rename to patches/server/0695-Add-packet-limiter-config.patch
diff --git a/patches/server/0697-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0697-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0698-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0697-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0698-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0697-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0699-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0698-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0699-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0698-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0700-Time-scoreboard-search.patch b/patches/server/0699-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0700-Time-scoreboard-search.patch
rename to patches/server/0699-Time-scoreboard-search.patch
diff --git a/patches/server/0701-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 94%
rename from patches/server/0701-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch
index dba17c9f63..d2497585ec 100644
--- a/patches/server/0701-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,7 +9,7 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index c41f06c82d2db758d8a91317ef21eb2f5eb76a49..09f6948a52721b27ccd7c761a7efd09bfd7a183c 100644
+index f56291dae2fdf4b54dd673e1b98dc39a94f42a9e..57d3249c8b18f34245389b1f828e927becafc10c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -180,7 +180,7 @@ public class ServerEntity {
diff --git a/patches/server/0702-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0701-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0702-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0701-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0703-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0702-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0703-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0702-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0704-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0703-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 95%
rename from patches/server/0704-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0703-Optimise-BlockSoil-nearby-water-lookup.patch
index ed636e2ee2..08ef0f3bc8 100644
--- a/patches/server/0704-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0703-Optimise-BlockSoil-nearby-water-lookup.patch
@@ -7,7 +7,7 @@ Apparently the abstract block iteration was taking about
 75% of the method call.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index b78a65ed6f632093eb34872e07d0835e766101e2..552d8c8f3f56bfccd25d11488ed7ec1644a92f47 100644
+index 3b4d8a47e7fe08284b79fab2d147629e902db026..5946f06f63b5694034bd027984a4925b0831d439 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 @@ -142,19 +142,27 @@ public class FarmBlock extends Block {
diff --git a/patches/server/0705-Optimise-random-block-ticking.patch b/patches/server/0704-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0705-Optimise-random-block-ticking.patch
rename to patches/server/0704-Optimise-random-block-ticking.patch
index 4157e93a2c..852edb5de6 100644
--- a/patches/server/0705-Optimise-random-block-ticking.patch
+++ b/patches/server/0704-Optimise-random-block-ticking.patch
@@ -304,7 +304,7 @@ index f0f764f36fb92c64ab2dc8a0a50c3f48321c3c9a..311625277a26c9c187025a1036978229
      public void getAll(IntConsumer action) {
          for(int i = 0; i < this.size; ++i) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 99fc97051c61ac8d08afdc0ea4845e96705e243b..c48bf4ca76f70d878378fc43c8270de5c3332824 100644
+index fd6ce6e8a3a7c889276e06fb427e0d17ed093149..76ab82553488e129882fc9beb603636bb723ec42 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -84,7 +84,7 @@ public class Turtle extends Animal {
diff --git a/patches/server/0706-Optimise-non-flush-packet-sending.patch b/patches/server/0705-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0706-Optimise-non-flush-packet-sending.patch
rename to patches/server/0705-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0707-Optimise-nearby-player-lookups.patch b/patches/server/0706-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0707-Optimise-nearby-player-lookups.patch
rename to patches/server/0706-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0708-Remove-streams-for-villager-AI.patch b/patches/server/0707-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0708-Remove-streams-for-villager-AI.patch
rename to patches/server/0707-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0709-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0708-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0709-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0708-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0710-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0709-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0710-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0709-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0711-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0710-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0711-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0710-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0712-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0711-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0712-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0711-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0713-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0712-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0713-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0712-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0714-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0714-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index be10fb5089..538d614beb 100644
--- a/patches/server/0714-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0713-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 b40bcdfaac568b248c67036de6e9d0969da38ae4..150b3944ee840cccb494a87a96ee1eb47015ba79 100644
+index a1114ae100a5216883756822b8d0f2df077b819d..87c97beb46fdd0b8b78713ce3a64dd98ea3eead0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -847,6 +847,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0715-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0714-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0715-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0714-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0716-Ensure-valid-vehicle-status.patch b/patches/server/0715-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0716-Ensure-valid-vehicle-status.patch
rename to patches/server/0715-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0717-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0716-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0717-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0716-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0718-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0717-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0718-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0717-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0719-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0718-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0719-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0718-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0720-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0719-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0720-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0719-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0721-Preserve-overstacked-loot.patch b/patches/server/0720-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0721-Preserve-overstacked-loot.patch
rename to patches/server/0720-Preserve-overstacked-loot.patch
diff --git a/patches/server/0722-Update-head-rotation-in-missing-places.patch b/patches/server/0721-Update-head-rotation-in-missing-places.patch
similarity index 93%
rename from patches/server/0722-Update-head-rotation-in-missing-places.patch
rename to patches/server/0721-Update-head-rotation-in-missing-places.patch
index d08c4d10e5..377d26ab3f 100644
--- a/patches/server/0722-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0721-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 f1101d91b3c0e2ce05e69591a7740aa914ff5331..fb56e011de267a0f57c8b3b604409d35dd640856 100644
+index b421f4f8f32dd3df97ba465e6d865d23fc0afda8..e6ec85bb667cf1c7618402bfc2e6fc194706c368 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1903,6 +1903,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0723-prevent-unintended-light-block-manipulation.patch b/patches/server/0722-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0723-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0722-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0724-Fix-CraftCriteria-defaults-map.patch b/patches/server/0723-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0724-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0723-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0725-Fix-upstreams-block-state-factories.patch b/patches/server/0724-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0725-Fix-upstreams-block-state-factories.patch
rename to patches/server/0724-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0726-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0725-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0726-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0725-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0727-Configurable-feature-seeds.patch b/patches/server/0726-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0727-Configurable-feature-seeds.patch
rename to patches/server/0726-Configurable-feature-seeds.patch
diff --git a/patches/server/0728-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0728-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0729-Add-root-admin-user-detection.patch b/patches/server/0728-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0729-Add-root-admin-user-detection.patch
rename to patches/server/0728-Add-root-admin-user-detection.patch
diff --git a/patches/server/0730-Always-allow-item-changing-in-Fireball.patch b/patches/server/0729-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0730-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0729-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0731-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0730-don-t-attempt-to-teleport-dead-entities.patch
similarity index 91%
rename from patches/server/0731-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0730-don-t-attempt-to-teleport-dead-entities.patch
index 35e1ddc351..34f97a6fed 100644
--- a/patches/server/0731-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0730-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 fb56e011de267a0f57c8b3b604409d35dd640856..b857e1846b6e215ab71cf31c31ce8c96266a4145 100644
+index e6ec85bb667cf1c7618402bfc2e6fc194706c368..ba65d8898aa198d598189fc40ad7dd080daba35a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -787,7 +787,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0732-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 90%
rename from patches/server/0732-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch
index 5cdbdc4130..568f5ba069 100644
--- a/patches/server/0732-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dd95550877d67d8521a96f1e31994cff894502e1..70cdcc7508998ef1b107f60c619c3d521dadd124 100644
+index 9f4e33bbd8d86707d50c280d1b9fc0f8538f7700..6220a17852b51f45756d576af662460a28099abc 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2658,13 +2658,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2648,13 +2648,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.hasEffect(MobEffects.JUMP) ? 0.1F * ((float) this.getEffect(MobEffects.JUMP).getAmplifier() + 1.0F) : 0.0F;
      }
  
diff --git a/patches/server/0733-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0732-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0733-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0732-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0734-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0733-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0734-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0733-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0735-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 93%
rename from patches/server/0735-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 1001f67b5d..27f890cda2 100644
--- a/patches/server/0735-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -18,7 +18,7 @@ index 97da8896865ff0bdd4fe8f2155b0830b42051bb1..9ca897d92c5bdd2764d114c74d64c776
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 09f6948a52721b27ccd7c761a7efd09bfd7a183c..71a8812365503d840f6702a21d504a37d67c7194 100644
+index 57d3249c8b18f34245389b1f828e927becafc10c..485ed6cfdb2bb0c06dd639f6cad26cd3112c618d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -338,7 +338,10 @@ public class ServerEntity {
@@ -34,10 +34,10 @@ index 09f6948a52721b27ccd7c761a7efd09bfd7a183c..71a8812365503d840f6702a21d504a37
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 70cdcc7508998ef1b107f60c619c3d521dadd124..3161b5da8bd4045123ee067ffc693165507a02ea 100644
+index 6220a17852b51f45756d576af662460a28099abc..a5cf00a41c61cc9f851781cc4f55c9bb47c2f5b6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3167,7 +3167,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3157,7 +3157,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
          equipmentChanges.forEach((enumitemslot, itemstack) -> {
              ItemStack itemstack1 = itemstack.copy();
  
@@ -49,7 +49,7 @@ index 70cdcc7508998ef1b107f60c619c3d521dadd124..3161b5da8bd4045123ee067ffc693165
              switch (enumitemslot.getType()) {
                  case HAND:
                      this.setLastHandItem(enumitemslot, itemstack1);
-@@ -3180,6 +3183,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3170,6 +3173,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
          ((ServerLevel) this.level()).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
      }
  
diff --git a/patches/server/0736-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 94%
rename from patches/server/0736-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch
index 3729683282..907816e047 100644
--- a/patches/server/0736-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Hide unnecessary itemmeta from clients
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 71a8812365503d840f6702a21d504a37d67c7194..63561c0044375465fa0023b2b563a6516d7fa76c 100644
+index 485ed6cfdb2bb0c06dd639f6cad26cd3112c618d..3212a4cfb0c7e0003981097e813ebbe2601cdfec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -340,7 +340,7 @@ public class ServerEntity {
@@ -18,7 +18,7 @@ index 71a8812365503d840f6702a21d504a37d67c7194..63561c0044375465fa0023b2b563a651
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 150b3944ee840cccb494a87a96ee1eb47015ba79..3b61e9dcbc06ecba3cd47bd3fb06f8903fb2c8ee 100644
+index 87c97beb46fdd0b8b78713ce3a64dd98ea3eead0..913cd79d9a382d9464ce20a95f91f0e0122fc71b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2708,8 +2708,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -33,10 +33,10 @@ index 150b3944ee840cccb494a87a96ee1eb47015ba79..3b61e9dcbc06ecba3cd47bd3fb06f890
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3161b5da8bd4045123ee067ffc693165507a02ea..5287ff8b30a6d27ca05241695a6c99e868a5aa36 100644
+index a5cf00a41c61cc9f851781cc4f55c9bb47c2f5b6..f306c9e8f46d80d4c4fdc671e3754b3faff72fa2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3169,7 +3169,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3159,7 +3159,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
              // Paper start - prevent oversized data
              ItemStack toSend = sanitizeItemStack(itemstack1, true);
@@ -45,7 +45,7 @@ index 3161b5da8bd4045123ee067ffc693165507a02ea..5287ff8b30a6d27ca05241695a6c99e8
              // Paper end
              switch (enumitemslot.getType()) {
                  case HAND:
-@@ -3183,6 +3183,70 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3173,6 +3173,70 @@ public abstract class LivingEntity extends Entity implements Attackable {
          ((ServerLevel) this.level()).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
      }
  
diff --git a/patches/server/0737-Fix-Spigot-growth-modifiers.patch b/patches/server/0736-Fix-Spigot-growth-modifiers.patch
similarity index 98%
rename from patches/server/0737-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0736-Fix-Spigot-growth-modifiers.patch
index 7530d5438f..47946c5054 100644
--- a/patches/server/0737-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0736-Fix-Spigot-growth-modifiers.patch
@@ -36,7 +36,7 @@ index 55f2fa02a36f0500b47f9ce377926719557106e5..18b5bce1138d50be32e5da013221be69
      public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) {
          return new ItemStack(Items.GLOW_BERRIES);
 diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-index 448c958a7a40258132add92da74fa689cf2ac046..c463adf131c4ca6e38f18d4efd94f4629bcfafe9 100644
+index 08d442713bf0cc4f01f693c9a2fbd1a17a6fa348..decb8caa67bc5f4525e4d92fedf465a17171fceb 100644
 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
 @@ -84,6 +84,10 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
diff --git a/patches/server/0738-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0737-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0738-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0737-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0739-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0738-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0739-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0738-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0741-Optimize-HashMapPalette.patch b/patches/server/0739-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0741-Optimize-HashMapPalette.patch
rename to patches/server/0739-Optimize-HashMapPalette.patch
diff --git a/patches/server/0740-Add-player-health-update-API.patch b/patches/server/0740-Add-player-health-update-API.patch
deleted file mode 100644
index 819b5e9da0..0000000000
--- a/patches/server/0740-Add-player-health-update-API.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SamB440 <sam@islandearth.net>
-Date: Wed, 17 Nov 2021 12:31:42 +0000
-Subject: [PATCH] Add player health update API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fdd2539576df733424fcd68a8ff7612f5dc39db8..e41beff4c687917313f3a9c27b9079b979bd8c78 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2320,9 +2320,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         this.getHandle().maxHealthCache = getMaxHealth();
-     }
- 
--    public void sendHealthUpdate() {
-+    // Paper start
-+    @Override
-+    public void sendHealthUpdate(final double health, final int foodLevel, final float saturationLevel) {
-         // Paper start - cancellable death event
--        ClientboundSetHealthPacket packet = new ClientboundSetHealthPacket(this.getScaledHealth(), this.getHandle().getFoodData().getFoodLevel(), this.getHandle().getFoodData().getSaturationLevel());
-+        ClientboundSetHealthPacket packet = new ClientboundSetHealthPacket((float) health, foodLevel, saturationLevel);
-         if (this.getHandle().queueHealthUpdatePacket) {
-             this.getHandle().queuedHealthUpdatePacket = packet;
-         } else {
-@@ -2331,6 +2333,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         // Paper end
-     }
- 
-+    @Override
-+    public void sendHealthUpdate() {
-+        this.sendHealthUpdate(this.getScaledHealth(), this.getHandle().getFoodData().getFoodLevel(), this.getHandle().getFoodData().getSaturationLevel());
-+    }
-+    // Paper end
-+
-     public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
-         if (!this.scaledHealth && !force) {
-             return;
diff --git a/patches/server/0742-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0740-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 97%
rename from patches/server/0742-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0740-Allow-delegation-to-vanilla-chunk-gen.patch
index 67bf1a50b0..e8d1e04124 100644
--- a/patches/server/0742-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0740-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dfb3aef5fdc4fea0975c7f27ceaf895f1094f8a5..f23c83b281e8fa7310bd8d10f6972f68743e2ab4 100644
+index 18feaee5cbc2ad9440e8183b19cb5dbb2b24df25..e6b70fcd96b99558342de82a1235c6de923219fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2366,6 +2366,88 @@ public final class CraftServer implements Server {
+@@ -2380,6 +2380,88 @@ public final class CraftServer implements Server {
          return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME), world); // Paper - Anti-Xray - Add parameters
      }
  
diff --git a/patches/server/0743-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0741-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0743-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0741-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 71830dfd1c..0794c185b3 100644
--- a/patches/server/0743-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0741-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1215,7 +1215,7 @@ index ffa831673805201932c36b814f4439f3bb5c4c04..64e40e3caa85bff9382a483237301a8f
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b857e1846b6e215ab71cf31c31ce8c96266a4145..5296675dc1c197b67371e86da1c39dcc2e1d69e6 100644
+index ba65d8898aa198d598189fc40ad7dd080daba35a..f0971946e3683733d5f12888263ebe2996aa0df0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1210,9 +1210,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0744-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0742-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0744-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0742-Optimise-collision-checking-in-player-move-packet-ha.patch
index 04033fb89e..8343f3caa3 100644
--- a/patches/server/0744-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0742-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3b61e9dcbc06ecba3cd47bd3fb06f8903fb2c8ee..df22e934f8d1fae8411a5829db73ba9680649f43 100644
+index 913cd79d9a382d9464ce20a95f91f0e0122fc71b..58ee55afb11b0c64b78014424bbcb5ac301efe79 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -647,7 +647,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0745-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0743-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0745-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0743-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0746-Add-more-Campfire-API.patch b/patches/server/0744-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0746-Add-more-Campfire-API.patch
rename to patches/server/0744-Add-more-Campfire-API.patch
diff --git a/patches/server/0747-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0745-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0747-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0745-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0748-Fix-tripwire-state-inconsistency.patch b/patches/server/0746-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0748-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0746-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0749-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0747-Forward-CraftEntity-in-teleport-command.patch
similarity index 88%
rename from patches/server/0749-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0747-Forward-CraftEntity-in-teleport-command.patch
index 5ae23d9d77..16d3d61491 100644
--- a/patches/server/0749-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0747-Forward-CraftEntity-in-teleport-command.patch
@@ -5,10 +5,10 @@ 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 5296675dc1c197b67371e86da1c39dcc2e1d69e6..769b5e4af8d23c768ade210cb72f8857473a696c 100644
+index f0971946e3683733d5f12888263ebe2996aa0df0..602f0ea9a0a077df7dd4b8964d442cfaca25d37e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3455,6 +3455,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3444,6 +3444,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index 5296675dc1c197b67371e86da1c39dcc2e1d69e6..769b5e4af8d23c768ade210cb72f8857
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3536,10 +3543,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3525,10 +3532,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit
                          ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit
                      }
diff --git a/patches/server/0750-Improve-scoreboard-entries.patch b/patches/server/0748-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0750-Improve-scoreboard-entries.patch
rename to patches/server/0748-Improve-scoreboard-entries.patch
diff --git a/patches/server/0751-Entity-powdered-snow-API.patch b/patches/server/0749-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0751-Entity-powdered-snow-API.patch
rename to patches/server/0749-Entity-powdered-snow-API.patch
diff --git a/patches/server/0752-Add-API-for-item-entity-health.patch b/patches/server/0750-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0752-Add-API-for-item-entity-health.patch
rename to patches/server/0750-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0753-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0751-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0753-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0751-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0754-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0752-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0754-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0752-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0755-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0753-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0755-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0753-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0756-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0754-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0756-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0754-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0757-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0755-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0757-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0755-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0758-Fix-bees-aging-inside-hives.patch b/patches/server/0756-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0758-Fix-bees-aging-inside-hives.patch
rename to patches/server/0756-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0759-Bucketable-API.patch b/patches/server/0757-Bucketable-API.patch
similarity index 100%
rename from patches/server/0759-Bucketable-API.patch
rename to patches/server/0757-Bucketable-API.patch
diff --git a/patches/server/0760-Validate-usernames.patch b/patches/server/0758-Validate-usernames.patch
similarity index 100%
rename from patches/server/0760-Validate-usernames.patch
rename to patches/server/0758-Validate-usernames.patch
diff --git a/patches/server/0761-Make-water-animal-spawn-height-configurable.patch b/patches/server/0759-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0761-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0759-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0762-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0760-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 97%
rename from patches/server/0762-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0760-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index e35c0bb71b..c53d96847b 100644
--- a/patches/server/0762-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0760-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -18,10 +18,10 @@ index ebd092a3f3c745b3a2f69fd72c04be7a2ab214a2..91a66fb66e9df5d5878315afa9d357a3
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f23c83b281e8fa7310bd8d10f6972f68743e2ab4..012d9b8d053dea682cf1d857b5ce5d3585f331e8 100644
+index e6b70fcd96b99558342de82a1235c6de923219fe..6ecaf821a908b68182879b5da1cbbd82939a785b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1237,7 +1237,7 @@ public final class CraftServer implements Server {
+@@ -1240,7 +1240,7 @@ public final class CraftServer implements Server {
          List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
          LevelStem worlddimension = iregistry.get(actualDimension);
  
@@ -31,7 +31,7 @@ index f23c83b281e8fa7310bd8d10f6972f68743e2ab4..012d9b8d053dea682cf1d857b5ce5d35
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index dbdae5af24f762c7c2678754eb688c0de9ca5215..05c085f6c2c304879f6c5a823755bfe6aee1a9b9 100644
+index dfcf7748ef45d35538e65f655f3a892f582435ca..0159eb5302c73dd51daa11f100901acc431449c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -202,6 +202,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0763-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0761-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0763-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0761-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0764-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0762-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0764-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0762-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0765-Multiple-Entries-with-Scoreboards.patch b/patches/server/0763-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0765-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0763-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0766-Reset-placed-block-on-exception.patch b/patches/server/0764-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0766-Reset-placed-block-on-exception.patch
rename to patches/server/0764-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0767-Add-configurable-height-for-slime-spawn.patch b/patches/server/0765-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0767-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0765-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0768-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0766-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0768-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0766-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0769-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0767-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0769-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0767-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0770-Kick-on-main-for-illegal-chat.patch b/patches/server/0768-Kick-on-main-for-illegal-chat.patch
similarity index 96%
rename from patches/server/0770-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0768-Kick-on-main-for-illegal-chat.patch
index c1e3e1cc38..c621bcc64c 100644
--- a/patches/server/0770-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0768-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 df22e934f8d1fae8411a5829db73ba9680649f43..5df6f813599b6bb5dff34386f603793156d3ca7a 100644
+index 58ee55afb11b0c64b78014424bbcb5ac301efe79..69cec44550b8d7ac14498f410e48a5d82056f174 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2165,7 +2165,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0771-Multi-Block-Change-API-Implementation.patch b/patches/server/0769-Multi-Block-Change-API-Implementation.patch
similarity index 95%
rename from patches/server/0771-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0769-Multi-Block-Change-API-Implementation.patch
index 7a0ce2ea11..0600bd3ec8 100644
--- a/patches/server/0771-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0769-Multi-Block-Change-API-Implementation.patch
@@ -24,10 +24,10 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e41beff4c687917313f3a9c27b9079b979bd8c78..86e397e54b56e46f5f5f75529b8ee8ea4715e61d 100644
+index 002ea991ba890d4e2f2485b3da75b53d7127c89c..32266b6e1011c21510a13a53ab1568988ce73522 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -882,6 +882,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -888,6 +888,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0772-Fix-NotePlayEvent.patch b/patches/server/0770-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0772-Fix-NotePlayEvent.patch
rename to patches/server/0770-Fix-NotePlayEvent.patch
diff --git a/patches/server/0773-Freeze-Tick-Lock-API.patch b/patches/server/0771-Freeze-Tick-Lock-API.patch
similarity index 93%
rename from patches/server/0773-Freeze-Tick-Lock-API.patch
rename to patches/server/0771-Freeze-Tick-Lock-API.patch
index 0951dac980..54685abe12 100644
--- a/patches/server/0773-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0771-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 769b5e4af8d23c768ade210cb72f8857473a696c..cad5f9feffd70ca1cdff9f36b16e73df405858bf 100644
+index 602f0ea9a0a077df7dd4b8964d442cfaca25d37e..5aed3f18ef7464e1fa6f6ee69fad72d524356af0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -402,6 +402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -46,10 +46,10 @@ index 769b5e4af8d23c768ade210cb72f8857473a696c..cad5f9feffd70ca1cdff9f36b16e73df
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5287ff8b30a6d27ca05241695a6c99e868a5aa36..351c60a6f1dfc00aa1a300ed929e81df8d0d025a 100644
+index f306c9e8f46d80d4c4fdc671e3754b3faff72fa2..1822382211b512f88c3e94258bbb6cb27cce3d07 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3427,7 +3427,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3417,7 +3417,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
          this.level().getProfiler().pop();
          this.level().getProfiler().push("freezing");
diff --git a/patches/server/0774-Dolphin-API.patch b/patches/server/0772-Dolphin-API.patch
similarity index 100%
rename from patches/server/0774-Dolphin-API.patch
rename to patches/server/0772-Dolphin-API.patch
diff --git a/patches/server/0775-More-PotionEffectType-API.patch b/patches/server/0773-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0775-More-PotionEffectType-API.patch
rename to patches/server/0773-More-PotionEffectType-API.patch
diff --git a/patches/server/0776-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0774-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0776-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0774-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0777-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0775-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 97%
rename from patches/server/0777-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0775-API-for-creating-command-sender-which-forwards-feedb.patch
index 379e607e9d..15535c8e38 100644
--- a/patches/server/0777-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0775-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 012d9b8d053dea682cf1d857b5ce5d3585f331e8..74b7824d104ad568e76dd3352bc509997b5c91fd 100644
+index 6ecaf821a908b68182879b5da1cbbd82939a785b..c0c88a974955e378c1df678a00d345a61e7f9336 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2017,6 +2017,13 @@ public final class CraftServer implements Server {
+@@ -2031,6 +2031,13 @@ public final class CraftServer implements Server {
          return console.console;
      }
  
diff --git a/patches/server/0778-Add-missing-structure-set-seed-configs.patch b/patches/server/0776-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0778-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0776-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0779-Implement-regenerateChunk.patch b/patches/server/0777-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0779-Implement-regenerateChunk.patch
rename to patches/server/0777-Implement-regenerateChunk.patch
index 2101ebbee1..781aaa93b6 100644
--- a/patches/server/0779-Implement-regenerateChunk.patch
+++ b/patches/server/0777-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 05c085f6c2c304879f6c5a823755bfe6aee1a9b9..e49c907f668b17cb85505b9199af3b90f2c5af74 100644
+index 0159eb5302c73dd51daa11f100901acc431449c0..9c7d9ab63cd24e58a0e0e5af15fc434f8811591a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -141,6 +141,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/server/0780-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0778-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 92%
rename from patches/server/0780-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0778-Fix-cancelled-powdered-snow-bucket-placement.patch
index 7e8db55923..b6ede7ccfc 100644
--- a/patches/server/0780-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0778-Fix-cancelled-powdered-snow-bucket-placement.patch
@@ -20,19 +20,19 @@ index e581dc10f3c805f7f8b6e4c842092609e7e1a0f8..b0204af850ee182773ad458208cccd94
                                  }
                                  return InteractionResult.FAIL;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 487f16f64ac3d4c22538032029925ed156cf119c..9047d65b60203062dac6eeac3b90ef3417074c09 100644
+index 037d9a64772b42ab3852a1a1d8b3532cbb0d161f..671af924e54e96e91a284103d5f347853ce338b6 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -352,7 +352,7 @@ public final class ItemStack {
              int oldCount = this.getCount();
-             ServerLevel world = (ServerLevel) itemactioncontext.getLevel();
+             ServerLevel world = (ServerLevel) context.getLevel();
  
 -            if (!(this.getItem() instanceof BucketItem || this.getItem() instanceof SolidBucketItem)) { // if not bucket
 +            if (!(this.getItem() instanceof BucketItem/* || this.getItem() instanceof SolidBucketItem*/)) { // if not bucket // Paper - capture block states for snow buckets
                  world.captureBlockStates = true;
                  // special case bonemeal
                  if (this.getItem() == Items.BONE_MEAL) {
-@@ -407,7 +407,7 @@ public final class ItemStack {
+@@ -408,7 +408,7 @@ public final class ItemStack {
                  world.capturedBlockStates.clear();
                  if (blocks.size() > 1) {
                      placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockMultiPlaceEvent(world, entityhuman, enumhand, blocks, blockposition.getX(), blockposition.getY(), blockposition.getZ());
diff --git a/patches/server/0781-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0779-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 86%
rename from patches/server/0781-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0779-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index e39fc3e9bd..b86e8e3be8 100644
--- a/patches/server/0781-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0779-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 74b7824d104ad568e76dd3352bc509997b5c91fd..f2f81ee6e938ef3d148f16729c0daf2fde8e1b26 100644
+index c0c88a974955e378c1df678a00d345a61e7f9336..f5c267c9f58f1e4580cd6dfd29e0cd4e089b236c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2194,6 +2194,8 @@ public final class CraftServer implements Server {
+@@ -2208,6 +2208,8 @@ public final class CraftServer implements Server {
      @Override
      public int getSpawnLimit(SpawnCategory spawnCategory) {
          // Paper start
diff --git a/patches/server/0782-Add-GameEvent-tags.patch b/patches/server/0780-Add-GameEvent-tags.patch
similarity index 95%
rename from patches/server/0782-Add-GameEvent-tags.patch
rename to patches/server/0780-Add-GameEvent-tags.patch
index b33e7a1eba..221575f12c 100644
--- a/patches/server/0782-Add-GameEvent-tags.patch
+++ b/patches/server/0780-Add-GameEvent-tags.patch
@@ -46,10 +46,10 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f2f81ee6e938ef3d148f16729c0daf2fde8e1b26..68a929979e61f418f5833ba7886c86d959d3a89f 100644
+index f5c267c9f58f1e4580cd6dfd29e0cd4e089b236c..98d6e9dd76c30d5688605a4086afd01457669628 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2615,6 +2615,15 @@ public final class CraftServer implements Server {
+@@ -2629,6 +2629,15 @@ public final class CraftServer implements Server {
                      return (org.bukkit.Tag<T>) new CraftEntityTag(BuiltInRegistries.ENTITY_TYPE, entityTagKey);
                  }
              }
@@ -65,7 +65,7 @@ index f2f81ee6e938ef3d148f16729c0daf2fde8e1b26..68a929979e61f418f5833ba7886c86d9
              default -> throw new IllegalArgumentException();
          }
  
-@@ -2647,6 +2656,13 @@ public final class CraftServer implements Server {
+@@ -2661,6 +2670,13 @@ public final class CraftServer implements Server {
                  net.minecraft.core.Registry<EntityType<?>> entityTags = BuiltInRegistries.ENTITY_TYPE;
                  return entityTags.getTags().map(pair -> (org.bukkit.Tag<T>) new CraftEntityTag(entityTags, pair.getFirst())).collect(ImmutableList.toImmutableList());
              }
diff --git a/patches/server/0783-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0781-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0783-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0781-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0784-Furnace-RecipesUsed-API.patch b/patches/server/0782-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0784-Furnace-RecipesUsed-API.patch
rename to patches/server/0782-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0785-Configurable-sculk-sensor-listener-range.patch b/patches/server/0783-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0785-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0783-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0786-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0784-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0786-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0784-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0787-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0785-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0787-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0785-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0788-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0786-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 92%
rename from patches/server/0788-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0786-Put-world-into-worldlist-before-initing-the-world.patch
index 5dd414a8a8..5435f60e03 100644
--- a/patches/server/0788-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0786-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,10 +23,10 @@ index a9240274b903f23a5d0b2414b3bc7a984845b6cd..9b720d3407802eac986c2044892d5b70
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 68a929979e61f418f5833ba7886c86d959d3a89f..bee2e61da10e97433c0a77496de421db85200055 100644
+index 98d6e9dd76c30d5688605a4086afd01457669628..fd7cc379ebc762133e14a4cc3c464f17ec706cfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1266,10 +1266,11 @@ public final class CraftServer implements Server {
+@@ -1269,10 +1269,11 @@ public final class CraftServer implements Server {
              return null;
          }
  
diff --git a/patches/server/0789-Fix-Entity-Position-Desync.patch b/patches/server/0787-Fix-Entity-Position-Desync.patch
similarity index 93%
rename from patches/server/0789-Fix-Entity-Position-Desync.patch
rename to patches/server/0787-Fix-Entity-Position-Desync.patch
index 3ccd5470c9..6c45d79350 100644
--- a/patches/server/0789-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0787-Fix-Entity-Position-Desync.patch
@@ -9,7 +9,7 @@ This excludes hanging entities, as this fix caused problematic behavior due to t
 position field.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 63561c0044375465fa0023b2b563a6516d7fa76c..6670e657e08e130f7e0368f418379fd1ece00cdf 100644
+index 3212a4cfb0c7e0003981097e813ebbe2601cdfec..900bf9fb40026cce1d869bb7ab1694e6cd354099 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -174,7 +174,7 @@ public class ServerEntity {
diff --git a/patches/server/0790-Custom-Potion-Mixes.patch b/patches/server/0788-Custom-Potion-Mixes.patch
similarity index 97%
rename from patches/server/0790-Custom-Potion-Mixes.patch
rename to patches/server/0788-Custom-Potion-Mixes.patch
index be42b2c77e..8316a53631 100644
--- a/patches/server/0790-Custom-Potion-Mixes.patch
+++ b/patches/server/0788-Custom-Potion-Mixes.patch
@@ -164,10 +164,10 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bee2e61da10e97433c0a77496de421db85200055..7e7539b7f50007f10d7926bb13beea2538403b1f 100644
+index fd7cc379ebc762133e14a4cc3c464f17ec706cfa..6e9f3db637a61d29e3ef8b3e390e143d2ad281ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -300,6 +300,7 @@ public final class CraftServer implements Server {
+@@ -303,6 +303,7 @@ public final class CraftServer implements Server {
      private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
      public static Exception excessiveVelEx; // Paper - Velocity warnings
      private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
@@ -175,7 +175,7 @@ index bee2e61da10e97433c0a77496de421db85200055..7e7539b7f50007f10d7926bb13beea25
  
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
-@@ -327,7 +328,7 @@ public final class CraftServer implements Server {
+@@ -330,7 +331,7 @@ public final class CraftServer implements Server {
          Enchantments.SHARPNESS.getClass();
          org.bukkit.enchantments.Enchantment.stopAcceptingRegistrations();
  
@@ -184,7 +184,7 @@ index bee2e61da10e97433c0a77496de421db85200055..7e7539b7f50007f10d7926bb13beea25
          MobEffects.BLINDNESS.getClass();
          PotionEffectType.stopAcceptingRegistrations();
          // Ugly hack :(
-@@ -2974,5 +2975,10 @@ public final class CraftServer implements Server {
+@@ -2988,5 +2989,10 @@ public final class CraftServer implements Server {
          return datapackManager;
      }
  
diff --git a/patches/server/0791-Force-close-world-loading-screen.patch b/patches/server/0789-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0791-Force-close-world-loading-screen.patch
rename to patches/server/0789-Force-close-world-loading-screen.patch
diff --git a/patches/server/0792-Fix-falling-block-spawn-methods.patch b/patches/server/0790-Fix-falling-block-spawn-methods.patch
similarity index 94%
rename from patches/server/0792-Fix-falling-block-spawn-methods.patch
rename to patches/server/0790-Fix-falling-block-spawn-methods.patch
index daa0d01521..d96bea324d 100644
--- a/patches/server/0792-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0790-Fix-falling-block-spawn-methods.patch
@@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 7318209de454b233e22c20b176cb207de7f86674..414b4fd46307aa9c9d0f96bc571a68642f33afdb 100644
+index 49d6ae8465397c4210a6f9599d14008518c30cd0..72cf724733bc5a1e5dcca20fa0a6a8f7874f5f8b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -598,7 +598,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -24,7 +24,7 @@ index 7318209de454b233e22c20b176cb207de7f86674..414b4fd46307aa9c9d0f96bc571a6864
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e49c907f668b17cb85505b9199af3b90f2c5af74..1e26fea83065c7e76b196e6599892c11d4370617 100644
+index 9c7d9ab63cd24e58a0e0e5af15fc434f8811591a..3ef243039fdb1b28075c309fa5743f40d2d5efee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1397,7 +1397,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0793-Expose-furnace-minecart-push-values.patch b/patches/server/0791-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0793-Expose-furnace-minecart-push-values.patch
rename to patches/server/0791-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0794-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0792-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0794-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0792-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0795-More-Projectile-API.patch b/patches/server/0793-More-Projectile-API.patch
similarity index 99%
rename from patches/server/0795-More-Projectile-API.patch
rename to patches/server/0793-More-Projectile-API.patch
index bc39b7ad22..03671b1b51 100644
--- a/patches/server/0795-More-Projectile-API.patch
+++ b/patches/server/0793-More-Projectile-API.patch
@@ -20,7 +20,7 @@ public net.minecraft.world.entity.projectile.Projectile canHitEntity(Lnet/minecr
 Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
-index bc8cc9ced3fd32ff916c42e8ae95a95414dd1f25..6b3153de653a72720537795ff96f0c64fb6932d0 100644
+index 135cd9c154a90d5c2351d8bdd8217134114af5a0..f4342f6a36cf31066af3ee32fff059e6a318fad6 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
 @@ -99,6 +99,11 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
diff --git a/patches/server/0796-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0794-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0796-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0794-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0797-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0795-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0797-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0795-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index ab5762de22..1f7066313d 100644
--- a/patches/server/0797-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0795-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 5df6f813599b6bb5dff34386f603793156d3ca7a..db79b51cbe94c8c584fcc38298638d2cf196f0ac 100644
+index 69cec44550b8d7ac14498f410e48a5d82056f174..a5f6fed7774c7ea3b9cae59f72d2ea4b435af641 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -576,6 +576,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0798-Implement-getComputedBiome-API.patch b/patches/server/0796-Implement-getComputedBiome-API.patch
similarity index 97%
rename from patches/server/0798-Implement-getComputedBiome-API.patch
rename to patches/server/0796-Implement-getComputedBiome-API.patch
index 7eec45ff95..ed458fddb1 100644
--- a/patches/server/0798-Implement-getComputedBiome-API.patch
+++ b/patches/server/0796-Implement-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 414b4fd46307aa9c9d0f96bc571a68642f33afdb..61bc6a68fe1b0101f70b065710d941b36f8766a8 100644
+index 72cf724733bc5a1e5dcca20fa0a6a8f7874f5f8b..9c18ffb9753c135e2dd1c1119082dcbddadc31ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -220,6 +220,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0799-Make-some-itemstacks-nonnull.patch b/patches/server/0797-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0799-Make-some-itemstacks-nonnull.patch
rename to patches/server/0797-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0800-Implement-enchantWithLevels-API.patch b/patches/server/0798-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0800-Implement-enchantWithLevels-API.patch
rename to patches/server/0798-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0801-Fix-saving-in-unloadWorld.patch b/patches/server/0799-Fix-saving-in-unloadWorld.patch
similarity index 83%
rename from patches/server/0801-Fix-saving-in-unloadWorld.patch
rename to patches/server/0799-Fix-saving-in-unloadWorld.patch
index 50f6a5db96..4c76d650b2 100644
--- a/patches/server/0801-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0799-Fix-saving-in-unloadWorld.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7e7539b7f50007f10d7926bb13beea2538403b1f..86e11118d21849cb5613bcf0e18ec85467b6ab3a 100644
+index 6e9f3db637a61d29e3ef8b3e390e143d2ad281ee..884a7dd2ee3e0dc671cb111a9493bd1a8d3f7d0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1314,7 +1314,7 @@ public final class CraftServer implements Server {
+@@ -1317,7 +1317,7 @@ public final class CraftServer implements Server {
  
          try {
              if (save) {
diff --git a/patches/server/0802-Buffer-OOB-setBlock-calls.patch b/patches/server/0800-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0802-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0800-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0803-Add-TameableDeathMessageEvent.patch b/patches/server/0801-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0803-Add-TameableDeathMessageEvent.patch
rename to patches/server/0801-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0802-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0802-Fix-new-block-data-for-EntityChangeBlockEvent.patch
new file mode 100644
index 0000000000..cb4f4d4b82
--- /dev/null
+++ b/patches/server/0802-Fix-new-block-data-for-EntityChangeBlockEvent.patch
@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SoSeDiK <mrsosedik@gmail.com>
+Date: Mon, 21 Mar 2022 20:00:53 +0200
+Subject: [PATCH] Fix new block data for EntityChangeBlockEvent
+
+Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
+
+diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
+index 9be4e715faefc5f7972abf064bfff3c1c980f7fc..77542bbdfdc2bf0ec1527ad8551493e1d89da40c 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
++++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
+@@ -77,7 +77,7 @@ public class EatBlockGoal extends Goal {
+                 BlockPos blockposition1 = blockposition.below();
+ 
+                 if (this.level.getBlockState(blockposition1).is(Blocks.GRASS_BLOCK)) {
+-                    if (CraftEventFactory.callEntityChangeBlockEvent(this.mob, blockposition1, Blocks.AIR.defaultBlockState(), !this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // CraftBukkit
++                    if (CraftEventFactory.callEntityChangeBlockEvent(this.mob, blockposition1, Blocks.DIRT.defaultBlockState(), !this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // CraftBukkit // Paper - Fix wrong block state
+                         this.level.levelEvent(2001, blockposition1, Block.getId(Blocks.GRASS_BLOCK.defaultBlockState()));
+                         this.level.setBlock(blockposition1, Blocks.DIRT.defaultBlockState(), 2);
+                     }
+diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+index 703068eaff84bcce83f61d805afa6cc0fef909b1..1ea5b05405f115e5d77ff0b282075628e64fec3d 100644
+--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+@@ -373,7 +373,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+ 
+                                 if (WitherBoss.canDestroy(iblockdata)) {
+                                     // CraftBukkit start
+-                                    if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, Blocks.AIR.defaultBlockState())) {
++                                    if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.getFluidState().createLegacyBlock())) { // Paper
+                                         continue;
+                                     }
+                                     // CraftBukkit end
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+index c245acdbaa84cc795e341ed042a0d8d90383f070..842146548fc42c3b67a1196620b096d6c500b88d 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+@@ -175,7 +175,7 @@ public class Ravager extends Raider {
+ 
+                     if (block instanceof LeavesBlock) {
+                         // CraftBukkit start
+-                        if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState())) {
++                        if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.getFluidState().createLegacyBlock())) { // Paper - use correct block state
+                             continue;
+                         }
+                         // CraftBukkit end
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+index 754bad0bd38b8a356403f4c90de26de445cbf3c7..0b2d9eb8b3ff06cc64aa5bc7a81d79769709ccf0 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+@@ -179,7 +179,10 @@ public class Silverfish extends Monster {
+ 
+                             if (block instanceof InfestedBlock) {
+                                 // CraftBukkit start
+-                                if (!CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockposition1, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState())) {
++                                // Paper start - use correct block state
++                                final BlockState afterState = world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? net.minecraft.world.level.block.Blocks.AIR.defaultBlockState() : ((InfestedBlock) block).hostStateByInfested(world.getBlockState(blockposition1));
++                                if (!CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockposition1, afterState)) {
++                                    // Paper end - use correct block state
+                                     continue;
+                                 }
+                                 // CraftBukkit end
+diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
+index 719c60316d6e22d8a6014fa491c904dec4bf2835..5355d9f3eb241be8101e8770c63cabbaf1e6d471 100644
+--- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
+@@ -129,7 +129,7 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
+ 
+         if (!world.isClientSide && projectile.mayInteract(world, blockposition) && projectile instanceof ThrownTrident && projectile.getDeltaMovement().length() > 0.6D) {
+             // CraftBukkit start
+-            if (!CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, Blocks.AIR.defaultBlockState())) {
++            if (!CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, state.getFluidState().createLegacyBlock())) { // Paper - use correct block state
+                 return;
+             }
+             // CraftBukkit end
diff --git a/patches/server/0805-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0803-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0805-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0803-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0804-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0804-Ensure-entity-passenger-world-matches-ridden-entity.patch
new file mode 100644
index 0000000000..4bed9196fe
--- /dev/null
+++ b/patches/server/0804-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <Spottedleaf@users.noreply.github.com>
+Date: Thu, 31 Mar 2022 05:11:37 -0700
+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 5aed3f18ef7464e1fa6f6ee69fad72d524356af0..32d7f615982f73dd985b919aae071d426ad08ca9 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -2778,7 +2778,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+     }
+ 
+     public boolean startRiding(Entity entity, boolean force) {
+-        if (entity == this.vehicle) {
++        if (entity == this.vehicle || entity.level != this.level) { // Paper - check level
+             return false;
+         } else if (!entity.couldAcceptPassenger()) {
+             return false;
diff --git a/patches/server/0804-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0804-Fix-new-block-data-for-EntityChangeBlockEvent.patch
deleted file mode 100644
index 0ee11ae770..0000000000
--- a/patches/server/0804-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <mrsosedik@gmail.com>
-Date: Mon, 21 Mar 2022 20:00:53 +0200
-Subject: [PATCH] Fix new block data for EntityChangeBlockEvent
-
-Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-index 06b7ff21a6e3817e92bc135a573b2419e8900c5f..abf796c3369da6b73c8587dfc05f56d0b8933fde 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-@@ -79,7 +79,7 @@ public class EatBlockGoal extends Goal {
- 
-                 if (this.level.getBlockState(blockposition1).is(Blocks.GRASS_BLOCK)) {
-                     // CraftBukkit
--                    if (!CraftEventFactory.callEntityChangeBlockEvent(this.mob, blockposition1, Blocks.AIR.defaultBlockState(), !this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)).isCancelled()) {
-+                    if (!CraftEventFactory.callEntityChangeBlockEvent(this.mob, blockposition1, Blocks.DIRT.defaultBlockState(), !this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)).isCancelled()) { // Paper - Fix wrong block state
-                         this.level.levelEvent(2001, blockposition1, Block.getId(Blocks.GRASS_BLOCK.defaultBlockState()));
-                         this.level.setBlock(blockposition1, Blocks.DIRT.defaultBlockState(), 2);
-                     }
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index de97ded68bca375d81c77e30afa6622e74a299b7..f69e0b11be74ac83694f59999b3f07a318410c19 100644
---- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -373,7 +373,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
- 
-                                 if (WitherBoss.canDestroy(iblockdata)) {
-                                     // CraftBukkit start
--                                    if (CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, Blocks.AIR.defaultBlockState()).isCancelled()) {
-+                                    if (CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.getFluidState().createLegacyBlock()).isCancelled()) { // Paper
-                                         continue;
-                                     }
-                                     // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index aad1fb5cf231b400dc8c192871aa4429536d53ee..75d661c23cde1ba09ea0b673860c9659c32ef77e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -170,7 +170,7 @@ public class Ravager extends Raider {
-                     BlockState iblockdata = this.level().getBlockState(blockposition);
-                     Block block = iblockdata.getBlock();
- 
--                    if (block instanceof LeavesBlock && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState()).isCancelled()) { // CraftBukkit
-+                    if (block instanceof LeavesBlock && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.getFluidState().createLegacyBlock()).isCancelled()) { // CraftBukkit // Paper
-                         flag = this.level().destroyBlock(blockposition, true, this) || flag;
-                     }
-                 }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index d99923c355e50bfa4682dd147d83dd1cf58553f1..9d3f0f413120e825a44f3eea6b9089761840ff1f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -176,7 +176,11 @@ public class Silverfish extends Monster {
- 
-                             if (block instanceof InfestedBlock) {
-                                 // CraftBukkit start
--                                if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockposition1, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState()).isCancelled()) {
-+                                // Paper start
-+                                BlockState afterState = world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? net.minecraft.world.level.block.Blocks.AIR.defaultBlockState() : ((InfestedBlock) block).hostStateByInfested(world.getBlockState(blockposition1));
-+                                org.bukkit.event.entity.EntityChangeBlockEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockposition1, afterState);
-+                                if (event.isCancelled()) {
-+                                // Paper end
-                                     continue;
-                                 }
-                                 // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-index 918dd360a8cac3fe2b7d73f3f7d2b5c687400683..58a966e3aefad6c812cc64f65780e7b4953191eb 100644
---- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-@@ -129,7 +129,7 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
- 
-         if (!world.isClientSide && projectile.mayInteract(world, blockposition) && projectile instanceof ThrownTrident && projectile.getDeltaMovement().length() > 0.6D) {
-             // CraftBukkit start
--            if (CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, Blocks.AIR.defaultBlockState()).isCancelled()) {
-+            if (CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, state.getFluidState().createLegacyBlock()).isCancelled()) { // Paper
-                 return;
-             }
-             // CraftBukkit end
diff --git a/patches/server/0807-Guard-against-invalid-entity-positions.patch b/patches/server/0805-Guard-against-invalid-entity-positions.patch
similarity index 92%
rename from patches/server/0807-Guard-against-invalid-entity-positions.patch
rename to patches/server/0805-Guard-against-invalid-entity-positions.patch
index 8db61fe05f..b1fbf03312 100644
--- a/patches/server/0807-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0805-Guard-against-invalid-entity-positions.patch
@@ -6,10 +6,10 @@ 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 ad5b4f317f5914fafa5d4905903c4c534ece6996..58a22c5ca035ba55d2c05f53839416582532b24a 100644
+index 32d7f615982f73dd985b919aae071d426ad08ca9..a92c3b7dbd4bd352ba1d2ed3310c8993ea3ea921 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4460,11 +4460,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4443,11 +4443,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.getZ((2.0D * this.random.nextDouble() - 1.0D) * widthScale);
      }
  
diff --git a/patches/server/0806-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0806-Ensure-entity-passenger-world-matches-ridden-entity.patch
deleted file mode 100644
index f3bbed2174..0000000000
--- a/patches/server/0806-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Thu, 31 Mar 2022 05:11:37 -0700
-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 cad5f9feffd70ca1cdff9f36b16e73df405858bf..ad5b4f317f5914fafa5d4905903c4c534ece6996 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2844,6 +2844,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
- 
-     protected boolean addPassenger(Entity entity) { // CraftBukkit
-+        // Paper start
-+        if (entity.level != this.level) {
-+            LOGGER.error("Entity passenger world must match, cannot add " + entity + " as passenger to " + this, new Throwable());
-+            return false;
-+        }
-+        // Paper end
-         if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
-         if (entity.getVehicle() != this) {
-             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
diff --git a/patches/server/0808-cache-resource-keys.patch b/patches/server/0806-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0808-cache-resource-keys.patch
rename to patches/server/0806-cache-resource-keys.patch
diff --git a/patches/server/0809-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0807-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0809-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0807-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0810-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0808-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0810-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0808-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0811-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0809-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0811-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0809-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0812-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0810-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 93%
rename from patches/server/0812-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0810-Prevent-tile-entity-copies-loading-chunks.patch
index 5d7ce07699..b49e491ad5 100644
--- a/patches/server/0812-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0810-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 db79b51cbe94c8c584fcc38298638d2cf196f0ac..308d954fccded0a396fabac993762dd32c24f031 100644
+index a5f6fed7774c7ea3b9cae59f72d2ea4b435af641..8df825472dba458d2b61cd176da9fb2128479629 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3311,7 +3311,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0813-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0811-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0813-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0811-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0814-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0812-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0814-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0812-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0815-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0813-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0815-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0813-Pass-ServerLevel-for-gamerule-callbacks.patch
index 52df88c9a6..ab5a82565d 100644
--- a/patches/server/0815-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0813-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index 9a45921cbb1e7a39e6ef46cc93c14766ee8229ad..8115cf64a30b6438721769df6045e1b7
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 308d954fccded0a396fabac993762dd32c24f031..50e07efe00f4dd989f22e0c6a9ac2f76d0ea214b 100644
+index 8df825472dba458d2b61cd176da9fb2128479629..c585eaab498df14e3e3eb5a2e1f1ad589680aec3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2901,7 +2901,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -158,7 +158,7 @@ index de713f1ca1d61a6b1fca2b66de9162556d102449..edd2c9d0cf5a81c779011cb4215d496a
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1e26fea83065c7e76b196e6599892c11d4370617..5deed29e78ba599c4732b9bac57f0661e4871882 100644
+index 3ef243039fdb1b28075c309fa5743f40d2d5efee..e36c535ede104fe6c60348558e31ad5571c5ac2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1950,7 +1950,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0816-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0814-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 89%
rename from patches/server/0816-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0814-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index d5e87f2276..12659c668e 100644
--- a/patches/server/0816-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0814-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add pre-unbreaking amount to PlayerItemDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 9047d65b60203062dac6eeac3b90ef3417074c09..784623eefedfb601a8e0b8b42cbdb71eaebcac84 100644
+index 671af924e54e96e91a284103d5f347853ce338b6..90e4f8d21822cb0dc8bda586803f8c086f0fbeee 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -607,10 +607,11 @@ public final class ItemStack {
+@@ -608,10 +608,11 @@ public final class ItemStack {
                      }
                  }
  
diff --git a/patches/server/0817-WorldCreator-keepSpawnLoaded.patch b/patches/server/0815-WorldCreator-keepSpawnLoaded.patch
similarity index 85%
rename from patches/server/0817-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0815-WorldCreator-keepSpawnLoaded.patch
index d1c0f4c8e8..76eb1a946a 100644
--- a/patches/server/0817-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0815-WorldCreator-keepSpawnLoaded.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 86e11118d21849cb5613bcf0e18ec85467b6ab3a..738ba9f21169511eeabb5204c49049f77c2bc9da 100644
+index 884a7dd2ee3e0dc671cb111a9493bd1a8d3f7d0a..c27fc3c75c55fdc418dce8aef98faa237af4c727 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1273,6 +1273,7 @@ public final class CraftServer implements Server {
+@@ -1276,6 +1276,7 @@ public final class CraftServer implements Server {
          internal.setSpawnSettings(true, true);
          // Paper - move up
  
diff --git a/patches/server/0818-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0816-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 97%
rename from patches/server/0818-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0816-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index adaea7c292..dd839528c9 100644
--- a/patches/server/0818-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0816-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index a09df00d0be1621012466d6ea46a19e0087a6fa6..0d9168613effe33245b1a2be48ae3ebf1d702d31 100644
+index 0cb9803e30702de1cc530c1205fe9bbb4dcb2c08..96fde7b84ce4d195d0c54deff71df9fcf8447979 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -428,12 +428,16 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0819-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0817-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 94%
rename from patches/server/0819-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0817-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 83deaddd5f..4f2b30a276 100644
--- a/patches/server/0819-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0817-Add-EntityDyeEvent-and-CollarColorable-interface.patch
@@ -23,10 +23,10 @@ index 770b15f5413eb38890587aa6af2a56f15bf5934f..438d7c26cc3a4a3b5a1affffbbe26e4d
                          if (!player.getAbilities().instabuild) {
                              itemstack.shrink(1);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 948978306db3bffd07d0c5d91cd4853102411061..27c4dd3605373f08078048fe923a8f6f4d3ccf3b 100644
+index 88563894af2b6386ced89c2fbe3cba434dbb8040..57ceec70bb150afaa66962090b142048d5b50c2f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -380,6 +380,14 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -367,6 +367,14 @@ public class Wolf extends TamableAnimal implements NeutralMob {
                          DyeColor enumcolor = itemdye.getDyeColor();
  
                          if (enumcolor != this.getCollarColor()) {
diff --git a/patches/server/0820-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0818-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0820-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0818-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0821-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0819-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0821-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0819-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0822-Add-PlayerStopUsingItemEvent.patch b/patches/server/0820-Add-PlayerStopUsingItemEvent.patch
similarity index 85%
rename from patches/server/0822-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0820-Add-PlayerStopUsingItemEvent.patch
index 78a9eb0f99..0e7d33a986 100644
--- a/patches/server/0822-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0820-Add-PlayerStopUsingItemEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 351c60a6f1dfc00aa1a300ed929e81df8d0d025a..680e1d6f2e3391e377be5c488e0554ccbb852f84 100644
+index 1822382211b512f88c3e94258bbb6cb27cce3d07..269dee8308604fce3333fc2236db9102dd869e09 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3986,6 +3986,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3976,6 +3976,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      public void releaseUsingItem() {
          if (!this.useItem.isEmpty()) {
diff --git a/patches/server/0823-FallingBlock-auto-expire-setting.patch b/patches/server/0821-FallingBlock-auto-expire-setting.patch
similarity index 84%
rename from patches/server/0823-FallingBlock-auto-expire-setting.patch
rename to patches/server/0821-FallingBlock-auto-expire-setting.patch
index ed07517265..870320aae9 100644
--- a/patches/server/0823-FallingBlock-auto-expire-setting.patch
+++ b/patches/server/0821-FallingBlock-auto-expire-setting.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] FallingBlock auto expire setting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 4a44109df0aece6661567dac5ebf6355de5d58c7..eff81e846f696349b3bd3d26c02442f157b169f0 100644
+index 562462729d0262bac5968583b064124167437449..18eaccb39a4c81338a8cbebe3de03934913ac2a4 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -64,6 +64,7 @@ public class FallingBlockEntity extends Entity {
+@@ -66,6 +66,7 @@ public class FallingBlockEntity extends Entity {
      @Nullable
      public CompoundTag blockData;
      protected static final EntityDataAccessor<BlockPos> DATA_START_POS = SynchedEntityData.defineId(FallingBlockEntity.class, EntityDataSerializers.BLOCK_POS);
@@ -16,7 +16,7 @@ index 4a44109df0aece6661567dac5ebf6355de5d58c7..eff81e846f696349b3bd3d26c02442f1
  
      public FallingBlockEntity(EntityType<? extends FallingBlockEntity> type, Level world) {
          super(type, world);
-@@ -178,7 +179,7 @@ public class FallingBlockEntity extends Entity {
+@@ -180,7 +181,7 @@ public class FallingBlockEntity extends Entity {
                  }
  
                  if (!this.onGround() && !flag1) {
@@ -25,7 +25,7 @@ index 4a44109df0aece6661567dac5ebf6355de5d58c7..eff81e846f696349b3bd3d26c02442f1
                          if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
                              this.spawnAtLocation((ItemLike) block);
                          }
-@@ -326,6 +327,7 @@ public class FallingBlockEntity extends Entity {
+@@ -328,6 +329,7 @@ public class FallingBlockEntity extends Entity {
          }
  
          nbt.putBoolean("CancelDrop", this.cancelDrop);
@@ -33,7 +33,7 @@ index 4a44109df0aece6661567dac5ebf6355de5d58c7..eff81e846f696349b3bd3d26c02442f1
      }
  
      @Override
-@@ -361,6 +363,11 @@ public class FallingBlockEntity extends Entity {
+@@ -363,6 +365,11 @@ public class FallingBlockEntity extends Entity {
              this.setOrigin(new org.bukkit.Location(this.level().getWorld(), srcX, srcY, srcZ));
          }
          // Paper end
@@ -46,10 +46,10 @@ index 4a44109df0aece6661567dac5ebf6355de5d58c7..eff81e846f696349b3bd3d26c02442f1
  
      public void setHurtsEntities(float fallHurtAmount, int fallHurtMax) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-index 4a4fe85abb4ddd62e04f348e5be8b98ca4d4fbdc..e99314b905a7ed54ceeb156ed92ff1a5793df99a 100644
+index 7124d996fd34155fa76ff1b7ee3f823fb94b08a8..d17808d132b332d51189067fed245eb6bb904968 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-@@ -97,4 +97,15 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
+@@ -107,4 +107,15 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
              this.setHurtEntities(true);
          }
      }
diff --git a/patches/server/0824-Don-t-tick-markers.patch b/patches/server/0822-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0824-Don-t-tick-markers.patch
rename to patches/server/0822-Don-t-tick-markers.patch
diff --git a/patches/server/0825-Do-not-accept-invalid-client-settings.patch b/patches/server/0823-Do-not-accept-invalid-client-settings.patch
similarity index 93%
rename from patches/server/0825-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0823-Do-not-accept-invalid-client-settings.patch
index f385551768..e2d888b6ff 100644
--- a/patches/server/0825-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0823-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 50e07efe00f4dd989f22e0c6a9ac2f76d0ea214b..01c252c02b7a576676a88b5f03eda4412daa3b23 100644
+index c585eaab498df14e3e3eb5a2e1f1ad589680aec3..45cd5a5026ba5a1221adac51755522357f204b61 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3453,6 +3453,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0826-Add-support-for-Proxy-Protocol.patch b/patches/server/0824-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0826-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0824-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0827-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0825-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 92%
rename from patches/server/0827-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0825-Fix-OfflinePlayer-getBedSpawnLocation.patch
index f74dc698da..450ba848ef 100644
--- a/patches/server/0827-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0825-Fix-OfflinePlayer-getBedSpawnLocation.patch
@@ -8,10 +8,10 @@ instance of CraftOfflinePlayer the world was incorrect
 due to the logic for reading the NBT not being up-to-date.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 17b3d5de58a9ef3acc67624c46cd6bbd96394f87..714afc98b5150907b45a00060be4e41582333204 100644
+index ef48315b98aa39ed245fb7619cf594bfb767931a..2856b861a1207ef94ae5671c5898f08fedd14475 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -31,6 +31,7 @@ import org.bukkit.profile.PlayerProfile;
+@@ -34,6 +34,7 @@ import org.bukkit.profile.PlayerProfile;
  
  @SerializableAs("Player")
  public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializable {
@@ -19,7 +19,7 @@ index 17b3d5de58a9ef3acc67624c46cd6bbd96394f87..714afc98b5150907b45a00060be4e415
      private final GameProfile profile;
      private final CraftServer server;
      private final PlayerDataStorage storage;
-@@ -319,11 +320,20 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -318,11 +319,20 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
          if (data == null) return null;
  
          if (data.contains("SpawnX") && data.contains("SpawnY") && data.contains("SpawnZ")) {
diff --git a/patches/server/0828-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0826-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0828-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0826-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0829-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0827-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0829-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0827-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0830-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0828-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0830-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0828-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0831-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0829-Prevent-entity-loading-causing-async-lookups.patch
similarity index 97%
rename from patches/server/0831-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0829-Prevent-entity-loading-causing-async-lookups.patch
index e2214f6079..b8918a1854 100644
--- a/patches/server/0831-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0829-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 58a22c5ca035ba55d2c05f53839416582532b24a..86677e14f218188660330601c872905545501e25 100644
+index a92c3b7dbd4bd352ba1d2ed3310c8993ea3ea921..ad33392e27ce009dbbf1d16f669542fd9623db01 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -796,6 +796,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0832-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0830-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 93%
rename from patches/server/0832-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0830-Throw-exception-on-world-create-while-being-ticked.patch
index d292db0d7f..4df4344992 100644
--- a/patches/server/0832-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0830-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,10 +45,10 @@ index 910523399b1fae64808b292cfb45bed56719fcb3..66bb92ca535b559d3bca89b9bc841f8f
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 738ba9f21169511eeabb5204c49049f77c2bc9da..fdceec1390113fd009801f42608c1dfc747e47bf 100644
+index c27fc3c75c55fdc418dce8aef98faa237af4c727..398812a53abaad6a3551d45b624ec9340b5f52dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -868,6 +868,11 @@ public final class CraftServer implements Server {
+@@ -871,6 +871,11 @@ public final class CraftServer implements Server {
          return new ArrayList<World>(this.worlds.values());
      }
  
@@ -60,7 +60,7 @@ index 738ba9f21169511eeabb5204c49049f77c2bc9da..fdceec1390113fd009801f42608c1dfc
      public DedicatedPlayerList getHandle() {
          return this.playerList;
      }
-@@ -1149,6 +1154,7 @@ public final class CraftServer implements Server {
+@@ -1152,6 +1157,7 @@ public final class CraftServer implements Server {
      @Override
      public World createWorld(WorldCreator creator) {
          Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
@@ -68,7 +68,7 @@ index 738ba9f21169511eeabb5204c49049f77c2bc9da..fdceec1390113fd009801f42608c1dfc
          Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");
  
          String name = creator.name();
-@@ -1288,6 +1294,7 @@ public final class CraftServer implements Server {
+@@ -1291,6 +1297,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean unloadWorld(World world, boolean save) {
diff --git a/patches/server/0833-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0831-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0833-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0831-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0834-Dont-resent-entity-on-art-update.patch b/patches/server/0832-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0834-Dont-resent-entity-on-art-update.patch
rename to patches/server/0832-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0835-Add-WardenAngerChangeEvent.patch b/patches/server/0833-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0835-Add-WardenAngerChangeEvent.patch
rename to patches/server/0833-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0836-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0834-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0836-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0834-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0837-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0835-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0837-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0835-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0838-Nameable-Banner-API.patch b/patches/server/0836-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0838-Nameable-Banner-API.patch
rename to patches/server/0836-Nameable-Banner-API.patch
diff --git a/patches/server/0839-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0837-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 92%
rename from patches/server/0839-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0837-Don-t-broadcast-messages-to-command-blocks.patch
index 0ed5794063..d85fba5cc7 100644
--- a/patches/server/0839-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0837-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,10 +20,10 @@ index e05eb08a9c229b371887676da510df948b896a85..ceeedbd88c56c08ec8b047c9ca2f14cc
              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 fdceec1390113fd009801f42608c1dfc747e47bf..70e77e0e165140e761193d9255cfe3bfcb710979 100644
+index 398812a53abaad6a3551d45b624ec9340b5f52dd..295d6bec7b2fc943197b315ebd09b159ea670a79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1790,7 +1790,7 @@ public final class CraftServer implements Server {
+@@ -1793,7 +1793,7 @@ public final class CraftServer implements Server {
          // Paper end
          Set<CommandSender> recipients = new HashSet<>();
          for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
diff --git a/patches/server/0840-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0838-Prevent-empty-items-from-being-added-to-world.patch
similarity index 90%
rename from patches/server/0840-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0838-Prevent-empty-items-from-being-added-to-world.patch
index af7950c0cb..d4b066c764 100644
--- a/patches/server/0840-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0838-Prevent-empty-items-from-being-added-to-world.patch
@@ -19,15 +19,15 @@ index 653c9c41ab7c5cd332565436564396d18f26c17c..06df21e55fdb70558b85fc095a04b3bb
              if (captureDrops != null && entity instanceof net.minecraft.world.entity.item.ItemEntity) {
                  captureDrops.add((net.minecraft.world.entity.item.ItemEntity) entity);
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 8a2c135ee7c6fe60a2debf7a7b02fb9ffc3d2c2f..b1ae4702d7165794600b257fe8563a4ac48d922c 100644
+index d1085e6f2de19b380c09a32b31d53374f2785488..b76270c37b568b69af99a2a99dbab3f2f1b57d22 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -515,7 +515,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -520,7 +520,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
      }
  
      public void setItem(ItemStack stack) {
 -        com.google.common.base.Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); // CraftBukkit
 +        // com.google.common.base.Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); // CraftBukkit // Paper - Remove check
          this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
-         this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty
          this.despawnRate = this.level().paperConfig().entities.spawning.altItemDespawnRate.enabled ? this.level().paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), this.level().spigotConfig.itemDespawnRate) : this.level().spigotConfig.itemDespawnRate; // Paper
+     }
diff --git a/patches/server/0841-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0839-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0841-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0839-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0842-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0840-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 94%
rename from patches/server/0842-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0840-Don-t-print-component-in-resource-pack-rejection-mes.patch
index 68228734e8..917c4e14fe 100644
--- a/patches/server/0842-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0840-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 01c252c02b7a576676a88b5f03eda4412daa3b23..bcfdbe37ed8e49fdafd0835dfaa4af4d0573840c 100644
+index 45cd5a5026ba5a1221adac51755522357f204b61..0661f0a2f4a58092ca059027defa0842eb921473 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2035,7 +2035,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0843-Add-Player-getFishHook.patch b/patches/server/0841-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0843-Add-Player-getFishHook.patch
rename to patches/server/0841-Add-Player-getFishHook.patch
diff --git a/patches/server/0844-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0842-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0844-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0842-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0845-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0843-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 88%
rename from patches/server/0845-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0843-Add-various-missing-EntityDropItemEvent-calls.patch
index d723f0211a..45c1f0c564 100644
--- a/patches/server/0845-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0843-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 86677e14f218188660330601c872905545501e25..018afaedd306df9088f1d1b9b99655cd5ad92a91 100644
+index ad33392e27ce009dbbf1d16f669542fd9623db01..63e31a1ceac5ff944e2e79b7f10f38109cffcf88 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2677,6 +2677,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,10 +24,10 @@ index 86677e14f218188660330601c872905545501e25..018afaedd306df9088f1d1b9b99655cd
              EntityDropItemEvent event = new EntityDropItemEvent(this.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
              Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 5c260a56b1df66069aec59726d61ef382ae29faa..501e6cb4aa83f81c1f657e41f4e7f11d19d46831 100644
+index b3c904416e19edb3508e4e7aa11e1f58cd3fc203..4ec6dc8ddcb940091956fdf014f43832db287d8d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -593,7 +593,7 @@ public class Dolphin extends WaterAnimal {
+@@ -597,7 +597,7 @@ public class Dolphin extends WaterAnimal {
                  float f2 = 0.02F * Dolphin.this.random.nextFloat();
  
                  entityitem.setDeltaMovement((double) (0.3F * -Mth.sin(Dolphin.this.getYRot() * 0.017453292F) * Mth.cos(Dolphin.this.getXRot() * 0.017453292F) + Mth.cos(f1) * f2), (double) (0.3F * Mth.sin(Dolphin.this.getXRot() * 0.017453292F) * 1.5F), (double) (0.3F * Mth.cos(Dolphin.this.getYRot() * 0.017453292F) * Mth.cos(Dolphin.this.getXRot() * 0.017453292F) + Mth.sin(f1) * f2));
@@ -37,7 +37,7 @@ index 5c260a56b1df66069aec59726d61ef382ae29faa..501e6cb4aa83f81c1f657e41f4e7f11d
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 1526ca0063da0962ae781b7aa877d8cf5e1ffd73..167f142d6960867320b90d61db312ebf23e24a48 100644
+index 24ae11d300d0856350f185f03552ba592f3d218a..5052bcf16bb09b7bcf39566fef1378b1c4970fe6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -503,14 +503,14 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -58,10 +58,10 @@ index 1526ca0063da0962ae781b7aa877d8cf5e1ffd73..167f142d6960867320b90d61db312ebf
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 316823ea978b9c9b6656a01254c201fdd8c11797..c2111491642dfa29bb85027e137b1a19e3d2d9e6 100644
+index a3a5dbaed7a7647249747154ac0c024bddd7eb13..c7b914cc0d702c6dd04add5247ec509d5870abb3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -354,8 +354,7 @@ public class Goat extends Animal {
+@@ -355,8 +355,7 @@ public class Goat extends Animal {
              double d2 = (double) Mth.randomBetween(this.random, -0.2F, 0.2F);
              ItemEntity entityitem = new ItemEntity(this.level(), vec3d.x(), vec3d.y(), vec3d.z(), itemstack, d0, d1, d2);
  
diff --git a/patches/server/0846-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0844-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 94%
rename from patches/server/0846-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0844-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 478278b0b4..5788af2cc9 100644
--- a/patches/server/0846-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0844-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 bcfdbe37ed8e49fdafd0835dfaa4af4d0573840c..27e86df114811775e53da2617d78160478b4a326 100644
+index 0661f0a2f4a58092ca059027defa0842eb921473..ddde8721ca8dee386a54040f5fc57f25de71d2a2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2293,7 +2293,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0847-Fix-Bee-flower-NPE.patch b/patches/server/0845-Fix-Bee-flower-NPE.patch
similarity index 85%
rename from patches/server/0847-Fix-Bee-flower-NPE.patch
rename to patches/server/0845-Fix-Bee-flower-NPE.patch
index 8e5627e598..8bf7400efa 100644
--- a/patches/server/0847-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0845-Fix-Bee-flower-NPE.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Bee flower NPE
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index c2f56c44e824e3d4f169691b557483a4f0f5b3c6..ea4ca82388f1526fc5af01f6cc406306d79b7499 100644
+index 7c81c6ebe200a029a5944b65827223e81ab08938..e06d5eea4bc81be264a1f5d5fad2d4548c4ae8d2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -799,7 +799,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -803,7 +803,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
              ++this.pollinatingTicks;
              if (this.pollinatingTicks > 600) {
                  Bee.this.savedFlowerPos = null;
diff --git a/patches/server/0848-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0846-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 92%
rename from patches/server/0848-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0846-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index a57a611f53..3f308e6f71 100644
--- a/patches/server/0848-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0846-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 27e86df114811775e53da2617d78160478b4a326..1c46ab884dcc9ef22935d763e152c354fd7dd000 100644
+index ddde8721ca8dee386a54040f5fc57f25de71d2a2..f30c7b2dfd7b768dd98f4dfa532d54da8a1d9257 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2540,7 +2540,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0849-More-Teleport-API.patch b/patches/server/0847-More-Teleport-API.patch
similarity index 96%
rename from patches/server/0849-More-Teleport-API.patch
rename to patches/server/0847-More-Teleport-API.patch
index fa2087fcfb..097c59bec2 100644
--- a/patches/server/0849-More-Teleport-API.patch
+++ b/patches/server/0847-More-Teleport-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API
 public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1c46ab884dcc9ef22935d763e152c354fd7dd000..9b63aa58423bfd235690cacc94f57c2b40a97bc5 100644
+index f30c7b2dfd7b768dd98f4dfa532d54da8a1d9257..94d78b8854deba8cf7c862ab1a095c576209ea6e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1711,11 +1711,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -74,10 +74,10 @@ index cc72d960d9a5f9481ec2214b1549a344907a68da..94b41e9e3abe9cfbe09af67b03bc841f
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 86e397e54b56e46f5f5f75529b8ee8ea4715e61d..c2006bd45a6a02eb55fbdd5625bc3cb7101bdb00 100644
+index 32266b6e1011c21510a13a53ab1568988ce73522..8c98546d13ded3142cc3250391db86694e5835f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1203,13 +1203,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1209,13 +1209,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setRotation(float yaw, float pitch) {
@@ -180,7 +180,7 @@ index 86e397e54b56e46f5f5f75529b8ee8ea4715e61d..c2006bd45a6a02eb55fbdd5625bc3cb7
          location.checkFinite();
  
          ServerPlayer entity = this.getHandle();
-@@ -1222,7 +1310,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1228,7 +1316,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             return false;
          }
  
@@ -189,7 +189,7 @@ index 86e397e54b56e46f5f5f75529b8ee8ea4715e61d..c2006bd45a6a02eb55fbdd5625bc3cb7
              return false;
          }
  
-@@ -1240,7 +1328,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1246,7 +1334,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          // If this player is riding another entity, we must dismount before teleporting.
@@ -198,7 +198,7 @@ index 86e397e54b56e46f5f5f75529b8ee8ea4715e61d..c2006bd45a6a02eb55fbdd5625bc3cb7
  
          // SPIGOT-5509: Wakeup, similar to riding
          if (this.isSleeping()) {
-@@ -1256,13 +1344,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1262,13 +1350,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ServerLevel toWorld = ((CraftWorld) to.getWorld()).getHandle();
  
          // Close any foreign inventory
diff --git a/patches/server/0850-Add-EntityPortalReadyEvent.patch b/patches/server/0848-Add-EntityPortalReadyEvent.patch
similarity index 88%
rename from patches/server/0850-Add-EntityPortalReadyEvent.patch
rename to patches/server/0848-Add-EntityPortalReadyEvent.patch
index c775c2df51..91eedd9dff 100644
--- a/patches/server/0850-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0848-Add-EntityPortalReadyEvent.patch
@@ -5,10 +5,10 @@ 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 018afaedd306df9088f1d1b9b99655cd5ad92a91..3d95a435a9f6e28c43f275781db909bf9e71397b 100644
+index 63e31a1ceac5ff944e2e79b7f10f38109cffcf88..5bc44f88ec3ad6e25c2df6e6829c1d9a1f8f836d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3033,6 +3033,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3016,6 +3016,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
                      this.level().getProfiler().push("portal");
                      this.portalTime = i;
@@ -22,7 +22,7 @@ index 018afaedd306df9088f1d1b9b99655cd5ad92a91..3d95a435a9f6e28c43f275781db909bf
                      this.setPortalCooldown();
                      // CraftBukkit start
                      if (this instanceof ServerPlayer) {
-@@ -3040,6 +3047,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3023,6 +3030,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      } else {
                          this.changeDimension(worldserver1);
                      }
diff --git a/patches/server/0851-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0849-Don-t-use-level-random-in-entity-constructors.patch
similarity index 85%
rename from patches/server/0851-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0849-Don-t-use-level-random-in-entity-constructors.patch
index c3f35be4a5..a510263a68 100644
--- a/patches/server/0851-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0849-Don-t-use-level-random-in-entity-constructors.patch
@@ -9,10 +9,10 @@ should be supported. Some entities (for whatever
 reason) use the level's random in some places.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index ea4ca82388f1526fc5af01f6cc406306d79b7499..f6062bf8c888baeb7b421150a2c64bf1af1a312b 100644
+index e06d5eea4bc81be264a1f5d5fad2d4548c4ae8d2..55026e1731e41b4e3e4c6a8fef5d96a32051a556 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -1025,7 +1025,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1029,7 +1029,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
  
          BeeGoToHiveGoal() {
              super();
@@ -21,7 +21,7 @@ index ea4ca82388f1526fc5af01f6cc406306d79b7499..f6062bf8c888baeb7b421150a2c64bf1
              this.blacklistedTargets = Lists.newArrayList();
              this.setFlags(EnumSet.of(Goal.Flag.MOVE));
          }
-@@ -1142,7 +1142,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1146,7 +1146,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
  
          BeeGoToKnownFlowerGoal() {
              super();
@@ -31,10 +31,10 @@ index ea4ca82388f1526fc5af01f6cc406306d79b7499..f6062bf8c888baeb7b421150a2c64bf1
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index b1ae4702d7165794600b257fe8563a4ac48d922c..00ecef0ba7530ff2533fa9d5eaa8489da8796ead 100644
+index b76270c37b568b69af99a2a99dbab3f2f1b57d22..08a2ce0ab024b99df5f6e23aa5a13c9d6f431db6 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -63,7 +63,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -64,7 +64,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
      }
  
      public ItemEntity(Level world, double x, double y, double z, ItemStack stack) {
@@ -49,10 +49,10 @@ index b1ae4702d7165794600b257fe8563a4ac48d922c..00ecef0ba7530ff2533fa9d5eaa8489d
  
      public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 1251c704e3b83888133b83757e7773c3e3664e6e..bf3301eb1341ba9d482e10873447c42bd670f5ed 100644
+index 57f9bf73ee14bc8811d0192543caf2b02e890ee0..4ce3e69970dd9eb251d0538a2d233ca30e9e5e47 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -33,7 +33,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -36,7 +36,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
      public PrimedTnt(Level world, double x, double y, double z, @Nullable LivingEntity igniter) {
          this(EntityType.TNT, world);
          this.setPos(x, y, z);
diff --git a/patches/server/0852-Send-block-entities-after-destroy-prediction.patch b/patches/server/0850-Send-block-entities-after-destroy-prediction.patch
similarity index 96%
rename from patches/server/0852-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0850-Send-block-entities-after-destroy-prediction.patch
index 2e233b1b8d..4e14c8d078 100644
--- a/patches/server/0852-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0850-Send-block-entities-after-destroy-prediction.patch
@@ -7,7 +7,7 @@ Minecraft's prediction system does not handle block entities, so if we are manua
 block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0d9168613effe33245b1a2be48ae3ebf1d702d31..8bbfd7ea9a29d9e5a8a2502ffbb802d32cbeaeeb 100644
+index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6f027c151 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -62,6 +62,8 @@ public class ServerPlayerGameMode {
@@ -57,7 +57,7 @@ index 0d9168613effe33245b1a2be48ae3ebf1d702d31..8bbfd7ea9a29d9e5a8a2502ffbb802d3
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9b63aa58423bfd235690cacc94f57c2b40a97bc5..90c1cd80e0d3fd0d7d66541f3d17d71353e7f258 100644
+index 94d78b8854deba8cf7c862ab1a095c576209ea6e..c60906e122e058a19248b0e629531d8ec27146ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1857,8 +1857,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0853-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0851-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 98%
rename from patches/server/0853-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0851-Warn-on-plugins-accessing-faraway-chunks.patch
index 90275821d3..111d9702f9 100644
--- a/patches/server/0853-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0851-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -18,7 +18,7 @@ index 8107c8e4a994523c75252f7762e362ab6eb13e43..b3f4469c137d221bf5f43565800df59c
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5deed29e78ba599c4732b9bac57f0661e4871882..1a481fb4f4228f0fea8a7dc6132248c98b727c90 100644
+index e36c535ede104fe6c60348558e31ad5571c5ac2a..550dcb7d595221b221e4710890d8a3cad789fc07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -310,9 +310,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0854-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0852-Custom-Chat-Completion-Suggestions-API.patch
similarity index 90%
rename from patches/server/0854-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0852-Custom-Chat-Completion-Suggestions-API.patch
index 8cea2fb01b..7b67326aff 100644
--- a/patches/server/0854-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0852-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c2006bd45a6a02eb55fbdd5625bc3cb7101bdb00..b2f333b88f8282b01975c622c496ca796745b1d4 100644
+index 8c98546d13ded3142cc3250391db86694e5835f4..d7327b7e57c5075eb687331c7244d0aae1ac7c98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -643,6 +643,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -649,6 +649,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
      }
diff --git a/patches/server/0855-Add-missing-BlockFadeEvents.patch b/patches/server/0853-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0855-Add-missing-BlockFadeEvents.patch
rename to patches/server/0853-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0856-Collision-API.patch b/patches/server/0854-Collision-API.patch
similarity index 96%
rename from patches/server/0856-Collision-API.patch
rename to patches/server/0854-Collision-API.patch
index 19339f84ba..abf0202c4e 100644
--- a/patches/server/0856-Collision-API.patch
+++ b/patches/server/0854-Collision-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 61bc6a68fe1b0101f70b065710d941b36f8766a8..086cbbfb492413bf1ae901c46f8e8ebbadd68b21 100644
+index 9c18ffb9753c135e2dd1c1119082dcbddadc31ca..6537862552818e1e9e0a684a4999e27bd46753d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -1015,5 +1015,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0857-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0855-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0857-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0855-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0858-Block-Ticking-API.patch b/patches/server/0856-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0858-Block-Ticking-API.patch
rename to patches/server/0856-Block-Ticking-API.patch
diff --git a/patches/server/0859-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch
similarity index 98%
rename from patches/server/0859-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch
index 091bb3c90f..b793e34155 100644
--- a/patches/server/0859-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch
@@ -213,10 +213,10 @@ index 3fcd7bfdb8945b276c94a263e9da6b85ce470366..3431b1132e55c53cda7cf47f021f2306
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 70e77e0e165140e761193d9255cfe3bfcb710979..9f8c5ceb8485b14a84f2a7b2ffc8192be5c6bdfd 100644
+index 295d6bec7b2fc943197b315ebd09b159ea670a79..7f955f8a42b6c917dbd6f3533927a7295c1c5e20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -797,7 +797,7 @@ public final class CraftServer implements Server {
+@@ -800,7 +800,7 @@ public final class CraftServer implements Server {
      @Override
      public long getConnectionThrottle() {
          // Spigot Start - Automatically set connection throttle for bungee configurations
diff --git a/patches/server/0860-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0860-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0861-Add-NamespacedKey-biome-methods.patch b/patches/server/0859-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0861-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0859-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0862-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 96%
rename from patches/server/0862-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch
index af3d178c6b..eef2cb84ad 100644
--- a/patches/server/0862-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch
@@ -49,7 +49,7 @@ index 66bb92ca535b559d3bca89b9bc841f8f842b7e07..c5f3dc74888919e82e2ffbb8d648b764
          // Paper end
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 9f1b363e1a6fa4925dc4560654af8426e6908c9d..717e292040ed7779eb4b6c5fa26665d3df9024e7 100644
+index 800c70f022aee593ff35f05a86ddeba864567f2d..0fb86a1183e0373a68e110a8828df5b63a71d751 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -18,6 +18,12 @@ public class Main {
diff --git a/patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 94%
rename from patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch
index 1a4fc80ccb..a66acfb1ef 100644
--- a/patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 680e1d6f2e3391e377be5c488e0554ccbb852f84..14d9bd4b32f2d7f34283e1efcd780c07ac498d6c 100644
+index 269dee8308604fce3333fc2236db9102dd869e09..420f4e7d77f2a950a4cce691e57bb2e2ba5bfb23 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3037,37 +3037,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3027,37 +3027,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.level().getProfiler().pop();
          this.level().getProfiler().push("rangeChecks");
  
diff --git a/patches/server/0864-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 84%
rename from patches/server/0864-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch
index c7fbbaaa64..66e4d63675 100644
--- a/patches/server/0864-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fire EntityChangeBlockEvent in more places
 Co-authored-by: ChristopheG <61288881+chrisgdt@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LightningBolt.java b/src/main/java/net/minecraft/world/entity/LightningBolt.java
-index 611028d65925053c47510185abc526201e5df6bb..cdf1899f1e9978fcf58f05b1efb3165e55445f93 100644
+index 611028d65925053c47510185abc526201e5df6bb..a01a8ba27534d2b0d544423bc2c48fd29d0a6d64 100644
 --- a/src/main/java/net/minecraft/world/entity/LightningBolt.java
 +++ b/src/main/java/net/minecraft/world/entity/LightningBolt.java
 @@ -98,7 +98,7 @@ public class LightningBolt extends Entity {
@@ -34,7 +34,7 @@ index 611028d65925053c47510185abc526201e5df6bb..cdf1899f1e9978fcf58f05b1efb3165e
 -            world.setBlockAndUpdate(blockposition1, WeatheringCopper.getFirst(world.getBlockState(blockposition1)));
 +            // Paper start - call EntityChangeBlockEvent
 +            BlockState newBlock = WeatheringCopper.getFirst(world.getBlockState(blockposition1));
-+            if (!CraftEventFactory.callEntityChangeBlockEvent(lightning, blockposition1, newBlock).isCancelled()) {
++            if (CraftEventFactory.callEntityChangeBlockEvent(lightning, blockposition1, newBlock)) {
 +                world.setBlockAndUpdate(blockposition1, newBlock);
 +            }
 +            // Paper end
@@ -74,12 +74,12 @@ index 611028d65925053c47510185abc526201e5df6bb..cdf1899f1e9978fcf58f05b1efb3165e
  
          BlockPos blockposition1Final = blockposition1; // CraftBukkit - decompile error
          WeatheringCopper.getPrevious(iblockdata).ifPresent((iblockdata1) -> {
-+            if (!CraftEventFactory.callEntityChangeBlockEvent(lightning, blockposition1Final, iblockdata1).isCancelled()) // Paper - call EntityChangeBlockEvent
++            if (CraftEventFactory.callEntityChangeBlockEvent(lightning, blockposition1Final, iblockdata1)) // Paper - call EntityChangeBlockEvent
              world.setBlockAndUpdate(blockposition1Final, iblockdata1); // CraftBukkit - decompile error
          });
          world.levelEvent(3002, blockposition1, -1);
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java b/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java
-index 2c443b421e342ebfbdf941a431ba20560521920b..72cab38ab1f16f7ccc85258266d4c58cf3287d7d 100644
+index 2c443b421e342ebfbdf941a431ba20560521920b..91b68ee3605afdb845405e455c869e48a7fc9aab 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java
 @@ -27,6 +27,12 @@ public class TryLaySpawnOnWaterNearLand {
@@ -87,7 +87,7 @@ index 2c443b421e342ebfbdf941a431ba20560521920b..72cab38ab1f16f7ccc85258266d4c58c
                                  if (world.getBlockState(blockPos3).isAir()) {
                                      BlockState blockState = frogSpawn.defaultBlockState();
 +                                    // Paper start
-+                                    if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockPos3, blockState).isCancelled()) {
++                                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockPos3, blockState)) {
 +                                        isPregnant.erase(); // forgot pregnant memory
 +                                        return true;
 +                                    }
@@ -96,7 +96,7 @@ index 2c443b421e342ebfbdf941a431ba20560521920b..72cab38ab1f16f7ccc85258266d4c58c
                                      world.gameEvent(GameEvent.BLOCK_PLACE, blockPos3, GameEvent.Context.of(entity, blockState));
                                      world.playSound((Player)null, entity, SoundEvents.FROG_LAY_SPAWN, SoundSource.BLOCKS, 1.0F, 1.0F);
 diff --git a/src/main/java/net/minecraft/world/item/AxeItem.java b/src/main/java/net/minecraft/world/item/AxeItem.java
-index 2f8ae1786a4c4438515c59fa56acaefdff60703d..9c7d0b9cc2fa98d5785c914c0183f7d4b5b1c1ea 100644
+index 2f8ae1786a4c4438515c59fa56acaefdff60703d..18898e16ec42f6b694b06e09d9174b60d62450d7 100644
 --- a/src/main/java/net/minecraft/world/item/AxeItem.java
 +++ b/src/main/java/net/minecraft/world/item/AxeItem.java
 @@ -54,6 +54,11 @@ public class AxeItem extends DiggerItem {
@@ -104,7 +104,7 @@ index 2f8ae1786a4c4438515c59fa56acaefdff60703d..9c7d0b9cc2fa98d5785c914c0183f7d4
  
          if (optional4.isPresent()) {
 +            // Paper start - EntityChangeBlockEvent
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, optional4.get()).isCancelled()) {
++            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, optional4.get())) {
 +                return InteractionResult.PASS;
 +            }
 +            // Paper end
@@ -112,7 +112,7 @@ index 2f8ae1786a4c4438515c59fa56acaefdff60703d..9c7d0b9cc2fa98d5785c914c0183f7d4
                  CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
              }
 diff --git a/src/main/java/net/minecraft/world/item/EnderEyeItem.java b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-index 1fddc9025a9e5079f05dd6c86f6ca43c5d51d9c3..2735e139fd2b5ab11e4311848e9676ee203b1a6b 100644
+index 1fddc9025a9e5079f05dd6c86f6ca43c5d51d9c3..6d45e3ebea6721b9c168fea572e9bd610eb54431 100644
 --- a/src/main/java/net/minecraft/world/item/EnderEyeItem.java
 +++ b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
 @@ -43,6 +43,11 @@ public class EnderEyeItem extends Item {
@@ -120,7 +120,7 @@ index 1fddc9025a9e5079f05dd6c86f6ca43c5d51d9c3..2735e139fd2b5ab11e4311848e9676ee
              } else {
                  BlockState iblockdata1 = (BlockState) iblockdata.setValue(EndPortalFrameBlock.HAS_EYE, true);
 +                // Paper start
-+                if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(context.getPlayer(), blockposition, iblockdata1).isCancelled()) {
++                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(context.getPlayer(), blockposition, iblockdata1)) {
 +                    return InteractionResult.PASS;
 +                }
 +                // Paper end
@@ -128,7 +128,7 @@ index 1fddc9025a9e5079f05dd6c86f6ca43c5d51d9c3..2735e139fd2b5ab11e4311848e9676ee
                  Block.pushEntitiesUp(iblockdata, iblockdata1, world, blockposition);
                  world.setBlock(blockposition, iblockdata1, 2);
 diff --git a/src/main/java/net/minecraft/world/item/HoneycombItem.java b/src/main/java/net/minecraft/world/item/HoneycombItem.java
-index 5ab115834cddb9ab3209c11bd0fe657b06a02eb2..744ee7633e10c68a830e7513993e4c307c8984d2 100644
+index 5ab115834cddb9ab3209c11bd0fe657b06a02eb2..eaa263db594d5cf8758c8205ea06bbd37d56cdd4 100644
 --- a/src/main/java/net/minecraft/world/item/HoneycombItem.java
 +++ b/src/main/java/net/minecraft/world/item/HoneycombItem.java
 @@ -39,6 +39,14 @@ public class HoneycombItem extends Item implements SignApplicator {
@@ -136,7 +136,7 @@ index 5ab115834cddb9ab3209c11bd0fe657b06a02eb2..744ee7633e10c68a830e7513993e4c30
              Player player = context.getPlayer();
              ItemStack itemStack = context.getItemInHand();
 +            // Paper start - EntityChangeBlockEvent
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, state).isCancelled()) {
++            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, state)) {
 +                if (!player.isCreative()) {
 +                    player.containerMenu.sendAllDataToRemote();
 +                }
@@ -147,7 +147,7 @@ index 5ab115834cddb9ab3209c11bd0fe657b06a02eb2..744ee7633e10c68a830e7513993e4c30
                  CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
              }
 diff --git a/src/main/java/net/minecraft/world/item/PotionItem.java b/src/main/java/net/minecraft/world/item/PotionItem.java
-index 8c79ca75089e739d4899421106833e42e4e57280..f8b201f8a8019bc9b85ed013cbe7f20b4f07ec85 100644
+index 8c79ca75089e739d4899421106833e42e4e57280..88df7093c47f2a90f79a55797a04d7e4f51ed549 100644
 --- a/src/main/java/net/minecraft/world/item/PotionItem.java
 +++ b/src/main/java/net/minecraft/world/item/PotionItem.java
 @@ -107,6 +107,12 @@ public class PotionItem extends Item {
@@ -155,7 +155,7 @@ index 8c79ca75089e739d4899421106833e42e4e57280..f8b201f8a8019bc9b85ed013cbe7f20b
  
          if (context.getClickedFace() != Direction.DOWN && iblockdata.is(BlockTags.CONVERTABLE_TO_MUD) && PotionUtils.getPotion(itemstack) == Potions.WATER) {
 +            // Paper start
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityhuman, blockposition, Blocks.MUD.defaultBlockState()).isCancelled()) {
++            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityhuman, blockposition, Blocks.MUD.defaultBlockState())) {
 +                entityhuman.containerMenu.sendAllDataToRemote();
 +                return InteractionResult.PASS;
 +            }
@@ -164,7 +164,7 @@ index 8c79ca75089e739d4899421106833e42e4e57280..f8b201f8a8019bc9b85ed013cbe7f20b
              entityhuman.setItemInHand(context.getHand(), ItemUtils.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE)));
              entityhuman.awardStat(Stats.ITEM_USED.get(itemstack.getItem()));
 diff --git a/src/main/java/net/minecraft/world/item/ShovelItem.java b/src/main/java/net/minecraft/world/item/ShovelItem.java
-index 32995cb5efdad0bc34ecacacb78cccd21220ba8d..c7195f2e12bbd6545f7bffcc2b4ba5cc3d48df20 100644
+index 32995cb5efdad0bc34ecacacb78cccd21220ba8d..21212462e6b415e96536a27b2c009d1562f18946 100644
 --- a/src/main/java/net/minecraft/world/item/ShovelItem.java
 +++ b/src/main/java/net/minecraft/world/item/ShovelItem.java
 @@ -36,20 +36,29 @@ public class ShovelItem extends DiggerItem {
@@ -190,7 +190,7 @@ index 32995cb5efdad0bc34ecacacb78cccd21220ba8d..c7195f2e12bbd6545f7bffcc2b4ba5cc
              if (blockState3 != null) {
                  if (!level.isClientSide) {
 +                    // Paper start
-+                    if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(context.getPlayer(), blockPos, blockState3).isCancelled()) {
++                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(context.getPlayer(), blockPos, blockState3)) {
 +                        return InteractionResult.PASS;
 +                    }
 +                    afterAction.run();
@@ -199,10 +199,10 @@ index 32995cb5efdad0bc34ecacacb78cccd21220ba8d..c7195f2e12bbd6545f7bffcc2b4ba5cc
                      level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(player, blockState3));
                      if (player != null) {
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index f1a0304a92abbb58aa8a22f8e470a0f5e4189d02..113083f1b909e3e279789d67e24af36dc0f151bf 100644
+index 4f24d5453522c68c22f15beed87e5237163c701a..38cb52d185e543c4df9eebfcd856df6fa80ba0ed 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -232,6 +232,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -231,6 +231,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          if (i < 8 && ComposterBlock.COMPOSTABLES.containsKey(itemstack.getItem())) {
              if (i < 7 && !world.isClientSide) {
                  BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, itemstack);
@@ -214,14 +214,14 @@ index f1a0304a92abbb58aa8a22f8e470a0f5e4189d02..113083f1b909e3e279789d67e24af36d
  
                  world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
                  player.awardStat(Stats.ITEM_USED.get(itemstack.getItem()));
-@@ -255,11 +260,16 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -254,11 +259,16 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          if (i < 7 && ComposterBlock.COMPOSTABLES.containsKey(stack.getItem())) {
              // CraftBukkit start
              double rand = world.getRandom().nextDouble();
 -            BlockState iblockdata1 = ComposterBlock.addItem(user, state, DummyGeneratorAccess.INSTANCE, pos, stack, rand);
--            if (state == iblockdata1 || org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(user, pos, iblockdata1).isCancelled()) {
+-            if (state == iblockdata1 || !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(user, pos, iblockdata1)) {
 +            BlockState iblockdata1 = null; // Paper
-+            if (false && (state == iblockdata1 || org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(user, pos, iblockdata1).isCancelled())) { // Paper - call it later
++            if (false && (state == iblockdata1 || !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(user, pos, iblockdata1))) { // Paper - move event call into addItem
                  return state;
              }
              iblockdata1 = ComposterBlock.addItem(user, state, world, pos, stack, rand);
@@ -233,7 +233,7 @@ index f1a0304a92abbb58aa8a22f8e470a0f5e4189d02..113083f1b909e3e279789d67e24af36d
              // CraftBukkit end
  
              stack.shrink(1);
-@@ -300,11 +310,13 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -299,11 +309,13 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          return iblockdata1;
      }
  
@@ -247,12 +247,12 @@ index f1a0304a92abbb58aa8a22f8e470a0f5e4189d02..113083f1b909e3e279789d67e24af36d
      static BlockState addItem(@Nullable Entity entity, BlockState iblockdata, LevelAccessor generatoraccess, BlockPos blockposition, ItemStack itemstack, double rand) {
          // CraftBukkit end
          int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
-@@ -315,6 +327,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -314,6 +326,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          } else {
              int j = i + 1;
              BlockState iblockdata1 = (BlockState) iblockdata.setValue(ComposterBlock.LEVEL, j);
 +            // Paper start - move the EntityChangeBlockEvent here to avoid conflict later for the compost events
-+            if (entity != null && org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, iblockdata1).isCancelled()) {
++            if (entity != null && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, iblockdata1)) {
 +                return null;
 +            }
 +            // Paper end
diff --git a/patches/server/0865-Missing-eating-regain-reason.patch b/patches/server/0863-Missing-eating-regain-reason.patch
similarity index 94%
rename from patches/server/0865-Missing-eating-regain-reason.patch
rename to patches/server/0863-Missing-eating-regain-reason.patch
index b5a99bc0ef..c3b9f6bde8 100644
--- a/patches/server/0865-Missing-eating-regain-reason.patch
+++ b/patches/server/0863-Missing-eating-regain-reason.patch
@@ -31,10 +31,10 @@ index c853123c451c41beb42209c7edc14a5dcffa2a50..2030fdb3124f793d7b545135b1db32fe
  
              boolean bl2 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 4033945cb992e2c9bf42b8a7eda581319a6c6917..3bbb1455773570e3f7f6b8b144d3c589e2705b81 100644
+index 7379e99c4d599aa0119bae9ebdc5e2058ada10cb..d28089c37707f323f73e60cb0ebed4e3cdf8c0fd 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -217,7 +217,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -216,7 +216,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          }
  
          if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
diff --git a/patches/server/0866-Missing-effect-cause.patch b/patches/server/0864-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0866-Missing-effect-cause.patch
rename to patches/server/0864-Missing-effect-cause.patch
diff --git a/patches/server/0867-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0867-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 91%
rename from patches/server/0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 4aa37793dd..392e7b8688 100644
--- a/patches/server/0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4590764ec62938e2b601f9f8339d5c4ea183e5e2..4cf07ff38df050defceb69335e402ca52972a05f 100644
+index c29067c513531b819e4d48cd8cab3ed036ae1668..877d3eba8fead8793258f762058121a68e627378 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -496,8 +496,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -509,8 +509,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      }
  
      @Override
@@ -25,7 +25,7 @@ index 4590764ec62938e2b601f9f8339d5c4ea183e5e2..4cf07ff38df050defceb69335e402ca5
          Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation");
  
          net.minecraft.world.level.Level world = ((CraftWorld) getWorld()).getHandle();
-@@ -580,6 +587,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -593,6 +600,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          if (velocity != null) {
              ((T) launch.getBukkitEntity()).setVelocity(velocity);
          }
@@ -38,7 +38,7 @@ index 4590764ec62938e2b601f9f8339d5c4ea183e5e2..4cf07ff38df050defceb69335e402ca5
          world.addFreshEntity(launch);
          return (T) launch.getBukkitEntity();
 diff --git a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-index 18d6846d04268f0099a84b01a3a2790d7742d85e..40a1f138b610e336eb11f2ace4a0da5703295c6b 100644
+index 9d5194676f1d84c69ddc756a94ae6e5ca628727b..1cb5875ae9a55fba589697ec66d3e95c35e0e6a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
 +++ b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
 @@ -57,6 +57,13 @@ public class CraftBlockProjectileSource implements BlockProjectileSource {
diff --git a/patches/server/0869-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0867-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0869-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0867-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0870-Configurable-chat-thread-limit.patch b/patches/server/0868-Configurable-chat-thread-limit.patch
similarity index 97%
rename from patches/server/0870-Configurable-chat-thread-limit.patch
rename to patches/server/0868-Configurable-chat-thread-limit.patch
index d6404f007b..2885355aee 100644
--- a/patches/server/0870-Configurable-chat-thread-limit.patch
+++ b/patches/server/0868-Configurable-chat-thread-limit.patch
@@ -22,7 +22,7 @@ is actually processed, this is honestly really just exposed for the misnomers or
 who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index eb12227b009b1fb766a5f9e338e5d2394d498376..ffbab76e55807f04ebb25242eadbea114004b1b3 100644
+index 6a0560b1b0972f90b5260115e81f2baa84cfb40d..4ac3fa45cd155ae8a852e26d4d4d1f16b28efdc2 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -238,13 +238,26 @@ public class GlobalConfiguration extends ConfigurationPart {
diff --git a/patches/server/0871-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0871-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0872-fix-Jigsaw-block-kicking-user.patch b/patches/server/0870-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0872-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0870-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0873-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 95%
rename from patches/server/0873-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 7cd7034099..9f2be73c77 100644
--- a/patches/server/0873-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] use BlockFormEvent for mud converting into clay
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-index 58a966e3aefad6c812cc64f65780e7b4953191eb..e978132e51cde52f7ff1ba31ad521fc2cb4f0dce 100644
+index 5355d9f3eb241be8101e8770c63cabbaf1e6d471..e6efeec733802a17b1ac47ded1af418595c2b94f 100644
 --- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
 @@ -211,10 +211,13 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
diff --git a/patches/server/0874-Add-getDrops-to-BlockState.patch b/patches/server/0872-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0874-Add-getDrops-to-BlockState.patch
rename to patches/server/0872-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 97%
rename from patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch
index 58f6a034df..d933ff971d 100644
--- a/patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch
@@ -92,7 +92,7 @@ index 06df21e55fdb70558b85fc095a04b3bb64fbe770..c6a7aace64785f76792b03be08fb69e4
  
              if (!list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 8bbfd7ea9a29d9e5a8a2502ffbb802d32cbeaeeb..6a5e3649d9843d85eceb0eae225200fa2551e844 100644
+index 6cc9c28032cafd15d884223a01208ce6f027c151..14bbc86bbaad49b2af16f3b171eb667c28eda702 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -92,7 +92,7 @@ public class ServerPlayerGameMode {
@@ -139,10 +139,10 @@ index 19540fd4a7f992888fadb6501d0c8a5a7e71fcf6..e241ae250f4f04a17ef2c583d00b065a
      public void start() {
          this.creeper.getNavigation().stop();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index c2111491642dfa29bb85027e137b1a19e3d2d9e6..528e7ba29dcd38726b2c1bbc1d8ac208c64ba9df 100644
+index c7b914cc0d702c6dd04add5247ec509d5870abb3..247aca0b612f5079a0596350e8311c385df8ab1c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -236,9 +236,10 @@ public class Goat extends Animal {
+@@ -237,9 +237,10 @@ public class Goat extends Animal {
              player.setItemInHand(hand, itemstack1);
              return InteractionResult.sidedSuccess(this.level().isClientSide);
          } else {
@@ -155,10 +155,10 @@ index c2111491642dfa29bb85027e137b1a19e3d2d9e6..528e7ba29dcd38726b2c1bbc1d8ac208
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 64b1668856bb2afda3707f7ccc11764fab33ae9f..7f238a9d98095806132c0d22ed7b0dfd25c45262 100644
+index 6bab94ac458081e9ed6e1999a9a3f884dd710604..49d7109b6ca63c8073db777549a65b2fcb70967e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -247,7 +247,13 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -250,7 +250,13 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
  
      @Override
      public void equipSaddle(@Nullable SoundSource sound) {
diff --git a/patches/server/0876-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0876-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0877-Fix-custom-piglin-loved-items.patch b/patches/server/0875-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0877-Fix-custom-piglin-loved-items.patch
rename to patches/server/0875-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0878-EntityPickupItemEvent-fixes.patch b/patches/server/0876-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0878-EntityPickupItemEvent-fixes.patch
rename to patches/server/0876-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 92%
rename from patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch
index c2c8040ccd..ab58d7ba9d 100644
--- a/patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle interactions with items on cooldown
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 6a5e3649d9843d85eceb0eae225200fa2551e844..1635fee928d64f4d2c336dca6675ed4641918830 100644
+index 14bbc86bbaad49b2af16f3b171eb667c28eda702..34ecfb89372f459117db99d57a7edd6f681bbe8a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -521,6 +521,7 @@ public class ServerPlayerGameMode {
@@ -30,10 +30,10 @@ index 6a5e3649d9843d85eceb0eae225200fa2551e844..1635fee928d64f4d2c336dca6675ed46
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9201e143ff520126c27a649bba62b359a01669c4..a4653a660e74f5d65489ddbb7b0e46134f2472c0 100644
+index f40ff2f248e3cacc924d90e9f90692b5bde7ea53..295014956cd50054d1c039e0de4dfe54c43a5835 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -512,7 +512,13 @@ public class CraftEventFactory {
+@@ -517,7 +517,13 @@ public class CraftEventFactory {
          return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, false, hand, null);
      }
  
@@ -47,7 +47,7 @@ index 9201e143ff520126c27a649bba62b359a01669c4..a4653a660e74f5d65489ddbb7b0e4613
          Player player = (who == null) ? null : (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
  
-@@ -547,6 +553,11 @@ public class CraftEventFactory {
+@@ -552,6 +558,11 @@ public class CraftEventFactory {
          if (cancelledBlock) {
              event.setUseInteractedBlock(Event.Result.DENY);
          }
diff --git a/patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0881-Elder-Guardian-appearance-API.patch b/patches/server/0879-Elder-Guardian-appearance-API.patch
similarity index 84%
rename from patches/server/0881-Elder-Guardian-appearance-API.patch
rename to patches/server/0879-Elder-Guardian-appearance-API.patch
index 5855c82762..82b78ed56e 100644
--- a/patches/server/0881-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0879-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b2f333b88f8282b01975c622c496ca796745b1d4..e0f2f83f411270ac3bc95979ab6778606b3fc890 100644
+index d7327b7e57c5075eb687331c7244d0aae1ac7c98..0c5ba227bd1bd6eec15e8b3f0acfb082eacd2e02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3083,6 +3083,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3112,6 +3112,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0882-Allow-changing-bed-s-occupied-property.patch b/patches/server/0880-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0882-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0880-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0883-Add-entity-knockback-API.patch b/patches/server/0881-Add-entity-knockback-API.patch
similarity index 81%
rename from patches/server/0883-Add-entity-knockback-API.patch
rename to patches/server/0881-Add-entity-knockback-API.patch
index 3c5152fdf6..92dc055fcf 100644
--- a/patches/server/0883-Add-entity-knockback-API.patch
+++ b/patches/server/0881-Add-entity-knockback-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4cf07ff38df050defceb69335e402ca52972a05f..a4d2f2a296e93dd786abf81439eb759c49029850 100644
+index 877d3eba8fead8793258f762058121a68e627378..0b5e4d4a58c6fbfd87832859d3a21cc45e31a3e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -989,5 +989,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1016,5 +1016,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
          throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
diff --git a/patches/server/0884-Detect-headless-JREs.patch b/patches/server/0882-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0884-Detect-headless-JREs.patch
rename to patches/server/0882-Detect-headless-JREs.patch
diff --git a/patches/server/0885-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0885-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0886-optimized-dirt-and-snow-spreading.patch b/patches/server/0884-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0886-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0884-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0887-Added-EntityToggleSitEvent.patch b/patches/server/0885-Added-EntityToggleSitEvent.patch
similarity index 95%
rename from patches/server/0887-Added-EntityToggleSitEvent.patch
rename to patches/server/0885-Added-EntityToggleSitEvent.patch
index 3545a2f37d..0aeccc4f1a 100644
--- a/patches/server/0887-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0885-Added-EntityToggleSitEvent.patch
@@ -31,7 +31,7 @@ index 9fb11df7131f400e6e631146c32efccea83adf56..1282911b97292cde30dff83de756bc91
          if (inSittingPose) {
              this.entityData.set(DATA_FLAGS_ID, (byte)(b | 1));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 167f142d6960867320b90d61db312ebf23e24a48..844083101e9763330af0175388f6cdda27a97ecc 100644
+index 5052bcf16bb09b7bcf39566fef1378b1c4970fe6..62604ed2e82afd3603ccac5d9c6e285c431542b1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -427,7 +427,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -57,10 +57,10 @@ index 167f142d6960867320b90d61db312ebf23e24a48..844083101e9763330af0175388f6cdda
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index a0933b8467bf81333dc103055e73bb75069dcb36..9b807b318a2843810c3963277d464439a865cfb6 100644
+index 4f03e50d8d9d67aa9a62fbb3bdb14f5ba851e08a..f43c4fed59c4c75540008284ddb197d9a6b5487b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -132,6 +132,7 @@ public class Panda extends Animal {
+@@ -135,6 +135,7 @@ public class Panda extends Animal {
      }
  
      public void sit(boolean sitting) {
diff --git a/patches/server/0888-Add-fire-tick-delay-option.patch b/patches/server/0886-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0888-Add-fire-tick-delay-option.patch
rename to patches/server/0886-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0889-Add-Moving-Piston-API.patch b/patches/server/0887-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0889-Add-Moving-Piston-API.patch
rename to patches/server/0887-Add-Moving-Piston-API.patch
diff --git a/patches/server/0890-Ignore-impossible-spawn-tick.patch b/patches/server/0888-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0890-Ignore-impossible-spawn-tick.patch
rename to patches/server/0888-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0891-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0891-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0892-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0892-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 91%
rename from patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index ba347aa9a8..5c611fbfce 100644
--- a/patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3d95a435a9f6e28c43f275781db909bf9e71397b..e967413613bc247176c5af380162ba25fa821377 100644
+index 5bc44f88ec3ad6e25c2df6e6829c1d9a1f8f836d..869062266419beca820d95a40b6a8a5ce8a31e1f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3308,6 +3308,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3291,6 +3291,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              pluginManager.callEvent(entityCombustEvent);
              if (!entityCombustEvent.isCancelled()) {
                  this.setSecondsOnFire(entityCombustEvent.getDuration(), false);
diff --git a/patches/server/0894-Prevent-compass-from-loading-chunks.patch b/patches/server/0892-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0894-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0892-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0895-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0893-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0895-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0893-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0896-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0896-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0897-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0897-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0898-Add-Player-Warden-Warning-API.patch b/patches/server/0896-Add-Player-Warden-Warning-API.patch
similarity index 93%
rename from patches/server/0898-Add-Player-Warden-Warning-API.patch
rename to patches/server/0896-Add-Player-Warden-Warning-API.patch
index 102a25ab34..8fa41762ef 100644
--- a/patches/server/0898-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0896-Add-Player-Warden-Warning-API.patch
@@ -10,10 +10,10 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e0f2f83f411270ac3bc95979ab6778606b3fc890..621a990a54e61e174e77558d70a84d6a215fb879 100644
+index 0c5ba227bd1bd6eec15e8b3f0acfb082eacd2e02..d1db06cab4c74610f5e3815ae615e9423b92c124 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3088,6 +3088,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3117,6 +3117,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void showElderGuardian(boolean silent) {
          if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
      }
diff --git a/patches/server/0899-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0899-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0900-Add-paper-dumplisteners-command.patch b/patches/server/0898-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0900-Add-paper-dumplisteners-command.patch
rename to patches/server/0898-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0901-check-global-player-list-where-appropriate.patch b/patches/server/0899-check-global-player-list-where-appropriate.patch
similarity index 96%
rename from patches/server/0901-check-global-player-list-where-appropriate.patch
rename to patches/server/0899-check-global-player-list-where-appropriate.patch
index be6c2d1321..06093f7117 100644
--- a/patches/server/0901-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0899-check-global-player-list-where-appropriate.patch
@@ -24,10 +24,10 @@ index 5bdae591d344fc9b72ffcc1a44fb5e495b1e6bb2..37873ea2876a89ac8ea702ab0a71171e
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 14d9bd4b32f2d7f34283e1efcd780c07ac498d6c..e59738a15c3db0d11bb7007af160aa1845cafd28 100644
+index 420f4e7d77f2a950a4cce691e57bb2e2ba5bfb23..3b480415f6c862206dd733c6a3ffda451668d24b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3623,7 +3623,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3613,7 +3613,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void onItemPickup(ItemEntity item) {
diff --git a/patches/server/0902-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 95%
rename from patches/server/0902-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch
index fdb8bd16d3..209c549aa9 100644
--- a/patches/server/0902-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch
@@ -17,7 +17,7 @@ index 52fd12c474c01f3b53d0f6596b7a6fafee52bd0d..877498729c66de9aa6a27c9148f7494d
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 086cbbfb492413bf1ae901c46f8e8ebbadd68b21..23d77e6cc55c06d9c2cfb21421cd19c487dbe765 100644
+index 6537862552818e1e9e0a684a4999e27bd46753d3..b305941aaf50b417bb054a9327c67a0891f2fe9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -401,10 +401,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0903-ItemStack-damage-API.patch b/patches/server/0901-ItemStack-damage-API.patch
similarity index 94%
rename from patches/server/0903-ItemStack-damage-API.patch
rename to patches/server/0901-ItemStack-damage-API.patch
index 9c9e244de1..50b1a931b1 100644
--- a/patches/server/0903-ItemStack-damage-API.patch
+++ b/patches/server/0901-ItemStack-damage-API.patch
@@ -11,10 +11,10 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a4d2f2a296e93dd786abf81439eb759c49029850..7db6e0f8260f748669b1d98160bc47b979ade0f7 100644
+index 0b5e4d4a58c6fbfd87832859d3a21cc45e31a3e2..83429bfd26128e85864806699017a481109e75e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -990,6 +990,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1017,6 +1017,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
  
diff --git a/patches/server/0904-Friction-API.patch b/patches/server/0902-Friction-API.patch
similarity index 88%
rename from patches/server/0904-Friction-API.patch
rename to patches/server/0902-Friction-API.patch
index b137b79138..b81cea4c7b 100644
--- a/patches/server/0904-Friction-API.patch
+++ b/patches/server/0902-Friction-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e59738a15c3db0d11bb7007af160aa1845cafd28..6e955e940ab95c5be22a8fb331b3c61347a77f92 100644
+index 3b480415f6c862206dd733c6a3ffda451668d24b..fb3eb0125e524c5a06b21c5a6e80f5b6220460cd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public boolean bukkitPickUpLoot;
      public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
      public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
@@ -16,7 +16,7 @@ index e59738a15c3db0d11bb7007af160aa1845cafd28..6e955e940ab95c5be22a8fb331b3c613
  
      @Override
      public float getBukkitYaw() {
-@@ -718,7 +719,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -717,7 +718,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public boolean shouldDiscardFriction() {
@@ -25,7 +25,7 @@ index e59738a15c3db0d11bb7007af160aa1845cafd28..6e955e940ab95c5be22a8fb331b3c613
      }
  
      public void setDiscardFriction(boolean noDrag) {
-@@ -762,6 +763,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -761,6 +762,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
@@ -37,7 +37,7 @@ index e59738a15c3db0d11bb7007af160aa1845cafd28..6e955e940ab95c5be22a8fb331b3c613
          nbt.putFloat("Health", this.getHealth());
          nbt.putShort("HurtTime", (short) this.hurtTime);
          nbt.putInt("HurtByTimestamp", this.lastHurtByMobTimestamp);
-@@ -804,6 +810,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -803,6 +809,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
              absorptionAmount = 0;
          }
          this.setAbsorptionAmount(absorptionAmount);
@@ -54,10 +54,10 @@ index e59738a15c3db0d11bb7007af160aa1845cafd28..6e955e940ab95c5be22a8fb331b3c613
          if (nbt.contains("Attributes", 9) && this.level() != null && !this.level().isClientSide) {
              this.getAttributes().load(nbt.getList("Attributes", 10));
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 00ecef0ba7530ff2533fa9d5eaa8489da8796ead..3d41dbe0285f8fec8adae1e93010cf464df9b08c 100644
+index 08a2ce0ab024b99df5f6e23aa5a13c9d6f431db6..52196431a6538872755344859a0454a0e50c3b6e 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -54,6 +54,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -55,6 +55,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
      private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
      public boolean canMobPickup = true; // Paper
      private int despawnRate = -1; // Paper
@@ -65,7 +65,7 @@ index 00ecef0ba7530ff2533fa9d5eaa8489da8796ead..3d41dbe0285f8fec8adae1e93010cf46
  
      public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
          super(type, world);
-@@ -159,7 +160,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -160,7 +161,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  this.move(MoverType.SELF, this.getDeltaMovement());
                  float f1 = 0.98F;
  
@@ -78,7 +78,7 @@ index 00ecef0ba7530ff2533fa9d5eaa8489da8796ead..3d41dbe0285f8fec8adae1e93010cf46
                      f1 = this.level().getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).getBlock().getFriction() * 0.98F;
                  }
  
-@@ -364,6 +369,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -369,6 +374,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
@@ -90,7 +90,7 @@ index 00ecef0ba7530ff2533fa9d5eaa8489da8796ead..3d41dbe0285f8fec8adae1e93010cf46
          nbt.putShort("Health", (short) this.health);
          nbt.putShort("Age", (short) this.age);
          nbt.putShort("PickupDelay", (short) this.pickupDelay);
-@@ -397,6 +407,17 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -402,6 +412,17 @@ public class ItemEntity extends Entity implements TraceableEntity {
              this.thrower = nbt.getUUID("Thrower");
          }
  
@@ -132,10 +132,10 @@ index e9946edf568db010e4ccb9fe7755709ed7b8310f..a925b5c490e7129b27370aa57b5fad1c
      public int getHealth() {
          return item.health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7db6e0f8260f748669b1d98160bc47b979ade0f7..40c80ba7fa6e0505c23e643acbc87fd03b69e208 100644
+index 83429bfd26128e85864806699017a481109e75e4..b166ca8b8d21b3f7e930fa9b9b71fbca70bfdb97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1037,6 +1037,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1064,6 +1064,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          });
      }
  
diff --git a/patches/server/0905-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 97%
rename from patches/server/0905-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 458d74cc9c..a019ee3c47 100644
--- a/patches/server/0905-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch
@@ -29,7 +29,7 @@ index de06ae3e8757c923a6f3f475a34885d2f15af46e..3ff999734d14e2b6e7828e117f5ee32a
      private EntitySelector() {}
      // Paper start
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index 8c767aba1e800c41412e92afe9cb09cfab1c6ffc..bc7648dbc132551dc6591ab49a1919a623c30f60 100644
+index b1fc786970b5288a02cc3a46e3fe7784ac566c07..dfeb3e336e06ef01f5401a362755030db942bb07 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 @@ -33,13 +33,22 @@ public class PhantomSpawner implements CustomSpawner {
diff --git a/patches/server/0906-Fix-player-kick-on-shutdown.patch b/patches/server/0904-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0906-Fix-player-kick-on-shutdown.patch
rename to patches/server/0904-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0907-Sync-offhand-slot-in-menus.patch b/patches/server/0905-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0907-Sync-offhand-slot-in-menus.patch
rename to patches/server/0905-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0908-Player-Entity-Tracking-Events.patch b/patches/server/0906-Player-Entity-Tracking-Events.patch
similarity index 90%
rename from patches/server/0908-Player-Entity-Tracking-Events.patch
rename to patches/server/0906-Player-Entity-Tracking-Events.patch
index 0fdc102ca9..ea49083406 100644
--- a/patches/server/0908-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0906-Player-Entity-Tracking-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e967413613bc247176c5af380162ba25fa821377..44495b2bbbc9cb8c5086475f403ef20e88101536 100644
+index 869062266419beca820d95a40b6a8a5ce8a31e1f..3ca30e0351e3ccb9bcb9094f4337f62c42a8afc5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4030,9 +4030,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4013,9 +4013,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          EnchantmentHelper.doPostDamageEffects(attacker, target);
      }
  
diff --git a/patches/server/0909-Limit-pet-look-distance.patch b/patches/server/0907-Limit-pet-look-distance.patch
similarity index 91%
rename from patches/server/0909-Limit-pet-look-distance.patch
rename to patches/server/0907-Limit-pet-look-distance.patch
index 724bcbffa1..144e4e1680 100644
--- a/patches/server/0909-Limit-pet-look-distance.patch
+++ b/patches/server/0907-Limit-pet-look-distance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit pet look distance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
-index 26cf3592ff8cb8d2429882fbd10cb3251481292a..13f96d7c1f2d920172f49fcd82d719f0416ffcee 100644
+index 11cc26954b4e97114b59df35a4f9b75a09132e20..8e1c60d3622bf069feec5e636d2a5b4257e11776 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
 @@ -93,7 +93,7 @@ public class FollowOwnerGoal extends Goal {
diff --git a/patches/server/0910-Properly-resend-entities.patch b/patches/server/0908-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/0910-Properly-resend-entities.patch
rename to patches/server/0908-Properly-resend-entities.patch
index 745e3f5e4e..48460e34fd 100644
--- a/patches/server/0910-Properly-resend-entities.patch
+++ b/patches/server/0908-Properly-resend-entities.patch
@@ -82,7 +82,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..15add3f4dfd718ec09bb1db4f2222346
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 90c1cd80e0d3fd0d7d66541f3d17d71353e7f258..ab5b5e41017cd069903cee5394494352e7ff2adf 100644
+index c60906e122e058a19248b0e629531d8ec27146ca..bd3dcc1e126c91644fb0a23423d0f6d1c32f3352 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2799,7 +2799,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0911-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0911-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0912-fix-Instruments.patch b/patches/server/0910-fix-Instruments.patch
similarity index 93%
rename from patches/server/0912-fix-Instruments.patch
rename to patches/server/0910-fix-Instruments.patch
index c488b2b420..177350915b 100644
--- a/patches/server/0912-fix-Instruments.patch
+++ b/patches/server/0910-fix-Instruments.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 621a990a54e61e174e77558d70a84d6a215fb879..c1d8535564446d297238a962cc0956f75a314e7b 100644
+index d1db06cab4c74610f5e3815ae615e9423b92c124..1b776dc69369c1ce8042e379e8064c00f17f0c43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -717,29 +717,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -723,29 +723,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0913-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0913-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0914-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0914-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0915-Add-BlockLockCheckEvent.patch b/patches/server/0913-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0915-Add-BlockLockCheckEvent.patch
rename to patches/server/0913-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0916-Add-Sneaking-API-for-Entities.patch b/patches/server/0914-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0916-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0914-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0917-Improve-logging-and-errors.patch b/patches/server/0915-Improve-logging-and-errors.patch
similarity index 97%
rename from patches/server/0917-Improve-logging-and-errors.patch
rename to patches/server/0915-Improve-logging-and-errors.patch
index cfa7c7ae7c..50afaf6da4 100644
--- a/patches/server/0917-Improve-logging-and-errors.patch
+++ b/patches/server/0915-Improve-logging-and-errors.patch
@@ -22,7 +22,7 @@ index f6e423a76d4c9cf639f1d44af80d33cf3072f6b5..135fc81414446f24c3adad71f5199c78
              Properties properties;
              Properties properties1;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ab5b5e41017cd069903cee5394494352e7ff2adf..c1696b5d9d48a520c1b9a3f5abdeb1909aed0b3c 100644
+index bd3dcc1e126c91644fb0a23423d0f6d1c32f3352..a53d44f26c3cf51ae4a4219a0e9ecec50666e53d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3588,7 +3588,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0918-Improve-PortalEvents.patch b/patches/server/0916-Improve-PortalEvents.patch
similarity index 89%
rename from patches/server/0918-Improve-PortalEvents.patch
rename to patches/server/0916-Improve-PortalEvents.patch
index aa5fbc2763..025a4e1d25 100644
--- a/patches/server/0918-Improve-PortalEvents.patch
+++ b/patches/server/0916-Improve-PortalEvents.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 44495b2bbbc9cb8c5086475f403ef20e88101536..a1fd4745063a3e4fbd98600b5725df41817f650f 100644
+index 3ca30e0351e3ccb9bcb9094f4337f62c42a8afc5..414f635fd591d1b89806c7980bc3734753dcc8c4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3686,7 +3686,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3669,7 +3669,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          Location enter = bukkitEntity.getLocation();
          Location exit = CraftLocation.toBukkit(exitPosition, exitWorldServer.getWorld());
  
diff --git a/patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 96%
rename from patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch
index 38b52c6506..79b5138f8f 100644
--- a/patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a1fd4745063a3e4fbd98600b5725df41817f650f..fbbbb1a02a522f97928ac4b52b625f5bf2bc7537 100644
+index 414f635fd591d1b89806c7980bc3734753dcc8c4..11b413e85ad23fa555392c0dcb639e7b90ae6526 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 92%
rename from patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch
index fd93a00358..0a9fb0d1c1 100644
--- a/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c1696b5d9d48a520c1b9a3f5abdeb1909aed0b3c..09be9631f06705fc8f82e0de7f032bbea21dca03 100644
+index a53d44f26c3cf51ae4a4219a0e9ecec50666e53d..8cfde7c8b2e45fd2856e7d7bdae75dd379f464f8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2257,7 +2257,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0921-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0921-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0922-Flying-Fall-Damage.patch b/patches/server/0920-Flying-Fall-Damage.patch
similarity index 93%
rename from patches/server/0922-Flying-Fall-Damage.patch
rename to patches/server/0920-Flying-Fall-Damage.patch
index 3ed95d5d3f..64788275cc 100644
--- a/patches/server/0922-Flying-Fall-Damage.patch
+++ b/patches/server/0920-Flying-Fall-Damage.patch
@@ -26,10 +26,10 @@ index 53487f0a4fe672298c3b83d24a2a603641afcde8..58152160d609d0e9d105153aeb166a56
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c1d8535564446d297238a962cc0956f75a314e7b..3d447541b733aa6cefc29c49d551b83642bc1f2a 100644
+index 1b776dc69369c1ce8042e379e8064c00f17f0c43..34512d3b4ba2d6e4f7a07536c65d40c2a7cf24aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2304,6 +2304,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2334,6 +2334,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().onUpdateAbilities();
      }
  
diff --git a/patches/server/0923-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/server/0923-Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 91%
rename from patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 5f8840b205..2e5c280365 100644
--- a/patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fbbbb1a02a522f97928ac4b52b625f5bf2bc7537..64068958a29f5e867932d6c23ab504a2fafdd3f1 100644
+index 11b413e85ad23fa555392c0dcb639e7b90ae6526..e70e6f82321ac0c6c8ac1f7d9144e1e9495bf5ae 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1156,7 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0925-config-for-disabling-entity-tag-tags.patch b/patches/server/0923-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0925-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0923-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0926-Use-single-player-info-update-packet-on-join.patch b/patches/server/0924-Use-single-player-info-update-packet-on-join.patch
similarity index 97%
rename from patches/server/0926-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0924-Use-single-player-info-update-packet-on-join.patch
index d834385b0a..70e235b64f 100644
--- a/patches/server/0926-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0924-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 09be9631f06705fc8f82e0de7f032bbea21dca03..a6eeb1dd1a7623a9ff9e1124b539cdd2c89f517c 100644
+index 8cfde7c8b2e45fd2856e7d7bdae75dd379f464f8..65c768a911b2e634ae4c8ee4f210a031731e357d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3603,7 +3603,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 92%
rename from patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 48e1f8b1ec..9edc053a77 100644
--- a/patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,10 +22,10 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6e955e940ab95c5be22a8fb331b3c61347a77f92..98a6480b32a1897dfcae84ed72409441519a827f 100644
+index fb3eb0125e524c5a06b21c5a6e80f5b6220460cd..0d710469aea2718d5be7806a565b886316d26b0c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1592,7 +1592,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1582,7 +1582,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.level().getCraftServer().getPluginManager().callEvent(event);
  
              if (!event.isCancelled()) {
diff --git a/patches/server/0928-Win-Screen-API.patch b/patches/server/0926-Win-Screen-API.patch
similarity index 88%
rename from patches/server/0928-Win-Screen-API.patch
rename to patches/server/0926-Win-Screen-API.patch
index 0fec33ced7..9c090fc443 100644
--- a/patches/server/0928-Win-Screen-API.patch
+++ b/patches/server/0926-Win-Screen-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3d447541b733aa6cefc29c49d551b83642bc1f2a..3643c7f434d8aa66633311ccb77ba4d035e8d337 100644
+index 34512d3b4ba2d6e4f7a07536c65d40c2a7cf24aa..0a20b01493ee742e1203b4cc69300ddc98a128ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1206,6 +1206,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1212,6 +1212,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0929-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0929-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0930-Fix-force-opening-enchantment-tables.patch b/patches/server/0928-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0930-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0928-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0931-Add-Entity-Body-Yaw-API.patch b/patches/server/0929-Add-Entity-Body-Yaw-API.patch
similarity index 87%
rename from patches/server/0931-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0929-Add-Entity-Body-Yaw-API.patch
index 6381bc95be..32feb04c9d 100644
--- a/patches/server/0931-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0929-Add-Entity-Body-Yaw-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 40c80ba7fa6e0505c23e643acbc87fd03b69e208..7880631fe8a4b06f29ef69ab850129737a99521b 100644
+index b166ca8b8d21b3f7e930fa9b9b71fbca70bfdb97..73cd175cba0e441b8af63d8c05ae0d9143687995 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1029,6 +1029,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1056,6 +1056,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot);
      }
  
diff --git a/patches/server/0932-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0932-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0933-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0933-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0934-Add-EntityFertilizeEggEvent.patch b/patches/server/0932-Add-EntityFertilizeEggEvent.patch
similarity index 96%
rename from patches/server/0934-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0932-Add-EntityFertilizeEggEvent.patch
index 11c26f4178..190472324b 100644
--- a/patches/server/0934-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0932-Add-EntityFertilizeEggEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityFertilizeEggEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index c48bf4ca76f70d878378fc43c8270de5c3332824..098ae9d8fa3e7cad8473a877decba771f6bd1b36 100644
+index 76ab82553488e129882fc9beb603636bb723ec42..d3c15d029d5f003cba3c89f7ea1f3ed4f943f2bd 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -441,6 +441,10 @@ public class Turtle extends Animal {
@@ -69,10 +69,10 @@ index c0f19138c6a00ce6ae837c972ae4af522ddd2895..a6d98f64910c816a5c11867d12698f5c
          world.addFreshEntity(entityitem);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e813b58d724b9e5900df68f763ad0b59c84e47f4..847144ef0943e509827b06fa4668bd729e356e50 100644
+index 295014956cd50054d1c039e0de4dfe54c43a5835..b118d412e5b98973af63b89d8b4f6420b404e06f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1980,4 +1980,29 @@ public class CraftEventFactory {
+@@ -2014,4 +2014,29 @@ public class CraftEventFactory {
          return event.callEvent();
      }
      // Paper end
diff --git a/patches/server/0935-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0935-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 90%
rename from patches/server/0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index c09b36b849..1291727de8 100644
--- a/patches/server/0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add CompostItemEvent and EntityCompostItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index 113083f1b909e3e279789d67e24af36dc0f151bf..87153b5576fed05103183a9860d804c2c8cfbe1c 100644
+index 38cb52d185e543c4df9eebfcd856df6fa80ba0ed..10d3912ef043eefdf89105332e29b0d2bf4a5539 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -322,7 +322,21 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -321,7 +321,21 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
          float f = ComposterBlock.COMPOSTABLES.getFloat(itemstack.getItem());
  
@@ -31,7 +31,7 @@ index 113083f1b909e3e279789d67e24af36dc0f151bf..87153b5576fed05103183a9860d804c2
              return iblockdata;
          } else {
              int j = i + 1;
-@@ -472,6 +486,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -471,6 +485,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
                  this.changed = true;
                  BlockState iblockdata = ComposterBlock.addItem((Entity) null, this.state, this.level, this.pos, itemstack);
  
diff --git a/patches/server/0937-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0937-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch
similarity index 93%
rename from patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch
index 549fd4f631..8f732ca932 100644
--- a/patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch
@@ -23,10 +23,10 @@ index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 98a6480b32a1897dfcae84ed72409441519a827f..a189461330a4d427a7450d504ef13de3605497e3 100644
+index 0d710469aea2718d5be7806a565b886316d26b0c..dee49691dcaac57ab56195a4dd299a5c23a56bbb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2283,7 +2283,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2273,7 +2273,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  // Duplicate triggers if blocking
                  if (event.getDamage(DamageModifier.BLOCKING) < 0) {
                      if (this instanceof ServerPlayer) {
@@ -35,7 +35,7 @@ index 98a6480b32a1897dfcae84ed72409441519a827f..a189461330a4d427a7450d504ef13de3
                          f2 = (float) -event.getDamage(DamageModifier.BLOCKING);
                          if (f2 > 0.0F && f2 < 3.4028235E37F) {
                              ((ServerPlayer) this).awardStat(Stats.DAMAGE_BLOCKED_BY_SHIELD, Math.round(originalDamage * 10.0F));
-@@ -2291,7 +2291,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2281,7 +2281,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      }
  
                      if (damagesource.getEntity() instanceof ServerPlayer) {
diff --git a/patches/server/0939-Fix-text-display-error-on-spawn.patch b/patches/server/0937-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0939-Fix-text-display-error-on-spawn.patch
rename to patches/server/0937-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0940-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch
similarity index 95%
rename from patches/server/0940-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch
index e69fe4eb74..d3435b63af 100644
--- a/patches/server/0940-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch
@@ -7,10 +7,10 @@ Wandering Trader, AbstractHorse, and Beacon inventories returned null locations
 when a block or entity location is readily available
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 7f238a9d98095806132c0d22ed7b0dfd25c45262..79b6e241f425622fdc575b77d8dce7061c0ab783 100644
+index 49d7109b6ca63c8073db777549a65b2fcb70967e..9b35a50eb99551f28d45fd5114e0401b4c54646e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -342,7 +342,15 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -345,7 +345,15 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
      public void createInventory() {
          SimpleContainer inventorysubcontainer = this.inventory;
  
diff --git a/patches/server/0941-Add-Shearable-API.patch b/patches/server/0939-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0941-Add-Shearable-API.patch
rename to patches/server/0939-Add-Shearable-API.patch
diff --git a/patches/server/0942-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0942-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0944-Optimize-Hoppers.patch b/patches/server/0942-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/0944-Optimize-Hoppers.patch
rename to patches/server/0942-Optimize-Hoppers.patch
index 18820e3768..cb703b47be 100644
--- a/patches/server/0944-Optimize-Hoppers.patch
+++ b/patches/server/0942-Optimize-Hoppers.patch
@@ -25,10 +25,10 @@ index c5f3dc74888919e82e2ffbb8d648b7640aa6b690..80cf4852e4010eeeadaf920ab927a40d
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 784623eefedfb601a8e0b8b42cbdb71eaebcac84..90ed64613717e104fc31d7e8d5df964c92119052 100644
+index 90e4f8d21822cb0dc8bda586803f8c086f0fbeee..22e148867a2832035546148fc5aa27b9d4de3c64 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -718,10 +718,16 @@ public final class ItemStack {
+@@ -719,10 +719,16 @@ public final class ItemStack {
      }
  
      public ItemStack copy() {
diff --git a/patches/server/0945-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 96%
rename from patches/server/0945-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch
index df619142e1..73fe5e036a 100644
--- a/patches/server/0945-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix beehives generating from using bonemeal
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 90ed64613717e104fc31d7e8d5df964c92119052..50141d426dc93149dc48d876487649aab7e74380 100644
+index 22e148867a2832035546148fc5aa27b9d4de3c64..6a25b768ea2e99acdda781cdc0ab7bf80b45912c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -392,6 +392,7 @@ public final class ItemStack {
diff --git a/patches/server/0947-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0944-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0947-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0944-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0948-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0945-Treat-sequence-violations-like-they-should-be.patch
similarity index 91%
rename from patches/server/0948-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0945-Treat-sequence-violations-like-they-should-be.patch
index e6f29131f5..ff6e249616 100644
--- a/patches/server/0948-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0945-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a6eeb1dd1a7623a9ff9e1124b539cdd2c89f517c..b7d8d12bf3cafe106c976e3c2a14e1addde9795c 100644
+index 65c768a911b2e634ae4c8ee4f210a031731e357d..d9161ccea1c0af96e2718defba68e098c22082a3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2127,6 +2127,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0946-Fix-api-checking-banned-ips.patch b/patches/server/0946-Fix-api-checking-banned-ips.patch
deleted file mode 100644
index 08f63f3c08..0000000000
--- a/patches/server/0946-Fix-api-checking-banned-ips.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 22 Mar 2023 13:12:01 -0700
-Subject: [PATCH] Fix api checking banned ips
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java b/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java
-index 0787159a6fde31260f87ee974381f21ce97620a6..5a7d884bcad7b30109567c1eff816a31c1701b06 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java
-@@ -64,7 +64,7 @@ public class CraftIpBanList implements org.bukkit.BanList {
-     public boolean isBanned(String target) {
-         Preconditions.checkArgument(target != null, "Target cannot be null");
- 
--        return this.list.isBanned(InetSocketAddress.createUnresolved(target, 0));
-+        return this.list.isBanned(target); // Paper - fix checking banned ips
-     }
- 
-     @Override
diff --git a/patches/server/0949-remove-duplicate-animate-packet-for-records.patch b/patches/server/0946-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0949-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0946-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0947-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 97%
rename from patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0947-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 5f55b8a9f1..aab2e82646 100644
--- a/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0947-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 23e0e6937e28f09271a4ec7c35e0076a576cf3d3..4aa8b483841028fbcc43f9ed47730881
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b7d8d12bf3cafe106c976e3c2a14e1addde9795c..3ac28fb22efaec7621f8e42f998fd84bbff9ec91 100644
+index d9161ccea1c0af96e2718defba68e098c22082a3..1d0e439c00ac4ab72dc656038c9271b1240acc88 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -296,6 +296,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0951-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0948-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0951-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0948-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0952-Use-array-for-gamerule-storage.patch b/patches/server/0949-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0952-Use-array-for-gamerule-storage.patch
rename to patches/server/0949-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0953-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0950-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0953-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0950-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0954-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0951-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0954-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0951-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0955-Add-Mob-Experience-reward-API.patch b/patches/server/0952-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0955-Add-Mob-Experience-reward-API.patch
rename to patches/server/0952-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0956-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0953-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0956-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0953-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0954-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 88%
rename from patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0954-Fix-DamageCause-for-Falling-Blocks.patch
index 4aee7f13b4..b351a0532e 100644
--- a/patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0954-Fix-DamageCause-for-Falling-Blocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 847144ef0943e509827b06fa4668bd729e356e50..950e0cd5266499f506792b2a0efbcf403bdb4943 100644
+index b118d412e5b98973af63b89d8b4f6420b404e06f..e78e41fe5e3721b0cc465009984d4816c9d809eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1027,6 +1027,11 @@ public class CraftEventFactory {
+@@ -1032,6 +1032,11 @@ public class CraftEventFactory {
              } else if (source.is(DamageTypes.SONIC_BOOM)) {
                  cause = DamageCause.SONIC_BOOM;
              }
diff --git a/patches/server/0958-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0955-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0958-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0955-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0959-More-accurate-isInOpenWater-impl.patch b/patches/server/0956-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0959-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0956-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0960-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0957-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0960-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0957-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0961-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0958-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0961-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0958-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0962-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0959-Fix-destroying-beehive-without-any-players-nearby-th.patch
similarity index 100%
rename from patches/server/0962-Fix-destroying-beehive-without-any-players-nearby-th.patch
rename to patches/server/0959-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0963-Expand-PlayerItemMendEvent.patch b/patches/server/0960-Expand-PlayerItemMendEvent.patch
similarity index 93%
rename from patches/server/0963-Expand-PlayerItemMendEvent.patch
rename to patches/server/0960-Expand-PlayerItemMendEvent.patch
index b9a642317c..e085643456 100644
--- a/patches/server/0963-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0960-Expand-PlayerItemMendEvent.patch
@@ -33,10 +33,10 @@ index 8d8fe55a05eea237a8af99ed15ab16d6167daa77..eca634792d2a7cc649675e3394e84dba
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3643c7f434d8aa66633311ccb77ba4d035e8d337..59c00045ec903a635966f16cf33e5b4110262953 100644
+index 0a20b01493ee742e1203b4cc69300ddc98a128ce..5b201d2c21f04e0223970035e0631f8f92ea0d3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1674,11 +1674,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1704,11 +1704,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ());
  
              int i = Math.min(orb.xpToDurability(amount), itemstack.getDamageValue());
@@ -51,10 +51,10 @@ index 3643c7f434d8aa66633311ccb77ba4d035e8d337..59c00045ec903a635966f16cf33e5b41
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 950e0cd5266499f506792b2a0efbcf403bdb4943..621b6a1cacb17fff578855cf2dab8142a5f321ed 100644
+index e78e41fe5e3721b0cc465009984d4816c9d809eb..85885b835cd661d6dcacf7f6501cc6b1ffb9f137 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1263,10 +1263,10 @@ public class CraftEventFactory {
+@@ -1268,10 +1268,10 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0961-Refresh-ProjectileSource-for-projectiles.patch
similarity index 97%
rename from patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0961-Refresh-ProjectileSource-for-projectiles.patch
index e666028592..131575e7af 100644
--- a/patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0961-Refresh-ProjectileSource-for-projectiles.patch
@@ -9,7 +9,7 @@ Previously, after the entity reloaded, Projectile#getShooter
 would return null, while the entity still had an owner.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 64068958a29f5e867932d6c23ab504a2fafdd3f1..b38c4cbcf0405d82c7b6e018e80a3174e460c1a4 100644
+index e70e6f82321ac0c6c8ac1f7d9144e1e9495bf5ae..8218169014a7af183e6b0058fe08af18ca047448 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -382,6 +382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0965-Add-transient-modifier-API.patch b/patches/server/0962-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0965-Add-transient-modifier-API.patch
rename to patches/server/0962-Add-transient-modifier-API.patch
diff --git a/patches/server/0966-Fix-block-place-logic.patch b/patches/server/0963-Fix-block-place-logic.patch
similarity index 94%
rename from patches/server/0966-Fix-block-place-logic.patch
rename to patches/server/0963-Fix-block-place-logic.patch
index 57ecc3dabb..978ab2720d 100644
--- a/patches/server/0966-Fix-block-place-logic.patch
+++ b/patches/server/0963-Fix-block-place-logic.patch
@@ -18,10 +18,10 @@ index b0204af850ee182773ad458208cccd946ad148d5..ebee8de2ed831755b6fd154f6cc77ac9
                      if ((entityhuman == null || !entityhuman.getAbilities().instabuild) && itemstack != ItemStack.EMPTY) { // CraftBukkit
                          itemstack.shrink(1);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 50141d426dc93149dc48d876487649aab7e74380..414167d5390baea98a9876ee4ea368c8eeee2f9f 100644
+index 6a25b768ea2e99acdda781cdc0ab7bf80b45912c..5f0e01060e1d8716e7514a25cbe68b732efaa8ef 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -462,13 +462,7 @@ public final class ItemStack {
+@@ -463,13 +463,7 @@ public final class ItemStack {
                          if (tileentity instanceof JukeboxBlockEntity) {
                              JukeboxBlockEntity tileentityjukebox = (JukeboxBlockEntity) tileentity;
  
diff --git a/patches/server/0967-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0964-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 86%
rename from patches/server/0967-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0964-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 0176a6c1b6..bb91243734 100644
--- a/patches/server/0967-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0964-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
@@ -5,16 +5,16 @@ Subject: [PATCH] Fix spigot sound playing for BlockItem ItemStacks
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 414167d5390baea98a9876ee4ea368c8eeee2f9f..adb7220be617d6d9f2cdd7fbe4fa2dd24cc7d142 100644
+index 5f0e01060e1d8716e7514a25cbe68b732efaa8ef..ae9b821d71d2868ba4eb3c73558fdcd6caf264e3 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -513,7 +513,11 @@ public final class ItemStack {
+@@ -514,7 +514,11 @@ public final class ItemStack {
  
                      // SPIGOT-1288 - play sound stripped from ItemBlock
                      if (this.item instanceof BlockItem) {
 -                        SoundType soundeffecttype = ((BlockItem) this.item).getBlock().defaultBlockState().getSoundType(); // TODO: not strictly correct, however currently only affects decorated pots
 +                        // Paper start
-+                        BlockPos position = new net.minecraft.world.item.context.BlockPlaceContext(itemactioncontext).getClickedPos();
++                        BlockPos position = new net.minecraft.world.item.context.BlockPlaceContext(context).getClickedPos();
 +                        net.minecraft.world.level.block.state.BlockState blockData = world.getBlockState(position);
 +                        SoundType soundeffecttype = blockData.getSoundType();
 +                        // Paper end
diff --git a/patches/server/0968-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0965-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0968-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0965-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0969-Call-BlockGrowEvent-for-the-pitcher-crop.patch b/patches/server/0966-Call-BlockGrowEvent-for-the-pitcher-crop.patch
similarity index 100%
rename from patches/server/0969-Call-BlockGrowEvent-for-the-pitcher-crop.patch
rename to patches/server/0966-Call-BlockGrowEvent-for-the-pitcher-crop.patch
diff --git a/patches/server/0972-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0967-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 90%
rename from patches/server/0972-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0967-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 9df3133e61..e9017a42c1 100644
--- a/patches/server/0972-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0967-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9f8c5ceb8485b14a84f2a7b2ffc8192be5c6bdfd..59984cb8ba9ffb66b59a2c907e4f04b5a51ea8ed 100644
+index 7f955f8a42b6c917dbd6f3533927a7295c1c5e20..d5c7b4292b244e0e3c12491c3facc90066425f15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -351,7 +351,11 @@ public final class CraftServer implements Server {
+@@ -354,7 +354,11 @@ public final class CraftServer implements Server {
          }
          this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
          this.commandsConfiguration.options().copyDefaults(true);
diff --git a/patches/server/0973-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0968-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0973-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0968-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0974-Fix-sniffer-removeExploredLocation.patch b/patches/server/0969-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0974-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0969-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0970-Add-API-for-waxed-signs.patch b/patches/server/0970-Add-API-for-waxed-signs.patch
deleted file mode 100644
index a2329c0a7a..0000000000
--- a/patches/server/0970-Add-API-for-waxed-signs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 8 Jun 2023 23:22:36 -0700
-Subject: [PATCH] Add API for waxed signs
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index a74a585a270e4a4c12f025b35a7f104f21e4705c..d00e3627a4da6369e08f3495f04af342ae28e71f 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-@@ -67,6 +67,18 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
-         getSnapshot().setWaxed(!editable);
-     }
- 
-+    // Paper start
-+    @Override
-+    public boolean isWaxed() {
-+        return this.getSnapshot().isWaxed();
-+    }
-+
-+    @Override
-+    public void setWaxed(final boolean waxed) {
-+        this.getSnapshot().setWaxed(waxed);
-+    }
-+    // Paper end
-+
-     @Override
-     public boolean isGlowingText() {
-         return this.front.isGlowingText();
diff --git a/patches/server/0975-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0970-Add-method-to-remove-all-active-potion-effects.patch
similarity index 86%
rename from patches/server/0975-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0970-Add-method-to-remove-all-active-potion-effects.patch
index c1e651e367..6ba0203886 100644
--- a/patches/server/0975-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0970-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7880631fe8a4b06f29ef69ab850129737a99521b..19212795df4024cfb2b9f56e1efcd4c9f20d1d83 100644
+index 73cd175cba0e441b8af63d8c05ae0d9143687995..6095d43e08bc1ffc4e9a4796fc7adbd07d69d716 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -490,6 +490,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -503,6 +503,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return effects;
      }
  
diff --git a/patches/server/0971-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0971-Properly-remove-the-experimental-smithing-inventory-.patch
deleted file mode 100644
index 73dd186dd3..0000000000
--- a/patches/server/0971-Properly-remove-the-experimental-smithing-inventory-.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 8 Jun 2023 14:45:18 -0700
-Subject: [PATCH] Properly remove the experimental smithing inventory type
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
-index dbfd36859010a1f950769708fbc5fc604c0754a9..7cc161b13f915dd8fe1ebc77169f1c2cbed2849b 100644
---- a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
-@@ -147,7 +147,7 @@ public class SmithingMenu extends ItemCombinerMenu {
-             return this.bukkitEntity;
-         }
- 
--        org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventorySmithingNew(
-+        org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventorySmithing( // Paper
-                 access.getLocation(), this.inputSlots, this.resultSlots);
-         this.bukkitEntity = new CraftInventoryView(this.player.getBukkitEntity(), inventory, this);
-         return this.bukkitEntity;
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index bdaa739aa18a95894a165e9333a3e9d596fd7dc3..3075ba5f6d66316f27e618d8b279252e9520b9cb 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -161,6 +161,7 @@ public class CraftContainer extends AbstractContainerMenu {
-             case STONECUTTER:
-                 return MenuType.STONECUTTER;
-             case SMITHING_NEW:
-+            case SMITHING:
-                 return MenuType.SMITHING;
-             case CREATIVE:
-             case CRAFTING:
-@@ -204,7 +205,6 @@ public class CraftContainer extends AbstractContainerMenu {
-                 this.delegate = new HopperMenu(windowId, bottom, top);
-                 break;
-             case ANVIL:
--            case SMITHING:
-                 this.setupAnvil(top, bottom); // SPIGOT-6783 - manually set up slots so we can use the delegated inventory and not the automatically created one
-                 break;
-             case BEACON:
-@@ -237,6 +237,7 @@ public class CraftContainer extends AbstractContainerMenu {
-             case MERCHANT:
-                 this.delegate = new MerchantMenu(windowId, bottom);
-                 break;
-+            case SMITHING: // Paper
-             case SMITHING_NEW:
-                 this.setupSmithing(top, bottom); // SPIGOT-6783 - manually set up slots so we can use the delegated inventory and not the automatically created one
-                 break;
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index bfac13ec6c316caa65db4a51b77f0a7045ad88ff..df254c42b73cdb56f71781473cbf9d0f28dcfb08 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -536,8 +536,7 @@ public class CraftInventory implements Inventory {
-             return InventoryType.COMPOSTER;
-         } else if (this.inventory instanceof JukeboxBlockEntity) {
-             return InventoryType.JUKEBOX;
--        } else if (this instanceof CraftInventorySmithingNew) {
--            return InventoryType.SMITHING_NEW;
-+            // Paper - remove
-         } else {
-             return InventoryType.CHEST;
-         }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithing.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithing.java
-index b665e5ce358b54be7c3c9a5e0ab21fa9430a685b..d89c5d601a15a9b4787e5672a850cb4eaf3eced0 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithing.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithing.java
-@@ -28,12 +28,12 @@ public class CraftInventorySmithing extends CraftResultInventory implements Smit
- 
-     @Override
-     public ItemStack getResult() {
--        return getItem(2);
-+        return getItem(net.minecraft.world.inventory.SmithingMenu.RESULT_SLOT); // Paper
-     }
- 
-     @Override
-     public void setResult(ItemStack item) {
--        setItem(2, item);
-+        setItem(net.minecraft.world.inventory.SmithingMenu.RESULT_SLOT, item); // Paper
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithingNew.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithingNew.java
-deleted file mode 100644
-index 50c023f7f742f1466f75a217937ef664a619d753..0000000000000000000000000000000000000000
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithingNew.java
-+++ /dev/null
-@@ -1,44 +0,0 @@
--package org.bukkit.craftbukkit.inventory;
--
--import net.minecraft.world.Container;
--import net.minecraft.world.inventory.ResultContainer;
--import org.bukkit.Location;
--import org.bukkit.inventory.ItemStack;
--import org.bukkit.inventory.Recipe;
--import org.bukkit.inventory.SmithingInventory;
--
--public class CraftInventorySmithingNew extends CraftResultInventory implements SmithingInventory {
--
--    private final Location location;
--
--    public CraftInventorySmithingNew(Location location, Container inventory, ResultContainer resultInventory) {
--        super(inventory, resultInventory);
--        this.location = location;
--    }
--
--    @Override
--    public ResultContainer getResultInventory() {
--        return (ResultContainer) super.getResultInventory();
--    }
--
--    @Override
--    public Location getLocation() {
--        return this.location;
--    }
--
--    @Override
--    public ItemStack getResult() {
--        return getItem(3);
--    }
--
--    @Override
--    public void setResult(ItemStack item) {
--        setItem(3, item);
--    }
--
--    @Override
--    public Recipe getRecipe() {
--        net.minecraft.world.item.crafting.Recipe recipe = this.getResultInventory().getRecipeUsed();
--        return (recipe == null) ? null : recipe.toBukkitRecipe();
--    }
--}
diff --git a/patches/server/0976-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0971-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 91%
rename from patches/server/0976-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0971-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
index 76f96a8532..e1fab1d4bb 100644
--- a/patches/server/0976-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ b/patches/server/0971-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Temp: Pre-init PlayerChunkLoaderData in order to prepopulate
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 717e292040ed7779eb4b6c5fa26665d3df9024e7..d4f6935a1bea77e5118bfd538f9b1358c21591a7 100644
+index 0fb86a1183e0373a68e110a8828df5b63a71d751..daed278d1bcf84ee42749f24e311b22b70015d79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -359,6 +359,7 @@ public class Main {
diff --git a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch b/patches/server/0972-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0977-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0972-Folia-scheduler-and-owned-region-API.patch
index 427beda3ea..5c25ad2fbd 100644
--- a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0972-Folia-scheduler-and-owned-region-API.patch
@@ -1158,7 +1158,7 @@ index 8547e7ff2f1f5b7701fb0f3c3010c14601a5f83e..fff7ad7a45f310783ac96b44575ad3db
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b38c4cbcf0405d82c7b6e018e80a3174e460c1a4..6abaf7ef99800a238b29dbbb85de8c970c0806a7 100644
+index 8218169014a7af183e6b0058fe08af18ca047448..3ffb92a82e17af467afb18c81accc482a93d6a6f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -246,11 +246,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1194,7 +1194,7 @@ index b38c4cbcf0405d82c7b6e018e80a3174e460c1a4..6abaf7ef99800a238b29dbbb85de8c97
          this.remove(Entity.RemovalReason.DISCARDED);
      }
  
-@@ -4668,6 +4681,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4651,6 +4664,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              return;
          }
          // Paper end - rewrite chunk system
@@ -1202,7 +1202,7 @@ index b38c4cbcf0405d82c7b6e018e80a3174e460c1a4..6abaf7ef99800a238b29dbbb85de8c97
          if (this.removalReason == null) {
              this.removalReason = reason;
          }
-@@ -4678,12 +4692,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4661,12 +4675,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          if (reason != RemovalReason.UNLOADED_TO_CHUNK) this.getPassengers().forEach(Entity::stopRiding); // Paper - chunk system - don't adjust passenger state when unloading, it's just not safe (and messes with our logic in entity chunk unload)
          this.levelCallback.onRemove(reason);
@@ -1232,10 +1232,10 @@ index b38c4cbcf0405d82c7b6e018e80a3174e460c1a4..6abaf7ef99800a238b29dbbb85de8c97
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59984cb8ba9ffb66b59a2c907e4f04b5a51ea8ed..0859f11567aecc8cae993a1409cfac7c53ab3dd5 100644
+index d5c7b4292b244e0e3c12491c3facc90066425f15..a05c1bc8874ef5e380544a6a344c848e37da49c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -302,6 +302,76 @@ public final class CraftServer implements Server {
+@@ -305,6 +305,76 @@ public final class CraftServer implements Server {
      private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
      private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper
  
diff --git a/patches/server/0978-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0973-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0978-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0973-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0979-Properly-Cancel-Usable-Items.patch b/patches/server/0974-Properly-Cancel-Usable-Items.patch
similarity index 89%
rename from patches/server/0979-Properly-Cancel-Usable-Items.patch
rename to patches/server/0974-Properly-Cancel-Usable-Items.patch
index 306ce8eeac..45da59d385 100644
--- a/patches/server/0979-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0974-Properly-Cancel-Usable-Items.patch
@@ -10,7 +10,7 @@ The underlying issue of this is that the client modifies their synced data value
 them in order for the client to reset their using item state.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ac28fb22efaec7621f8e42f998fd84bbff9ec91..2a609e43370e68943c580083f7f7d8c9b0972955 100644
+index 1d0e439c00ac4ab72dc656038c9271b1240acc88..b777547cb9f8edf4e7b3c2cfb894f8cd1b1a35a5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2029,6 +2029,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -22,10 +22,10 @@ index 3ac28fb22efaec7621f8e42f998fd84bbff9ec91..2a609e43370e68943c580083f7f7d8c9
                  return;
              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a189461330a4d427a7450d504ef13de3605497e3..064bd3f2615009b3f15f3a5006f0b5f7a7ba6bf5 100644
+index dee49691dcaac57ab56195a4dd299a5c23a56bbb..e11d7283662834047b2ff81a2fd25a4263792deb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3758,6 +3758,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3748,6 +3748,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return ((Byte) this.entityData.get(LivingEntity.DATA_LIVING_ENTITY_FLAGS) & 2) > 0 ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
      }
  
diff --git a/patches/server/0980-Add-event-for-player-editing-sign.patch b/patches/server/0975-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0980-Add-event-for-player-editing-sign.patch
rename to patches/server/0975-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0981-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0976-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 92%
rename from patches/server/0981-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0976-Only-tick-item-frames-if-players-can-see-it.patch
index 33c6f01d10..774e8b47eb 100644
--- a/patches/server/0981-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0976-Only-tick-item-frames-if-players-can-see-it.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only tick item frames if players can see it
 In the event that an item frame cannot be seen by any players, ticking the item frame every tick is unnecessary. This can be a very hot section of the entity tracker when lots of item frames are present on a server, so this reduces the logic which speeds it up.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 6670e657e08e130f7e0368f418379fd1ece00cdf..acaf9f392660d618472aea7bce967d374eb5d549 100644
+index 900bf9fb40026cce1d869bb7ab1694e6cd354099..81d0b2933040a451441f660f9e46199ae3b111e3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -108,7 +108,7 @@ public class ServerEntity {
diff --git a/patches/server/0982-Improve-command-function-perm-level-checks.patch b/patches/server/0977-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0982-Improve-command-function-perm-level-checks.patch
rename to patches/server/0977-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0983-Add-option-to-disable-block-updates.patch b/patches/server/0978-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0983-Add-option-to-disable-block-updates.patch
rename to patches/server/0978-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0984-Call-missing-BlockDispenseEvent.patch b/patches/server/0979-Call-missing-BlockDispenseEvent.patch
similarity index 97%
rename from patches/server/0984-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0979-Call-missing-BlockDispenseEvent.patch
index db959592eb..3ee461383b 100644
--- a/patches/server/0984-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0979-Call-missing-BlockDispenseEvent.patch
@@ -50,10 +50,10 @@ index b4f5dbe9022dd20437c15c4f6fbe2ac06dacbadb..70aade6a8d36f8376cc567800258ea6f
                              for (int k = 0; k < 5; ++k) {
                                  worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c1583340ecaedab0af44501213b2d24f8ad71e0c..568527cccebb5669184026f6cbaf4835ead6792a 100644
+index 85885b835cd661d6dcacf7f6501cc6b1ffb9f137..a6edbb5cde568d8138af568122d5d11243f3fb07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1986,6 +1986,32 @@ public class CraftEventFactory {
+@@ -2020,6 +2020,32 @@ public class CraftEventFactory {
      }
      // Paper end
  
diff --git a/work/Bukkit b/work/Bukkit
index 0c5d870919..01aa02eb53 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 0c5d870919854258f5f51530a66d839fba20e288
+Subproject commit 01aa02eb531ba554701b02986193c874ccb7635d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index b6b514b7ec..b60a95c8cf 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b6b514b7ec49531dc334c4e7bfee2569cfe33398
+Subproject commit b60a95c8cf3ca3a6353be1ecf2a6baa6f9072c57
diff --git a/work/Spigot b/work/Spigot
index c62f4bd99c..9ebce8afbf 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit c62f4bd99c6f565026bdba8eabb941b0c58a19d8
+Subproject commit 9ebce8afbf14ba4b857ce5befe716fecbd6d8879