573 files changed, 106 insertions, 124 deletions

diff --git a/patches/api/0217-Player-elytra-boost-API.patch b/patches/api/0217-Player-elytra-boost-API.patch
index 1e1555551d..59f6d90234 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 81e8bfbe4380090830591274025a026de740fd05..e9df321980d0744a50edf2d5f978340013588803 100644
+index 81e8bfbe4380090830591274025a026de740fd05..36e3f86f463cd7b6bca4c8b63739a06f17d7e28a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2880,6 +2880,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2880,6 +2880,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @NotNull
      <T> T getClientOption(@NotNull com.destroystokyo.paper.ClientOption<T> option);
@@ -22,9 +22,14 @@ index 81e8bfbe4380090830591274025a026de740fd05..e9df321980d0744a50edf2d5f9783400
 +     * @return The {@link Firework} boosting the Player or null if the spawning of the entity was cancelled
 +     * @throws IllegalArgumentException if {@link #isGliding()} is false
 +     * or if the {@code firework} isn't a {@link Material#FIREWORK_ROCKET}
++     * @deprecated use {@link HumanEntity#fireworkBoost(ItemStack)} instead. Note that this method <b>does not</b>
++     * check if the player is gliding or not.
 +     */
 +    @Nullable
-+    Firework boostElytra(@NotNull ItemStack firework);
++    default Firework boostElytra(@NotNull ItemStack firework) {
++        com.google.common.base.Preconditions.checkState(this.isGliding(), "Player must be gliding");
++        return this.fireworkBoost(firework);
++    }
      // Paper end
  
      // Spigot start
diff --git a/patches/api/0244-Add-sendOpLevel-API.patch b/patches/api/0244-Add-sendOpLevel-API.patch
index bc8064f6cd..84102bed82 100644
--- a/patches/api/0244-Add-sendOpLevel-API.patch
+++ b/patches/api/0244-Add-sendOpLevel-API.patch
@@ -5,14 +5,14 @@ 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 e9df321980d0744a50edf2d5f978340013588803..8a6cab8df1f1947bbdc4d11ba24b982a8483b2cc 100644
+index 36e3f86f463cd7b6bca4c8b63739a06f17d7e28a..a46bc40bf101df46843311684f232b4b5b6f9127 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2893,6 +2893,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      */
-     @Nullable
-     Firework boostElytra(@NotNull ItemStack firework);
-+
+@@ -2900,6 +2900,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     }
+     // Paper end
+ 
++    // Paper start - sendOpLevel API
 +    /**
 +     * Send a packet to the player indicating its operator status level.
 +     * <p>
@@ -23,6 +23,8 @@ index e9df321980d0744a50edf2d5f978340013588803..8a6cab8df1f1947bbdc4d11ba24b982a
 +     * @throws IllegalArgumentException If the level is negative or greater than {@code 4} (i.e. not within {@code [0, 4]}).
 +     */
 +    void sendOpLevel(byte level);
-     // Paper end
- 
++    // Paper end - sendOpLevel API
++
      // Spigot start
+     public class Spigot extends Entity.Spigot {
+ 
diff --git a/patches/api/0369-More-Teleport-API.patch b/patches/api/0369-More-Teleport-API.patch
index d76458bbf1..b8c95b2bc5 100644
--- a/patches/api/0369-More-Teleport-API.patch
+++ b/patches/api/0369-More-Teleport-API.patch
@@ -165,10 +165,10 @@ index 77e29cada05da8946d718fe331e28e7553922033..5607404fa0132febdbdaad051a4e9426
       * 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 fe1c58a20de699d869a3f86295c8446991cce399..6a53097f308955dc063daf96aa367c2cb2945ca1 100644
+index ccc7077f66d96b85478545a89c94b7466c3cdb77..3d64f8c3071495ec95350e09843d8e140b6a9af3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3053,6 +3053,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3060,6 +3060,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  
diff --git a/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch
index 6855546ed2..05790dfeb1 100644
--- a/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,14 +5,14 @@ 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 6a53097f308955dc063daf96aa367c2cb2945ca1..470d47d6ffaf04805439d043fbb04bf2342d1db8 100644
+index 3d64f8c3071495ec95350e09843d8e140b6a9af3..58498426c6ec697091a7a8ceeae6b85525ef39b7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2935,6 +2935,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]}).
-      */
+@@ -2944,6 +2944,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void sendOpLevel(byte level);
-+
+     // Paper end - sendOpLevel API
+ 
++    // Paper start - custom chat completions API
 +    /**
 +     * Adds custom chat completion suggestions that the client will
 +     * suggest when typing in chat.
@@ -35,6 +35,8 @@ index 6a53097f308955dc063daf96aa367c2cb2945ca1..470d47d6ffaf04805439d043fbb04bf2
 +     */
 +    @Deprecated(since = "1.20.1")
 +    void removeAdditionalChatCompletions(@NotNull java.util.Collection<String> completions);
-     // Paper end
- 
++    // Paper end - custom chat completions API
++
      // Spigot start
+     public class Spigot extends Entity.Spigot {
+ 
diff --git a/patches/api/0381-Elder-Guardian-appearance-API.patch b/patches/api/0381-Elder-Guardian-appearance-API.patch
index 254bf53ceb..0e572b6907 100644
--- a/patches/api/0381-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 470d47d6ffaf04805439d043fbb04bf2342d1db8..93a8db0a1f7fa0a06315a9ec9f58c62c6faa4fb8 100644
+index 58498426c6ec697091a7a8ceeae6b85525ef39b7..ef2e523e7571be791e37a66c2f859bd5e04d16ab 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3119,6 +3119,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3128,6 +3128,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/0389-Add-Player-Warden-Warning-API.patch b/patches/api/0389-Add-Player-Warden-Warning-API.patch
index c230bcf1dc..092341a502 100644
--- a/patches/api/0389-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 93a8db0a1f7fa0a06315a9ec9f58c62c6faa4fb8..4d1d81ddc7638e958f9cd1b10fd26227efc1578d 100644
+index ef2e523e7571be791e37a66c2f859bd5e04d16ab..1746e646ccf73efddd62eb7522f2560fdef32c49 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3135,6 +3135,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3144,6 +3144,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/0442-Add-player-idle-duration-API.patch b/patches/api/0442-Add-player-idle-duration-API.patch
index 5be2c8d0eb..aa1ff4414c 100644
--- a/patches/api/0442-Add-player-idle-duration-API.patch
+++ b/patches/api/0442-Add-player-idle-duration-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 20fa1024f9ad8f478a347be5c554b5e45b398a1c..2996db88343060624d6aab7889290ae74a973fe8 100644
+index 91919b2d06d544be9a09c486791de7dff599f75a..087898a50909a40aabec09f1e52cefed6565ba4c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3274,6 +3274,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3283,6 +3283,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void increaseWardenWarningLevel();
      // Paper end
  
diff --git a/patches/server/0479-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0478-Fixed-TileEntityBell-memory-leak.patch
index 0cd7feb8d4..0cd7feb8d4 100644
--- a/patches/server/0479-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0478-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0478-Player-elytra-boost-API.patch b/patches/server/0478-Player-elytra-boost-API.patch
deleted file mode 100644
index 192b0e99e2..0000000000
--- a/patches/server/0478-Player-elytra-boost-API.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Trigary <[email protected]>
-Date: Tue, 14 Apr 2020 12:05:22 +0200
-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 0656ea43e1d508d8f6af308475942c28d77655a4..aef0fa6fd575c08c75c75463abcc43089aada9e3 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -626,6 +626,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         }
-         throw new RuntimeException("Unknown settings type");
-     }
-+
-+    @Override
-+    public org.bukkit.entity.Firework boostElytra(ItemStack firework) {
-+        Preconditions.checkState(this.isGliding(), "Player must be gliding");
-+        Preconditions.checkArgument(firework != null, "firework == null");
-+        Preconditions.checkArgument(firework.getType() == Material.FIREWORK_ROCKET, "Firework must be Material.FIREWORK_ROCKET");
-+
-+        net.minecraft.world.item.ItemStack item = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(firework);
-+        net.minecraft.world.level.Level world = ((CraftWorld) getWorld()).getHandle();
-+        net.minecraft.world.entity.projectile.FireworkRocketEntity entity = new net.minecraft.world.entity.projectile.FireworkRocketEntity(world, item, getHandle());
-+        return world.addFreshEntity(entity)
-+            ? (org.bukkit.entity.Firework) entity.getBukkitEntity()
-+            : null;
-+    }
-     // Paper end
- 
-     @Override
diff --git a/patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 27b0ff407c..27b0ff407c 100644
--- a/patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
index b71a0f1eba..f2e0ca17ed 100644
--- a/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b1761300567e0e36ed17caed76f2aaa0ddb949d3..dac43bcd9dc796ffec983013291530f3bc541a26 100644
+index b1162c638a87714ba9e54a24f10f229d303123bd..98fe64fcab9d0f8497794ccb8df563be782798d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1814,6 +1814,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0482-Add-ignore-discounts-API.patch b/patches/server/0481-Add-ignore-discounts-API.patch
index 94293b80ce..94293b80ce 100644
--- a/patches/server/0482-Add-ignore-discounts-API.patch
+++ b/patches/server/0481-Add-ignore-discounts-API.patch
diff --git a/patches/server/0483-Toggle-for-removing-existing-dragon.patch b/patches/server/0482-Toggle-for-removing-existing-dragon.patch
index 0ec8e9d4ef..0ec8e9d4ef 100644
--- a/patches/server/0483-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0482-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0484-Fix-client-lag-on-advancement-loading.patch b/patches/server/0483-Fix-client-lag-on-advancement-loading.patch
index 9d922ffc2f..9d922ffc2f 100644
--- a/patches/server/0484-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0483-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0485-Item-no-age-no-player-pickup.patch b/patches/server/0484-Item-no-age-no-player-pickup.patch
index 09109439e5..8ab619bbbd 100644
--- a/patches/server/0485-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0484-Item-no-age-no-player-pickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item no age & no player pickup
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index b1be6c99ebff90ff98a7d5cafec4a856b9704b66..43f6422fedae4304801c7be21990725eca11fc62 100644
+index 7b11db70668951e5331b6d6b99f616e163d7d7d6..953d3762292a4c15b063f9e237edf2f5c5362cb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack;
diff --git a/patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 9a80ce81b8..9a80ce81b8 100644
--- a/patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0487-Beacon-API-custom-effect-ranges.patch b/patches/server/0486-Beacon-API-custom-effect-ranges.patch
index 6dd6575eb1..f3b72c6e9c 100644
--- a/patches/server/0487-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0486-Beacon-API-custom-effect-ranges.patch
@@ -95,7 +95,7 @@ index cd28ee0cbc69713a641a21c9a626c694a4bcbfc9..3a50fe20294048a1c818ae717a918bb1
  
      public void setCustomName(@Nullable Component customName) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
-index 57925335811f814fbd6010e58dc0566401cae21d..7aa4c30149289412991f54b1e730857a8e120eb3 100644
+index c4890927419e27fd35e4e373fb09dcb182234fbf..7d90360bac08d6ec796ba44f1809793f3a3c1b3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
 @@ -32,7 +32,7 @@ public class CraftBeacon extends CraftBlockEntityState<BeaconBlockEntity> implem
diff --git a/patches/server/0488-Add-API-for-quit-reason.patch b/patches/server/0487-Add-API-for-quit-reason.patch
index 0a76db357f..ef1802dc67 100644
--- a/patches/server/0488-Add-API-for-quit-reason.patch
+++ b/patches/server/0487-Add-API-for-quit-reason.patch
@@ -25,7 +25,7 @@ index f9d7fec242a059a3b056c569ffaf214a361716d6..33a3c657bd390b9e8bc23af93c1107f5
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 48985c0577fe1a09838137286e32128b29a60552..9c74a7e1dc74873c16a0fc474de459ccec4d372d 100644
+index 567bfcdf5c946d09bb8188435ee13930082dccf5..bf637aae0dcd701dd31568b3c84851349c4c5a0a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -272,6 +272,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 48985c0577fe1a09838137286e32128b29a60552..9c74a7e1dc74873c16a0fc474de459cc
      // Paper start - replace player chunk loader
      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));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index e8133a1ec975b7f63926acc7d6ab9291a2107084..95d37df1b51453722d47eb07e2e0247f308fa171 100644
+index 96ee68e6656a59d959ad7a7e78f5a3752d6e3dbb..d660041805bcd1bb97cf347d8b1cfe5c65469f56 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -302,6 +302,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -49,7 +49,7 @@ index e8133a1ec975b7f63926acc7d6ab9291a2107084..95d37df1b51453722d47eb07e2e0247f
              this.connection.disconnect(ichatbasecomponent);
          }));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1c95c4ff3f4b1811ff60ecb9518e0ef90c5120a5..f5df936cd96688758a1acd8d3ff743e507bc2001 100644
+index cedc6b1e4255336b610ab9ba88a04d8dfde433cf..2c3ff91a7275158cdffa828e133a131b138bfa7c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -560,7 +560,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch
index 09e0c87600..09e0c87600 100644
--- a/patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0490-Expose-world-spawn-angle.patch b/patches/server/0489-Expose-world-spawn-angle.patch
index d4805d01c0..8910923479 100644
--- a/patches/server/0490-Expose-world-spawn-angle.patch
+++ b/patches/server/0489-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f5df936cd96688758a1acd8d3ff743e507bc2001..303e207e6819e77cf489dd47fb9450c629b70975 100644
+index 2c3ff91a7275158cdffa828e133a131b138bfa7c..3f6e0319c1580dface0a175ebb93321ae4f45a35 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -832,7 +832,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0491-Add-Destroy-Speed-API.patch b/patches/server/0490-Add-Destroy-Speed-API.patch
index eda1608ac3..eda1608ac3 100644
--- a/patches/server/0491-Add-Destroy-Speed-API.patch
+++ b/patches/server/0490-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index defbf49445..28a718b3b8 100644
--- a/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0491-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 e3d6fd978f1f64e980e5729a2ad2712f44923786..192981678ad54bf1b71db4d1f15e6884e88ecebb 100644
+index 7b1404ac481ea9a059197b9f752327ef0bf72c5c..1f742a39d1f31ef27cb4e662a6c3935600728d0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2538,7 +2538,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2524,7 +2524,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/0493-Add-LivingEntity-clearActiveItem.patch b/patches/server/0492-Add-LivingEntity-clearActiveItem.patch
index 3c5a99d1c4..ee851be253 100644
--- a/patches/server/0493-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0492-Add-LivingEntity-clearActiveItem.patch
@@ -5,7 +5,7 @@ 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 8ed8bd2c539af20aa97bff1c0f719c4c2f793fc5..66a4d3d3626e4382e07617d0af464e6fbd8a9427 100644
+index c8e729e949e7a8301f17768d6ae3f3ce940bb73a..a654f22a6c331cd69290b99e6c73f3ed611c58a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -887,6 +887,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0494-Add-PlayerItemCooldownEvent.patch b/patches/server/0493-Add-PlayerItemCooldownEvent.patch
index 751841d117..751841d117 100644
--- a/patches/server/0494-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0493-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch
index 95f0914262..95f0914262 100644
--- a/patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0496-More-lightning-API.patch b/patches/server/0495-More-lightning-API.patch
index 0a4adb0107..bda291858a 100644
--- a/patches/server/0496-More-lightning-API.patch
+++ b/patches/server/0495-More-lightning-API.patch
@@ -8,7 +8,7 @@ public net.minecraft.world.entity.LightningBolt life
 public net.minecraft.world.entity.LightningBolt flashes
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
-index b9a8a39fed91aa5bbcd3c9c05ba9f10e2b7ec889..ef5a5aed9e1b15a29fd3a97ccd502c40b1d865ac 100644
+index 849c7d1e4eabfaea491b6c9004f764307ad1b9c6..cd9bd7f06e55e970b7791e635610bb5e7491d102 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 @@ -66,4 +66,23 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
diff --git a/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch
index cebad4dbb1..4bfcf1a94b 100644
--- a/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0496-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 658e47bf5aff1e56462cc3f0a87eeb7349654176..c35d22e4d54abcb16b7ec932729d2f177fd4a14b 100644
+index d4f89c87b989be9cfb4bd991bc69b85760df4bb2..9068a9646a7e436a5a0d9ea9deb52b78a316ba4a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2057,6 +2057,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -45,7 +45,7 @@ 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 b2383510e00dcd68dee1a1f48aab873ae09f4d97..f767d1d98574fc847c495baee1bf369444443aad 100644
+index 2b0178507a39c95fff94bea382bacebb8c40f1b7..7b68fd746338fadba2b3e9aee4df5fb965299f1a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3424,7 +3424,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -117,7 +117,7 @@ index e7a8120a7d8bc9d668050c7f8fe94df90133b36c..9f46eb8417ad19e6f1bbf369f4c6b94f
      }
  
 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 7e996a527a632a2b382f5eea6df6be839a7a0ef4..25bf917fae922b34cc639148993bac39a50b4ce5 100644
+index e4e734e0f4c43c1687c8e3a8bbe15441e0bd8e76..d972c59ec98e73d7ccd774e0f06c686251ffe4cf 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/0498-Added-missing-default-perms-for-commands.patch b/patches/server/0497-Added-missing-default-perms-for-commands.patch
index 96adf6f379..9a4184db30 100644
--- a/patches/server/0498-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0497-Added-missing-default-perms-for-commands.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added missing default perms for commands
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-index ca30f9c590f792caa8f1b76d7219e9121d932673..74ffea16027ba8eaa26716c3b6b78a8e83c9ed79 100644
+index a9ea2e38e4673686c9994a58c94ad19e59fd423c..ea732f8fe7b5dd56aab5d3a061a1cad19c49ae0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 @@ -24,13 +24,73 @@ public final class CommandPermissions {
diff --git a/patches/server/0499-Add-PlayerShearBlockEvent.patch b/patches/server/0498-Add-PlayerShearBlockEvent.patch
index 56a84bee18..56a84bee18 100644
--- a/patches/server/0499-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0498-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0500-Limit-recipe-packets.patch b/patches/server/0499-Limit-recipe-packets.patch
index 4b41c6795a..4b41c6795a 100644
--- a/patches/server/0500-Limit-recipe-packets.patch
+++ b/patches/server/0499-Limit-recipe-packets.patch
diff --git a/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0500-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0500-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0502-Player-Chunk-Load-Unload-Events.patch b/patches/server/0501-Player-Chunk-Load-Unload-Events.patch
index 504b607773..504b607773 100644
--- a/patches/server/0502-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0501-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch
index d664f7ff69..d664f7ff69 100644
--- a/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0504-Expose-LivingEntity-hurt-direction.patch b/patches/server/0503-Expose-LivingEntity-hurt-direction.patch
index 4ff58cbd93..4ff58cbd93 100644
--- a/patches/server/0504-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0503-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index e2a2d2a3a3..e2a2d2a3a3 100644
--- a/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index 429087e774..429087e774 100644
--- a/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index d4c042a0ed..d4c042a0ed 100644
--- a/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0508-Implement-TargetHitEvent.patch b/patches/server/0507-Implement-TargetHitEvent.patch
index 78722933d9..78722933d9 100644
--- a/patches/server/0508-Implement-TargetHitEvent.patch
+++ b/patches/server/0507-Implement-TargetHitEvent.patch
diff --git a/patches/server/0509-MC-4-Fix-item-position-desync.patch b/patches/server/0508-MC-4-Fix-item-position-desync.patch
index dcbd1a97ed..dcbd1a97ed 100644
--- a/patches/server/0509-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0508-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0510-Additional-Block-Material-API-s.patch b/patches/server/0509-Additional-Block-Material-API-s.patch
index 051b8a644d..051b8a644d 100644
--- a/patches/server/0510-Additional-Block-Material-API-s.patch
+++ b/patches/server/0509-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0511-Fix-harming-potion-dupe.patch b/patches/server/0510-Fix-harming-potion-dupe.patch
index 7b2d745291..7b2d745291 100644
--- a/patches/server/0511-Fix-harming-potion-dupe.patch
+++ b/patches/server/0510-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 754c03c42c..754c03c42c 100644
--- a/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0513-Cache-burn-durations.patch b/patches/server/0512-Cache-burn-durations.patch
index c4372f6401..c4372f6401 100644
--- a/patches/server/0513-Cache-burn-durations.patch
+++ b/patches/server/0512-Cache-burn-durations.patch
diff --git a/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index bd783eafb5..bd783eafb5 100644
--- a/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch
index 38593b84f5..38593b84f5 100644
--- a/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch
index 4670eeb506..4670eeb506 100644
--- a/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0518-Zombie-API-breaking-doors.patch b/patches/server/0517-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0518-Zombie-API-breaking-doors.patch
+++ b/patches/server/0517-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0519-Fix-nerfed-slime-when-splitting.patch b/patches/server/0518-Fix-nerfed-slime-when-splitting.patch
index d2beca8665..d2beca8665 100644
--- a/patches/server/0519-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0518-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0520-Add-EntityLoadCrossbowEvent.patch b/patches/server/0519-Add-EntityLoadCrossbowEvent.patch
index 07e5946fbf..07e5946fbf 100644
--- a/patches/server/0520-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0519-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0521-Added-WorldGameRuleChangeEvent.patch b/patches/server/0520-Added-WorldGameRuleChangeEvent.patch
index f79f5393c5..f79f5393c5 100644
--- a/patches/server/0521-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0520-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0522-Added-ServerResourcesReloadedEvent.patch b/patches/server/0521-Added-ServerResourcesReloadedEvent.patch
index 490a9f39f8..490a9f39f8 100644
--- a/patches/server/0522-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0521-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch
index 9d7b4d29c5..9d7b4d29c5 100644
--- a/patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0523-Implemented-BlockFailedDispenseEvent.patch
index 4269a73f28..4269a73f28 100644
--- a/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0523-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0525-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0524-Added-PlayerLecternPageChangeEvent.patch
index 57485f4ee7..57485f4ee7 100644
--- a/patches/server/0525-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0524-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch
index 93e862a643..93e862a643 100644
--- a/patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0527-Configurable-door-breaking-difficulty.patch b/patches/server/0526-Configurable-door-breaking-difficulty.patch
index 5338964e49..5338964e49 100644
--- a/patches/server/0527-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0526-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0528-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0527-Empty-commands-shall-not-be-dispatched.patch
index 9b41ebaaf7..9b41ebaaf7 100644
--- a/patches/server/0528-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0527-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0529-Remove-stale-POIs.patch b/patches/server/0528-Remove-stale-POIs.patch
index ffd7e9574e..ffd7e9574e 100644
--- a/patches/server/0529-Remove-stale-POIs.patch
+++ b/patches/server/0528-Remove-stale-POIs.patch
diff --git a/patches/server/0530-Fix-villager-boat-exploit.patch b/patches/server/0529-Fix-villager-boat-exploit.patch
index 0663c12d9c..0663c12d9c 100644
--- a/patches/server/0530-Fix-villager-boat-exploit.patch
+++ b/patches/server/0529-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0531-Add-sendOpLevel-API.patch b/patches/server/0530-Add-sendOpLevel-API.patch
index ae6be27473..9278d614ff 100644
--- a/patches/server/0531-Add-sendOpLevel-API.patch
+++ b/patches/server/0530-Add-sendOpLevel-API.patch
@@ -32,20 +32,22 @@ index 9b56415f1a03423f29822839ce27bbdf33bb91d5..89d18ae87029b82beea5e1bd69580f54
  
      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 192981678ad54bf1b71db4d1f15e6884e88ecebb..47f3bd3be8da2c79d3655823ac0f2f4a8f9d7efe 100644
+index 1f742a39d1f31ef27cb4e662a6c3935600728d0b..69d0694f2f25ce51f40c7cd283e1591fe05ffe2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -640,6 +640,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             ? (org.bukkit.entity.Firework) entity.getBukkitEntity()
-             : null;
+@@ -628,6 +628,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
-+
+     // Paper end
+ 
++    // Paper start - sendOpLevel API
 +    @Override
 +    public void sendOpLevel(byte level) {
 +        Preconditions.checkArgument(level >= 0 && level <= 4, "Level must be within [0, 4]");
 +
 +        this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
 +    }
-     // Paper end
- 
++    // Paper end - sendOpLevel API
++
      @Override
+     public void setCompassTarget(Location loc) {
+         Preconditions.checkArgument(loc != null, "Location cannot be null");
diff --git a/patches/server/0532-TODO-Registry-Modification-API.patch b/patches/server/0531-TODO-Registry-Modification-API.patch
index c247dad753..c247dad753 100644
--- a/patches/server/0532-TODO-Registry-Modification-API.patch
+++ b/patches/server/0531-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0533-Add-StructuresLocateEvent.patch b/patches/server/0532-Add-StructuresLocateEvent.patch
index 47d435b995..47d435b995 100644
--- a/patches/server/0533-Add-StructuresLocateEvent.patch
+++ b/patches/server/0532-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0534-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0533-Collision-option-for-requiring-a-player-participant.patch
index 09bc1189ea..09bc1189ea 100644
--- a/patches/server/0534-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0533-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 3f7c51ddfe..3f7c51ddfe 100644
--- a/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch
index 17e9def19b..17e9def19b 100644
--- a/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0537-Make-schedule-command-per-world.patch b/patches/server/0536-Make-schedule-command-per-world.patch
index 8e29559590..8e29559590 100644
--- a/patches/server/0537-Make-schedule-command-per-world.patch
+++ b/patches/server/0536-Make-schedule-command-per-world.patch
diff --git a/patches/server/0538-Configurable-max-leash-distance.patch b/patches/server/0537-Configurable-max-leash-distance.patch
index c1ac4b5634..c1ac4b5634 100644
--- a/patches/server/0538-Configurable-max-leash-distance.patch
+++ b/patches/server/0537-Configurable-max-leash-distance.patch
diff --git a/patches/server/0539-Implement-BlockPreDispenseEvent.patch b/patches/server/0538-Implement-BlockPreDispenseEvent.patch
index 7fb05f89fa..7fb05f89fa 100644
--- a/patches/server/0539-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0538-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 03d8cdf4c8..03d8cdf4c8 100644
--- a/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch
index 39e24e6044..39e24e6044 100644
--- a/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch
index 9750570e73..9750570e73 100644
--- a/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 93cff1f7ad..93cff1f7ad 100644
--- a/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0543-Reset-shield-blocking-on-dimension-change.patch
index 77d3f29709..77d3f29709 100644
--- a/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0543-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0545-add-DragonEggFormEvent.patch b/patches/server/0544-add-DragonEggFormEvent.patch
index e4c888b12d..e4c888b12d 100644
--- a/patches/server/0545-add-DragonEggFormEvent.patch
+++ b/patches/server/0544-add-DragonEggFormEvent.patch
diff --git a/patches/server/0546-EntityMoveEvent.patch b/patches/server/0545-EntityMoveEvent.patch
index 1597623bc7..1597623bc7 100644
--- a/patches/server/0546-EntityMoveEvent.patch
+++ b/patches/server/0545-EntityMoveEvent.patch
diff --git a/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch
index 2019b707c1..2019b707c1 100644
--- a/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0548-Inline-shift-direction-fields.patch b/patches/server/0547-Inline-shift-direction-fields.patch
index f0c71d61f2..f0c71d61f2 100644
--- a/patches/server/0548-Inline-shift-direction-fields.patch
+++ b/patches/server/0547-Inline-shift-direction-fields.patch
diff --git a/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch
index 18e781092c..18e781092c 100644
--- a/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 88e136bf5d..88e136bf5d 100644
--- a/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0551-living-entity-allow-attribute-registration.patch b/patches/server/0550-living-entity-allow-attribute-registration.patch
index d9d31ae912..d9d31ae912 100644
--- a/patches/server/0551-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0550-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0552-fix-dead-slime-setSize-invincibility.patch b/patches/server/0551-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0552-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0551-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0554-Expose-Tracked-Players.patch b/patches/server/0553-Expose-Tracked-Players.patch
index d997a95f37..d997a95f37 100644
--- a/patches/server/0554-Expose-Tracked-Players.patch
+++ b/patches/server/0553-Expose-Tracked-Players.patch
diff --git a/patches/server/0555-Remove-streams-from-SensorNearest.patch b/patches/server/0554-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0555-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0554-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0556-Improve-ServerGUI.patch b/patches/server/0555-Improve-ServerGUI.patch
index cb4eed5f13..cb4eed5f13 100644
--- a/patches/server/0556-Improve-ServerGUI.patch
+++ b/patches/server/0555-Improve-ServerGUI.patch
diff --git a/patches/server/0557-fix-converting-txt-to-json-file.patch b/patches/server/0556-fix-converting-txt-to-json-file.patch
index 786852a5f5..786852a5f5 100644
--- a/patches/server/0557-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0556-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0558-Add-worldborder-events.patch b/patches/server/0557-Add-worldborder-events.patch
index 176d1259e4..176d1259e4 100644
--- a/patches/server/0558-Add-worldborder-events.patch
+++ b/patches/server/0557-Add-worldborder-events.patch
diff --git a/patches/server/0559-added-PlayerNameEntityEvent.patch b/patches/server/0558-added-PlayerNameEntityEvent.patch
index d5a8060153..d5a8060153 100644
--- a/patches/server/0559-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0558-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0559-Prevent-grindstones-from-overstacking-items.patch
index 896e20afba..896e20afba 100644
--- a/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0559-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0561-Add-recipe-to-cook-events.patch b/patches/server/0560-Add-recipe-to-cook-events.patch
index e7fabd3ae9..e7fabd3ae9 100644
--- a/patches/server/0561-Add-recipe-to-cook-events.patch
+++ b/patches/server/0560-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0562-Add-Block-isValidTool.patch b/patches/server/0561-Add-Block-isValidTool.patch
index ff5e330151..ff5e330151 100644
--- a/patches/server/0562-Add-Block-isValidTool.patch
+++ b/patches/server/0561-Add-Block-isValidTool.patch
diff --git a/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0562-Allow-using-signs-inside-spawn-protection.patch
index 4f612be1e2..4f612be1e2 100644
--- a/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0562-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0564-Expand-world-key-API.patch b/patches/server/0563-Expand-world-key-API.patch
index bd45d36dbb..bd45d36dbb 100644
--- a/patches/server/0564-Expand-world-key-API.patch
+++ b/patches/server/0563-Expand-world-key-API.patch
diff --git a/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0566-Item-Rarity-API.patch b/patches/server/0565-Item-Rarity-API.patch
index 370339eb5f..370339eb5f 100644
--- a/patches/server/0566-Item-Rarity-API.patch
+++ b/patches/server/0565-Item-Rarity-API.patch
diff --git a/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch
index 7811bd17da..7811bd17da 100644
--- a/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0567-forced-whitelist-use-configurable-kick-message.patch
index 0d27e71091..0d27e71091 100644
--- a/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0567-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index e8b8c0ce59..e8b8c0ce59 100644
--- a/patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0570-Expose-protocol-version.patch b/patches/server/0569-Expose-protocol-version.patch
index fad23f6e40..fad23f6e40 100644
--- a/patches/server/0570-Expose-protocol-version.patch
+++ b/patches/server/0569-Expose-protocol-version.patch
diff --git a/patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch
index 80761df4ca..80761df4ca 100644
--- a/patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 9fed251180..9fed251180 100644
--- a/patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0573-Add-bypass-host-check.patch b/patches/server/0572-Add-bypass-host-check.patch
index 21a11f4ee1..21a11f4ee1 100644
--- a/patches/server/0573-Add-bypass-host-check.patch
+++ b/patches/server/0572-Add-bypass-host-check.patch
diff --git a/patches/server/0574-Set-area-affect-cloud-rotation.patch b/patches/server/0573-Set-area-affect-cloud-rotation.patch
index 963479559a..963479559a 100644
--- a/patches/server/0574-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0573-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch
index cb15f6a02e..cb15f6a02e 100644
--- a/patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch
index 68c2cd3ffe..68c2cd3ffe 100644
--- a/patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch
index ecc0f6c3cd..ecc0f6c3cd 100644
--- a/patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch
index 13ba5fd753..13ba5fd753 100644
--- a/patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0580-Added-PlayerDeepSleepEvent.patch b/patches/server/0579-Added-PlayerDeepSleepEvent.patch
index d2c5959056..d2c5959056 100644
--- a/patches/server/0580-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0579-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0581-More-World-API.patch b/patches/server/0580-More-World-API.patch
index 649e3e23ac..649e3e23ac 100644
--- a/patches/server/0581-More-World-API.patch
+++ b/patches/server/0580-More-World-API.patch
diff --git a/patches/server/0582-Added-PlayerBedFailEnterEvent.patch b/patches/server/0581-Added-PlayerBedFailEnterEvent.patch
index dd4d2712ed..dd4d2712ed 100644
--- a/patches/server/0582-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0581-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch
index 69751ade08..69751ade08 100644
--- a/patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 7fd6ccefcc..7fd6ccefcc 100644
--- a/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0585-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0584-Introduce-beacon-activation-deactivation-events.patch
index d28ff36b79..d28ff36b79 100644
--- a/patches/server/0585-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0584-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 0553fa6089..0553fa6089 100644
--- a/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0587-Add-Channel-initialization-listeners.patch b/patches/server/0586-Add-Channel-initialization-listeners.patch
index 360d19718e..360d19718e 100644
--- a/patches/server/0587-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0586-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch
index d0ff308b9e..d0ff308b9e 100644
--- a/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0589-Add-more-WanderingTrader-API.patch b/patches/server/0588-Add-more-WanderingTrader-API.patch
index e7542c5ef9..e7542c5ef9 100644
--- a/patches/server/0589-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0588-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
index 0488f4f727..0488f4f727 100644
--- a/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0591-Entity-load-save-limit-per-chunk.patch b/patches/server/0590-Entity-load-save-limit-per-chunk.patch
index f07dc4c039..f07dc4c039 100644
--- a/patches/server/0591-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0590-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 85efd06d0c..85efd06d0c 100644
--- a/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 87bbcb36ba..87bbcb36ba 100644
--- a/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0594-Inventory-close.patch b/patches/server/0593-Inventory-close.patch
index 9e9df237f4..9e9df237f4 100644
--- a/patches/server/0594-Inventory-close.patch
+++ b/patches/server/0593-Inventory-close.patch
diff --git a/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 33c6b6d97f..33c6b6d97f 100644
--- a/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0596-Add-basic-Datapack-API.patch b/patches/server/0595-Add-basic-Datapack-API.patch
index 39820340b7..39820340b7 100644
--- a/patches/server/0596-Add-basic-Datapack-API.patch
+++ b/patches/server/0595-Add-basic-Datapack-API.patch
diff --git a/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0596-Add-environment-variable-to-disable-server-gui.patch
index 15f4f2968a..15f4f2968a 100644
--- a/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0596-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
index d3be632fee..f5ea880338 100644
--- a/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
@@ -144,10 +144,10 @@ index 1c795202f3b5be8f7ee41724258b509aa5b1947d..bca39612af8c9bed1e97697c42825fb7
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 47f3bd3be8da2c79d3655823ac0f2f4a8f9d7efe..a4869668643bcfe11c4a0f33d02e4b800da29a48 100644
+index 69d0694f2f25ce51f40c7cd283e1591fe05ffe2c..ba6c3e838fd486a5b68a224c1c32ef38908e3125 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1564,7 +1564,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1552,7 +1552,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/0599-ItemStack-repair-check-API.patch b/patches/server/0598-ItemStack-repair-check-API.patch
index b82fb6d5dd..b82fb6d5dd 100644
--- a/patches/server/0599-ItemStack-repair-check-API.patch
+++ b/patches/server/0598-ItemStack-repair-check-API.patch
diff --git a/patches/server/0600-More-Enchantment-API.patch b/patches/server/0599-More-Enchantment-API.patch
index fc96204583..fc96204583 100644
--- a/patches/server/0600-More-Enchantment-API.patch
+++ b/patches/server/0599-More-Enchantment-API.patch
diff --git a/patches/server/0601-Move-range-check-for-block-placing-up.patch b/patches/server/0600-Move-range-check-for-block-placing-up.patch
index 4553cc1ba0..4553cc1ba0 100644
--- a/patches/server/0601-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0600-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0601-Fix-and-optimise-world-force-upgrading.patch
index cb7fbee987..cb7fbee987 100644
--- a/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0601-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0603-Add-Mob-lookAt-API.patch b/patches/server/0602-Add-Mob-lookAt-API.patch
index 1215b07374..1215b07374 100644
--- a/patches/server/0603-Add-Mob-lookAt-API.patch
+++ b/patches/server/0602-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0604-Add-Unix-domain-socket-support.patch b/patches/server/0603-Add-Unix-domain-socket-support.patch
index c1d9e612c9..c1d9e612c9 100644
--- a/patches/server/0604-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0603-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0605-Add-EntityInsideBlockEvent.patch b/patches/server/0604-Add-EntityInsideBlockEvent.patch
index ca5eb3ba9f..ca5eb3ba9f 100644
--- a/patches/server/0605-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0604-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0606-Attributes-API-for-item-defaults.patch b/patches/server/0605-Attributes-API-for-item-defaults.patch
index 3b1bb9e3fd..3b1bb9e3fd 100644
--- a/patches/server/0606-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0605-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch
index 9a9a933443..9a9a933443 100644
--- a/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0608-More-Lidded-Block-API.patch b/patches/server/0607-More-Lidded-Block-API.patch
index e65c6a26cb..e65c6a26cb 100644
--- a/patches/server/0608-More-Lidded-Block-API.patch
+++ b/patches/server/0607-More-Lidded-Block-API.patch
diff --git a/patches/server/0609-Limit-item-frame-cursors-on-maps.patch b/patches/server/0608-Limit-item-frame-cursors-on-maps.patch
index 64dc46158b..64dc46158b 100644
--- a/patches/server/0609-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0608-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0610-Add-PlayerKickEvent-causes.patch b/patches/server/0609-Add-PlayerKickEvent-causes.patch
index d90f5b0d02..a992c7d6f6 100644
--- a/patches/server/0610-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0609-Add-PlayerKickEvent-causes.patch
@@ -488,7 +488,7 @@ index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f62
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a4869668643bcfe11c4a0f33d02e4b800da29a48..dad0a07790579bc3d8b018e1c5e281d4fe9633ba 100644
+index ba6c3e838fd486a5b68a224c1c32ef38908e3125..34377bef2b359292d184ec89311f49dd234be53e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -586,7 +586,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -517,7 +517,7 @@ index a4869668643bcfe11c4a0f33d02e4b800da29a48..dad0a07790579bc3d8b018e1c5e281d4
          }
      }
  
-@@ -672,7 +677,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -660,7 +665,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Paper start - Improve chat handling
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(msg)) {
diff --git a/patches/server/0611-Add-PufferFishStateChangeEvent.patch b/patches/server/0610-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0611-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0610-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 1dbdf33922..1dbdf33922 100644
--- a/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index e8ae16c851..e8ae16c851 100644
--- a/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch
index 8f2e06ffef..8f2e06ffef 100644
--- a/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0615-Add-BellRevealRaiderEvent.patch b/patches/server/0614-Add-BellRevealRaiderEvent.patch
index ed8e81f6a2..ed8e81f6a2 100644
--- a/patches/server/0615-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0614-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0616-Fix-invulnerable-end-crystals.patch b/patches/server/0615-Fix-invulnerable-end-crystals.patch
index 195d6b8a42..195d6b8a42 100644
--- a/patches/server/0616-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0615-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0616-Add-ElderGuardianAppearanceEvent.patch
index 93e8beb3d3..93e8beb3d3 100644
--- a/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0616-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0618-Fix-dangerous-end-portal-logic.patch b/patches/server/0617-Fix-dangerous-end-portal-logic.patch
index d83d8296e1..d83d8296e1 100644
--- a/patches/server/0618-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0617-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index ef457d74af..ef457d74af 100644
--- a/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0620-Make-item-validations-configurable.patch b/patches/server/0619-Make-item-validations-configurable.patch
index c080248e33..c080248e33 100644
--- a/patches/server/0620-Make-item-validations-configurable.patch
+++ b/patches/server/0619-Make-item-validations-configurable.patch
diff --git a/patches/server/0621-Line-Of-Sight-Changes.patch b/patches/server/0620-Line-Of-Sight-Changes.patch
index ba904ef595..ba904ef595 100644
--- a/patches/server/0621-Line-Of-Sight-Changes.patch
+++ b/patches/server/0620-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0622-add-per-world-spawn-limits.patch b/patches/server/0621-add-per-world-spawn-limits.patch
index 5a0bee4c61..5a0bee4c61 100644
--- a/patches/server/0622-add-per-world-spawn-limits.patch
+++ b/patches/server/0621-add-per-world-spawn-limits.patch
diff --git a/patches/server/0623-Fix-potions-splash-events.patch b/patches/server/0622-Fix-potions-splash-events.patch
index e217ede002..e217ede002 100644
--- a/patches/server/0623-Fix-potions-splash-events.patch
+++ b/patches/server/0622-Fix-potions-splash-events.patch
diff --git a/patches/server/0624-Add-more-LimitedRegion-API.patch b/patches/server/0623-Add-more-LimitedRegion-API.patch
index 2a50497e38..2a50497e38 100644
--- a/patches/server/0624-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0623-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 71965c5192..71965c5192 100644
--- a/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0626-Missing-Entity-API.patch b/patches/server/0625-Missing-Entity-API.patch
index 04b4f8487e..04b4f8487e 100644
--- a/patches/server/0626-Missing-Entity-API.patch
+++ b/patches/server/0625-Missing-Entity-API.patch
diff --git a/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 6d154d7e68..6d154d7e68 100644
--- a/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 46818e51e6..46818e51e6 100644
--- a/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch
index 4bdc40acc5..4bdc40acc5 100644
--- a/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch
index 915947a504..915947a504 100644
--- a/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0631-Adds-PlayerArmSwingEvent.patch b/patches/server/0630-Adds-PlayerArmSwingEvent.patch
index 5aef5fc4e8..5aef5fc4e8 100644
--- a/patches/server/0631-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0630-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch
index 270f37cb14..270f37cb14 100644
--- a/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch
index 6f53f12f33..6f53f12f33 100644
--- a/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0633-Fix-incorrect-message-for-outdated-client.patch
index c668a16be5..c668a16be5 100644
--- a/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0633-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0634-Don-t-apply-cramming-damage-to-players.patch
index 99113340f6..99113340f6 100644
--- a/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0634-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 297c6b3a06..297c6b3a06 100644
--- a/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 4a998000b2..4a998000b2 100644
--- a/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0638-Stinger-API.patch b/patches/server/0637-Stinger-API.patch
index a7104402ba..a7104402ba 100644
--- a/patches/server/0638-Stinger-API.patch
+++ b/patches/server/0637-Stinger-API.patch
diff --git a/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index d3cf90c2af..d3cf90c2af 100644
--- a/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0640-Add-System.out-err-catcher.patch b/patches/server/0639-Add-System.out-err-catcher.patch
index 6fd5f26dc3..6fd5f26dc3 100644
--- a/patches/server/0640-Add-System.out-err-catcher.patch
+++ b/patches/server/0639-Add-System.out-err-catcher.patch
diff --git a/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index f4242ad30e..f4242ad30e 100644
--- a/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0642-Improve-boat-collision-performance.patch b/patches/server/0641-Improve-boat-collision-performance.patch
index 30906bd16a..30906bd16a 100644
--- a/patches/server/0642-Improve-boat-collision-performance.patch
+++ b/patches/server/0641-Improve-boat-collision-performance.patch
diff --git a/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch
index f97c806cf2..f97c806cf2 100644
--- a/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch
index 9fba827e12..9fba827e12 100644
--- a/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0645-Add-PlayerSetSpawnEvent.patch b/patches/server/0644-Add-PlayerSetSpawnEvent.patch
index b0c4474c88..c3b686909c 100644
--- a/patches/server/0645-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0644-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 dad0a07790579bc3d8b018e1c5e281d4fe9633ba..529792ac8f17ffd4960e67638e87974474cd776c 100644
+index 34377bef2b359292d184ec89311f49dd234be53e..4b167b30275a4dd180c4b88f453e5d2ff935a857 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1323,9 +1323,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1311,9 +1311,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void setBedSpawnLocation(Location location, boolean override) {
          if (location == null) {
diff --git a/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch
index 45531b8594..45531b8594 100644
--- a/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0646-Optimize-entity-tracker-passenger-checks.patch
index 524e1fabfb..524e1fabfb 100644
--- a/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0646-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0647-Config-option-for-Piglins-guarding-chests.patch
index 63865bec49..63865bec49 100644
--- a/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0647-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0649-Added-EntityDamageItemEvent.patch b/patches/server/0648-Added-EntityDamageItemEvent.patch
index 935084ef4b..935084ef4b 100644
--- a/patches/server/0649-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0648-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0650-Optimize-indirect-passenger-iteration.patch b/patches/server/0649-Optimize-indirect-passenger-iteration.patch
index a3a4dcc84e..a3a4dcc84e 100644
--- a/patches/server/0650-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0649-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch
index a1e4f933cb..a1e4f933cb 100644
--- a/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0651-Make-EntityUnleashEvent-cancellable.patch
index 17a8a654c4..17a8a654c4 100644
--- a/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0651-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0653-Clear-bucket-NBT-after-dispense.patch b/patches/server/0652-Clear-bucket-NBT-after-dispense.patch
index 1f2a7cae78..1f2a7cae78 100644
--- a/patches/server/0653-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0652-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch
index 48c5524ab8..48c5524ab8 100644
--- a/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0655-Add-BlockBreakBlockEvent.patch b/patches/server/0654-Add-BlockBreakBlockEvent.patch
index 52a9d63ddc..52a9d63ddc 100644
--- a/patches/server/0655-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0654-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 1002fe00f7..1002fe00f7 100644
--- a/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0657-More-CommandBlock-API.patch b/patches/server/0656-More-CommandBlock-API.patch
index 65a5093980..65a5093980 100644
--- a/patches/server/0657-More-CommandBlock-API.patch
+++ b/patches/server/0656-More-CommandBlock-API.patch
diff --git a/patches/server/0658-Add-missing-team-sidebar-display-slots.patch b/patches/server/0657-Add-missing-team-sidebar-display-slots.patch
index 446d882c45..446d882c45 100644
--- a/patches/server/0658-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0657-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0659-Add-back-EntityPortalExitEvent.patch b/patches/server/0658-Add-back-EntityPortalExitEvent.patch
index fa64daa44d..fa64daa44d 100644
--- a/patches/server/0659-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0658-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch
index 827935032f..827935032f 100644
--- a/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0661-Get-entity-default-attributes.patch b/patches/server/0660-Get-entity-default-attributes.patch
index afd4c49b4d..afd4c49b4d 100644
--- a/patches/server/0661-Get-entity-default-attributes.patch
+++ b/patches/server/0660-Get-entity-default-attributes.patch
diff --git a/patches/server/0662-Left-handed-API.patch b/patches/server/0661-Left-handed-API.patch
index e75eb9ca95..e75eb9ca95 100644
--- a/patches/server/0662-Left-handed-API.patch
+++ b/patches/server/0661-Left-handed-API.patch
diff --git a/patches/server/0663-Add-more-advancement-API.patch b/patches/server/0662-Add-more-advancement-API.patch
index c7966b2e3e..c7966b2e3e 100644
--- a/patches/server/0663-Add-more-advancement-API.patch
+++ b/patches/server/0662-Add-more-advancement-API.patch
diff --git a/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch
index 4fd7a361e7..4fd7a361e7 100644
--- a/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0665-Add-critical-damage-API.patch b/patches/server/0664-Add-critical-damage-API.patch
index 2485aabae6..2485aabae6 100644
--- a/patches/server/0665-Add-critical-damage-API.patch
+++ b/patches/server/0664-Add-critical-damage-API.patch
diff --git a/patches/server/0666-Fix-issues-with-mob-conversion.patch b/patches/server/0665-Fix-issues-with-mob-conversion.patch
index 237d313b89..237d313b89 100644
--- a/patches/server/0666-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0665-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0667-Add-isCollidable-methods-to-various-places.patch b/patches/server/0666-Add-isCollidable-methods-to-various-places.patch
index 8c0d3f840e..8c0d3f840e 100644
--- a/patches/server/0667-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0666-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0668-Goat-ram-API.patch b/patches/server/0667-Goat-ram-API.patch
index 443c58b4ee..443c58b4ee 100644
--- a/patches/server/0668-Goat-ram-API.patch
+++ b/patches/server/0667-Goat-ram-API.patch
diff --git a/patches/server/0669-Add-API-for-resetting-a-single-score.patch b/patches/server/0668-Add-API-for-resetting-a-single-score.patch
index 7d45195961..7d45195961 100644
--- a/patches/server/0669-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0668-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch
index 23ec0bc909..23ec0bc909 100644
--- a/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0671-Vanilla-command-permission-fixes.patch b/patches/server/0670-Vanilla-command-permission-fixes.patch
index 316475ab5c..316475ab5c 100644
--- a/patches/server/0671-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0670-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 0949a12465..0949a12465 100644
--- a/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0673-Fix-GameProfileCache-concurrency.patch b/patches/server/0672-Fix-GameProfileCache-concurrency.patch
index 0337248104..0337248104 100644
--- a/patches/server/0673-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0672-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0674-Improve-and-expand-AsyncCatcher.patch b/patches/server/0673-Improve-and-expand-AsyncCatcher.patch
index 810a3aa123..810a3aa123 100644
--- a/patches/server/0674-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0673-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 3201888a6b..3201888a6b 100644
--- a/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0675-Sanitize-ResourceLocation-error-logging.patch
index 989716f6fd..989716f6fd 100644
--- a/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0675-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0677-Optimise-general-POI-access.patch b/patches/server/0676-Optimise-general-POI-access.patch
index 332786d627..332786d627 100644
--- a/patches/server/0677-Optimise-general-POI-access.patch
+++ b/patches/server/0676-Optimise-general-POI-access.patch
diff --git a/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch
index 0023c8bd8c..0023c8bd8c 100644
--- a/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0678-Manually-inline-methods-in-BlockPosition.patch
index c8b8adfce9..c8b8adfce9 100644
--- a/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0678-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e97fc69558..e97fc69558 100644
--- a/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 007351ae6c..007351ae6c 100644
--- a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 5475ff2092..5475ff2092 100644
--- a/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch
index d931ef54fa..d931ef54fa 100644
--- a/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0684-Time-scoreboard-search.patch b/patches/server/0683-Time-scoreboard-search.patch
index e2bd684e63..e2bd684e63 100644
--- a/patches/server/0684-Time-scoreboard-search.patch
+++ b/patches/server/0683-Time-scoreboard-search.patch
diff --git a/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch
index f005ae7e71..f005ae7e71 100644
--- a/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch
index 75ece1bf8b..75ece1bf8b 100644
--- a/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch
index 3a0637b6e5..3a0637b6e5 100644
--- a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0687-Oprimise-map-impl-for-tracked-players.patch
index 42fe98d24e..42fe98d24e 100644
--- a/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0687-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch
index 08ef0f3bc8..08ef0f3bc8 100644
--- a/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0690-Optimise-random-block-ticking.patch b/patches/server/0689-Optimise-random-block-ticking.patch
index 3587292de4..3587292de4 100644
--- a/patches/server/0690-Optimise-random-block-ticking.patch
+++ b/patches/server/0689-Optimise-random-block-ticking.patch
diff --git a/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0a7c36c977..0a7c36c977 100644
--- a/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch
index cc0f4ae232..cc0f4ae232 100644
--- a/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch
index 316023491e..316023491e 100644
--- a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 429df0d968..429df0d968 100644
--- a/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch
index c77b9ae0d6..c77b9ae0d6 100644
--- a/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0696-Distance-manager-tick-timings.patch b/patches/server/0695-Distance-manager-tick-timings.patch
index c7179fd70d..c7179fd70d 100644
--- a/patches/server/0696-Distance-manager-tick-timings.patch
+++ b/patches/server/0695-Distance-manager-tick-timings.patch
diff --git a/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 2450152a70..2450152a70 100644
--- a/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch
index f32c6d0bed..f32c6d0bed 100644
--- a/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 63f447f944..63f447f944 100644
--- a/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0700-Add-packet-limiter-config.patch b/patches/server/0699-Add-packet-limiter-config.patch
index 6b454b34dd..6b454b34dd 100644
--- a/patches/server/0700-Add-packet-limiter-config.patch
+++ b/patches/server/0699-Add-packet-limiter-config.patch
diff --git a/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 341421e59d..341421e59d 100644
--- a/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0702-Ensure-valid-vehicle-status.patch b/patches/server/0701-Ensure-valid-vehicle-status.patch
index 608f09c5af..608f09c5af 100644
--- a/patches/server/0702-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0701-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch
index df49391139..df49391139 100644
--- a/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0704-Don-t-log-debug-logging-being-disabled.patch
index 2130840734..2130840734 100644
--- a/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0704-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0705-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0705-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0707-Preserve-overstacked-loot.patch b/patches/server/0706-Preserve-overstacked-loot.patch
index 004c7c6f77..004c7c6f77 100644
--- a/patches/server/0707-Preserve-overstacked-loot.patch
+++ b/patches/server/0706-Preserve-overstacked-loot.patch
diff --git a/patches/server/0708-Update-head-rotation-in-missing-places.patch b/patches/server/0707-Update-head-rotation-in-missing-places.patch
index 77c31f1712..77c31f1712 100644
--- a/patches/server/0708-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0707-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0709-prevent-unintended-light-block-manipulation.patch b/patches/server/0708-prevent-unintended-light-block-manipulation.patch
index 745b4cd9b5..745b4cd9b5 100644
--- a/patches/server/0709-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0708-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0710-Fix-CraftCriteria-defaults-map.patch b/patches/server/0709-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0710-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0709-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0711-Fix-upstreams-block-state-factories.patch b/patches/server/0710-Fix-upstreams-block-state-factories.patch
index da98b563f3..da98b563f3 100644
--- a/patches/server/0711-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0710-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0712-Configurable-feature-seeds.patch b/patches/server/0711-Configurable-feature-seeds.patch
index 2e7ba7f297..2e7ba7f297 100644
--- a/patches/server/0712-Configurable-feature-seeds.patch
+++ b/patches/server/0711-Configurable-feature-seeds.patch
diff --git a/patches/server/0713-Add-root-admin-user-detection.patch b/patches/server/0712-Add-root-admin-user-detection.patch
index 8f7dec5ba1..8f7dec5ba1 100644
--- a/patches/server/0713-Add-root-admin-user-detection.patch
+++ b/patches/server/0712-Add-root-admin-user-detection.patch
diff --git a/patches/server/0714-Always-allow-item-changing-in-Fireball.patch b/patches/server/0713-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0714-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0713-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch
index 9cc1f40ca7..9cc1f40ca7 100644
--- a/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0715-Prevent-excessive-velocity-through-repeated-crits.patch
index 3f080e05bc..3f080e05bc 100644
--- a/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0715-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch
index db5dd67f1b..db5dd67f1b 100644
--- a/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch
index c57379be37..c57379be37 100644
--- a/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 2d07a04363..2d07a04363 100644
--- a/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch
index 6553879c95..6553879c95 100644
--- a/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0721-Fix-Spigot-growth-modifiers.patch b/patches/server/0720-Fix-Spigot-growth-modifiers.patch
index 2535a2a265..2535a2a265 100644
--- a/patches/server/0721-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0720-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0722-Add-PlayerItemFrameChangeEvent.patch
index 6214bdbdef..6214bdbdef 100644
--- a/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0722-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0724-Optimize-HashMapPalette.patch b/patches/server/0723-Optimize-HashMapPalette.patch
index 9e2b26701e..9e2b26701e 100644
--- a/patches/server/0724-Optimize-HashMapPalette.patch
+++ b/patches/server/0723-Optimize-HashMapPalette.patch
diff --git a/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch
index 4feabbc623..4feabbc623 100644
--- a/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0726-Collision-optimisations.patch b/patches/server/0725-Collision-optimisations.patch
index 97c209f43c..97c209f43c 100644
--- a/patches/server/0726-Collision-optimisations.patch
+++ b/patches/server/0725-Collision-optimisations.patch
diff --git a/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch
index 9e795d10e4..9e795d10e4 100644
--- a/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 3302cf5d13..3302cf5d13 100644
--- a/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0729-Add-more-Campfire-API.patch b/patches/server/0728-Add-more-Campfire-API.patch
index 61de925634..61de925634 100644
--- a/patches/server/0729-Add-more-Campfire-API.patch
+++ b/patches/server/0728-Add-more-Campfire-API.patch
diff --git a/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 5c74ea64c9..5c74ea64c9 100644
--- a/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0731-Fix-tripwire-state-inconsistency.patch b/patches/server/0730-Fix-tripwire-state-inconsistency.patch
index 8c45070e31..8c45070e31 100644
--- a/patches/server/0731-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0730-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0731-Forward-CraftEntity-in-teleport-command.patch
index cdfb7af3ef..cdfb7af3ef 100644
--- a/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0731-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0733-Improve-scoreboard-entries.patch b/patches/server/0732-Improve-scoreboard-entries.patch
index 5c71b1a0dc..5c71b1a0dc 100644
--- a/patches/server/0733-Improve-scoreboard-entries.patch
+++ b/patches/server/0732-Improve-scoreboard-entries.patch
diff --git a/patches/server/0734-Entity-powdered-snow-API.patch b/patches/server/0733-Entity-powdered-snow-API.patch
index 695d4ee581..695d4ee581 100644
--- a/patches/server/0734-Entity-powdered-snow-API.patch
+++ b/patches/server/0733-Entity-powdered-snow-API.patch
diff --git a/patches/server/0735-Add-API-for-item-entity-health.patch b/patches/server/0734-Add-API-for-item-entity-health.patch
index dd1d43a643..dd1d43a643 100644
--- a/patches/server/0735-Add-API-for-item-entity-health.patch
+++ b/patches/server/0734-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch
index 213b301fc1..213b301fc1 100644
--- a/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch
index 59eb60edd7..59eb60edd7 100644
--- a/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 913048fffc..913048fffc 100644
--- a/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch
index b0884e52bd..b0884e52bd 100644
--- a/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0741-Fix-bees-aging-inside-hives.patch b/patches/server/0740-Fix-bees-aging-inside-hives.patch
index 646f563356..646f563356 100644
--- a/patches/server/0741-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0740-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0742-Bucketable-API.patch b/patches/server/0741-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0742-Bucketable-API.patch
+++ b/patches/server/0741-Bucketable-API.patch
diff --git a/patches/server/0743-Validate-usernames.patch b/patches/server/0742-Validate-usernames.patch
index fe0bca6d14..fe0bca6d14 100644
--- a/patches/server/0743-Validate-usernames.patch
+++ b/patches/server/0742-Validate-usernames.patch
diff --git a/patches/server/0744-Make-water-animal-spawn-height-configurable.patch b/patches/server/0743-Make-water-animal-spawn-height-configurable.patch
index 9e90672eb5..9e90672eb5 100644
--- a/patches/server/0744-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0743-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 4ed71d8ecc..4ed71d8ecc 100644
--- a/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch
index ad9460d017..ad9460d017 100644
--- a/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0748-Multiple-Entries-with-Scoreboards.patch b/patches/server/0747-Multiple-Entries-with-Scoreboards.patch
index 69772b2ea9..69772b2ea9 100644
--- a/patches/server/0748-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0747-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0749-Reset-placed-block-on-exception.patch b/patches/server/0748-Reset-placed-block-on-exception.patch
index 308089d693..308089d693 100644
--- a/patches/server/0749-Reset-placed-block-on-exception.patch
+++ b/patches/server/0748-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0750-Add-configurable-height-for-slime-spawn.patch b/patches/server/0749-Add-configurable-height-for-slime-spawn.patch
index a9aa51d551..a9aa51d551 100644
--- a/patches/server/0750-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0749-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 5d3797471d..5d3797471d 100644
--- a/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0751-Fix-xp-reward-for-baby-zombies.patch
index a8293675b5..a8293675b5 100644
--- a/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0751-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0753-Kick-on-main-for-illegal-chat.patch b/patches/server/0752-Kick-on-main-for-illegal-chat.patch
index 90fe5ee6ad..90fe5ee6ad 100644
--- a/patches/server/0753-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0752-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0754-Multi-Block-Change-API-Implementation.patch b/patches/server/0753-Multi-Block-Change-API-Implementation.patch
index 61a5c2f1ce..d3cd5e8039 100644
--- a/patches/server/0754-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0753-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 529792ac8f17ffd4960e67638e87974474cd776c..ed7d6c2303873b39ecabfe78d0950cf698f6f61c 100644
+index 4b167b30275a4dd180c4b88f453e5d2ff935a857..4dcc4ad66e7c6cd9cbf568d8763d707b5e2b3b8b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -891,6 +891,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -879,6 +879,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0755-Fix-NotePlayEvent.patch b/patches/server/0754-Fix-NotePlayEvent.patch
index 5104743fbe..5104743fbe 100644
--- a/patches/server/0755-Fix-NotePlayEvent.patch
+++ b/patches/server/0754-Fix-NotePlayEvent.patch
diff --git a/patches/server/0756-Freeze-Tick-Lock-API.patch b/patches/server/0755-Freeze-Tick-Lock-API.patch
index 33dfa398ab..33dfa398ab 100644
--- a/patches/server/0756-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0755-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0757-Dolphin-API.patch b/patches/server/0756-Dolphin-API.patch
index e971f87322..e971f87322 100644
--- a/patches/server/0757-Dolphin-API.patch
+++ b/patches/server/0756-Dolphin-API.patch
diff --git a/patches/server/0758-More-PotionEffectType-API.patch b/patches/server/0757-More-PotionEffectType-API.patch
index 5103da4ead..5103da4ead 100644
--- a/patches/server/0758-More-PotionEffectType-API.patch
+++ b/patches/server/0757-More-PotionEffectType-API.patch
diff --git a/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 84ed67d62f..84ed67d62f 100644
--- a/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch
index b92c1c2856..b92c1c2856 100644
--- a/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0761-Add-missing-structure-set-seed-configs.patch b/patches/server/0760-Add-missing-structure-set-seed-configs.patch
index 619c499781..619c499781 100644
--- a/patches/server/0761-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0760-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0762-Implement-regenerateChunk.patch b/patches/server/0761-Implement-regenerateChunk.patch
index dd01785a8f..dd01785a8f 100644
--- a/patches/server/0762-Implement-regenerateChunk.patch
+++ b/patches/server/0761-Implement-regenerateChunk.patch
diff --git a/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch
index 6c443ed789..6c443ed789 100644
--- a/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 56af4853a3..56af4853a3 100644
--- a/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0765-Add-GameEvent-tags.patch b/patches/server/0764-Add-GameEvent-tags.patch
index 02e72d2282..02e72d2282 100644
--- a/patches/server/0765-Add-GameEvent-tags.patch
+++ b/patches/server/0764-Add-GameEvent-tags.patch
diff --git a/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 1c13cca49e..1c13cca49e 100644
--- a/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0767-Furnace-RecipesUsed-API.patch b/patches/server/0766-Furnace-RecipesUsed-API.patch
index 075cd97b56..075cd97b56 100644
--- a/patches/server/0767-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0766-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0768-Configurable-sculk-sensor-listener-range.patch b/patches/server/0767-Configurable-sculk-sensor-listener-range.patch
index ff5a549be0..ff5a549be0 100644
--- a/patches/server/0768-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0767-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0768-Add-missing-block-data-mins-and-maxes.patch
index bf5dcd67c2..bf5dcd67c2 100644
--- a/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0768-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 9a36732d25..9a36732d25 100644
--- a/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch
index 63add2e773..63add2e773 100644
--- a/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0772-Fix-Entity-Position-Desync.patch b/patches/server/0771-Fix-Entity-Position-Desync.patch
index 1a885e69f8..1a885e69f8 100644
--- a/patches/server/0772-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0771-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0773-Custom-Potion-Mixes.patch b/patches/server/0772-Custom-Potion-Mixes.patch
index bbfbea8133..bbfbea8133 100644
--- a/patches/server/0773-Custom-Potion-Mixes.patch
+++ b/patches/server/0772-Custom-Potion-Mixes.patch
diff --git a/patches/server/0774-Force-close-world-loading-screen.patch b/patches/server/0773-Force-close-world-loading-screen.patch
index 331c05b9a6..331c05b9a6 100644
--- a/patches/server/0774-Force-close-world-loading-screen.patch
+++ b/patches/server/0773-Force-close-world-loading-screen.patch
diff --git a/patches/server/0775-Fix-falling-block-spawn-methods.patch b/patches/server/0774-Fix-falling-block-spawn-methods.patch
index 546e16b94b..546e16b94b 100644
--- a/patches/server/0775-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0774-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0776-Expose-furnace-minecart-push-values.patch b/patches/server/0775-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0776-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0775-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 9a608358db..9a608358db 100644
--- a/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0778-More-Projectile-API.patch b/patches/server/0777-More-Projectile-API.patch
index d43871e79b..d43871e79b 100644
--- a/patches/server/0778-More-Projectile-API.patch
+++ b/patches/server/0777-More-Projectile-API.patch
diff --git a/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch
index b2499e69cc..b2499e69cc 100644
--- a/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 62ec01585d..62ec01585d 100644
--- a/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0781-Implement-getComputedBiome-API.patch b/patches/server/0780-Implement-getComputedBiome-API.patch
index 4421a72bbd..4421a72bbd 100644
--- a/patches/server/0781-Implement-getComputedBiome-API.patch
+++ b/patches/server/0780-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0782-Make-some-itemstacks-nonnull.patch b/patches/server/0781-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0782-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0781-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0783-Implement-enchantWithLevels-API.patch b/patches/server/0782-Implement-enchantWithLevels-API.patch
index ab96d4c51c..ab96d4c51c 100644
--- a/patches/server/0783-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0782-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0784-Fix-saving-in-unloadWorld.patch b/patches/server/0783-Fix-saving-in-unloadWorld.patch
index 727e9e5c96..727e9e5c96 100644
--- a/patches/server/0784-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0783-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0785-Buffer-OOB-setBlock-calls.patch b/patches/server/0784-Buffer-OOB-setBlock-calls.patch
index d17173fb30..d17173fb30 100644
--- a/patches/server/0785-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0784-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0786-Add-TameableDeathMessageEvent.patch b/patches/server/0785-Add-TameableDeathMessageEvent.patch
index b08801fd3d..b08801fd3d 100644
--- a/patches/server/0786-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0785-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index c99d407f99..c99d407f99 100644
--- a/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 7730bb996e..7730bb996e 100644
--- a/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch
index cd6f5e26bb..cd6f5e26bb 100644
--- a/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0790-Guard-against-invalid-entity-positions.patch b/patches/server/0789-Guard-against-invalid-entity-positions.patch
index 959e17ca71..959e17ca71 100644
--- a/patches/server/0790-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0789-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0791-cache-resource-keys.patch b/patches/server/0790-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0791-cache-resource-keys.patch
+++ b/patches/server/0790-cache-resource-keys.patch
diff --git a/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 26b7c6f5cf..26b7c6f5cf 100644
--- a/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index e9c2bc86cd..e9c2bc86cd 100644
--- a/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index c7c36d1add..c7c36d1add 100644
--- a/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch
index e1d3f11682..e1d3f11682 100644
--- a/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 34c3763697..34c3763697 100644
--- a/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 7f78aa076d..7f78aa076d 100644
--- a/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch
index a9456a58e4..a9456a58e4 100644
--- a/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 676f145bb4..676f145bb4 100644
--- a/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0800-WorldCreator-keepSpawnLoaded.patch b/patches/server/0799-WorldCreator-keepSpawnLoaded.patch
index d83f7422f1..d83f7422f1 100644
--- a/patches/server/0800-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0799-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index 0510692ca9..0510692ca9 100644
--- a/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 0a9bd54413..0a9bd54413 100644
--- a/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 76380e425b..76380e425b 100644
--- a/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch
index bcc871d7bc..bcc871d7bc 100644
--- a/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch
index fec28b7e17..fec28b7e17 100644
--- a/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0806-Add-PlayerStopUsingItemEvent.patch b/patches/server/0805-Add-PlayerStopUsingItemEvent.patch
index 3134b2b297..3134b2b297 100644
--- a/patches/server/0806-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0805-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0807-Don-t-tick-markers.patch b/patches/server/0806-Don-t-tick-markers.patch
index 48b356285d..48b356285d 100644
--- a/patches/server/0807-Don-t-tick-markers.patch
+++ b/patches/server/0806-Don-t-tick-markers.patch
diff --git a/patches/server/0808-Expand-FallingBlock-API.patch b/patches/server/0807-Expand-FallingBlock-API.patch
index 69b20741d3..69b20741d3 100644
--- a/patches/server/0808-Expand-FallingBlock-API.patch
+++ b/patches/server/0807-Expand-FallingBlock-API.patch
diff --git a/patches/server/0809-Do-not-accept-invalid-client-settings.patch b/patches/server/0808-Do-not-accept-invalid-client-settings.patch
index 81f2f884ae..81f2f884ae 100644
--- a/patches/server/0809-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0808-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0810-Add-support-for-Proxy-Protocol.patch b/patches/server/0809-Add-support-for-Proxy-Protocol.patch
index 30de84af65..30de84af65 100644
--- a/patches/server/0810-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0809-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch
index ed4f98caf0..ed4f98caf0 100644
--- a/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch
index b3404362f9..b3404362f9 100644
--- a/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch
index 0c4b4bfa98..0c4b4bfa98 100644
--- a/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch
index cdc81374d4..cdc81374d4 100644
--- a/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0816-Add-Alternate-Current-redstone-implementation.patch
index 1fc17d2b19..1fc17d2b19 100644
--- a/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0816-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0818-Dont-resent-entity-on-art-update.patch b/patches/server/0817-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0818-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0817-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0819-Add-WardenAngerChangeEvent.patch b/patches/server/0818-Add-WardenAngerChangeEvent.patch
index eb11b51339..eb11b51339 100644
--- a/patches/server/0819-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0818-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch
index 919ba3b905..919ba3b905 100644
--- a/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch
index c18323e95f..c18323e95f 100644
--- a/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0822-Nameable-Banner-API.patch b/patches/server/0821-Nameable-Banner-API.patch
index 351d3597e0..351d3597e0 100644
--- a/patches/server/0822-Nameable-Banner-API.patch
+++ b/patches/server/0821-Nameable-Banner-API.patch
diff --git a/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
index d009bb5b66..d009bb5b66 100644
--- a/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch
index 6ba582fff8..6ba582fff8 100644
--- a/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 5816232b91..5816232b91 100644
--- a/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0826-Add-Player-getFishHook.patch b/patches/server/0825-Add-Player-getFishHook.patch
index 8823cf2f88..8823cf2f88 100644
--- a/patches/server/0826-Add-Player-getFishHook.patch
+++ b/patches/server/0825-Add-Player-getFishHook.patch
diff --git a/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 3956916b04..3956916b04 100644
--- a/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch
index c41f44844d..c41f44844d 100644
--- a/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 1305d58c28..1305d58c28 100644
--- a/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0830-Fix-Bee-flower-NPE.patch b/patches/server/0829-Fix-Bee-flower-NPE.patch
index bbc40a996b..bbc40a996b 100644
--- a/patches/server/0830-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0829-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index eb5f74ca9a..eb5f74ca9a 100644
--- a/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0832-More-Teleport-API.patch b/patches/server/0831-More-Teleport-API.patch
index 519cdbe10e..b6588baba2 100644
--- a/patches/server/0832-More-Teleport-API.patch
+++ b/patches/server/0831-More-Teleport-API.patch
@@ -72,10 +72,10 @@ index b9c69703bb41f7d04f95bef27eb0614c5931c326..706eeebe3ebbecd431c42140e7f351d5
          // 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 ed7d6c2303873b39ecabfe78d0950cf698f6f61c..8bdfbe71e2718e0e24b1de048c8e48927fae1e3a 100644
+index 4dcc4ad66e7c6cd9cbf568d8763d707b5e2b3b8b..3f31fca8d1bbbcd62d72c3d8ce47237aff2a326d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1212,13 +1212,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1200,13 +1200,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setRotation(float yaw, float pitch) {
@@ -178,7 +178,7 @@ index ed7d6c2303873b39ecabfe78d0950cf698f6f61c..8bdfbe71e2718e0e24b1de048c8e4892
          location.checkFinite();
  
          ServerPlayer entity = this.getHandle();
-@@ -1231,7 +1319,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1219,7 +1307,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             return false;
          }
  
@@ -187,7 +187,7 @@ index ed7d6c2303873b39ecabfe78d0950cf698f6f61c..8bdfbe71e2718e0e24b1de048c8e4892
              return false;
          }
  
-@@ -1249,7 +1337,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1237,7 +1325,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          // If this player is riding another entity, we must dismount before teleporting.
@@ -196,7 +196,7 @@ index ed7d6c2303873b39ecabfe78d0950cf698f6f61c..8bdfbe71e2718e0e24b1de048c8e4892
  
          // SPIGOT-5509: Wakeup, similar to riding
          if (this.isSleeping()) {
-@@ -1265,13 +1353,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1253,13 +1341,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ServerLevel toWorld = ((CraftWorld) to.getWorld()).getHandle();
  
          // Close any foreign inventory
diff --git a/patches/server/0833-Add-EntityPortalReadyEvent.patch b/patches/server/0832-Add-EntityPortalReadyEvent.patch
index 92b7d3617b..92b7d3617b 100644
--- a/patches/server/0833-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0832-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch
index 380c4d5c5d..380c4d5c5d 100644
--- a/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0835-Send-block-entities-after-destroy-prediction.patch b/patches/server/0834-Send-block-entities-after-destroy-prediction.patch
index 1ea3e81505..1ea3e81505 100644
--- a/patches/server/0835-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0834-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch
index 22237fb9e2..22237fb9e2 100644
--- a/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch
index 70a7bab286..94ccf0b6a5 100644
--- a/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,14 +5,14 @@ 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 8bdfbe71e2718e0e24b1de048c8e48927fae1e3a..7cea988c9ada598f00e79c834c644d6bf01b4c93 100644
+index 3f31fca8d1bbbcd62d72c3d8ce47237aff2a326d..0d8bdc59e8b900fc39234aaeb9b0faa97c71ec33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -652,6 +652,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-         this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
+@@ -642,6 +642,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
-+
+     // Paper end - sendOpLevel API
+ 
++    // Paper start - custom chat completions API
 +    @Override
 +    public void addAdditionalChatCompletions(@NotNull Collection<String> completions) {
 +        this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket(
@@ -28,6 +28,8 @@ index 8bdfbe71e2718e0e24b1de048c8e48927fae1e3a..7cea988c9ada598f00e79c834c644d6b
 +            new ArrayList<>(completions)
 +        ));
 +    }
-     // Paper end
- 
++    // Paper end - custom chat completions API
++
      @Override
+     public void setCompassTarget(Location loc) {
+         Preconditions.checkArgument(loc != null, "Location cannot be null");
diff --git a/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch
index dd7008cfb5..dd7008cfb5 100644
--- a/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0839-Collision-API.patch b/patches/server/0838-Collision-API.patch
index efa8916419..efa8916419 100644
--- a/patches/server/0839-Collision-API.patch
+++ b/patches/server/0838-Collision-API.patch
diff --git a/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index bffcadeb49..bffcadeb49 100644
--- a/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0841-Block-Ticking-API.patch b/patches/server/0840-Block-Ticking-API.patch
index 4511a8454a..4511a8454a 100644
--- a/patches/server/0841-Block-Ticking-API.patch
+++ b/patches/server/0840-Block-Ticking-API.patch
diff --git a/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch
index 85a2ae83e6..85a2ae83e6 100644
--- a/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index c067fd1eaf..c067fd1eaf 100644
--- a/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0844-Add-NamespacedKey-biome-methods.patch b/patches/server/0843-Add-NamespacedKey-biome-methods.patch
index 6c282cba3f..6c282cba3f 100644
--- a/patches/server/0844-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0843-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch
index a3c6981860..a3c6981860 100644
--- a/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch
index 9c3d5e3b5f..9c3d5e3b5f 100644
--- a/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch
index 4f0d9f51f2..4f0d9f51f2 100644
--- a/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0848-Missing-eating-regain-reason.patch b/patches/server/0847-Missing-eating-regain-reason.patch
index e04644ebf1..e04644ebf1 100644
--- a/patches/server/0848-Missing-eating-regain-reason.patch
+++ b/patches/server/0847-Missing-eating-regain-reason.patch
diff --git a/patches/server/0849-Missing-effect-cause.patch b/patches/server/0848-Missing-effect-cause.patch
index c5a77c1456..c5a77c1456 100644
--- a/patches/server/0849-Missing-effect-cause.patch
+++ b/patches/server/0848-Missing-effect-cause.patch
diff --git a/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch
index 3e6734569e..3e6734569e 100644
--- a/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 7e974ebb59..7e974ebb59 100644
--- a/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0851-Call-BlockPhysicsEvent-more-often.patch
index ea04c3e249..ea04c3e249 100644
--- a/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0851-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0853-Configurable-chat-thread-limit.patch b/patches/server/0852-Configurable-chat-thread-limit.patch
index 5e312d3a14..5e312d3a14 100644
--- a/patches/server/0853-Configurable-chat-thread-limit.patch
+++ b/patches/server/0852-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 764d46a061..764d46a061 100644
--- a/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0855-fix-Jigsaw-block-kicking-user.patch b/patches/server/0854-fix-Jigsaw-block-kicking-user.patch
index 6206d8d028..6206d8d028 100644
--- a/patches/server/0855-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0854-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 39be29edef..39be29edef 100644
--- a/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0857-Add-getDrops-to-BlockState.patch b/patches/server/0856-Add-getDrops-to-BlockState.patch
index f1c9e20197..f1c9e20197 100644
--- a/patches/server/0857-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0856-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch
index 5ef20d44ed..5ef20d44ed 100644
--- a/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 17bbabc57b..17bbabc57b 100644
--- a/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0860-Fix-custom-piglin-loved-items.patch b/patches/server/0859-Fix-custom-piglin-loved-items.patch
index 41c934194f..41c934194f 100644
--- a/patches/server/0860-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0859-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0861-EntityPickupItemEvent-fixes.patch b/patches/server/0860-EntityPickupItemEvent-fixes.patch
index d052f8e0a1..d052f8e0a1 100644
--- a/patches/server/0861-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0860-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch
index e49f829afc..e49f829afc 100644
--- a/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch
index a39e739eaa..a39e739eaa 100644
--- a/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0864-Elder-Guardian-appearance-API.patch b/patches/server/0863-Elder-Guardian-appearance-API.patch
index 467d5949ce..309d1be1cc 100644
--- a/patches/server/0864-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0863-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 7cea988c9ada598f00e79c834c644d6bf01b4c93..d24f7d1a3e9d7f0752a8c3c028465cdaf13f8cf8 100644
+index 0d8bdc59e8b900fc39234aaeb9b0faa97c71ec33..11a8f6105a3de444dbe3a13ce98f9c91697bdc71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3172,6 +3172,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3162,6 +3162,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0865-Allow-changing-bed-s-occupied-property.patch b/patches/server/0864-Allow-changing-bed-s-occupied-property.patch
index f1d50caf78..f1d50caf78 100644
--- a/patches/server/0865-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0864-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0866-Add-entity-knockback-API.patch b/patches/server/0865-Add-entity-knockback-API.patch
index 2fab1f9c44..2fab1f9c44 100644
--- a/patches/server/0866-Add-entity-knockback-API.patch
+++ b/patches/server/0865-Add-entity-knockback-API.patch
diff --git a/patches/server/0867-Detect-headless-JREs.patch b/patches/server/0866-Detect-headless-JREs.patch
index 21cb522e88..21cb522e88 100644
--- a/patches/server/0867-Detect-headless-JREs.patch
+++ b/patches/server/0866-Detect-headless-JREs.patch
diff --git a/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch
index ebd0cc3b2c..ebd0cc3b2c 100644
--- a/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0869-optimized-dirt-and-snow-spreading.patch b/patches/server/0868-optimized-dirt-and-snow-spreading.patch
index 08a3761309..08a3761309 100644
--- a/patches/server/0869-optimized-dirt-and-snow-spreading.patch
+++ b/patches/server/0868-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0870-Added-EntityToggleSitEvent.patch b/patches/server/0869-Added-EntityToggleSitEvent.patch
index 31eaca5429..31eaca5429 100644
--- a/patches/server/0870-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0869-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0871-Add-fire-tick-delay-option.patch b/patches/server/0870-Add-fire-tick-delay-option.patch
index 7649d101c9..7649d101c9 100644
--- a/patches/server/0871-Add-fire-tick-delay-option.patch
+++ b/patches/server/0870-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0872-Add-Moving-Piston-API.patch b/patches/server/0871-Add-Moving-Piston-API.patch
index b0b64257f1..b0b64257f1 100644
--- a/patches/server/0872-Add-Moving-Piston-API.patch
+++ b/patches/server/0871-Add-Moving-Piston-API.patch
diff --git a/patches/server/0873-Ignore-impossible-spawn-tick.patch b/patches/server/0872-Ignore-impossible-spawn-tick.patch
index 46cd469266..46cd469266 100644
--- a/patches/server/0873-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0872-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch
index fe9f8e5826..fe9f8e5826 100644
--- a/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index a840f9a576..a840f9a576 100644
--- a/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 0cdc0de2ff..0cdc0de2ff 100644
--- a/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0877-Prevent-compass-from-loading-chunks.patch b/patches/server/0876-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0877-Prevent-compass-from-loading-chunks.patch
+++ b/patches/server/0876-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0877-Add-PrePlayerAttackEntityEvent.patch
index 59e72b4db1..59e72b4db1 100644
--- a/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0877-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch
index 6107fe92f8..6107fe92f8 100644
--- a/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 9780023a35..9780023a35 100644
--- a/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0881-Add-Player-Warden-Warning-API.patch b/patches/server/0880-Add-Player-Warden-Warning-API.patch
index 249094a304..30ed1857b9 100644
--- a/patches/server/0881-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0880-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 d24f7d1a3e9d7f0752a8c3c028465cdaf13f8cf8..7569b59b75adf4c7870cc95aad92ccc949a8a070 100644
+index 11a8f6105a3de444dbe3a13ce98f9c91697bdc71..6b64a88d7653f2df288764a988d957d94b625ebe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3177,6 +3177,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3167,6 +3167,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void showElderGuardian(boolean silent) {
          if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
      }
diff --git a/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch
index 667a65e357..667a65e357 100644
--- a/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0883-Add-paper-dumplisteners-command.patch b/patches/server/0882-Add-paper-dumplisteners-command.patch
index 9669276c0a..9669276c0a 100644
--- a/patches/server/0883-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0882-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0884-check-global-player-list-where-appropriate.patch b/patches/server/0883-check-global-player-list-where-appropriate.patch
index 1b18c29415..1b18c29415 100644
--- a/patches/server/0884-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0883-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch
index a2b4a2f003..a2b4a2f003 100644
--- a/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0886-ItemStack-damage-API.patch b/patches/server/0885-ItemStack-damage-API.patch
index 83ab1c3ff4..83ab1c3ff4 100644
--- a/patches/server/0886-ItemStack-damage-API.patch
+++ b/patches/server/0885-ItemStack-damage-API.patch
diff --git a/patches/server/0887-Friction-API.patch b/patches/server/0886-Friction-API.patch
index 7d174e0e49..7d174e0e49 100644
--- a/patches/server/0887-Friction-API.patch
+++ b/patches/server/0886-Friction-API.patch
diff --git a/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a019ee3c47..a019ee3c47 100644
--- a/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0889-Fix-player-kick-on-shutdown.patch b/patches/server/0888-Fix-player-kick-on-shutdown.patch
index f5de61909f..f5de61909f 100644
--- a/patches/server/0889-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0888-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0890-Sync-offhand-slot-in-menus.patch b/patches/server/0889-Sync-offhand-slot-in-menus.patch
index d54a5a6e67..d54a5a6e67 100644
--- a/patches/server/0890-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0889-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0891-Player-Entity-Tracking-Events.patch b/patches/server/0890-Player-Entity-Tracking-Events.patch
index 7deeb6f655..7deeb6f655 100644
--- a/patches/server/0891-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0890-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0892-Limit-pet-look-distance.patch b/patches/server/0891-Limit-pet-look-distance.patch
index 6b827724a3..6b827724a3 100644
--- a/patches/server/0892-Limit-pet-look-distance.patch
+++ b/patches/server/0891-Limit-pet-look-distance.patch
diff --git a/patches/server/0893-Properly-resend-entities.patch b/patches/server/0892-Properly-resend-entities.patch
index 7fb40cf3fd..7fb40cf3fd 100644
--- a/patches/server/0893-Properly-resend-entities.patch
+++ b/patches/server/0892-Properly-resend-entities.patch
diff --git a/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch
index 2e8a508b26..2e8a508b26 100644
--- a/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0895-fix-Instruments.patch b/patches/server/0894-fix-Instruments.patch
index 8132408618..b0d3525e46 100644
--- a/patches/server/0895-fix-Instruments.patch
+++ b/patches/server/0894-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 7569b59b75adf4c7870cc95aad92ccc949a8a070..f496824194613851ea3eb500b12fe7b9351fea88 100644
+index 6b64a88d7653f2df288764a988d957d94b625ebe..28963293732ff801ab0926a4b6affaec52cada54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -726,29 +726,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -716,29 +716,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 6c0d7471d6..6c0d7471d6 100644
--- a/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index f318df5bb3..f318df5bb3 100644
--- a/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0898-Add-BlockLockCheckEvent.patch b/patches/server/0897-Add-BlockLockCheckEvent.patch
index 860cae73de..860cae73de 100644
--- a/patches/server/0898-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0897-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0899-Add-Sneaking-API-for-Entities.patch b/patches/server/0898-Add-Sneaking-API-for-Entities.patch
index 9106439646..9106439646 100644
--- a/patches/server/0899-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0898-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0900-Improve-logging-and-errors.patch b/patches/server/0899-Improve-logging-and-errors.patch
index 8689ac7c75..8689ac7c75 100644
--- a/patches/server/0900-Improve-logging-and-errors.patch
+++ b/patches/server/0899-Improve-logging-and-errors.patch
diff --git a/patches/server/0901-Improve-PortalEvents.patch b/patches/server/0900-Improve-PortalEvents.patch
index 0ac3f798dc..0ac3f798dc 100644
--- a/patches/server/0901-Improve-PortalEvents.patch
+++ b/patches/server/0900-Improve-PortalEvents.patch
diff --git a/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch
index 1a5abc1781..1a5abc1781 100644
--- a/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch
index 6234450db8..6234450db8 100644
--- a/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0905-Flying-Fall-Damage.patch b/patches/server/0904-Flying-Fall-Damage.patch
index 3231fd2429..5dad37d9dc 100644
--- a/patches/server/0905-Flying-Fall-Damage.patch
+++ b/patches/server/0904-Flying-Fall-Damage.patch
@@ -26,10 +26,10 @@ index f9a308490e1cd7745dc12369c6041f0ae9e0b1e1..481c3e321cfc0f20bb1c4c6942b8bdbd
          } 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 f496824194613851ea3eb500b12fe7b9351fea88..20b1de95c3afbf9cfd4f8943e06fdf07caa21219 100644
+index 28963293732ff801ab0926a4b6affaec52cada54..a26f4115b3fc1964e259d73bfbca315396394ced 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2392,6 +2392,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2382,6 +2382,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().onUpdateAbilities();
      }
  
diff --git a/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index 39ca938316..39ca938316 100644
--- a/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 1e77b38126..1e77b38126 100644
--- a/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0908-config-for-disabling-entity-tag-tags.patch b/patches/server/0907-config-for-disabling-entity-tag-tags.patch
index acdda06756..acdda06756 100644
--- a/patches/server/0908-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0907-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0909-Use-single-player-info-update-packet-on-join.patch b/patches/server/0908-Use-single-player-info-update-packet-on-join.patch
index 70aff90471..70aff90471 100644
--- a/patches/server/0909-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0908-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 7b2e2d63ae..7b2e2d63ae 100644
--- a/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0911-Win-Screen-API.patch b/patches/server/0910-Win-Screen-API.patch
index bd69622d7c..70e44adc2b 100644
--- a/patches/server/0911-Win-Screen-API.patch
+++ b/patches/server/0910-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 20b1de95c3afbf9cfd4f8943e06fdf07caa21219..42c6288d26dc866dae19031aa3310d88274a6fbf 100644
+index a26f4115b3fc1964e259d73bfbca315396394ced..e55898d5237d4413dfa2ea81f7e5f4941901bc08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1215,6 +1215,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1205,6 +1205,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch
index 76965d3ef0..76965d3ef0 100644
--- a/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0913-Fix-force-opening-enchantment-tables.patch b/patches/server/0912-Fix-force-opening-enchantment-tables.patch
index 7bdc01b518..7bdc01b518 100644
--- a/patches/server/0913-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0912-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0914-Add-Entity-Body-Yaw-API.patch b/patches/server/0913-Add-Entity-Body-Yaw-API.patch
index e9df66e906..e9df66e906 100644
--- a/patches/server/0914-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0913-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 9af995e790..9af995e790 100644
--- a/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0917-Add-EntityFertilizeEggEvent.patch b/patches/server/0916-Add-EntityFertilizeEggEvent.patch
index ea181cda54..ea181cda54 100644
--- a/patches/server/0917-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0916-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 1a7f1ab11a..1a7f1ab11a 100644
--- a/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 1291727de8..1291727de8 100644
--- a/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch
index c55eac7b90..c55eac7b90 100644
--- a/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0922-Fix-text-display-error-on-spawn.patch b/patches/server/0921-Fix-text-display-error-on-spawn.patch
index 43191b58fb..43191b58fb 100644
--- a/patches/server/0922-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0921-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch
index c5b7ef9a42..c5b7ef9a42 100644
--- a/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0924-Add-Shearable-API.patch b/patches/server/0923-Add-Shearable-API.patch
index 53d2faf459..53d2faf459 100644
--- a/patches/server/0924-Add-Shearable-API.patch
+++ b/patches/server/0923-Add-Shearable-API.patch
diff --git a/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 6a85431dfa..6a85431dfa 100644
--- a/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0926-Optimize-Hoppers.patch b/patches/server/0925-Optimize-Hoppers.patch
index 82b7c42ec0..82b7c42ec0 100644
--- a/patches/server/0926-Optimize-Hoppers.patch
+++ b/patches/server/0925-Optimize-Hoppers.patch
diff --git a/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0926-Fix-beehives-generating-from-using-bonemeal.patch
index ebf4eed61e..ebf4eed61e 100644
--- a/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0926-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0927-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 6bd28ec0d8..6bd28ec0d8 100644
--- a/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0927-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0928-Treat-sequence-violations-like-they-should-be.patch
index dda0696a1e..dda0696a1e 100644
--- a/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0928-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0930-remove-duplicate-animate-packet-for-records.patch b/patches/server/0929-remove-duplicate-animate-packet-for-records.patch
index 0958982027..0958982027 100644
--- a/patches/server/0930-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0929-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0930-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 920fe148a5..920fe148a5 100644
--- a/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0930-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0931-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index b0bdc70fe9..b0bdc70fe9 100644
--- a/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0931-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0933-Use-array-for-gamerule-storage.patch b/patches/server/0932-Use-array-for-gamerule-storage.patch
index 5c50da11c5..5c50da11c5 100644
--- a/patches/server/0933-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0932-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0933-Fix-a-couple-of-upstream-bed-issues.patch
index f4a4393fa2..f4a4393fa2 100644
--- a/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0933-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0934-Fix-demo-flag-not-enabling-demo-mode.patch
index 1c9d5aefe4..1c9d5aefe4 100644
--- a/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0934-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0936-Add-Mob-Experience-reward-API.patch b/patches/server/0935-Add-Mob-Experience-reward-API.patch
index 941296a95c..941296a95c 100644
--- a/patches/server/0936-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0935-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0936-Break-redstone-on-top-of-trap-doors-early.patch
index ff295ff960..ff295ff960 100644
--- a/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0936-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0937-Fix-DamageCause-for-Falling-Blocks.patch
index 7fe63b9f63..7fe63b9f63 100644
--- a/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0937-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0938-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0938-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0940-More-accurate-isInOpenWater-impl.patch b/patches/server/0939-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0940-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0939-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0940-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 2127f28b00..2127f28b00 100644
--- a/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0940-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0941-Optimise-recalcBlockCounts-for-empty-sections.patch
index 0e23a9a123..0e23a9a123 100644
--- a/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0941-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0943-Expand-PlayerItemMendEvent.patch b/patches/server/0942-Expand-PlayerItemMendEvent.patch
index 0b4ee58ae8..f3745282c6 100644
--- a/patches/server/0943-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0942-Expand-PlayerItemMendEvent.patch
@@ -33,10 +33,10 @@ index 37cd883f4920d5e1e58900ebdcfd4495a0abd2ae..6dac7cd4c9abfbde299f5d279acc2739
              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 42c6288d26dc866dae19031aa3310d88274a6fbf..2981475368094b7749cfec2e5a99ec0947248eee 100644
+index e55898d5237d4413dfa2ea81f7e5f4941901bc08..200f2a0a98e32fa722e50bf204d3ee886da58815 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1737,11 +1737,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1727,11 +1727,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());
diff --git a/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0943-Refresh-ProjectileSource-for-projectiles.patch
index 87276faa87..87276faa87 100644
--- a/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0943-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0945-Add-transient-modifier-API.patch b/patches/server/0944-Add-transient-modifier-API.patch
index e3b704e242..e3b704e242 100644
--- a/patches/server/0945-Add-transient-modifier-API.patch
+++ b/patches/server/0944-Add-transient-modifier-API.patch
diff --git a/patches/server/0946-Fix-block-place-logic.patch b/patches/server/0945-Fix-block-place-logic.patch
index a1c7cee366..a1c7cee366 100644
--- a/patches/server/0946-Fix-block-place-logic.patch
+++ b/patches/server/0945-Fix-block-place-logic.patch
diff --git a/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0946-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index da9489efd3..da9489efd3 100644
--- a/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0946-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0947-Ignore-inline-definitions-of-trim-material-pattern.patch
index 2b71534642..2b71534642 100644
--- a/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ b/patches/server/0947-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0948-Call-BlockGrowEvent-for-missing-blocks.patch
index 69fc87cf3f..69fc87cf3f 100644
--- a/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0948-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0949-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index efa2da58fc..efa2da58fc 100644
--- a/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0949-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0950-fix-MapLike-spam-for-missing-key-selector.patch
index 2fee78531f..2fee78531f 100644
--- a/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0950-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0952-Fix-sniffer-removeExploredLocation.patch b/patches/server/0951-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0952-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0951-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0952-Add-method-to-remove-all-active-potion-effects.patch
index 7b09037690..7b09037690 100644
--- a/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0952-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0953-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
index 466d256466..466d256466 100644
--- a/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ b/patches/server/0953-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0954-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index cfcf15909a..cfcf15909a 100644
--- a/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0954-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0956-Properly-Cancel-Usable-Items.patch b/patches/server/0955-Properly-Cancel-Usable-Items.patch
index ac735f5582..ac735f5582 100644
--- a/patches/server/0956-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0955-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0957-Add-event-for-player-editing-sign.patch b/patches/server/0956-Add-event-for-player-editing-sign.patch
index d8b7be275f..d8b7be275f 100644
--- a/patches/server/0957-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0956-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0957-Only-tick-item-frames-if-players-can-see-it.patch
index b3de8c9a7c..b3de8c9a7c 100644
--- a/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0957-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0959-Improve-command-function-perm-level-checks.patch b/patches/server/0958-Improve-command-function-perm-level-checks.patch
index 5d912059ff..5d912059ff 100644
--- a/patches/server/0959-Improve-command-function-perm-level-checks.patch
+++ b/patches/server/0958-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0960-Add-option-to-disable-block-updates.patch b/patches/server/0959-Add-option-to-disable-block-updates.patch
index 29e45a4f7d..29e45a4f7d 100644
--- a/patches/server/0960-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0959-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0961-Call-missing-BlockDispenseEvent.patch b/patches/server/0960-Call-missing-BlockDispenseEvent.patch
index 2496dada5e..2496dada5e 100644
--- a/patches/server/0961-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0960-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0961-Don-t-load-chunks-for-supporting-block-checks.patch
index 21461515af..21461515af 100644
--- a/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0961-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0963-Optimize-player-lookups-for-beacons.patch b/patches/server/0962-Optimize-player-lookups-for-beacons.patch
index 5245e38833..5245e38833 100644
--- a/patches/server/0963-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0962-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0964-Add-Sign-getInteractableSideFor.patch b/patches/server/0963-Add-Sign-getInteractableSideFor.patch
index 0a4aadfb36..0a4aadfb36 100644
--- a/patches/server/0964-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0963-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0965-Array-backed-synched-entity-data.patch b/patches/server/0964-Array-backed-synched-entity-data.patch
index 84bf2095b4..84bf2095b4 100644
--- a/patches/server/0965-Array-backed-synched-entity-data.patch
+++ b/patches/server/0964-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0965-fix-item-meta-for-tadpole-buckets.patch
index c1d43316d3..c1d43316d3 100644
--- a/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0965-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0966-Suppress-Item-Meta-Validation-Checks.patch
index 660669617a..660669617a 100644
--- a/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch
+++ b/patches/server/0966-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0968-Fix-BanList-API.patch b/patches/server/0967-Fix-BanList-API.patch
index 4dbd085a1a..aeed5fc467 100644
--- a/patches/server/0968-Fix-BanList-API.patch
+++ b/patches/server/0967-Fix-BanList-API.patch
@@ -208,10 +208,10 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2981475368094b7749cfec2e5a99ec0947248eee..1be276757f241d17f2d24f35df15c5d9cdaaa10c 100644
+index 200f2a0a98e32fa722e50bf204d3ee886da58815..48e6b61c0b61507e9aac7557ce3b9c7f115b8539 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1635,23 +1635,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1625,23 +1625,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
@@ -240,7 +240,7 @@ index 2981475368094b7749cfec2e5a99ec0947248eee..1be276757f241d17f2d24f35df15c5d9
          if (kickPlayer) {
              this.kickPlayer(reason);
          }
-@@ -1659,12 +1659,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1649,12 +1649,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0968-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 05fb1ac2ac..05fb1ac2ac 100644
--- a/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0968-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0969-Fix-possible-NPE-on-painting-creation.patch
index 8485ab1255..8485ab1255 100644
--- a/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0969-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0970-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index d72ec05289..d72ec05289 100644
--- a/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0970-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0971-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 49b157ea07..49b157ea07 100644
--- a/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0971-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0973-Don-t-tick-signs.patch b/patches/server/0972-Don-t-tick-signs.patch
index 759f4ef4d2..759f4ef4d2 100644
--- a/patches/server/0973-Don-t-tick-signs.patch
+++ b/patches/server/0972-Don-t-tick-signs.patch
diff --git a/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0973-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 45166cba2a..45166cba2a 100644
--- a/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0973-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0975-Add-whitelist-events.patch b/patches/server/0974-Add-whitelist-events.patch
index 42eff5bfe1..42eff5bfe1 100644
--- a/patches/server/0975-Add-whitelist-events.patch
+++ b/patches/server/0974-Add-whitelist-events.patch
diff --git a/patches/server/0976-Implement-PlayerFailMoveEvent.patch b/patches/server/0975-Implement-PlayerFailMoveEvent.patch
index 9feef646bd..9feef646bd 100644
--- a/patches/server/0976-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0975-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch b/patches/server/0976-Folia-scheduler-and-owned-region-API.patch
index d407af42b5..d407af42b5 100644
--- a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0976-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0977-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0977-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0979-API-for-updating-recipes-on-clients.patch b/patches/server/0978-API-for-updating-recipes-on-clients.patch
index 2e98d04389..2e98d04389 100644
--- a/patches/server/0979-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0978-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0979-Fix-rotation-when-spawning-display-entities.patch
index d0ab343b2d..d0ab343b2d 100644
--- a/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0979-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0981-Only-capture-actual-tree-growth.patch b/patches/server/0980-Only-capture-actual-tree-growth.patch
index 7035d46e7a..7035d46e7a 100644
--- a/patches/server/0981-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0980-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0981-Use-correct-source-for-mushroom-block-spread-event.patch
index 6eb9ff2e4c..6eb9ff2e4c 100644
--- a/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0981-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0982-Respect-randomizeData-on-more-entities-when-spawning.patch
index dd08dc14b0..dd08dc14b0 100644
--- a/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0982-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0984-Use-correct-seed-on-api-world-load.patch b/patches/server/0983-Use-correct-seed-on-api-world-load.patch
index 63fc9c60eb..63fc9c60eb 100644
--- a/patches/server/0984-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0983-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0984-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 56ce0b4a41..56ce0b4a41 100644
--- a/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0984-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0986-Cache-map-ids-on-item-frames.patch b/patches/server/0985-Cache-map-ids-on-item-frames.patch
index 9b22a5bbd5..9b22a5bbd5 100644
--- a/patches/server/0986-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0985-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0987-Fix-custom-statistic-criteria-creation.patch b/patches/server/0986-Fix-custom-statistic-criteria-creation.patch
index d027126175..d027126175 100644
--- a/patches/server/0987-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0986-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0988-Bandaid-fix-for-Effect.patch b/patches/server/0987-Bandaid-fix-for-Effect.patch
index 5c981e5fca..14e9b12cb4 100644
--- a/patches/server/0988-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0987-Bandaid-fix-for-Effect.patch
@@ -58,10 +58,10 @@ index c9ab48d99992a39cc6977424c589489a35f36992..5e350fa39f47d54f6048ea89c1317759
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1be276757f241d17f2d24f35df15c5d9cdaaa10c..3bdce11d4debf950ec5f1ce5d03e203f80b57214 100644
+index 48e6b61c0b61507e9aac7557ce3b9c7f115b8539..2e0863cf1756c0b76e5637777f15f27e2c94fe6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -862,7 +862,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -852,7 +852,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(effect != null, "Effect cannot be null");
          if (data != null) {
              Preconditions.checkArgument(effect.getData() != null, "Effect.%s does not have a valid Data", effect);
diff --git a/patches/server/0989-SculkCatalyst-bloom-API.patch b/patches/server/0988-SculkCatalyst-bloom-API.patch
index 77742addde..77742addde 100644
--- a/patches/server/0989-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0988-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0989-API-for-an-entity-s-scoreboard-name.patch
index 76ac7b4d9a..76ac7b4d9a 100644
--- a/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0989-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0990-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 2c00652021..2c00652021 100644
--- a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0990-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0991-Deprecate-and-replace-methods-with-old-StructureType.patch
index e45e0c150b..e45e0c150b 100644
--- a/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0991-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0992-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index a7e006f843..a7e006f843 100644
--- a/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0992-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0993-Properly-handle-BlockBreakEvent-isDropItems.patch
index ee56750095..ee56750095 100644
--- a/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0993-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0994-Fire-entity-death-event-for-ender-dragon.patch
index 3c23429d1c..3c23429d1c 100644
--- a/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0994-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0995-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 74202812a3..74202812a3 100644
--- a/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0995-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0997-Add-Listing-API-for-Player.patch b/patches/server/0996-Add-Listing-API-for-Player.patch
index 0a5a371aec..ab9b37502d 100644
--- a/patches/server/0997-Add-Listing-API-for-Player.patch
+++ b/patches/server/0996-Add-Listing-API-for-Player.patch
@@ -113,7 +113,7 @@ index 4e7141968d88ca3fbb9cceaadbef60fed0ce64eb..03d2dc7f68d6918065f852057321fbaa
          // Paper end
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3bdce11d4debf950ec5f1ce5d03e203f80b57214..dfa1f48b6d61c6644a02adbd5a5183f917a2982c 100644
+index 2e0863cf1756c0b76e5637777f15f27e2c94fe6b..97ef38f744908a09e4d24c445a5cc39db0e6ee7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -184,6 +184,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -124,7 +124,7 @@ index 3bdce11d4debf950ec5f1ce5d03e203f80b57214..dfa1f48b6d61c6644a02adbd5a5183f9
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
      private double health = 20;
-@@ -1975,7 +1976,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1965,7 +1966,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  otherPlayer.setUUID(uuidOverride);
              }
              // Paper end
@@ -133,7 +133,7 @@ index 3bdce11d4debf950ec5f1ce5d03e203f80b57214..dfa1f48b6d61c6644a02adbd5a5183f9
              if (original != null) otherPlayer.setUUID(original); // Paper - uuid override
          }
  
-@@ -2084,6 +2085,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2074,6 +2075,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (entity != null) ? this.canSee(entity) : false; // If we can't find it, we can't see it
      }
  
diff --git a/patches/server/0998-Configurable-Region-Compression-Format.patch b/patches/server/0997-Configurable-Region-Compression-Format.patch
index 08de696dde..08de696dde 100644
--- a/patches/server/0998-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0997-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0998-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 4ab00d4010..4ab00d4010 100644
--- a/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/server/0998-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0999-Fix-NPE-on-Boat-getStatus.patch
index f2b53faa13..f2b53faa13 100644
--- a/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0999-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/1001-Expand-Pose-API.patch b/patches/server/1000-Expand-Pose-API.patch
index 8d8a36f14b..8d8a36f14b 100644
--- a/patches/server/1001-Expand-Pose-API.patch
+++ b/patches/server/1000-Expand-Pose-API.patch
diff --git a/patches/server/1002-More-DragonBattle-API.patch b/patches/server/1001-More-DragonBattle-API.patch
index d14bf53224..d14bf53224 100644
--- a/patches/server/1002-More-DragonBattle-API.patch
+++ b/patches/server/1001-More-DragonBattle-API.patch
diff --git a/patches/server/1003-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1002-Deep-clone-unhandled-nbt-tags.patch
index a3b749dd22..a3b749dd22 100644
--- a/patches/server/1003-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/server/1002-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/1004-Add-PlayerPickItemEvent.patch b/patches/server/1003-Add-PlayerPickItemEvent.patch
index e27b097e29..e27b097e29 100644
--- a/patches/server/1004-Add-PlayerPickItemEvent.patch
+++ b/patches/server/1003-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/1005-Improve-performance-of-mass-crafts.patch b/patches/server/1004-Improve-performance-of-mass-crafts.patch
index 183698b5c5..183698b5c5 100644
--- a/patches/server/1005-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1004-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1006-Allow-trident-custom-damage.patch b/patches/server/1005-Allow-trident-custom-damage.patch
index dcbcba2af5..dcbcba2af5 100644
--- a/patches/server/1006-Allow-trident-custom-damage.patch
+++ b/patches/server/1005-Allow-trident-custom-damage.patch
diff --git a/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1006-Expose-hand-during-BlockCanBuildEvent.patch
index d14e34ae64..d14e34ae64 100644
--- a/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/server/1006-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1008-Optimize-nearest-structure-border-iteration.patch b/patches/server/1007-Optimize-nearest-structure-border-iteration.patch
index 07d0358cbb..07d0358cbb 100644
--- a/patches/server/1008-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/1007-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1009-Implement-OfflinePlayer-isConnected.patch b/patches/server/1008-Implement-OfflinePlayer-isConnected.patch
index 2cf0e8deb5..b96be3603a 100644
--- a/patches/server/1009-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/1008-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index f9b2d773449fa5d332e0c37454ba6ea731982e85..bb794638a990488afc8d9d245dd20326
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dfa1f48b6d61c6644a02adbd5a5183f917a2982c..57229748ae446d70dbc3d71219d9f81f5c8f72b1 100644
+index 9710cb0d414d33c98cccf6d3811530414a4a221f..2e6fb5111f1b1abcbff674855077dd377290d80d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -274,6 +274,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1010-Fix-inventory-desync.patch b/patches/server/1009-Fix-inventory-desync.patch
index d85eb950fd..d85eb950fd 100644
--- a/patches/server/1010-Fix-inventory-desync.patch
+++ b/patches/server/1009-Fix-inventory-desync.patch
diff --git a/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1010-Add-titleOverride-to-InventoryOpenEvent.patch
index f9b2542b7c..f9b2542b7c 100644
--- a/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/1010-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1012-Configure-sniffer-egg-hatch-time.patch b/patches/server/1011-Configure-sniffer-egg-hatch-time.patch
index 6c035ed11f..6c035ed11f 100644
--- a/patches/server/1012-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/1011-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1012-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0244f274f5..0244f274f5 100644
--- a/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/1012-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1013-Skip-POI-finding-if-stuck-in-vehicle.patch
index e45ced771d..e45ced771d 100644
--- a/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/1013-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1014-Add-slot-sanity-checks-in-container-clicks.patch
index c9eb55f978..c9eb55f978 100644
--- a/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/1014-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1015-Call-BlockRedstoneEvents-for-lecterns.patch
index dcb22051b6..dcb22051b6 100644
--- a/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/1015-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1016-Allow-proper-checking-of-empty-item-stacks.patch
index e6510b371c..e6510b371c 100644
--- a/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/1016-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1017-Fix-silent-equipment-change-for-mobs.patch
index 69b6c41e6e..69b6c41e6e 100644
--- a/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/1017-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1019-Fix-spigot-s-Forced-Stats.patch b/patches/server/1018-Fix-spigot-s-Forced-Stats.patch
index 8e012f221e..8e012f221e 100644
--- a/patches/server/1019-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/1018-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1019-Add-missing-InventoryHolders-to-inventories.patch
index b171f93a3c..b171f93a3c 100644
--- a/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/1019-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1020-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 738c4d4886..738c4d4886 100644
--- a/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/1020-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1022-Actually-optimise-explosions.patch b/patches/server/1021-Actually-optimise-explosions.patch
index a835a68c02..a835a68c02 100644
--- a/patches/server/1022-Actually-optimise-explosions.patch
+++ b/patches/server/1021-Actually-optimise-explosions.patch
diff --git a/patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1022-Add-missing-logs-for-log-ips-config-option.patch
index 604b80916e..604b80916e 100644
--- a/patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/1022-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1023-Remove-Spigot-Bug-Fix-for-MC-109346.patch
index d3ecc69301..d3ecc69301 100644
--- a/patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch
+++ b/patches/server/1023-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1025-Fix-SuspiciousStewMeta.patch b/patches/server/1024-Fix-SuspiciousStewMeta.patch
index 834deff5db..834deff5db 100644
--- a/patches/server/1025-Fix-SuspiciousStewMeta.patch
+++ b/patches/server/1024-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1026-Optimise-chunk-tick-iteration.patch b/patches/server/1025-Optimise-chunk-tick-iteration.patch
index 43a42f52d9..43a42f52d9 100644
--- a/patches/server/1026-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1025-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1027-Lag-compensation-ticks.patch b/patches/server/1026-Lag-compensation-ticks.patch
index ae178899ed..ae178899ed 100644
--- a/patches/server/1027-Lag-compensation-ticks.patch
+++ b/patches/server/1026-Lag-compensation-ticks.patch
diff --git a/patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1027-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index 34c0a06240..34c0a06240 100644
--- a/patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/1027-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch
index 6aa46a84f6..6aa46a84f6 100644
--- a/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1031-Optimise-nearby-player-retrieval.patch b/patches/server/1030-Optimise-nearby-player-retrieval.patch
index 114dfb6f4d..114dfb6f4d 100644
--- a/patches/server/1031-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1030-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1032-Remove-streams-for-villager-AI.patch b/patches/server/1031-Remove-streams-for-villager-AI.patch
index a2538da4d0..a2538da4d0 100644
--- a/patches/server/1032-Remove-streams-for-villager-AI.patch
+++ b/patches/server/1031-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1033-Fix-missing-map-initialize-event-call.patch b/patches/server/1032-Fix-missing-map-initialize-event-call.patch
index 76a90f7aec..76a90f7aec 100644
--- a/patches/server/1033-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1032-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1033-Update-entity-data-when-attaching-firework-to-entity.patch
index 40c89bc2cc..40c89bc2cc 100644
--- a/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/1033-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1034-Use-correct-variable-for-initializing-CraftLootTable.patch
index bffc71910b..bffc71910b 100644
--- a/patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch
+++ b/patches/server/1034-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1035-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
index b36b8cf1f6..b36b8cf1f6 100644
--- a/patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
+++ b/patches/server/1035-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1036-Fix-UnsafeValues-loadAdvancement.patch
index 2b7c0f8110..2b7c0f8110 100644
--- a/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/1036-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1038-Add-player-idle-duration-API.patch b/patches/server/1037-Add-player-idle-duration-API.patch
index bf7b454c60..64e41c50dd 100644
--- a/patches/server/1038-Add-player-idle-duration-API.patch
+++ b/patches/server/1037-Add-player-idle-duration-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 57229748ae446d70dbc3d71219d9f81f5c8f72b1..743b3c952e01de44905cacac3ffd501e2059238f 100644
+index f6bc3a4af1bffe6abf5a93e975848de44965cbe3..57b67e42c1e5784ecd752cf1a5165a4d7eccdb15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3280,6 +3280,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3270,6 +3270,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/1039-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch
index 81712ec1a3..81712ec1a3 100644
--- a/patches/server/1039-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1039-Fix-NPE-in-SculkBloomEvent-world-access.patch
index f4db24ce29..f4db24ce29 100644
--- a/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/1039-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index e70d4274ff..f5b7d3fea1 100644
--- a/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 743b3c952e01de44905cacac3ffd501e2059238f..4f237880cf53ec2eb4e7c93dccc168bbb682f473 100644
+index 57b67e42c1e5784ecd752cf1a5165a4d7eccdb15..00bae5df87bcc1c75d4e2f430241579d3be82c11 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1072,7 +1072,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1062,7 +1062,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void sendEquipmentChange(LivingEntity entity, EquipmentSlot slot, ItemStack item) {
diff --git a/patches/server/1042-Optimize-VarInts.patch b/patches/server/1041-Optimize-VarInts.patch
index 19e7fc574a..19e7fc574a 100644
--- a/patches/server/1042-Optimize-VarInts.patch
+++ b/patches/server/1041-Optimize-VarInts.patch
diff --git a/patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch b/patches/server/1042-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch
index 17028be297..17028be297 100644
--- a/patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch
+++ b/patches/server/1042-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch