Fix a bunch of stuff with player spawn locations (#9887)

If a playerdata doesn't contain a valid, loaded world, reset
to the main world spawn point

614 files changed, 255 insertions, 212 deletions

diff --git a/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 58d3032f44..f5d4cd1e7f 100644
--- a/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -3,25 +3,120 @@ From: 2277 <[email protected]>
 Date: Tue, 31 Mar 2020 10:33:55 +0100
 Subject: [PATCH] Move player to spawn point if spawn in unloaded world
 
-The code following this has better support for null worlds to move
-them back to the world spawn.
+If the playerdata contains an invalid world (missing, unloaded, invalid,
+etc.), spawn the player at the spawn point of the main world.
 
+Co-authored-by: Wyatt Childers <[email protected]>
+Co-authored-by: Jake Potrebic <[email protected]>
+
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index f8679d4b52a5948048a91338dc2cac8bfa5ef9e3..ac6c1c1cf0d736c31a4e3666cb9e10ba8bc1c7c5 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -196,7 +196,7 @@ public abstract class PlayerList {
+         }
+ 
+         CompoundTag nbttagcompound = this.load(player);
+-        ResourceKey resourcekey;
++        ResourceKey<Level> resourcekey = null; // Paper
+         // CraftBukkit start - Better rename detection
+         if (nbttagcompound != null && nbttagcompound.contains("bukkit")) {
+             CompoundTag bukkit = nbttagcompound.getCompound("bukkit");
+@@ -204,15 +204,42 @@ public abstract class PlayerList {
+         }
+         // CraftBukkit end
+ 
++        // Paper start - move logic in Entity to here, to use bukkit supplied world UUID & reset to main world spawn if no valid world is found
++        boolean invalidPlayerWorld = false;
++        bukkitData: if (nbttagcompound != null) {
++            // The main way for bukkit worlds to store the world is the world UUID despite mojang adding custom worlds
++            final org.bukkit.World bWorld;
++            if (nbttagcompound.contains("WorldUUIDMost") && nbttagcompound.contains("WorldUUIDLeast")) {
++                bWorld = org.bukkit.Bukkit.getServer().getWorld(new UUID(nbttagcompound.getLong("WorldUUIDMost"), nbttagcompound.getLong("WorldUUIDLeast")));
++            } else if (nbttagcompound.contains("world", net.minecraft.nbt.Tag.TAG_STRING)) { // Paper - legacy bukkit world name
++                bWorld = org.bukkit.Bukkit.getServer().getWorld(nbttagcompound.getString("world"));
++            } else {
++                break bukkitData; // if neither of the bukkit data points exist, proceed to the vanilla migration section
++            }
++            if (bWorld != null) {
++                resourcekey = ((CraftWorld) bWorld).getHandle().dimension();
++            } else {
++                resourcekey = Level.OVERWORLD;
++                invalidPlayerWorld = true;
++            }
++        }
++        if (resourcekey == null) { // only run the vanilla logic if we haven't found a world from the bukkit data
++        // Below is the vanilla way of getting the dimension, this is for migration from vanilla servers
++        // Paper end
+         if (nbttagcompound != null) {
+             DataResult<ResourceKey<Level>> dataresult = DimensionType.parseLegacy(new Dynamic(NbtOps.INSTANCE, nbttagcompound.get("Dimension"))); // CraftBukkit - decompile error
+             Logger logger = PlayerList.LOGGER;
+ 
+             Objects.requireNonNull(logger);
+-            resourcekey = (ResourceKey) dataresult.resultOrPartial(logger::error).orElse(player.serverLevel().dimension()); // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD
++            // Paper start - reset to main world spawn if no valid world is found
++            final Optional<ResourceKey<Level>> result = dataresult.resultOrPartial(logger::error);
++            invalidPlayerWorld = result.isEmpty();
++            resourcekey = result.orElse(Level.OVERWORLD);
++            // Paper end
+         } else {
+-            resourcekey = player.serverLevel().dimension(); // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD
++            resourcekey = Level.OVERWORLD; // Paper - revert to vanilla default main world, this isn't an "invalid world" since no player data existed
+         }
++        } // Paper
+ 
+         ResourceKey<Level> resourcekey1 = resourcekey;
+         ServerLevel worldserver = this.server.getLevel(resourcekey1);
+@@ -221,6 +248,7 @@ public abstract class PlayerList {
+         if (worldserver == null) {
+             PlayerList.LOGGER.warn("Unknown respawn dimension {}, defaulting to overworld", resourcekey1);
+             worldserver1 = this.server.overworld();
++            invalidPlayerWorld = true; // Paper - reset to main world if no world with parsed value is found
+         } else {
+             worldserver1 = worldserver;
+         }
+@@ -228,6 +256,10 @@ public abstract class PlayerList {
+         // Paper start
+         if (nbttagcompound == null) {
+             player.spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT; // set Player SpawnReason to DEFAULT on first login
++        // Paper start - reset to main world spawn if first spawn or invalid world
++        }
++        if (nbttagcompound == null || invalidPlayerWorld) {
++        // Paper end
+             player.fudgeSpawnLocation(worldserver1); // only move to spawn on first login, otherwise, stay where you are....
+         }
+         // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 32707ab485111e265cc34d5f09507c97067dfa09..eed16b541a9c39ed4697e783612e6f7b7ff23b70 100644
+index 9dd5844c31fa8733298eb70bb2a8deebfaea2a23..2f4afa9dd08820c3130fe6a85b051adb80057907 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2327,9 +2327,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                     bworld = server.getWorld(worldName);
-                 }
+@@ -2312,27 +2312,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+             }
+             // CraftBukkit end
  
+-            // CraftBukkit start - Reset world
+-            if (this instanceof ServerPlayer) {
+-                Server server = Bukkit.getServer();
+-                org.bukkit.World bworld = null;
+-
+-                // TODO: Remove World related checks, replaced with WorldUID
+-                String worldName = nbt.getString("world");
+-
+-                if (nbt.contains("WorldUUIDMost") && nbt.contains("WorldUUIDLeast")) {
+-                    UUID uid = new UUID(nbt.getLong("WorldUUIDMost"), nbt.getLong("WorldUUIDLeast"));
+-                    bworld = server.getWorld(uid);
+-                } else {
+-                    bworld = server.getWorld(worldName);
+-                }
+-
 -                if (bworld == null) {
 -                    bworld = ((org.bukkit.craftbukkit.CraftServer) server).getServer().getLevel(Level.OVERWORLD).getWorld();
 -                }
-+                // Paper start - Move player to spawn point if spawn in unloaded world
-+//                if (bworld == null) {
-+//                    bworld = ((org.bukkit.craftbukkit.CraftServer) server).getServer().getWorldServer(World.OVERWORLD).getWorld();
-+//                }
-+                // Paper end - Move player to spawn point if spawn in unloaded world
- 
-                 ((ServerPlayer) this).setLevel(bworld == null ? null : ((CraftWorld) bworld).getHandle());
-             }
+-
+-                ((ServerPlayer) this).setLevel(bworld == null ? null : ((CraftWorld) bworld).getHandle());
+-            }
++            // CraftBukkit start
++            // Paper - move world parsing/loading to PlayerList#placeNewPlayer
+             this.getBukkitEntity().readBukkitValues(nbt);
+             if (nbt.contains("Bukkit.invisible")) {
+                 boolean bukkitInvisible = nbt.getBoolean("Bukkit.invisible");
diff --git a/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 21ac6df91d..a8c259e985 100644
--- a/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,10 +16,10 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 77a4d6d14e79230cab80439d1fc28f27824ed04d..ad80dfcc0606a635185bf707af6d3b437f489a31 100644
+index 2f4afa9dd08820c3130fe6a85b051adb80057907..709a71eca4b1edb86af6f5f3345d90e7eb0b2893 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2457,11 +2457,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2436,11 +2436,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          } else {
              // CraftBukkit start - Capture drops for death event
              if (this instanceof net.minecraft.world.entity.LivingEntity && !((net.minecraft.world.entity.LivingEntity) this).forceDrops) {
@@ -34,7 +34,7 @@ index 77a4d6d14e79230cab80439d1fc28f27824ed04d..ad80dfcc0606a635185bf707af6d3b43
  
              entityitem.setDefaultPickUpDelay();
              // CraftBukkit start
-@@ -3263,6 +3264,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3242,6 +3243,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      @Nullable
      public Entity teleportTo(ServerLevel worldserver, Vec3 location) {
          // CraftBukkit end
@@ -47,7 +47,7 @@ index 77a4d6d14e79230cab80439d1fc28f27824ed04d..ad80dfcc0606a635185bf707af6d3b43
          if (this.level() instanceof ServerLevel && !this.isRemoved()) {
              this.level().getProfiler().push("changeDimension");
              // CraftBukkit start
-@@ -3289,6 +3296,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3268,6 +3275,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  // CraftBukkit end
  
                  this.level().getProfiler().popPush("reloading");
@@ -59,7 +59,7 @@ index 77a4d6d14e79230cab80439d1fc28f27824ed04d..ad80dfcc0606a635185bf707af6d3b43
                  Entity entity = this.getType().create(worldserver);
  
                  if (entity != null) {
-@@ -3302,10 +3314,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3281,10 +3293,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      // CraftBukkit start - Forward the CraftEntity to the new entity
                      this.getBukkitEntity().setHandle(entity);
                      entity.bukkitEntity = this.getBukkitEntity();
@@ -70,7 +70,7 @@ index 77a4d6d14e79230cab80439d1fc28f27824ed04d..ad80dfcc0606a635185bf707af6d3b43
                      // CraftBukkit end
                  }
  
-@@ -3426,7 +3434,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3405,7 +3413,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean canChangeDimensions() {
@@ -80,7 +80,7 @@ index 77a4d6d14e79230cab80439d1fc28f27824ed04d..ad80dfcc0606a635185bf707af6d3b43
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 61b9c3ebc97b0a778c3a75a926c0d689f43df823..50c68e48992add57accf7f5479952d17beca577a 100644
+index 5d4bf7390a4b368e9ef8f39da2aa4ff60329c161..109c381adefd61c69768ce1572873b2e629aff0e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1708,9 +1708,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
index 8b83857172..d6a09ee820 100644
--- a/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b80e8f05a8f99cc912904470c31092faad0717da..f2faddf78b5ea591f66d92d9e0f2b7984a3c2124 100644
+index 9c021bc57a3c4002b2f8f6e4d53f996eaf729c73..eedb6db6a5e4879847ea593975d6f6f1de954642 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -721,8 +721,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -19,7 +19,7 @@ index b80e8f05a8f99cc912904470c31092faad0717da..f2faddf78b5ea591f66d92d9e0f2b798
      }
  
      protected AABB makeBoundingBox() {
-@@ -4223,6 +4223,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4202,6 +4202,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setPosRaw(double x, double y, double z) {
@@ -31,7 +31,7 @@ index b80e8f05a8f99cc912904470c31092faad0717da..f2faddf78b5ea591f66d92d9e0f2b798
          // Paper start - rewrite chunk system
          if (this.updatingSectionStatus) {
              LOGGER.error("Refusing to update position for entity " + this + " to position " + new Vec3(x, y, z) + " since it is processing a section status update", new Throwable());
-@@ -4246,6 +4251,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4225,6 +4230,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.levelCallback.onMove();
          }
  
diff --git a/patches/server/0424-incremental-chunk-and-player-saving.patch b/patches/server/0424-incremental-chunk-and-player-saving.patch
index dfa7442af3..80ee782cde 100644
--- a/patches/server/0424-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0424-incremental-chunk-and-player-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] incremental chunk and player saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a106f5f573c9eec1f56fa88f7398ac28d231b5e5..04258e07f806acd9a0d659b682e0119a5dc23adf 100644
+index 219e191ff4d590aee9b7a704ba6fe84c3c12f43a..a5353af5ff47b5be7dac9a4e55989ad9490cf30f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -855,7 +855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -53,7 +53,7 @@ index a106f5f573c9eec1f56fa88f7398ac28d231b5e5..04258e07f806acd9a0d659b682e0119a
          // Paper start - move executeAll() into full server tick timing
          try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index a8c1620ec48adcd2bb116d48f8bb2d4af50f5f43..7d7dc8246f44d6ffd46b05f917ffbdb9cc24372b 100644
+index e27067e72a49e127aa4abb17f5ed1df09f943f3c..4e58f31e4852a0811f85596653f6db630a75b069 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -452,6 +452,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -73,7 +73,7 @@ index a8c1620ec48adcd2bb116d48f8bb2d4af50f5f43..7d7dc8246f44d6ffd46b05f917ffbdb9
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8467ea174dd48010b94b3f3c84ce097ecbb2ef14..5826536978724b54080d7d4ee61aa79800d57800 100644
+index 754e8de31e27264deebc94b1d3a9a51b5ca7e965..0ff614ea19ff5420c506fe402caf230b1e0a3a36 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1283,6 +1283,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -115,7 +115,7 @@ index 8467ea174dd48010b94b3f3c84ce097ecbb2ef14..5826536978724b54080d7d4ee61aa798
          // Paper start - rewrite chunk system - add close param
          this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6d411d6ccef650225f37275ec7c5033991408f25..4f98f80f6d8bebba33bad37fe6a722f778f93ed8 100644
+index a3c1797549e3b149f425f857bbf8564c5ef1e30e..2c2b1aef3f510edb9bb124581739f06692ab5673 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -184,6 +184,7 @@ import org.bukkit.inventory.MainHand;
@@ -127,10 +127,10 @@ index 6d411d6ccef650225f37275ec7c5033991408f25..4f98f80f6d8bebba33bad37fe6a722f7
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      public ServerGamePacketListenerImpl connection;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8b4c98ff8c411ee6f4efdf4839f9b34ea79fd599..76ab209f27afb88dfb26b8a45a6b36328f63ed45 100644
+index ac6c1c1cf0d736c31a4e3666cb9e10ba8bc1c7c5..3c7257d745406b4675155d7990a6661db7391d6b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -522,6 +522,7 @@ public abstract class PlayerList {
+@@ -554,6 +554,7 @@ public abstract class PlayerList {
  
      protected void save(ServerPlayer player) {
          if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
@@ -138,7 +138,7 @@ index 8b4c98ff8c411ee6f4efdf4839f9b34ea79fd599..76ab209f27afb88dfb26b8a45a6b3632
          this.playerIo.save(player);
          ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
  
-@@ -1119,10 +1120,22 @@ public abstract class PlayerList {
+@@ -1151,10 +1152,22 @@ public abstract class PlayerList {
      }
  
      public void saveAll() {
diff --git a/patches/server/0434-Add-PrepareResultEvent.patch b/patches/server/0433-Add-PrepareResultEvent.patch
index 963de37d64..963de37d64 100644
--- a/patches/server/0434-Add-PrepareResultEvent.patch
+++ b/patches/server/0433-Add-PrepareResultEvent.patch
diff --git a/patches/server/0433-Spawn-player-in-correct-world-on-login.patch b/patches/server/0433-Spawn-player-in-correct-world-on-login.patch
deleted file mode 100644
index 9c088c9864..0000000000
--- a/patches/server/0433-Spawn-player-in-correct-world-on-login.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Wyatt Childers <[email protected]>
-Date: Fri, 3 Jul 2020 14:57:05 -0400
-Subject: [PATCH] Spawn player in correct world on login
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 76ab209f27afb88dfb26b8a45a6b36328f63ed45..fc89e30c529ffee9acfd6bab1a89bbe56e80ba51 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -204,7 +204,18 @@ public abstract class PlayerList {
-         }
-         // CraftBukkit end
- 
--        if (nbttagcompound != null) {
-+        // Paper start - move logic in Entity to here, to use bukkit supplied world UUID.
-+        if (nbttagcompound != null && nbttagcompound.contains("WorldUUIDMost") && nbttagcompound.contains("WorldUUIDLeast")) {
-+            UUID uid = new UUID(nbttagcompound.getLong("WorldUUIDMost"), nbttagcompound.getLong("WorldUUIDLeast"));
-+            org.bukkit.World bWorld = org.bukkit.Bukkit.getServer().getWorld(uid);
-+            if (bWorld != null) {
-+                resourcekey = ((CraftWorld) bWorld).getHandle().dimension();
-+            } else {
-+                resourcekey = Level.OVERWORLD;
-+            }
-+        } else if (nbttagcompound != null) {
-+            // Vanilla migration support
-+            // Paper end
-             DataResult<ResourceKey<Level>> dataresult = DimensionType.parseLegacy(new Dynamic(NbtOps.INSTANCE, nbttagcompound.get("Dimension"))); // CraftBukkit - decompile error
-             Logger logger = PlayerList.LOGGER;
- 
diff --git a/patches/server/0435-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index e1da360f9f..e9ae4d3181 100644
--- a/patches/server/0435-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c87b149c7de77275252a5d6e182f96059760890b..b2383510e00dcd68dee1a1f48aab873ae09f4d97 100644
+index 109c381adefd61c69768ce1572873b2e629aff0e..2b0178507a39c95fff94bea382bacebb8c40f1b7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3508,7 +3508,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch
index 7ac2958bcd..7ac2958bcd 100644
--- a/patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch
index b99c971369..b99c971369 100644
--- a/patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0438-Fix-SPIGOT-5989.patch b/patches/server/0437-Fix-SPIGOT-5989.patch
index cf17a3f343..a2f9e1a3c2 100644
--- a/patches/server/0438-Fix-SPIGOT-5989.patch
+++ b/patches/server/0437-Fix-SPIGOT-5989.patch
@@ -10,10 +10,10 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fc89e30c529ffee9acfd6bab1a89bbe56e80ba51..1c95c4ff3f4b1811ff60ecb9518e0ef90c5120a5 100644
+index 3c7257d745406b4675155d7990a6661db7391d6b..e9b5d987c1891ba269ba6beec57c1e0fb65dbb4d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -789,6 +789,7 @@ public abstract class PlayerList {
+@@ -810,6 +810,7 @@ public abstract class PlayerList {
          // Paper start
          boolean isBedSpawn = false;
          boolean isRespawn = false;
@@ -21,7 +21,7 @@ index fc89e30c529ffee9acfd6bab1a89bbe56e80ba51..1c95c4ff3f4b1811ff60ecb9518e0ef9
          // Paper end
  
          // CraftBukkit start - fire PlayerRespawnEvent
-@@ -799,7 +800,7 @@ public abstract class PlayerList {
+@@ -820,7 +821,7 @@ public abstract class PlayerList {
                  Optional optional;
  
                  if (blockposition != null) {
@@ -30,7 +30,7 @@ index fc89e30c529ffee9acfd6bab1a89bbe56e80ba51..1c95c4ff3f4b1811ff60ecb9518e0ef9
                  } else {
                      optional = Optional.empty();
                  }
-@@ -843,7 +844,12 @@ public abstract class PlayerList {
+@@ -864,7 +865,12 @@ public abstract class PlayerList {
              }
              // Spigot End
  
@@ -44,7 +44,7 @@ index fc89e30c529ffee9acfd6bab1a89bbe56e80ba51..1c95c4ff3f4b1811ff60ecb9518e0ef9
              if (!flag) entityplayer.reset(); // SPIGOT-4785
              isRespawn = true; // Paper
          } else {
-@@ -882,8 +888,14 @@ public abstract class PlayerList {
+@@ -903,8 +909,14 @@ public abstract class PlayerList {
          }
          // entityplayer1.initInventoryMenu();
          entityplayer1.setHealth(entityplayer1.getHealth());
diff --git a/patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index f92eb1a39d..f92eb1a39d 100644
--- a/patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index f5cba763c4..f5cba763c4 100644
--- a/patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 5c1357ca7c..5c1357ca7c 100644
--- a/patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0442-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch
index ff42b6bac8..ff42b6bac8 100644
--- a/patches/server/0442-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0443-Fix-some-rails-connecting-improperly.patch b/patches/server/0442-Fix-some-rails-connecting-improperly.patch
index 1db425010e..1db425010e 100644
--- a/patches/server/0443-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0442-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0444-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 68d17065ec..68d17065ec 100644
--- a/patches/server/0444-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0445-Brand-support.patch b/patches/server/0444-Brand-support.patch
index 1eac141c5f..5f7f186907 100644
--- a/patches/server/0445-Brand-support.patch
+++ b/patches/server/0444-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4f98f80f6d8bebba33bad37fe6a722f778f93ed8..48985c0577fe1a09838137286e32128b29a60552 100644
+index 2c2b1aef3f510edb9bb124581739f06692ab5673..567bfcdf5c946d09bb8188435ee13930082dccf5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -271,6 +271,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 4f98f80f6d8bebba33bad37fe6a722f778f93ed8..48985c0577fe1a09838137286e32128b
      // 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 d1808bf9dc19fad84da5eb3b4c3d549bc624b00a..e8133a1ec975b7f63926acc7d6ab9291a2107084 100644
+index d25b6431ce617d90fd1d6489a308d6630b92c175..96ee68e6656a59d959ad7a7e78f5a3752d6e3dbb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -54,6 +54,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -57,7 +57,7 @@ index d1808bf9dc19fad84da5eb3b4c3d549bc624b00a..e8133a1ec975b7f63926acc7d6ab9291
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a516aa3ff7949d933c15220160f83a5b5dd5fd6c..82c3cac22e7384966bcd4d55a3434b781b5a6795 100644
+index b92cc9f8d62cc3bfefe42c4c1fb08af4731dd48f..7b1404ac481ea9a059197b9f752327ef0bf72c5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3009,6 +3009,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch
index 2518586ba3..5e9439a17f 100644
--- a/patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 71a2ac37046adb3826bc2e76b4ac385c7e331f5e..8ed8bd2c539af20aa97bff1c0f719c4c2f793fc5 100644
+index 38cad5b0d7e6018adda56b3292280738c46622e9..c8e729e949e7a8301f17768d6ae3f3ce940bb73a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -920,5 +920,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0447-Don-t-require-FACING-data.patch b/patches/server/0446-Don-t-require-FACING-data.patch
index bc170b7402..bc170b7402 100644
--- a/patches/server/0447-Don-t-require-FACING-data.patch
+++ b/patches/server/0446-Don-t-require-FACING-data.patch
diff --git a/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index ce6d8e5e50..ce6d8e5e50 100644
--- a/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0449-Add-moon-phase-API.patch b/patches/server/0448-Add-moon-phase-API.patch
index df66928ff7..df66928ff7 100644
--- a/patches/server/0449-Add-moon-phase-API.patch
+++ b/patches/server/0448-Add-moon-phase-API.patch
diff --git a/patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 977fecbd78..977fecbd78 100644
--- a/patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0451-Prevent-headless-pistons-from-being-created.patch b/patches/server/0450-Prevent-headless-pistons-from-being-created.patch
index a044172f14..a044172f14 100644
--- a/patches/server/0451-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0450-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0452-Add-BellRingEvent.patch b/patches/server/0451-Add-BellRingEvent.patch
index e10d690b22..6453b546ee 100644
--- a/patches/server/0452-Add-BellRingEvent.patch
+++ b/patches/server/0451-Add-BellRingEvent.patch
@@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e05b03b356d7a5de9f326a1004326326efd0e301..e18e733cd13b7b69170a839e78341f3f339afa09 100644
+index f4040a1187b49a3aaaca91ff983433b404765043..a19979dac60552791b7a8dd4920ba75b525340ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -367,10 +367,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0453-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch
index e14fe23350..157c5ec344 100644
--- a/patches/server/0453-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 4215c45aa1073b3c70eb58a06eb3dce26f389c90..760b880a11e8ece98b41f934f9a2441fd020ecd6 100644
+index 93ca1016806103fe688379c99afc57cb02635f65..f99e4382b4b191d9bd673a4307c6641857b836ca 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -109,7 +109,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0454-Buffer-joins-to-world.patch b/patches/server/0453-Buffer-joins-to-world.patch
index a0a51f955d..a0a51f955d 100644
--- a/patches/server/0454-Buffer-joins-to-world.patch
+++ b/patches/server/0453-Buffer-joins-to-world.patch
diff --git a/patches/server/0455-Eigencraft-redstone-implementation.patch b/patches/server/0454-Eigencraft-redstone-implementation.patch
index 5991ef0146..5991ef0146 100644
--- a/patches/server/0455-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0454-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 7ca2866cc1..17c5c43c44 100644
--- a/patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix hex colors not working in some kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index e6275103156b720d774e197ea61659f1f1699025..65ee0a7183abb0a4b1f36d2ef9631c00b52eb99e 100644
+index e8cf9eafe0908bc9b716d9b6ead97828a43413ec..2ee5c884571228a353120f658f1a2d39373ea4ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -77,12 +77,12 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
@@ -25,7 +25,7 @@ index e6275103156b720d774e197ea61659f1f1699025..65ee0a7183abb0a4b1f36d2ef9631c00
  
                      this.connection.send(new ClientboundLoginDisconnectPacket(ichatmutablecomponent));
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index c3e7a5f61e94d9905dc805bfc486819b61e143d1..7ae0ecc93a92edeb172d9ed0709c8f7f068cdf4e 100644
+index 673652231a65e9441ee882c86656b86a86547488..97e91910c2c30b4f838e78794c9107bdfe8d7668 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -97,7 +97,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch
index f8591215a4..a8f5144e8d 100644
--- a/patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -52,7 +52,7 @@ index 2bc31c28d0d5469476699b69efa6e07325f2a852..4066dd6a638cf2186c628905915f6353
  
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 8c6edd032c927f7d1e04e944b4ce5598d71cdd81..7f88b910dfd0303f69b4fd1c7918a401c1f369f2 100644
+index 893ff998afaa47500a03ae55ce45e9862ab1cc18..a3021fbc570ae47eb6b0d4a89388c8ed893aced7 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -13,6 +13,7 @@ import net.minecraft.server.level.ServerLevel;
diff --git a/patches/server/0458-Add-more-Evoker-API.patch b/patches/server/0457-Add-more-Evoker-API.patch
index 742d85985e..742d85985e 100644
--- a/patches/server/0458-Add-more-Evoker-API.patch
+++ b/patches/server/0457-Add-more-Evoker-API.patch
diff --git a/patches/server/0459-Add-methods-to-get-translation-keys.patch b/patches/server/0458-Add-methods-to-get-translation-keys.patch
index cc9ea76953..5f785eb079 100644
--- a/patches/server/0459-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0458-Add-methods-to-get-translation-keys.patch
@@ -10,7 +10,7 @@ public org.bukkit.craftbukkit.inventory.CraftMetaFirework getNBT(Lorg/bukkit/Fir
 Co-authored-by: MeFisto94 <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index e172d05e9e2b8d7844ecff286430f94c1b2fd7db..5a1b0f2352016497099c68c5bcd09a43ebe8bf3a 100644
+index 35e264172688be6cf6e82d948f591893d97a43aa..8313d6de11427a4340ac9fc4f3a04070a5c80cd8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -668,5 +668,10 @@ public class CraftBlock implements Block {
@@ -25,7 +25,7 @@ index e172d05e9e2b8d7844ecff286430f94c1b2fd7db..5a1b0f2352016497099c68c5bcd09a43
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index e8334e2264510f5101e80b4f130e7ae1442560d7..57decf4156f176ebcc988478c17856cbc555c5e4 100644
+index 9ae78a0fe829c7487a945a801dbbca2375da1cbb..5b09e7e08c61b10044ac5f481bf10bb79feda8a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 @@ -194,6 +194,11 @@ public class CraftEnchantment extends Enchantment {
diff --git a/patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch
index a8eadef392..a8eadef392 100644
--- a/patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0461-Cache-block-data-strings.patch b/patches/server/0460-Cache-block-data-strings.patch
index 16519200a0..bec929642c 100644
--- a/patches/server/0461-Cache-block-data-strings.patch
+++ b/patches/server/0460-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 04258e07f806acd9a0d659b682e0119a5dc23adf..14e82938f919975c4ff8d463307d1d26db18edc3 100644
+index a5353af5ff47b5be7dac9a4e55989ad9490cf30f..3ce983b0e93c1f70acaa22c800273fe625b20454 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2049,6 +2049,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index ab7ec82b37..232213f6f0 100644
--- a/patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c3844274b185decd92d021e7c7343adb56052cc6..3a85c81aceae20820e5630b745eadf012bad1faf 100644
+index 5cf42146e1885fe1427ac7a248e2ba6dc1b4128b..5566a7f225ea16eeb47c7bd3ad41515383574dfa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -657,7 +657,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -31,7 +31,7 @@ index c3844274b185decd92d021e7c7343adb56052cc6..3a85c81aceae20820e5630b745eadf01
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f2faddf78b5ea591f66d92d9e0f2b7984a3c2124..2d416d0d657667d857794bafa315c720dee9762a 100644
+index eedb6db6a5e4879847ea593975d6f6f1de954642..1035faf0a7af0cae34065c93da23736bcfe2f0ef 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -159,6 +159,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -69,7 +69,7 @@ index 369298dfd437c1c83801f3d4ba63484ee1b969fe..ae2b95f53e875716489821dc9b0a3a35
                          if (entity instanceof Mob) {
                              Mob entityinsentient = (Mob) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index eaa59959f4804d38ae486028c854ed63207fd3b9..2c4704fb85f29a02b7245d36e8e4383534c701f9 100644
+index fa1ebfb89eeb129abf6263ea93fb14e5b7607610..a5751fa22a6638abae155de483a769f12b125650 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -579,7 +579,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch
index 1559443eb8..63c8f421ec 100644
--- a/patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 80694a1d660a10909408c9b3169dda7847bf295e..05d9a9968588381aaa3aeb06ef4d18fed4085229 100644
+index 4ac714e39804fc8d269a717e8abf98f5814319e8..d41e37afeab1e8bb098c6ed012b10b113c4a4715 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -461,6 +461,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index b5d192ac20..b5d192ac20 100644
--- a/patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch
index e6b6d5c3ac..e6b6d5c3ac 100644
--- a/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 107a2e49b7..40b2934456 100644
--- a/patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2d416d0d657667d857794bafa315c720dee9762a..c78df4fc62a347455f8d7b3aa186344863915ab3 100644
+index 1035faf0a7af0cae34065c93da23736bcfe2f0ef..1a092af20c9dd18ddcf770bcc3cb3bead1a609a8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4472,4 +4472,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4451,4 +4451,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          void accept(Entity entity, double x, double y, double z);
      }
diff --git a/patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch
index 88b6225968..88b6225968 100644
--- a/patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0468-Entity-isTicking.patch b/patches/server/0467-Entity-isTicking.patch
index 77eace6373..705acc6135 100644
--- a/patches/server/0468-Entity-isTicking.patch
+++ b/patches/server/0467-Entity-isTicking.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c78df4fc62a347455f8d7b3aa186344863915ab3..658e47bf5aff1e56462cc3f0a87eeb7349654176 100644
+index 1a092af20c9dd18ddcf770bcc3cb3bead1a609a8..121139196c82eb87be771d93f0ca52b951c7eb52 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4477,5 +4477,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4456,5 +4456,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
@@ -19,7 +19,7 @@ index c78df4fc62a347455f8d7b3aa186344863915ab3..658e47bf5aff1e56462cc3f0a87eeb73
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 2c4704fb85f29a02b7245d36e8e4383534c701f9..cacefccf15d68759ec26548ac1c10ee97e251ac4 100644
+index a5751fa22a6638abae155de483a769f12b125650..505ab2218c87961fd8c616a130de5b5e2e597eb4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1363,5 +1363,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 83811c96bb..3f7af9b6a5 100644
--- a/patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 14e82938f919975c4ff8d463307d1d26db18edc3..e01e32c66afbc0719e3c47cb61e2e205876da884 100644
+index 3ce983b0e93c1f70acaa22c800273fe625b20454..331cc75f4802b7c6a2903d506e58d887ba15921d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2132,13 +2132,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch
index 07c57efa62..07c57efa62 100644
--- a/patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index fd459bdab5..fd459bdab5 100644
--- a/patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch
index 4a53f854d9..7809d6d781 100644
--- a/patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3a85c81aceae20820e5630b745eadf012bad1faf..d8174c67d31fa8b6730a80a8e2399eed5737f838 100644
+index 5566a7f225ea16eeb47c7bd3ad41515383574dfa..e4c4984285162523285b19de2e0c81b076b9c33b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -464,9 +464,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0473-Optimise-getType-calls.patch b/patches/server/0472-Optimise-getType-calls.patch
index 3ac5b9ed7e..3ac5b9ed7e 100644
--- a/patches/server/0473-Optimise-getType-calls.patch
+++ b/patches/server/0472-Optimise-getType-calls.patch
diff --git a/patches/server/0474-Villager-resetOffers.patch b/patches/server/0473-Villager-resetOffers.patch
index ba42f14185..f094a1397c 100644
--- a/patches/server/0474-Villager-resetOffers.patch
+++ b/patches/server/0473-Villager-resetOffers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Villager#resetOffers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 8f2d68890297521274a5c23daa272f0341427eec..629b79c6e59944994295768904c449733764cf99 100644
+index 0ded8ee2deb51bea7506a8fa2d21f5e160694d54..66b7a2c9a7dc18a98bf2c3aac863a10cbc3ae9f9 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -114,6 +114,13 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
@@ -23,7 +23,7 @@ index 8f2d68890297521274a5c23daa272f0341427eec..629b79c6e59944994295768904c44973
      public MerchantOffers getOffers() {
          if (this.offers == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
-index 1467232779541a9e38420caabf273662f380794c..762354681315e4c74e414bf7d677b5422385161e 100644
+index 19833c1fc6ee85e031e3c6aac3b00f44730c5e02..8db2c70d3600555bcb419260cafd56409478b227 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
 @@ -70,4 +70,11 @@ public class CraftAbstractVillager extends CraftAgeable implements AbstractVilla
diff --git a/patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch
index d825fe5c79..beeaff12c5 100644
--- a/patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 221a1e66814dda35feff9fa9ca0fe54feec335f9..1577b7317b85708d39d4171321df785a8107bdb2 100644
+index 7825f6185a9a73dd395cdb6d86947d33d8512200..e22214b99472b23ffc95c011b19bdb59e2d9bb40 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -157,7 +157,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch
index e1ea18140b..e1ea18140b 100644
--- a/patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0477-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0476-Fix-item-locations-dropped-from-campfires.patch
index d8e81d50ef..d8e81d50ef 100644
--- a/patches/server/0477-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0476-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0478-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0477-Fixed-TileEntityBell-memory-leak.patch
index 0cd7feb8d4..0cd7feb8d4 100644
--- a/patches/server/0478-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0477-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 27b0ff407c..27b0ff407c 100644
--- a/patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0479-Add-getOfflinePlayerIfCached-String.patch
index f2e0ca17ed..f2e0ca17ed 100644
--- a/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0479-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0481-Add-ignore-discounts-API.patch b/patches/server/0480-Add-ignore-discounts-API.patch
index 94293b80ce..94293b80ce 100644
--- a/patches/server/0481-Add-ignore-discounts-API.patch
+++ b/patches/server/0480-Add-ignore-discounts-API.patch
diff --git a/patches/server/0482-Toggle-for-removing-existing-dragon.patch b/patches/server/0481-Toggle-for-removing-existing-dragon.patch
index 0ec8e9d4ef..0ec8e9d4ef 100644
--- a/patches/server/0482-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0481-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0483-Fix-client-lag-on-advancement-loading.patch b/patches/server/0482-Fix-client-lag-on-advancement-loading.patch
index 9d922ffc2f..9d922ffc2f 100644
--- a/patches/server/0483-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0482-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0484-Item-no-age-no-player-pickup.patch b/patches/server/0483-Item-no-age-no-player-pickup.patch
index 8ab619bbbd..8ab619bbbd 100644
--- a/patches/server/0484-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0483-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 9a80ce81b8..9a80ce81b8 100644
--- a/patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0486-Beacon-API-custom-effect-ranges.patch b/patches/server/0485-Beacon-API-custom-effect-ranges.patch
index f3b72c6e9c..f3b72c6e9c 100644
--- a/patches/server/0486-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0485-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0487-Add-API-for-quit-reason.patch b/patches/server/0486-Add-API-for-quit-reason.patch
index ef1802dc67..fb77faf050 100644
--- a/patches/server/0487-Add-API-for-quit-reason.patch
+++ b/patches/server/0486-Add-API-for-quit-reason.patch
@@ -49,10 +49,10 @@ index 96ee68e6656a59d959ad7a7e78f5a3752d6e3dbb..d660041805bcd1bb97cf347d8b1cfe5c
              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 cedc6b1e4255336b610ab9ba88a04d8dfde433cf..2c3ff91a7275158cdffa828e133a131b138bfa7c 100644
+index e9b5d987c1891ba269ba6beec57c1e0fb65dbb4d..9174b356fcd0a4ae33e4b9e0cb085bbdba31a20d 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 {
+@@ -581,7 +581,7 @@ public abstract class PlayerList {
              entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
          }
  
diff --git a/patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch
index 09e0c87600..09e0c87600 100644
--- a/patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0489-Expose-world-spawn-angle.patch b/patches/server/0488-Expose-world-spawn-angle.patch
index 8910923479..c2242a53f8 100644
--- a/patches/server/0489-Expose-world-spawn-angle.patch
+++ b/patches/server/0488-Expose-world-spawn-angle.patch
@@ -5,10 +5,10 @@ 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 2c3ff91a7275158cdffa828e133a131b138bfa7c..3f6e0319c1580dface0a175ebb93321ae4f45a35 100644
+index 9174b356fcd0a4ae33e4b9e0cb085bbdba31a20d..9cb8d94e81fd9ce5e3d09a6bae4fb8beaae09454 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 {
+@@ -853,7 +853,7 @@ public abstract class PlayerList {
              if (location == null) {
                  worldserver1 = this.server.getLevel(Level.OVERWORLD);
                  blockposition = entityplayer1.getSpawnPoint(worldserver1);
diff --git a/patches/server/0490-Add-Destroy-Speed-API.patch b/patches/server/0489-Add-Destroy-Speed-API.patch
index eda1608ac3..eda1608ac3 100644
--- a/patches/server/0490-Add-Destroy-Speed-API.patch
+++ b/patches/server/0489-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 28a718b3b8..28a718b3b8 100644
--- a/patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0492-Add-LivingEntity-clearActiveItem.patch b/patches/server/0491-Add-LivingEntity-clearActiveItem.patch
index ee851be253..ee851be253 100644
--- a/patches/server/0492-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0491-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0493-Add-PlayerItemCooldownEvent.patch b/patches/server/0492-Add-PlayerItemCooldownEvent.patch
index 751841d117..751841d117 100644
--- a/patches/server/0493-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0492-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch
index 95f0914262..95f0914262 100644
--- a/patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0495-More-lightning-API.patch b/patches/server/0494-More-lightning-API.patch
index bda291858a..bda291858a 100644
--- a/patches/server/0495-More-lightning-API.patch
+++ b/patches/server/0494-More-lightning-API.patch
diff --git a/patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch
index 4bfcf1a94b..4bfcf1a94b 100644
--- a/patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0497-Added-missing-default-perms-for-commands.patch b/patches/server/0496-Added-missing-default-perms-for-commands.patch
index 9a4184db30..9a4184db30 100644
--- a/patches/server/0497-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0496-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0498-Add-PlayerShearBlockEvent.patch b/patches/server/0497-Add-PlayerShearBlockEvent.patch
index 56a84bee18..56a84bee18 100644
--- a/patches/server/0498-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0497-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0499-Limit-recipe-packets.patch b/patches/server/0498-Limit-recipe-packets.patch
index 4b41c6795a..4b41c6795a 100644
--- a/patches/server/0499-Limit-recipe-packets.patch
+++ b/patches/server/0498-Limit-recipe-packets.patch
diff --git a/patches/server/0500-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0499-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0500-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0499-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0501-Player-Chunk-Load-Unload-Events.patch b/patches/server/0500-Player-Chunk-Load-Unload-Events.patch
index 504b607773..504b607773 100644
--- a/patches/server/0501-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0500-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch
index d664f7ff69..d664f7ff69 100644
--- a/patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0503-Expose-LivingEntity-hurt-direction.patch b/patches/server/0502-Expose-LivingEntity-hurt-direction.patch
index 4ff58cbd93..4ff58cbd93 100644
--- a/patches/server/0503-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0502-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index e2a2d2a3a3..e2a2d2a3a3 100644
--- a/patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index 429087e774..429087e774 100644
--- a/patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index d4c042a0ed..d4c042a0ed 100644
--- a/patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0507-Implement-TargetHitEvent.patch b/patches/server/0506-Implement-TargetHitEvent.patch
index 78722933d9..78722933d9 100644
--- a/patches/server/0507-Implement-TargetHitEvent.patch
+++ b/patches/server/0506-Implement-TargetHitEvent.patch
diff --git a/patches/server/0508-MC-4-Fix-item-position-desync.patch b/patches/server/0507-MC-4-Fix-item-position-desync.patch
index dcbd1a97ed..9976e41aba 100644
--- a/patches/server/0508-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0507-MC-4-Fix-item-position-desync.patch
@@ -28,10 +28,10 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..33d9131e9c75ef23cd637f5d6c39a270
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9068a9646a7e436a5a0d9ea9deb52b78a316ba4a..9d169d6504ee486127b22cd4e6429c4eb5b7ec0a 100644
+index 9257855651f7605935ecab121e239bef7218e53c..e8604fa9ef819db8a5f5fabc99022095bce7b00d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4248,6 +4248,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4227,6 +4227,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              return;
          }
          // Paper end - rewrite chunk system
diff --git a/patches/server/0509-Additional-Block-Material-API-s.patch b/patches/server/0508-Additional-Block-Material-API-s.patch
index 051b8a644d..051b8a644d 100644
--- a/patches/server/0509-Additional-Block-Material-API-s.patch
+++ b/patches/server/0508-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0510-Fix-harming-potion-dupe.patch b/patches/server/0509-Fix-harming-potion-dupe.patch
index 7b2d745291..7b2d745291 100644
--- a/patches/server/0510-Fix-harming-potion-dupe.patch
+++ b/patches/server/0509-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 754c03c42c..754c03c42c 100644
--- a/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0512-Cache-burn-durations.patch b/patches/server/0511-Cache-burn-durations.patch
index c4372f6401..c4372f6401 100644
--- a/patches/server/0512-Cache-burn-durations.patch
+++ b/patches/server/0511-Cache-burn-durations.patch
diff --git a/patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index bd783eafb5..bd783eafb5 100644
--- a/patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch
index 38593b84f5..38593b84f5 100644
--- a/patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch
index 4670eeb506..4670eeb506 100644
--- a/patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0517-Zombie-API-breaking-doors.patch b/patches/server/0516-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0517-Zombie-API-breaking-doors.patch
+++ b/patches/server/0516-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0518-Fix-nerfed-slime-when-splitting.patch b/patches/server/0517-Fix-nerfed-slime-when-splitting.patch
index d2beca8665..d2beca8665 100644
--- a/patches/server/0518-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0517-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0519-Add-EntityLoadCrossbowEvent.patch b/patches/server/0518-Add-EntityLoadCrossbowEvent.patch
index 07e5946fbf..07e5946fbf 100644
--- a/patches/server/0519-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0518-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0520-Added-WorldGameRuleChangeEvent.patch b/patches/server/0519-Added-WorldGameRuleChangeEvent.patch
index f79f5393c5..f79f5393c5 100644
--- a/patches/server/0520-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0519-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0521-Added-ServerResourcesReloadedEvent.patch b/patches/server/0520-Added-ServerResourcesReloadedEvent.patch
index 490a9f39f8..490a9f39f8 100644
--- a/patches/server/0521-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0520-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch
index 9d7b4d29c5..9d7b4d29c5 100644
--- a/patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0523-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0522-Implemented-BlockFailedDispenseEvent.patch
index 4269a73f28..4269a73f28 100644
--- a/patches/server/0523-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0522-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0524-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0523-Added-PlayerLecternPageChangeEvent.patch
index 57485f4ee7..57485f4ee7 100644
--- a/patches/server/0524-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0523-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch
index 93e862a643..93e862a643 100644
--- a/patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0526-Configurable-door-breaking-difficulty.patch b/patches/server/0525-Configurable-door-breaking-difficulty.patch
index 5338964e49..5338964e49 100644
--- a/patches/server/0526-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0525-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0527-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0526-Empty-commands-shall-not-be-dispatched.patch
index 9b41ebaaf7..9b41ebaaf7 100644
--- a/patches/server/0527-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0526-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0528-Remove-stale-POIs.patch b/patches/server/0527-Remove-stale-POIs.patch
index ffd7e9574e..ffd7e9574e 100644
--- a/patches/server/0528-Remove-stale-POIs.patch
+++ b/patches/server/0527-Remove-stale-POIs.patch
diff --git a/patches/server/0529-Fix-villager-boat-exploit.patch b/patches/server/0528-Fix-villager-boat-exploit.patch
index 0663c12d9c..e4f758d90a 100644
--- a/patches/server/0529-Fix-villager-boat-exploit.patch
+++ b/patches/server/0528-Fix-villager-boat-exploit.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3f6e0319c1580dface0a175ebb93321ae4f45a35..9b56415f1a03423f29822839ce27bbdf33bb91d5 100644
+index 9cb8d94e81fd9ce5e3d09a6bae4fb8beaae09454..270e3aec3c477a80ea6f5e2e83337585a1dc9821 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -585,6 +585,14 @@ public abstract class PlayerList {
+@@ -606,6 +606,14 @@ public abstract class PlayerList {
                  PlayerList.LOGGER.debug("Removing player mount");
                  entityplayer.stopRiding();
                  entity.getPassengersAndSelf().forEach((entity1) -> {
diff --git a/patches/server/0530-Add-sendOpLevel-API.patch b/patches/server/0529-Add-sendOpLevel-API.patch
index 9278d614ff..281c9b08de 100644
--- a/patches/server/0530-Add-sendOpLevel-API.patch
+++ b/patches/server/0529-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9b56415f1a03423f29822839ce27bbdf33bb91d5..89d18ae87029b82beea5e1bd69580f54f600696f 100644
+index 270e3aec3c477a80ea6f5e2e83337585a1dc9821..705c0f7b601d025dfd7bbe1e69aec558f4bdb3f7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1080,6 +1080,11 @@ public abstract class PlayerList {
+@@ -1101,6 +1101,11 @@ public abstract class PlayerList {
      }
  
      private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
@@ -20,7 +20,7 @@ index 9b56415f1a03423f29822839ce27bbdf33bb91d5..89d18ae87029b82beea5e1bd69580f54
          if (player.connection != null) {
              byte b0;
  
-@@ -1094,8 +1099,10 @@ public abstract class PlayerList {
+@@ -1115,8 +1120,10 @@ public abstract class PlayerList {
              player.connection.send(new ClientboundEntityEventPacket(player, b0));
          }
  
diff --git a/patches/server/0531-TODO-Registry-Modification-API.patch b/patches/server/0530-TODO-Registry-Modification-API.patch
index c247dad753..c247dad753 100644
--- a/patches/server/0531-TODO-Registry-Modification-API.patch
+++ b/patches/server/0530-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0532-Add-StructuresLocateEvent.patch b/patches/server/0531-Add-StructuresLocateEvent.patch
index 47d435b995..47d435b995 100644
--- a/patches/server/0532-Add-StructuresLocateEvent.patch
+++ b/patches/server/0531-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0533-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch
index 09bc1189ea..b6f116cf0a 100644
--- a/patches/server/0533-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9d169d6504ee486127b22cd4e6429c4eb5b7ec0a..968d231c8f6762a2f6177897c3b5f24864d60152 100644
+index e8604fa9ef819db8a5f5fabc99022095bce7b00d..62de1d9529fe3d3a31f050cd6e0b7378c62aacc8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1927,6 +1927,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 3f7c51ddfe..3f7c51ddfe 100644
--- a/patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch
index 17e9def19b..17e9def19b 100644
--- a/patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0536-Make-schedule-command-per-world.patch b/patches/server/0535-Make-schedule-command-per-world.patch
index 8e29559590..8e29559590 100644
--- a/patches/server/0536-Make-schedule-command-per-world.patch
+++ b/patches/server/0535-Make-schedule-command-per-world.patch
diff --git a/patches/server/0537-Configurable-max-leash-distance.patch b/patches/server/0536-Configurable-max-leash-distance.patch
index c1ac4b5634..c1ac4b5634 100644
--- a/patches/server/0537-Configurable-max-leash-distance.patch
+++ b/patches/server/0536-Configurable-max-leash-distance.patch
diff --git a/patches/server/0538-Implement-BlockPreDispenseEvent.patch b/patches/server/0537-Implement-BlockPreDispenseEvent.patch
index 7fb05f89fa..7fb05f89fa 100644
--- a/patches/server/0538-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0537-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 03d8cdf4c8..03d8cdf4c8 100644
--- a/patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch
index 39e24e6044..39e24e6044 100644
--- a/patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch
index 9750570e73..9750570e73 100644
--- a/patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 93cff1f7ad..93cff1f7ad 100644
--- a/patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0543-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch
index 77d3f29709..77d3f29709 100644
--- a/patches/server/0543-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0544-add-DragonEggFormEvent.patch b/patches/server/0543-add-DragonEggFormEvent.patch
index e4c888b12d..e4c888b12d 100644
--- a/patches/server/0544-add-DragonEggFormEvent.patch
+++ b/patches/server/0543-add-DragonEggFormEvent.patch
diff --git a/patches/server/0545-EntityMoveEvent.patch b/patches/server/0544-EntityMoveEvent.patch
index 1597623bc7..1597623bc7 100644
--- a/patches/server/0545-EntityMoveEvent.patch
+++ b/patches/server/0544-EntityMoveEvent.patch
diff --git a/patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch
index 2019b707c1..2019b707c1 100644
--- a/patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0547-Inline-shift-direction-fields.patch b/patches/server/0546-Inline-shift-direction-fields.patch
index f0c71d61f2..f0c71d61f2 100644
--- a/patches/server/0547-Inline-shift-direction-fields.patch
+++ b/patches/server/0546-Inline-shift-direction-fields.patch
diff --git a/patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch
index 18e781092c..18e781092c 100644
--- a/patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 88e136bf5d..88e136bf5d 100644
--- a/patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0550-living-entity-allow-attribute-registration.patch b/patches/server/0549-living-entity-allow-attribute-registration.patch
index d9d31ae912..d9d31ae912 100644
--- a/patches/server/0550-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0549-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0551-fix-dead-slime-setSize-invincibility.patch b/patches/server/0550-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0551-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0550-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0553-Expose-Tracked-Players.patch b/patches/server/0552-Expose-Tracked-Players.patch
index d997a95f37..d997a95f37 100644
--- a/patches/server/0553-Expose-Tracked-Players.patch
+++ b/patches/server/0552-Expose-Tracked-Players.patch
diff --git a/patches/server/0554-Remove-streams-from-SensorNearest.patch b/patches/server/0553-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0554-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0553-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0555-Improve-ServerGUI.patch b/patches/server/0554-Improve-ServerGUI.patch
index cb4eed5f13..cb4eed5f13 100644
--- a/patches/server/0555-Improve-ServerGUI.patch
+++ b/patches/server/0554-Improve-ServerGUI.patch
diff --git a/patches/server/0556-fix-converting-txt-to-json-file.patch b/patches/server/0555-fix-converting-txt-to-json-file.patch
index 786852a5f5..25987960fd 100644
--- a/patches/server/0556-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0555-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index 6d7095a62f30b18bc8fb8dbc5a0f3331980b7140..2546136ecfc94a8220932a04993ffa46
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 89d18ae87029b82beea5e1bd69580f54f600696f..8662ded9a7d7bf75dcec2c859f9e76d3d63a8b29 100644
+index 705c0f7b601d025dfd7bbe1e69aec558f4bdb3f7..3cea14fa4a2f5346955c65864e24442c008ebcfa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -178,6 +178,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0557-Add-worldborder-events.patch b/patches/server/0556-Add-worldborder-events.patch
index 176d1259e4..176d1259e4 100644
--- a/patches/server/0557-Add-worldborder-events.patch
+++ b/patches/server/0556-Add-worldborder-events.patch
diff --git a/patches/server/0558-added-PlayerNameEntityEvent.patch b/patches/server/0557-added-PlayerNameEntityEvent.patch
index d5a8060153..d5a8060153 100644
--- a/patches/server/0558-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0557-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0559-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0558-Prevent-grindstones-from-overstacking-items.patch
index 896e20afba..896e20afba 100644
--- a/patches/server/0559-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0558-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0560-Add-recipe-to-cook-events.patch b/patches/server/0559-Add-recipe-to-cook-events.patch
index e7fabd3ae9..e7fabd3ae9 100644
--- a/patches/server/0560-Add-recipe-to-cook-events.patch
+++ b/patches/server/0559-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0561-Add-Block-isValidTool.patch b/patches/server/0560-Add-Block-isValidTool.patch
index ff5e330151..ff5e330151 100644
--- a/patches/server/0561-Add-Block-isValidTool.patch
+++ b/patches/server/0560-Add-Block-isValidTool.patch
diff --git a/patches/server/0562-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0561-Allow-using-signs-inside-spawn-protection.patch
index 4f612be1e2..4f612be1e2 100644
--- a/patches/server/0562-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0561-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0563-Expand-world-key-API.patch b/patches/server/0562-Expand-world-key-API.patch
index bd45d36dbb..bd45d36dbb 100644
--- a/patches/server/0563-Expand-world-key-API.patch
+++ b/patches/server/0562-Expand-world-key-API.patch
diff --git a/patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0565-Item-Rarity-API.patch b/patches/server/0564-Item-Rarity-API.patch
index 370339eb5f..370339eb5f 100644
--- a/patches/server/0565-Item-Rarity-API.patch
+++ b/patches/server/0564-Item-Rarity-API.patch
diff --git a/patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch
index 7811bd17da..8d13fb736c 100644
--- a/patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,10 +7,10 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8662ded9a7d7bf75dcec2c859f9e76d3d63a8b29..690bb831c41a344b284c16f2c44954f652784bdb 100644
+index 3cea14fa4a2f5346955c65864e24442c008ebcfa..504bed9e3baa3bdd1c4d913d033ac8d0bd7cfc24 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -578,6 +578,14 @@ public abstract class PlayerList {
+@@ -599,6 +599,14 @@ public abstract class PlayerList {
          }
          // Paper end
  
diff --git a/patches/server/0567-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch
index 0d27e71091..0d27e71091 100644
--- a/patches/server/0567-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index e8b8c0ce59..e8b8c0ce59 100644
--- a/patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0569-Expose-protocol-version.patch b/patches/server/0568-Expose-protocol-version.patch
index fad23f6e40..fad23f6e40 100644
--- a/patches/server/0569-Expose-protocol-version.patch
+++ b/patches/server/0568-Expose-protocol-version.patch
diff --git a/patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch
index 80761df4ca..80761df4ca 100644
--- a/patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 9fed251180..9fed251180 100644
--- a/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0572-Add-bypass-host-check.patch b/patches/server/0571-Add-bypass-host-check.patch
index 21a11f4ee1..21a11f4ee1 100644
--- a/patches/server/0572-Add-bypass-host-check.patch
+++ b/patches/server/0571-Add-bypass-host-check.patch
diff --git a/patches/server/0573-Set-area-affect-cloud-rotation.patch b/patches/server/0572-Set-area-affect-cloud-rotation.patch
index 963479559a..963479559a 100644
--- a/patches/server/0573-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0572-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch
index cb15f6a02e..cb15f6a02e 100644
--- a/patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch
index 68c2cd3ffe..68c2cd3ffe 100644
--- a/patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch
index ecc0f6c3cd..ecc0f6c3cd 100644
--- a/patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch
index 13ba5fd753..13ba5fd753 100644
--- a/patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0579-Added-PlayerDeepSleepEvent.patch b/patches/server/0578-Added-PlayerDeepSleepEvent.patch
index d2c5959056..d2c5959056 100644
--- a/patches/server/0579-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0578-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0580-More-World-API.patch b/patches/server/0579-More-World-API.patch
index 649e3e23ac..649e3e23ac 100644
--- a/patches/server/0580-More-World-API.patch
+++ b/patches/server/0579-More-World-API.patch
diff --git a/patches/server/0581-Added-PlayerBedFailEnterEvent.patch b/patches/server/0580-Added-PlayerBedFailEnterEvent.patch
index dd4d2712ed..dd4d2712ed 100644
--- a/patches/server/0581-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0580-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch
index 69751ade08..69751ade08 100644
--- a/patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 7fd6ccefcc..2b298c5771 100644
--- a/patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 690bb831c41a344b284c16f2c44954f652784bdb..b4b1678edb87269aa35ab07c0d91d067ca9b0097 100644
+index 504bed9e3baa3bdd1c4d913d033ac8d0bd7cfc24..289e5609b74c254ca95680eaf592bdcdb253c9ce 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -805,6 +805,7 @@ public abstract class PlayerList {
+@@ -826,6 +826,7 @@ public abstract class PlayerList {
  
          // Paper start
          boolean isBedSpawn = false;
@@ -17,7 +17,7 @@ index 690bb831c41a344b284c16f2c44954f652784bdb..b4b1678edb87269aa35ab07c0d91d067
          boolean isRespawn = false;
          boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
          // Paper end
-@@ -825,6 +826,7 @@ public abstract class PlayerList {
+@@ -846,6 +847,7 @@ public abstract class PlayerList {
                  if (optional.isPresent()) {
                      BlockState iblockdata = worldserver1.getBlockState(blockposition);
                      boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
@@ -25,7 +25,7 @@ index 690bb831c41a344b284c16f2c44954f652784bdb..b4b1678edb87269aa35ab07c0d91d067
                      Vec3 vec3d = (Vec3) optional.get();
                      float f1;
  
-@@ -853,7 +855,7 @@ public abstract class PlayerList {
+@@ -874,7 +876,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
diff --git a/patches/server/0584-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0583-Introduce-beacon-activation-deactivation-events.patch
index d28ff36b79..d28ff36b79 100644
--- a/patches/server/0584-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0583-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 0553fa6089..fe72810b24 100644
--- a/patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -18,10 +18,10 @@ index b1f7227cb63491f5899b9b9d8413715924d1b967..1c795202f3b5be8f7ee41724258b509a
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b4b1678edb87269aa35ab07c0d91d067ca9b0097..2726c54dc57e584352fde31f1638b0d1416b14ad 100644
+index 289e5609b74c254ca95680eaf592bdcdb253c9ce..80e31db0fbcac487f8dec943972204cddd10e161 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -764,6 +764,12 @@ public abstract class PlayerList {
+@@ -785,6 +785,12 @@ public abstract class PlayerList {
      }
  
      public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason) {
@@ -34,7 +34,7 @@ index b4b1678edb87269aa35ab07c0d91d067ca9b0097..2726c54dc57e584352fde31f1638b0d1
          entityplayer.stopRiding(); // CraftBukkit
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
-@@ -855,7 +861,7 @@ public abstract class PlayerList {
+@@ -876,7 +882,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
diff --git a/patches/server/0586-Add-Channel-initialization-listeners.patch b/patches/server/0585-Add-Channel-initialization-listeners.patch
index 360d19718e..360d19718e 100644
--- a/patches/server/0586-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0585-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch
index d0ff308b9e..d0ff308b9e 100644
--- a/patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0588-Add-more-WanderingTrader-API.patch b/patches/server/0587-Add-more-WanderingTrader-API.patch
index e7542c5ef9..e7542c5ef9 100644
--- a/patches/server/0588-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0587-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0588-Add-EntityBlockStorage-clearEntities.patch
index 0488f4f727..0488f4f727 100644
--- a/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0588-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0590-Entity-load-save-limit-per-chunk.patch b/patches/server/0589-Entity-load-save-limit-per-chunk.patch
index f07dc4c039..f07dc4c039 100644
--- a/patches/server/0590-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0589-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 85efd06d0c..85efd06d0c 100644
--- a/patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 87bbcb36ba..87bbcb36ba 100644
--- a/patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0593-Inventory-close.patch b/patches/server/0592-Inventory-close.patch
index 9e9df237f4..9e9df237f4 100644
--- a/patches/server/0593-Inventory-close.patch
+++ b/patches/server/0592-Inventory-close.patch
diff --git a/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 33c6b6d97f..33c6b6d97f 100644
--- a/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0595-Add-basic-Datapack-API.patch b/patches/server/0594-Add-basic-Datapack-API.patch
index 39820340b7..39820340b7 100644
--- a/patches/server/0595-Add-basic-Datapack-API.patch
+++ b/patches/server/0594-Add-basic-Datapack-API.patch
diff --git a/patches/server/0596-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0595-Add-environment-variable-to-disable-server-gui.patch
index 15f4f2968a..15f4f2968a 100644
--- a/patches/server/0596-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0595-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0596-additions-to-PlayerGameModeChangeEvent.patch
index f5ea880338..f5ea880338 100644
--- a/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0596-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0598-ItemStack-repair-check-API.patch b/patches/server/0597-ItemStack-repair-check-API.patch
index b82fb6d5dd..b82fb6d5dd 100644
--- a/patches/server/0598-ItemStack-repair-check-API.patch
+++ b/patches/server/0597-ItemStack-repair-check-API.patch
diff --git a/patches/server/0599-More-Enchantment-API.patch b/patches/server/0598-More-Enchantment-API.patch
index fc96204583..fc96204583 100644
--- a/patches/server/0599-More-Enchantment-API.patch
+++ b/patches/server/0598-More-Enchantment-API.patch
diff --git a/patches/server/0600-Move-range-check-for-block-placing-up.patch b/patches/server/0599-Move-range-check-for-block-placing-up.patch
index 4553cc1ba0..4553cc1ba0 100644
--- a/patches/server/0600-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0599-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0601-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0600-Fix-and-optimise-world-force-upgrading.patch
index cb7fbee987..cb7fbee987 100644
--- a/patches/server/0601-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0600-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0602-Add-Mob-lookAt-API.patch b/patches/server/0601-Add-Mob-lookAt-API.patch
index 1215b07374..1215b07374 100644
--- a/patches/server/0602-Add-Mob-lookAt-API.patch
+++ b/patches/server/0601-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0603-Add-Unix-domain-socket-support.patch b/patches/server/0602-Add-Unix-domain-socket-support.patch
index c1d9e612c9..c1d9e612c9 100644
--- a/patches/server/0603-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0602-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0604-Add-EntityInsideBlockEvent.patch b/patches/server/0603-Add-EntityInsideBlockEvent.patch
index ca5eb3ba9f..ca5eb3ba9f 100644
--- a/patches/server/0604-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0603-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0605-Attributes-API-for-item-defaults.patch b/patches/server/0604-Attributes-API-for-item-defaults.patch
index 3b1bb9e3fd..3b1bb9e3fd 100644
--- a/patches/server/0605-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0604-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0605-Add-cause-to-Weather-ThunderChangeEvents.patch
index 9a9a933443..9a9a933443 100644
--- a/patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0605-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0607-More-Lidded-Block-API.patch b/patches/server/0606-More-Lidded-Block-API.patch
index e65c6a26cb..e65c6a26cb 100644
--- a/patches/server/0607-More-Lidded-Block-API.patch
+++ b/patches/server/0606-More-Lidded-Block-API.patch
diff --git a/patches/server/0608-Limit-item-frame-cursors-on-maps.patch b/patches/server/0607-Limit-item-frame-cursors-on-maps.patch
index 64dc46158b..64dc46158b 100644
--- a/patches/server/0608-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0607-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0609-Add-PlayerKickEvent-causes.patch b/patches/server/0608-Add-PlayerKickEvent-causes.patch
index a992c7d6f6..dd0f8a66f6 100644
--- a/patches/server/0609-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0608-Add-PlayerKickEvent-causes.patch
@@ -434,10 +434,10 @@ index 24e3f3ee7f8af6ec9d61afd8e80e0909ee48c8f0..7f030cac8b3bc7d2d4b1c32ef5edc360
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2726c54dc57e584352fde31f1638b0d1416b14ad..0139313fb1b06da9df19317748862700c1b5b6e9 100644
+index 80e31db0fbcac487f8dec943972204cddd10e161..dd7298c41eee0f9a63416cfd6c5e5519ffde100a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -665,7 +665,7 @@ public abstract class PlayerList {
+@@ -686,7 +686,7 @@ public abstract class PlayerList {
          while (iterator.hasNext()) {
              entityplayer = (ServerPlayer) iterator.next();
              this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
@@ -446,7 +446,7 @@ index 2726c54dc57e584352fde31f1638b0d1416b14ad..0139313fb1b06da9df19317748862700
          }
  
          // Instead of kicking then returning, we need to store the kick reason
-@@ -1308,8 +1308,8 @@ public abstract class PlayerList {
+@@ -1329,8 +1329,8 @@ public abstract class PlayerList {
          // Paper end
          // CraftBukkit start - disconnect safely
          for (ServerPlayer player : this.players) {
diff --git a/patches/server/0610-Add-PufferFishStateChangeEvent.patch b/patches/server/0609-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0610-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0609-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0610-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 1dbdf33922..1dbdf33922 100644
--- a/patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0610-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0611-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index e8ae16c851..e8ae16c851 100644
--- a/patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0611-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0612-Add-option-to-fix-items-merging-through-walls.patch
index 8f2e06ffef..8f2e06ffef 100644
--- a/patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0612-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0614-Add-BellRevealRaiderEvent.patch b/patches/server/0613-Add-BellRevealRaiderEvent.patch
index ed8e81f6a2..ed8e81f6a2 100644
--- a/patches/server/0614-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0613-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0615-Fix-invulnerable-end-crystals.patch b/patches/server/0614-Fix-invulnerable-end-crystals.patch
index 195d6b8a42..195d6b8a42 100644
--- a/patches/server/0615-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0614-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0616-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0615-Add-ElderGuardianAppearanceEvent.patch
index 93e8beb3d3..93e8beb3d3 100644
--- a/patches/server/0616-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0615-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0617-Fix-dangerous-end-portal-logic.patch b/patches/server/0616-Fix-dangerous-end-portal-logic.patch
index d83d8296e1..0e878f6124 100644
--- a/patches/server/0617-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0616-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 968d231c8f6762a2f6177897c3b5f24864d60152..bbd071009d9ccf84f4c4ade296c98a8f4d6ac3ae 100644
+index 62de1d9529fe3d3a31f050cd6e0b7378c62aacc8..faac05c4d338ca33c7bcc8243b967b639177320e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -485,6 +485,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -51,7 +51,7 @@ index 968d231c8f6762a2f6177897c3b5f24864d60152..bbd071009d9ccf84f4c4ade296c98a8f
  
      public boolean isLegacyTrackingEntity = false;
  
-@@ -2871,6 +2901,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2850,6 +2880,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0617-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index ef457d74af..ef457d74af 100644
--- a/patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0617-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0619-Make-item-validations-configurable.patch b/patches/server/0618-Make-item-validations-configurable.patch
index c080248e33..c080248e33 100644
--- a/patches/server/0619-Make-item-validations-configurable.patch
+++ b/patches/server/0618-Make-item-validations-configurable.patch
diff --git a/patches/server/0620-Line-Of-Sight-Changes.patch b/patches/server/0619-Line-Of-Sight-Changes.patch
index ba904ef595..ba904ef595 100644
--- a/patches/server/0620-Line-Of-Sight-Changes.patch
+++ b/patches/server/0619-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0621-add-per-world-spawn-limits.patch b/patches/server/0620-add-per-world-spawn-limits.patch
index 5a0bee4c61..5a0bee4c61 100644
--- a/patches/server/0621-add-per-world-spawn-limits.patch
+++ b/patches/server/0620-add-per-world-spawn-limits.patch
diff --git a/patches/server/0622-Fix-potions-splash-events.patch b/patches/server/0621-Fix-potions-splash-events.patch
index e217ede002..e217ede002 100644
--- a/patches/server/0622-Fix-potions-splash-events.patch
+++ b/patches/server/0621-Fix-potions-splash-events.patch
diff --git a/patches/server/0623-Add-more-LimitedRegion-API.patch b/patches/server/0622-Add-more-LimitedRegion-API.patch
index 2a50497e38..2a50497e38 100644
--- a/patches/server/0623-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0622-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0623-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 71965c5192..71965c5192 100644
--- a/patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0623-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0625-Missing-Entity-API.patch b/patches/server/0624-Missing-Entity-API.patch
index 388ac52bba..388ac52bba 100644
--- a/patches/server/0625-Missing-Entity-API.patch
+++ b/patches/server/0624-Missing-Entity-API.patch
diff --git a/patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0625-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 6d154d7e68..6d154d7e68 100644
--- a/patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0625-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0626-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 46818e51e6..46818e51e6 100644
--- a/patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0626-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0627-Use-getChunkIfLoadedImmediately-in-places.patch
index 4bdc40acc5..4bdc40acc5 100644
--- a/patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0627-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0628-Fix-commands-from-signs-not-firing-command-events.patch
index 915947a504..915947a504 100644
--- a/patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0628-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0630-Adds-PlayerArmSwingEvent.patch b/patches/server/0629-Adds-PlayerArmSwingEvent.patch
index 5aef5fc4e8..5aef5fc4e8 100644
--- a/patches/server/0630-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0629-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch
index 270f37cb14..160440f8ce 100644
--- a/patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -96,10 +96,10 @@ index c38d6ff1c4b22833ce8c99ec420741659becf4d2..eabdaf85e904224f936154d415d183ba
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0139313fb1b06da9df19317748862700c1b5b6e9..e9b012889987d3c0fca2c90a4edee36b2c86cb88 100644
+index dd7298c41eee0f9a63416cfd6c5e5519ffde100a..3170c0f512ff315d40ad1d4e24794e51c1429a36 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -551,6 +551,11 @@ public abstract class PlayerList {
+@@ -572,6 +572,11 @@ public abstract class PlayerList {
      }
  
      public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer) { // CraftBukkit - return string // Paper - return Component
@@ -111,7 +111,7 @@ index 0139313fb1b06da9df19317748862700c1b5b6e9..e9b012889987d3c0fca2c90a4edee36b
          ServerLevel worldserver = entityplayer.serverLevel();
  
          entityplayer.awardStat(Stats.LEAVE_GAME);
-@@ -561,7 +566,7 @@ public abstract class PlayerList {
+@@ -582,7 +587,7 @@ public abstract class PlayerList {
              entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
          }
  
diff --git a/patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0631-Add-config-for-mobs-immune-to-default-effects.patch
index 6f53f12f33..6f53f12f33 100644
--- a/patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0631-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0633-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0632-Fix-incorrect-message-for-outdated-client.patch
index c668a16be5..c668a16be5 100644
--- a/patches/server/0633-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0632-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0634-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0633-Don-t-apply-cramming-damage-to-players.patch
index 99113340f6..99113340f6 100644
--- a/patches/server/0634-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0633-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0634-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 297c6b3a06..297c6b3a06 100644
--- a/patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0634-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0635-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 4a998000b2..4a998000b2 100644
--- a/patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0635-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0637-Stinger-API.patch b/patches/server/0636-Stinger-API.patch
index a7104402ba..a7104402ba 100644
--- a/patches/server/0637-Stinger-API.patch
+++ b/patches/server/0636-Stinger-API.patch
diff --git a/patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0637-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index d3cf90c2af..d3cf90c2af 100644
--- a/patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0637-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0639-Add-System.out-err-catcher.patch b/patches/server/0638-Add-System.out-err-catcher.patch
index 6fd5f26dc3..6fd5f26dc3 100644
--- a/patches/server/0639-Add-System.out-err-catcher.patch
+++ b/patches/server/0638-Add-System.out-err-catcher.patch
diff --git a/patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0639-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index f4242ad30e..f4242ad30e 100644
--- a/patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0639-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0641-Improve-boat-collision-performance.patch b/patches/server/0640-Improve-boat-collision-performance.patch
index 30906bd16a..30906bd16a 100644
--- a/patches/server/0641-Improve-boat-collision-performance.patch
+++ b/patches/server/0640-Improve-boat-collision-performance.patch
diff --git a/patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0641-Prevent-AFK-kick-while-watching-end-credits.patch
index f97c806cf2..f97c806cf2 100644
--- a/patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0641-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0642-Allow-skipping-writing-of-comments-to-server.propert.patch
index 9fba827e12..9fba827e12 100644
--- a/patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0642-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0644-Add-PlayerSetSpawnEvent.patch b/patches/server/0643-Add-PlayerSetSpawnEvent.patch
index c3b686909c..491095c872 100644
--- a/patches/server/0644-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0643-Add-PlayerSetSpawnEvent.patch
@@ -154,10 +154,10 @@ index 00adb106eea35b745e98e28e6b9e0affe2d00651..c358a078bdbb672b41f606cf83353fc3
  
      public SectionPos getLastSectionPos() {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e9b012889987d3c0fca2c90a4edee36b2c86cb88..87fc2c057667eaf7303f3be474e436e0d4cf109a 100644
+index 3170c0f512ff315d40ad1d4e24794e51c1429a36..b06f36138bfda3f9802ee15e57e1895d8fe16c54 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -855,7 +855,7 @@ public abstract class PlayerList {
+@@ -876,7 +876,7 @@ public abstract class PlayerList {
                      location = CraftLocation.toBukkit(vec3d, worldserver1.getWorld(), f1, 0.0F);
                  } else if (blockposition != null) {
                      entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
diff --git a/patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0644-Make-hoppers-respect-inventory-max-stack-size.patch
index 45531b8594..45531b8594 100644
--- a/patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0644-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0646-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0645-Optimize-entity-tracker-passenger-checks.patch
index 524e1fabfb..524e1fabfb 100644
--- a/patches/server/0646-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0645-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0647-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0646-Config-option-for-Piglins-guarding-chests.patch
index 63865bec49..63865bec49 100644
--- a/patches/server/0647-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0646-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0648-Added-EntityDamageItemEvent.patch b/patches/server/0647-Added-EntityDamageItemEvent.patch
index 935084ef4b..935084ef4b 100644
--- a/patches/server/0648-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0647-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0649-Optimize-indirect-passenger-iteration.patch b/patches/server/0648-Optimize-indirect-passenger-iteration.patch
index a3a4dcc84e..7d763603aa 100644
--- a/patches/server/0649-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0648-Optimize-indirect-passenger-iteration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bbd071009d9ccf84f4c4ade296c98a8f4d6ac3ae..cfc9732378772084cd0badabaccd3de934b39596 100644
+index faac05c4d338ca33c7bcc8243b967b639177320e..c8c145048ebe58e40818f998092c2912000f4c63 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3909,20 +3909,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3888,20 +3888,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Stream<Entity> getIndirectPassengersStream() {
@@ -43,7 +43,7 @@ index bbd071009d9ccf84f4c4ade296c98a8f4d6ac3ae..cfc9732378772084cd0badabaccd3de9
          return () -> {
              return this.getIndirectPassengersStream().iterator();
          };
-@@ -3939,6 +3953,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3918,6 +3932,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // Paper end - rewrite chunk system
  
      public boolean hasExactlyOnePlayerPassenger() {
diff --git a/patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0649-Configurable-item-frame-map-cursor-update-interval.patch
index a1e4f933cb..a1e4f933cb 100644
--- a/patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0649-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0651-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0650-Make-EntityUnleashEvent-cancellable.patch
index 17a8a654c4..17a8a654c4 100644
--- a/patches/server/0651-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0650-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0652-Clear-bucket-NBT-after-dispense.patch b/patches/server/0651-Clear-bucket-NBT-after-dispense.patch
index 1f2a7cae78..1f2a7cae78 100644
--- a/patches/server/0652-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0651-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0652-Change-EnderEye-target-without-changing-other-things.patch
index 48c5524ab8..48c5524ab8 100644
--- a/patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0652-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0654-Add-BlockBreakBlockEvent.patch b/patches/server/0653-Add-BlockBreakBlockEvent.patch
index 52a9d63ddc..52a9d63ddc 100644
--- a/patches/server/0654-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0653-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0654-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 1002fe00f7..1002fe00f7 100644
--- a/patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0654-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0656-More-CommandBlock-API.patch b/patches/server/0655-More-CommandBlock-API.patch
index 65a5093980..65a5093980 100644
--- a/patches/server/0656-More-CommandBlock-API.patch
+++ b/patches/server/0655-More-CommandBlock-API.patch
diff --git a/patches/server/0657-Add-missing-team-sidebar-display-slots.patch b/patches/server/0656-Add-missing-team-sidebar-display-slots.patch
index 446d882c45..446d882c45 100644
--- a/patches/server/0657-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0656-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0658-Add-back-EntityPortalExitEvent.patch b/patches/server/0657-Add-back-EntityPortalExitEvent.patch
index fa64daa44d..0aeb5e4001 100644
--- a/patches/server/0658-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0657-Add-back-EntityPortalExitEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cfc9732378772084cd0badabaccd3de934b39596..0dcc94b713593a298f09d489780f38298d5f4cc5 100644
+index c8c145048ebe58e40818f998092c2912000f4c63..52022b9df1a66ec4dad9e315450cbe5806e70fa1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3365,6 +3365,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3344,6 +3344,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              } else {
                  // CraftBukkit start
                  worldserver = shapedetectorshape.world;
@@ -37,7 +37,7 @@ index cfc9732378772084cd0badabaccd3de934b39596..0dcc94b713593a298f09d489780f3829
                  if (worldserver == this.level) {
                      // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in
                      this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot);
-@@ -3384,8 +3406,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3363,8 +3385,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
                  if (entity != null) {
                      entity.restoreFrom(this);
diff --git a/patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0658-Add-methods-to-find-targets-for-lightning-strikes.patch
index 827935032f..827935032f 100644
--- a/patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0658-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0660-Get-entity-default-attributes.patch b/patches/server/0659-Get-entity-default-attributes.patch
index afd4c49b4d..afd4c49b4d 100644
--- a/patches/server/0660-Get-entity-default-attributes.patch
+++ b/patches/server/0659-Get-entity-default-attributes.patch
diff --git a/patches/server/0661-Left-handed-API.patch b/patches/server/0660-Left-handed-API.patch
index e75eb9ca95..e75eb9ca95 100644
--- a/patches/server/0661-Left-handed-API.patch
+++ b/patches/server/0660-Left-handed-API.patch
diff --git a/patches/server/0662-Add-more-advancement-API.patch b/patches/server/0661-Add-more-advancement-API.patch
index c7966b2e3e..c7966b2e3e 100644
--- a/patches/server/0662-Add-more-advancement-API.patch
+++ b/patches/server/0661-Add-more-advancement-API.patch
diff --git a/patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0662-Add-ItemFactory-getSpawnEgg-API.patch
index 4fd7a361e7..4fd7a361e7 100644
--- a/patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0662-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0664-Add-critical-damage-API.patch b/patches/server/0663-Add-critical-damage-API.patch
index 2485aabae6..2485aabae6 100644
--- a/patches/server/0664-Add-critical-damage-API.patch
+++ b/patches/server/0663-Add-critical-damage-API.patch
diff --git a/patches/server/0665-Fix-issues-with-mob-conversion.patch b/patches/server/0664-Fix-issues-with-mob-conversion.patch
index 237d313b89..237d313b89 100644
--- a/patches/server/0665-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0664-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0666-Add-isCollidable-methods-to-various-places.patch b/patches/server/0665-Add-isCollidable-methods-to-various-places.patch
index 8c0d3f840e..8c0d3f840e 100644
--- a/patches/server/0666-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0665-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0667-Goat-ram-API.patch b/patches/server/0666-Goat-ram-API.patch
index 443c58b4ee..443c58b4ee 100644
--- a/patches/server/0667-Goat-ram-API.patch
+++ b/patches/server/0666-Goat-ram-API.patch
diff --git a/patches/server/0668-Add-API-for-resetting-a-single-score.patch b/patches/server/0667-Add-API-for-resetting-a-single-score.patch
index 7d45195961..7d45195961 100644
--- a/patches/server/0668-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0667-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0668-Add-Raw-Byte-Entity-Serialization.patch
index 23ec0bc909..f11527f5cf 100644
--- a/patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0668-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0dcc94b713593a298f09d489780f38298d5f4cc5..b248207e0dc52f8ac44a93a141e7e883b253a5ed 100644
+index 52022b9df1a66ec4dad9e315450cbe5806e70fa1..7418c2204cfbdd539b20b5f9f0b160dd7c3ccfa8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2146,6 +2146,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0670-Vanilla-command-permission-fixes.patch b/patches/server/0669-Vanilla-command-permission-fixes.patch
index 316475ab5c..316475ab5c 100644
--- a/patches/server/0670-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0669-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0670-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 0949a12465..0949a12465 100644
--- a/patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0670-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0672-Fix-GameProfileCache-concurrency.patch b/patches/server/0671-Fix-GameProfileCache-concurrency.patch
index 0337248104..0337248104 100644
--- a/patches/server/0672-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0671-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0673-Improve-and-expand-AsyncCatcher.patch b/patches/server/0672-Improve-and-expand-AsyncCatcher.patch
index 810a3aa123..810a3aa123 100644
--- a/patches/server/0673-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0672-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0673-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 3201888a6b..3201888a6b 100644
--- a/patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0673-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0675-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0674-Sanitize-ResourceLocation-error-logging.patch
index 989716f6fd..989716f6fd 100644
--- a/patches/server/0675-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0674-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0676-Optimise-general-POI-access.patch b/patches/server/0675-Optimise-general-POI-access.patch
index 332786d627..332786d627 100644
--- a/patches/server/0676-Optimise-general-POI-access.patch
+++ b/patches/server/0675-Optimise-general-POI-access.patch
diff --git a/patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0676-Custom-table-implementation-for-blockstate-state-loo.patch
index 0023c8bd8c..0023c8bd8c 100644
--- a/patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0676-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0678-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0677-Manually-inline-methods-in-BlockPosition.patch
index c8b8adfce9..c8b8adfce9 100644
--- a/patches/server/0678-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0677-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0678-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e97fc69558..e97fc69558 100644
--- a/patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0678-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0679-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 007351ae6c..007351ae6c 100644
--- a/patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0679-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0680-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 5475ff2092..5475ff2092 100644
--- a/patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0680-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0681-Don-t-lookup-fluid-state-when-raytracing.patch
index d931ef54fa..d931ef54fa 100644
--- a/patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0681-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0683-Time-scoreboard-search.patch b/patches/server/0682-Time-scoreboard-search.patch
index e2bd684e63..e2bd684e63 100644
--- a/patches/server/0683-Time-scoreboard-search.patch
+++ b/patches/server/0682-Time-scoreboard-search.patch
diff --git a/patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0683-Send-full-pos-packets-for-hard-colliding-entities.patch
index f005ae7e71..f005ae7e71 100644
--- a/patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0683-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0684-Do-not-run-raytrace-logic-for-AIR.patch
index 75ece1bf8b..75ece1bf8b 100644
--- a/patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0684-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0686-Execute-chunk-tasks-mid-tick.patch b/patches/server/0685-Execute-chunk-tasks-mid-tick.patch
index 3a0637b6e5..3a0637b6e5 100644
--- a/patches/server/0686-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0685-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0687-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0686-Oprimise-map-impl-for-tracked-players.patch
index 42fe98d24e..42fe98d24e 100644
--- a/patches/server/0687-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0686-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0687-Optimise-BlockSoil-nearby-water-lookup.patch
index 08ef0f3bc8..08ef0f3bc8 100644
--- a/patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0687-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0689-Optimise-random-block-ticking.patch b/patches/server/0688-Optimise-random-block-ticking.patch
index 3587292de4..3587292de4 100644
--- a/patches/server/0689-Optimise-random-block-ticking.patch
+++ b/patches/server/0688-Optimise-random-block-ticking.patch
diff --git a/patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0a7c36c977..0a7c36c977 100644
--- a/patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0690-Use-Velocity-compression-and-cipher-natives.patch
index cc0f4ae232..cc0f4ae232 100644
--- a/patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0690-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0691-Detail-more-information-in-watchdog-dumps.patch
index 316023491e..c07f133ae7 100644
--- a/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0691-Detail-more-information-in-watchdog-dumps.patch
@@ -122,7 +122,7 @@ index 59bc500d1dfabbd68cb0948b53f1a2f77378766c..7580fbc59780161946d9dc65587b6c6a
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b248207e0dc52f8ac44a93a141e7e883b253a5ed..808bbccad26c6e0cd07e27d6f380ba1eafd8bd22 100644
+index 7418c2204cfbdd539b20b5f9f0b160dd7c3ccfa8..bd50f7bee65337cc15f700d80052c90e19eaf2c2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1024,7 +1024,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -182,7 +182,7 @@ index b248207e0dc52f8ac44a93a141e7e883b253a5ed..808bbccad26c6e0cd07e27d6f380ba1e
      }
  
      private boolean isStateClimbable(BlockState state) {
-@@ -4251,7 +4293,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4230,7 +4272,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void setDeltaMovement(Vec3 velocity) {
@@ -192,7 +192,7 @@ index b248207e0dc52f8ac44a93a141e7e883b253a5ed..808bbccad26c6e0cd07e27d6f380ba1e
      }
  
      public void addDeltaMovement(Vec3 velocity) {
-@@ -4337,7 +4381,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4316,7 +4360,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
          // Paper end - fix MC-4
          if (this.position.x != x || this.position.y != y || this.position.z != z) {
diff --git a/patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0692-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 429df0d968..429df0d968 100644
--- a/patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0692-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0693-Fix-Bukkit-NamespacedKey-shenanigans.patch
index c77b9ae0d6..c77b9ae0d6 100644
--- a/patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0693-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0695-Distance-manager-tick-timings.patch b/patches/server/0694-Distance-manager-tick-timings.patch
index c7179fd70d..c7179fd70d 100644
--- a/patches/server/0695-Distance-manager-tick-timings.patch
+++ b/patches/server/0694-Distance-manager-tick-timings.patch
diff --git a/patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0695-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 2450152a70..2450152a70 100644
--- a/patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0695-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0696-Check-requirement-before-suggesting-root-nodes.patch
index f32c6d0bed..f32c6d0bed 100644
--- a/patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0696-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0697-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 63f447f944..63f447f944 100644
--- a/patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0697-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0699-Add-packet-limiter-config.patch b/patches/server/0698-Add-packet-limiter-config.patch
index 6b454b34dd..6b454b34dd 100644
--- a/patches/server/0699-Add-packet-limiter-config.patch
+++ b/patches/server/0698-Add-packet-limiter-config.patch
diff --git a/patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0699-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 341421e59d..341421e59d 100644
--- a/patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0699-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0701-Ensure-valid-vehicle-status.patch b/patches/server/0700-Ensure-valid-vehicle-status.patch
index 608f09c5af..608f09c5af 100644
--- a/patches/server/0701-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0700-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0701-Prevent-softlocked-end-exit-portal-generation.patch
index df49391139..df49391139 100644
--- a/patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0701-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0702-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0702-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0704-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0703-Don-t-log-debug-logging-being-disabled.patch
index 2130840734..2130840734 100644
--- a/patches/server/0704-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0703-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0705-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0704-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0705-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0704-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0706-Preserve-overstacked-loot.patch b/patches/server/0705-Preserve-overstacked-loot.patch
index 004c7c6f77..004c7c6f77 100644
--- a/patches/server/0706-Preserve-overstacked-loot.patch
+++ b/patches/server/0705-Preserve-overstacked-loot.patch
diff --git a/patches/server/0707-Update-head-rotation-in-missing-places.patch b/patches/server/0706-Update-head-rotation-in-missing-places.patch
index 77c31f1712..0ad23dd235 100644
--- a/patches/server/0707-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0706-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 808bbccad26c6e0cd07e27d6f380ba1eafd8bd22..69398b0cab962f506416802c20b7e7b76d09939b 100644
+index bd50f7bee65337cc15f700d80052c90e19eaf2c2..775ecdec4cec3d7ea291ee8c238a5e3b44fbbf73 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1911,6 +1911,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0708-prevent-unintended-light-block-manipulation.patch b/patches/server/0707-prevent-unintended-light-block-manipulation.patch
index 745b4cd9b5..745b4cd9b5 100644
--- a/patches/server/0708-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0707-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0709-Fix-CraftCriteria-defaults-map.patch b/patches/server/0708-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0709-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0708-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0710-Fix-upstreams-block-state-factories.patch b/patches/server/0709-Fix-upstreams-block-state-factories.patch
index da98b563f3..da98b563f3 100644
--- a/patches/server/0710-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0709-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0711-Configurable-feature-seeds.patch b/patches/server/0710-Configurable-feature-seeds.patch
index 2e7ba7f297..2e7ba7f297 100644
--- a/patches/server/0711-Configurable-feature-seeds.patch
+++ b/patches/server/0710-Configurable-feature-seeds.patch
diff --git a/patches/server/0712-Add-root-admin-user-detection.patch b/patches/server/0711-Add-root-admin-user-detection.patch
index 8f7dec5ba1..8f7dec5ba1 100644
--- a/patches/server/0712-Add-root-admin-user-detection.patch
+++ b/patches/server/0711-Add-root-admin-user-detection.patch
diff --git a/patches/server/0713-Always-allow-item-changing-in-Fireball.patch b/patches/server/0712-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0713-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0712-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0713-don-t-attempt-to-teleport-dead-entities.patch
index 9cc1f40ca7..6a600a86b3 100644
--- a/patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0713-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 69398b0cab962f506416802c20b7e7b76d09939b..0fb3cb6a30810b386b6406481f0bd36eb834004c 100644
+index 775ecdec4cec3d7ea291ee8c238a5e3b44fbbf73..5f77b6851baee35a279d570fba5baacec9278568 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -787,7 +787,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0715-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0714-Prevent-excessive-velocity-through-repeated-crits.patch
index 3f080e05bc..3f080e05bc 100644
--- a/patches/server/0715-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0714-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0715-Remove-client-side-code-using-deprecated-for-removal.patch
index db5dd67f1b..db5dd67f1b 100644
--- a/patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0715-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0716-Fix-removing-recipes-from-RecipeIterator.patch
index c57379be37..c57379be37 100644
--- a/patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0716-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0717-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 2d07a04363..2d07a04363 100644
--- a/patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0717-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0718-Hide-unnecessary-itemmeta-from-clients.patch
index 6553879c95..6553879c95 100644
--- a/patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0718-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0720-Fix-Spigot-growth-modifiers.patch b/patches/server/0719-Fix-Spigot-growth-modifiers.patch
index 2535a2a265..2535a2a265 100644
--- a/patches/server/0720-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0719-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0720-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0720-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0722-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0721-Add-PlayerItemFrameChangeEvent.patch
index 6214bdbdef..6214bdbdef 100644
--- a/patches/server/0722-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0721-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0723-Optimize-HashMapPalette.patch b/patches/server/0722-Optimize-HashMapPalette.patch
index 9e2b26701e..9e2b26701e 100644
--- a/patches/server/0723-Optimize-HashMapPalette.patch
+++ b/patches/server/0722-Optimize-HashMapPalette.patch
diff --git a/patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0723-Allow-delegation-to-vanilla-chunk-gen.patch
index 4feabbc623..4feabbc623 100644
--- a/patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0723-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0725-Collision-optimisations.patch b/patches/server/0724-Collision-optimisations.patch
index 97c209f43c..17b4be9180 100644
--- a/patches/server/0725-Collision-optimisations.patch
+++ b/patches/server/0724-Collision-optimisations.patch
@@ -2226,10 +2226,10 @@ index e45fc21532911aedacd99315386857e8e54ade32..97054a83f90cd1dc440b7c319c91014b
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 87fc2c057667eaf7303f3be474e436e0d4cf109a..f505977aaa48ab25b0a8a630f51e36551cb0fa79 100644
+index b06f36138bfda3f9802ee15e57e1895d8fe16c54..9010da755303a9c5bb9a2fbacaf6bcfd6db9e3af 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -892,7 +892,7 @@ public abstract class PlayerList {
+@@ -913,7 +913,7 @@ public abstract class PlayerList {
          entityplayer1.forceSetPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
  
          worldserver1.getChunkSource().addRegionTicket(net.minecraft.server.level.TicketType.POST_TELEPORT, new net.minecraft.world.level.ChunkPos(location.getBlockX() >> 4, location.getBlockZ() >> 4), 1, entityplayer.getId()); // Paper
@@ -2239,7 +2239,7 @@ index 87fc2c057667eaf7303f3be474e436e0d4cf109a..f505977aaa48ab25b0a8a630f51e3655
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0fb3cb6a30810b386b6406481f0bd36eb834004c..cc5c122fe9e3528e3b120d00e0a3600ef947c664 100644
+index 5f77b6851baee35a279d570fba5baacec9278568..5177dc096254cf17e61c93ce4f9f0c768730d70b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1210,9 +1210,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2393,7 +2393,7 @@ index 0fb3cb6a30810b386b6406481f0bd36eb834004c..cc5c122fe9e3528e3b120d00e0a3600e
      }
  
      public static Vec3 collideBoundingBox(@Nullable Entity entity, Vec3 movement, AABB entityBoundingBox, Level world, List<VoxelShape> collisions) {
-@@ -2619,11 +2708,70 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2598,11 +2687,70 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              float f = this.dimensions.width * 0.8F;
              AABB axisalignedbb = AABB.ofSize(this.getEyePosition(), (double) f, 1.0E-6D, (double) f);
  
diff --git a/patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0725-Optimise-collision-checking-in-player-move-packet-ha.patch
index 9e795d10e4..9e795d10e4 100644
--- a/patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0725-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0726-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 3302cf5d13..3302cf5d13 100644
--- a/patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0726-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0728-Add-more-Campfire-API.patch b/patches/server/0727-Add-more-Campfire-API.patch
index 61de925634..61de925634 100644
--- a/patches/server/0728-Add-more-Campfire-API.patch
+++ b/patches/server/0727-Add-more-Campfire-API.patch
diff --git a/patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0728-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 5c74ea64c9..5c74ea64c9 100644
--- a/patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0728-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0730-Fix-tripwire-state-inconsistency.patch b/patches/server/0729-Fix-tripwire-state-inconsistency.patch
index 8c45070e31..8c45070e31 100644
--- a/patches/server/0730-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0729-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0731-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0730-Forward-CraftEntity-in-teleport-command.patch
index cdfb7af3ef..5cba16fd32 100644
--- a/patches/server/0731-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0730-Forward-CraftEntity-in-teleport-command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cc5c122fe9e3528e3b120d00e0a3600ef947c664..27b07629aa36029e251ebbc3fb68466f02c0aab3 100644
+index 5177dc096254cf17e61c93ce4f9f0c768730d70b..d9df2df697d2abbcdb5f7928bb51f1210d71b888 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3527,6 +3527,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3506,6 +3506,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index cc5c122fe9e3528e3b120d00e0a3600ef947c664..27b07629aa36029e251ebbc3fb68466f
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3613,10 +3620,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3592,10 +3599,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit
                          ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit
                      }
diff --git a/patches/server/0732-Improve-scoreboard-entries.patch b/patches/server/0731-Improve-scoreboard-entries.patch
index 5c71b1a0dc..a11751b6c8 100644
--- a/patches/server/0732-Improve-scoreboard-entries.patch
+++ b/patches/server/0731-Improve-scoreboard-entries.patch
@@ -52,7 +52,7 @@ index 052389310826ee6b97cf27dfd952e0101fb2d097..a8c5bfc54ed2b8bd873f124c7080d73f
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index c0362c54d0d097ad6cd4616b3ab194e51258da1e..f0b59dd4b7c3d857f7aa7c8263c760f7a46c6e34 100644
+index 7900adb0b158bc17dd792dd082c338547bc1aa0a..27219bf2f16aed64c78623d44c3cc84aa9f47065 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 @@ -304,6 +304,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
diff --git a/patches/server/0733-Entity-powdered-snow-API.patch b/patches/server/0732-Entity-powdered-snow-API.patch
index 695d4ee581..695d4ee581 100644
--- a/patches/server/0733-Entity-powdered-snow-API.patch
+++ b/patches/server/0732-Entity-powdered-snow-API.patch
diff --git a/patches/server/0734-Add-API-for-item-entity-health.patch b/patches/server/0733-Add-API-for-item-entity-health.patch
index dd1d43a643..dd1d43a643 100644
--- a/patches/server/0734-Add-API-for-item-entity-health.patch
+++ b/patches/server/0733-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0734-Fix-entity-type-tags-suggestions-in-selectors.patch
index 213b301fc1..213b301fc1 100644
--- a/patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0734-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0735-Configurable-max-block-light-for-monster-spawning.patch
index 59eb60edd7..59eb60edd7 100644
--- a/patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0735-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0736-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 913048fffc..913048fffc 100644
--- a/patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0736-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0737-Load-effect-amplifiers-greater-than-127-correctly.patch
index b0884e52bd..b0884e52bd 100644
--- a/patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0737-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0738-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0738-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0740-Fix-bees-aging-inside-hives.patch b/patches/server/0739-Fix-bees-aging-inside-hives.patch
index 646f563356..646f563356 100644
--- a/patches/server/0740-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0739-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0741-Bucketable-API.patch b/patches/server/0740-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0741-Bucketable-API.patch
+++ b/patches/server/0740-Bucketable-API.patch
diff --git a/patches/server/0742-Validate-usernames.patch b/patches/server/0741-Validate-usernames.patch
index fe0bca6d14..4ea7843114 100644
--- a/patches/server/0742-Validate-usernames.patch
+++ b/patches/server/0741-Validate-usernames.patch
@@ -56,10 +56,10 @@ index 2e73c94f74be95a7d6ba58d5151c3090253bb9c6..3a177569b9aa8d641252d0169bea8be7
          GameProfile gameprofile = this.server.getSingleplayerProfile();
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f505977aaa48ab25b0a8a630f51e36551cb0fa79..b380cbe84835bbe68f63f097dfb57d960bbe3271 100644
+index 9010da755303a9c5bb9a2fbacaf6bcfd6db9e3af..7a305967fa532eb9eb4e6cfdb5d80f4192181d42 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -660,7 +660,7 @@ public abstract class PlayerList {
+@@ -681,7 +681,7 @@ public abstract class PlayerList {
  
          for (int i = 0; i < this.players.size(); ++i) {
              entityplayer = (ServerPlayer) this.players.get(i);
diff --git a/patches/server/0743-Make-water-animal-spawn-height-configurable.patch b/patches/server/0742-Make-water-animal-spawn-height-configurable.patch
index 9e90672eb5..9e90672eb5 100644
--- a/patches/server/0743-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0742-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0743-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 4ed71d8ecc..4ed71d8ecc 100644
--- a/patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0743-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0744-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0744-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch
index ad9460d017..ad9460d017 100644
--- a/patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0747-Multiple-Entries-with-Scoreboards.patch b/patches/server/0746-Multiple-Entries-with-Scoreboards.patch
index 69772b2ea9..d3d92906dd 100644
--- a/patches/server/0747-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0746-Multiple-Entries-with-Scoreboards.patch
@@ -70,7 +70,7 @@ index e84332b6f031e83283c1b6e90bb82a6053ff46d7..03d13c2425170a6513ea7442a4a12fc9
      public void onObjectiveAdded(Objective objective) {
          super.onObjectiveAdded(objective);
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index f0b59dd4b7c3d857f7aa7c8263c760f7a46c6e34..c25ab8baf2eb66f85a60280e32a134c99f21b40c 100644
+index 27219bf2f16aed64c78623d44c3cc84aa9f47065..fd86c1d43cccd036f60cb270b56fd33f95707720 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 @@ -229,6 +229,21 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
diff --git a/patches/server/0748-Reset-placed-block-on-exception.patch b/patches/server/0747-Reset-placed-block-on-exception.patch
index 308089d693..308089d693 100644
--- a/patches/server/0748-Reset-placed-block-on-exception.patch
+++ b/patches/server/0747-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0749-Add-configurable-height-for-slime-spawn.patch b/patches/server/0748-Add-configurable-height-for-slime-spawn.patch
index a9aa51d551..a9aa51d551 100644
--- a/patches/server/0749-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0748-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0749-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 5d3797471d..5d3797471d 100644
--- a/patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0749-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0751-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0750-Fix-xp-reward-for-baby-zombies.patch
index a8293675b5..a8293675b5 100644
--- a/patches/server/0751-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0750-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0752-Kick-on-main-for-illegal-chat.patch b/patches/server/0751-Kick-on-main-for-illegal-chat.patch
index 90fe5ee6ad..90fe5ee6ad 100644
--- a/patches/server/0752-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0751-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0753-Multi-Block-Change-API-Implementation.patch b/patches/server/0752-Multi-Block-Change-API-Implementation.patch
index d3cd5e8039..d3cd5e8039 100644
--- a/patches/server/0753-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0752-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0754-Fix-NotePlayEvent.patch b/patches/server/0753-Fix-NotePlayEvent.patch
index 5104743fbe..5104743fbe 100644
--- a/patches/server/0754-Fix-NotePlayEvent.patch
+++ b/patches/server/0753-Fix-NotePlayEvent.patch
diff --git a/patches/server/0755-Freeze-Tick-Lock-API.patch b/patches/server/0754-Freeze-Tick-Lock-API.patch
index 33dfa398ab..379ad1559c 100644
--- a/patches/server/0755-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0754-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 27b07629aa36029e251ebbc3fb68466f02c0aab3..1bdc0c95d1f739ce7fc664cc9f7e561e7565e9d4 100644
+index d9df2df697d2abbcdb5f7928bb51f1210d71b888..8b23d7dcfc4a877ec5332c8fce94db1375a3e2dd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -402,6 +402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -35,7 +35,7 @@ index 27b07629aa36029e251ebbc3fb68466f02c0aab3..1bdc0c95d1f739ce7fc664cc9f7e561e
              // Paper end
              return nbt;
          } catch (Throwable throwable) {
-@@ -2598,6 +2602,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2577,6 +2581,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (spawnReason == null) {
                  spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
              }
diff --git a/patches/server/0756-Dolphin-API.patch b/patches/server/0755-Dolphin-API.patch
index e971f87322..e971f87322 100644
--- a/patches/server/0756-Dolphin-API.patch
+++ b/patches/server/0755-Dolphin-API.patch
diff --git a/patches/server/0757-More-PotionEffectType-API.patch b/patches/server/0756-More-PotionEffectType-API.patch
index 5103da4ead..5103da4ead 100644
--- a/patches/server/0757-More-PotionEffectType-API.patch
+++ b/patches/server/0756-More-PotionEffectType-API.patch
diff --git a/patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0757-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 84ed67d62f..84ed67d62f 100644
--- a/patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0757-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0758-API-for-creating-command-sender-which-forwards-feedb.patch
index b92c1c2856..b92c1c2856 100644
--- a/patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0758-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0760-Add-missing-structure-set-seed-configs.patch b/patches/server/0759-Add-missing-structure-set-seed-configs.patch
index 619c499781..619c499781 100644
--- a/patches/server/0760-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0759-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0761-Implement-regenerateChunk.patch b/patches/server/0760-Implement-regenerateChunk.patch
index dd01785a8f..dd01785a8f 100644
--- a/patches/server/0761-Implement-regenerateChunk.patch
+++ b/patches/server/0760-Implement-regenerateChunk.patch
diff --git a/patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0761-Fix-cancelled-powdered-snow-bucket-placement.patch
index 6c443ed789..6c443ed789 100644
--- a/patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0761-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0762-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 56af4853a3..56af4853a3 100644
--- a/patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0762-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0764-Add-GameEvent-tags.patch b/patches/server/0763-Add-GameEvent-tags.patch
index 02e72d2282..02e72d2282 100644
--- a/patches/server/0764-Add-GameEvent-tags.patch
+++ b/patches/server/0763-Add-GameEvent-tags.patch
diff --git a/patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0764-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 1c13cca49e..1c13cca49e 100644
--- a/patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0764-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0766-Furnace-RecipesUsed-API.patch b/patches/server/0765-Furnace-RecipesUsed-API.patch
index 075cd97b56..075cd97b56 100644
--- a/patches/server/0766-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0765-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0767-Configurable-sculk-sensor-listener-range.patch b/patches/server/0766-Configurable-sculk-sensor-listener-range.patch
index ff5a549be0..ff5a549be0 100644
--- a/patches/server/0767-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0766-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0768-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0767-Add-missing-block-data-mins-and-maxes.patch
index bf5dcd67c2..bf5dcd67c2 100644
--- a/patches/server/0768-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0767-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0768-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 9a36732d25..9a36732d25 100644
--- a/patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0768-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0769-Put-world-into-worldlist-before-initing-the-world.patch
index 63add2e773..63add2e773 100644
--- a/patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0769-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0771-Fix-Entity-Position-Desync.patch b/patches/server/0770-Fix-Entity-Position-Desync.patch
index 1a885e69f8..1a885e69f8 100644
--- a/patches/server/0771-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0770-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0772-Custom-Potion-Mixes.patch b/patches/server/0771-Custom-Potion-Mixes.patch
index bbfbea8133..bbfbea8133 100644
--- a/patches/server/0772-Custom-Potion-Mixes.patch
+++ b/patches/server/0771-Custom-Potion-Mixes.patch
diff --git a/patches/server/0773-Force-close-world-loading-screen.patch b/patches/server/0772-Force-close-world-loading-screen.patch
index 331c05b9a6..d9dd154b5a 100644
--- a/patches/server/0773-Force-close-world-loading-screen.patch
+++ b/patches/server/0772-Force-close-world-loading-screen.patch
@@ -10,10 +10,10 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b380cbe84835bbe68f63f097dfb57d960bbe3271..fe3811e3bb0f47fb201a9d47357adf0e3fd00b01 100644
+index 7a305967fa532eb9eb4e6cfdb5d80f4192181d42..ba43aecf1a0cf7e2fabd8c01f0c75dc99592c264 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -379,6 +379,16 @@ public abstract class PlayerList {
+@@ -400,6 +400,16 @@ public abstract class PlayerList {
  
          // Paper start - move vehicle into method so it can be called above - short circuit around that code
          onPlayerJoinFinish(player, worldserver1, s1);
diff --git a/patches/server/0774-Fix-falling-block-spawn-methods.patch b/patches/server/0773-Fix-falling-block-spawn-methods.patch
index 546e16b94b..546e16b94b 100644
--- a/patches/server/0774-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0773-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0775-Expose-furnace-minecart-push-values.patch b/patches/server/0774-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0775-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0774-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0775-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 9a608358db..9a608358db 100644
--- a/patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0775-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0777-More-Projectile-API.patch b/patches/server/0776-More-Projectile-API.patch
index d43871e79b..d43871e79b 100644
--- a/patches/server/0777-More-Projectile-API.patch
+++ b/patches/server/0776-More-Projectile-API.patch
diff --git a/patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0777-Fix-swamp-hut-cat-generation-deadlock.patch
index b2499e69cc..b2499e69cc 100644
--- a/patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0777-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0778-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 62ec01585d..62ec01585d 100644
--- a/patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0778-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0780-Implement-getComputedBiome-API.patch b/patches/server/0779-Implement-getComputedBiome-API.patch
index 4421a72bbd..4421a72bbd 100644
--- a/patches/server/0780-Implement-getComputedBiome-API.patch
+++ b/patches/server/0779-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0781-Make-some-itemstacks-nonnull.patch b/patches/server/0780-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0781-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0780-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0782-Implement-enchantWithLevels-API.patch b/patches/server/0781-Implement-enchantWithLevels-API.patch
index ab96d4c51c..ab96d4c51c 100644
--- a/patches/server/0782-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0781-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0783-Fix-saving-in-unloadWorld.patch b/patches/server/0782-Fix-saving-in-unloadWorld.patch
index 727e9e5c96..727e9e5c96 100644
--- a/patches/server/0783-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0782-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0784-Buffer-OOB-setBlock-calls.patch b/patches/server/0783-Buffer-OOB-setBlock-calls.patch
index d17173fb30..d17173fb30 100644
--- a/patches/server/0784-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0783-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0785-Add-TameableDeathMessageEvent.patch b/patches/server/0784-Add-TameableDeathMessageEvent.patch
index b08801fd3d..b08801fd3d 100644
--- a/patches/server/0785-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0784-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0785-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index c99d407f99..c99d407f99 100644
--- a/patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0785-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 7730bb996e..7730bb996e 100644
--- a/patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0787-Ensure-entity-passenger-world-matches-ridden-entity.patch
index cd6f5e26bb..91086db186 100644
--- a/patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0787-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1bdc0c95d1f739ce7fc664cc9f7e561e7565e9d4..c453351b3734320bef991880743245e8e69d3e86 100644
+index 8b23d7dcfc4a877ec5332c8fce94db1375a3e2dd..da90572d7f258ff9035cbae4f85df4e256bebaa1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2841,7 +2841,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2820,7 +2820,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean startRiding(Entity entity, boolean force) {
diff --git a/patches/server/0789-Guard-against-invalid-entity-positions.patch b/patches/server/0788-Guard-against-invalid-entity-positions.patch
index 959e17ca71..fe431a5d58 100644
--- a/patches/server/0789-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0788-Guard-against-invalid-entity-positions.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c453351b3734320bef991880743245e8e69d3e86..540e357a191b3ebf27fd70f488f43839a1726225 100644
+index da90572d7f258ff9035cbae4f85df4e256bebaa1..e00b936d7cc46c5372d8a29a5b97efc44aa3ba4a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4522,11 +4522,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4501,11 +4501,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.getZ((2.0D * this.random.nextDouble() - 1.0D) * widthScale);
      }
  
diff --git a/patches/server/0790-cache-resource-keys.patch b/patches/server/0789-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0790-cache-resource-keys.patch
+++ b/patches/server/0789-cache-resource-keys.patch
diff --git a/patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0790-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 26b7c6f5cf..26b7c6f5cf 100644
--- a/patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0790-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0791-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index e9c2bc86cd..e9c2bc86cd 100644
--- a/patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0791-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0792-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index c7c36d1add..c7c36d1add 100644
--- a/patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0792-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0793-Prevent-tile-entity-copies-loading-chunks.patch
index e1d3f11682..e1d3f11682 100644
--- a/patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0793-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0794-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 34c3763697..098bf69f0e 100644
--- a/patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0794-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fe3811e3bb0f47fb201a9d47357adf0e3fd00b01..ce04374971e679b4883d8a6ebba4c6832b606a65 100644
+index ba43aecf1a0cf7e2fabd8c01f0c75dc99592c264..80d1c6850e7ce3d48cf54297ffcf9f5a2903d216 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1424,7 +1424,7 @@ public abstract class PlayerList {
+@@ -1445,7 +1445,7 @@ public abstract class PlayerList {
      // CraftBukkit start
      public ServerStatsCounter getPlayerStats(ServerPlayer entityhuman) {
          ServerStatsCounter serverstatisticmanager = entityhuman.getStats();
diff --git a/patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0795-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 7f78aa076d..7f78aa076d 100644
--- a/patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0795-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0796-Pass-ServerLevel-for-gamerule-callbacks.patch
index a9456a58e4..a9456a58e4 100644
--- a/patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0796-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0797-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 676f145bb4..676f145bb4 100644
--- a/patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0797-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0799-WorldCreator-keepSpawnLoaded.patch b/patches/server/0798-WorldCreator-keepSpawnLoaded.patch
index d83f7422f1..d83f7422f1 100644
--- a/patches/server/0799-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0798-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0799-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index 0510692ca9..0510692ca9 100644
--- a/patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0799-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0800-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 0a9bd54413..0a9bd54413 100644
--- a/patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0800-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0801-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 76380e425b..76380e425b 100644
--- a/patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0801-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0802-Fire-CauldronLevelChange-on-initial-fill.patch
index bcc871d7bc..bcc871d7bc 100644
--- a/patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0802-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0803-fix-powder-snow-cauldrons-not-turning-to-water.patch
index fec28b7e17..fec28b7e17 100644
--- a/patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0803-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0805-Add-PlayerStopUsingItemEvent.patch b/patches/server/0804-Add-PlayerStopUsingItemEvent.patch
index 3134b2b297..3134b2b297 100644
--- a/patches/server/0805-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0804-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0806-Don-t-tick-markers.patch b/patches/server/0805-Don-t-tick-markers.patch
index 48b356285d..48b356285d 100644
--- a/patches/server/0806-Don-t-tick-markers.patch
+++ b/patches/server/0805-Don-t-tick-markers.patch
diff --git a/patches/server/0807-Expand-FallingBlock-API.patch b/patches/server/0806-Expand-FallingBlock-API.patch
index 69b20741d3..69b20741d3 100644
--- a/patches/server/0807-Expand-FallingBlock-API.patch
+++ b/patches/server/0806-Expand-FallingBlock-API.patch
diff --git a/patches/server/0808-Do-not-accept-invalid-client-settings.patch b/patches/server/0807-Do-not-accept-invalid-client-settings.patch
index 81f2f884ae..81f2f884ae 100644
--- a/patches/server/0808-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0807-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0809-Add-support-for-Proxy-Protocol.patch b/patches/server/0808-Add-support-for-Proxy-Protocol.patch
index 30de84af65..30de84af65 100644
--- a/patches/server/0809-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0808-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0809-Fix-OfflinePlayer-getBedSpawnLocation.patch
index ed4f98caf0..ed4f98caf0 100644
--- a/patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0809-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0810-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0810-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0811-Sanitize-Sent-BlockEntity-NBT.patch
index b3404362f9..b3404362f9 100644
--- a/patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0811-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0812-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0812-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0813-Prevent-entity-loading-causing-async-lookups.patch
index 0c4b4bfa98..36c50cdc6b 100644
--- a/patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0813-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 540e357a191b3ebf27fd70f488f43839a1726225..0faf4c288cc9847fa72f2f2d98f55d552169524e 100644
+index e00b936d7cc46c5372d8a29a5b97efc44aa3ba4a..291d6701045acf96b3174fe877f1425fc1cbad88 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -796,6 +796,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0814-Throw-exception-on-world-create-while-being-ticked.patch
index cdc81374d4..cdc81374d4 100644
--- a/patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0814-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0816-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0815-Add-Alternate-Current-redstone-implementation.patch
index 1fc17d2b19..1fc17d2b19 100644
--- a/patches/server/0816-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0815-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0817-Dont-resent-entity-on-art-update.patch b/patches/server/0816-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0817-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0816-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0818-Add-WardenAngerChangeEvent.patch b/patches/server/0817-Add-WardenAngerChangeEvent.patch
index eb11b51339..eb11b51339 100644
--- a/patches/server/0818-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0817-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0818-Add-option-for-strict-advancement-dimension-checks.patch
index 919ba3b905..919ba3b905 100644
--- a/patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0818-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0819-Add-missing-important-BlockStateListPopulator-method.patch
index c18323e95f..c18323e95f 100644
--- a/patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0819-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0821-Nameable-Banner-API.patch b/patches/server/0820-Nameable-Banner-API.patch
index 351d3597e0..351d3597e0 100644
--- a/patches/server/0821-Nameable-Banner-API.patch
+++ b/patches/server/0820-Nameable-Banner-API.patch
diff --git a/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0821-Don-t-broadcast-messages-to-command-blocks.patch
index d009bb5b66..d009bb5b66 100644
--- a/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0821-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0822-Prevent-empty-items-from-being-added-to-world.patch
index 6ba582fff8..6ba582fff8 100644
--- a/patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0822-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0823-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 5816232b91..5816232b91 100644
--- a/patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0823-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0825-Add-Player-getFishHook.patch b/patches/server/0824-Add-Player-getFishHook.patch
index 8823cf2f88..8823cf2f88 100644
--- a/patches/server/0825-Add-Player-getFishHook.patch
+++ b/patches/server/0824-Add-Player-getFishHook.patch
diff --git a/patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0825-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 3956916b04..3956916b04 100644
--- a/patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0825-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0826-Add-various-missing-EntityDropItemEvent-calls.patch
index c41f44844d..ad46611a69 100644
--- a/patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0826-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0faf4c288cc9847fa72f2f2d98f55d552169524e..aa9fa4afe80fad145d94406f26dda2341da87dbe 100644
+index 291d6701045acf96b3174fe877f1425fc1cbad88..c328c90ad346e1f631490526d65b86abdc6b6282 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2693,6 +2693,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2672,6 +2672,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              stack.setCount(0); // Paper - destroy this item - if this ever leaks due to game bugs, ensure it doesn't dupe
  
              entityitem.setDefaultPickUpDelay();
diff --git a/patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0827-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 1305d58c28..1305d58c28 100644
--- a/patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0827-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0829-Fix-Bee-flower-NPE.patch b/patches/server/0828-Fix-Bee-flower-NPE.patch
index bbc40a996b..bbc40a996b 100644
--- a/patches/server/0829-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0828-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0829-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index eb5f74ca9a..eb5f74ca9a 100644
--- a/patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0829-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0831-More-Teleport-API.patch b/patches/server/0830-More-Teleport-API.patch
index b6588baba2..b6588baba2 100644
--- a/patches/server/0831-More-Teleport-API.patch
+++ b/patches/server/0830-More-Teleport-API.patch
diff --git a/patches/server/0832-Add-EntityPortalReadyEvent.patch b/patches/server/0831-Add-EntityPortalReadyEvent.patch
index 92b7d3617b..7dc5937171 100644
--- a/patches/server/0832-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0831-Add-EntityPortalReadyEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index aa9fa4afe80fad145d94406f26dda2341da87dbe..bc303e7ab3c8db5cffec2c1c3640fbaf59601101 100644
+index c328c90ad346e1f631490526d65b86abdc6b6282..45178d204a79eb47b36adf6e4dfa17d71c6b2c3a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3095,6 +3095,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3074,6 +3074,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
                      this.level().getProfiler().push("portal");
                      this.portalTime = i;
@@ -22,7 +22,7 @@ index aa9fa4afe80fad145d94406f26dda2341da87dbe..bc303e7ab3c8db5cffec2c1c3640fbaf
                      this.setPortalCooldown();
                      // CraftBukkit start
                      if (this instanceof ServerPlayer) {
-@@ -3102,6 +3109,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3081,6 +3088,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      } else {
                          this.changeDimension(worldserver1);
                      }
diff --git a/patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0832-Don-t-use-level-random-in-entity-constructors.patch
index 380c4d5c5d..380c4d5c5d 100644
--- a/patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0832-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0834-Send-block-entities-after-destroy-prediction.patch b/patches/server/0833-Send-block-entities-after-destroy-prediction.patch
index 1ea3e81505..1ea3e81505 100644
--- a/patches/server/0834-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0833-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0834-Warn-on-plugins-accessing-faraway-chunks.patch
index 22237fb9e2..22237fb9e2 100644
--- a/patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0834-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0835-Custom-Chat-Completion-Suggestions-API.patch
index 94ccf0b6a5..94ccf0b6a5 100644
--- a/patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0835-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0836-Add-and-fix-missing-BlockFadeEvents.patch
index dd7008cfb5..dd7008cfb5 100644
--- a/patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0836-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0838-Collision-API.patch b/patches/server/0837-Collision-API.patch
index efa8916419..efa8916419 100644
--- a/patches/server/0838-Collision-API.patch
+++ b/patches/server/0837-Collision-API.patch
diff --git a/patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0838-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index bffcadeb49..bffcadeb49 100644
--- a/patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0838-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0840-Block-Ticking-API.patch b/patches/server/0839-Block-Ticking-API.patch
index 4511a8454a..4511a8454a 100644
--- a/patches/server/0840-Block-Ticking-API.patch
+++ b/patches/server/0839-Block-Ticking-API.patch
diff --git a/patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0840-Add-Velocity-IP-Forwarding-Support.patch
index 85a2ae83e6..85a2ae83e6 100644
--- a/patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0840-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0841-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index c067fd1eaf..c067fd1eaf 100644
--- a/patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0841-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0843-Add-NamespacedKey-biome-methods.patch b/patches/server/0842-Add-NamespacedKey-biome-methods.patch
index 6c282cba3f..6c282cba3f 100644
--- a/patches/server/0843-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0842-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0843-Fix-plugin-loggers-on-server-shutdown.patch
index a3c6981860..a3c6981860 100644
--- a/patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0843-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0844-Stop-large-look-changes-from-crashing-the-server.patch
index 9c3d5e3b5f..9c3d5e3b5f 100644
--- a/patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0844-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0845-Fire-EntityChangeBlockEvent-in-more-places.patch
index 4f0d9f51f2..4f0d9f51f2 100644
--- a/patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0845-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0847-Missing-eating-regain-reason.patch b/patches/server/0846-Missing-eating-regain-reason.patch
index e04644ebf1..e04644ebf1 100644
--- a/patches/server/0847-Missing-eating-regain-reason.patch
+++ b/patches/server/0846-Missing-eating-regain-reason.patch
diff --git a/patches/server/0848-Missing-effect-cause.patch b/patches/server/0847-Missing-effect-cause.patch
index c5a77c1456..c5a77c1456 100644
--- a/patches/server/0848-Missing-effect-cause.patch
+++ b/patches/server/0847-Missing-effect-cause.patch
diff --git a/patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0848-Added-byte-array-serialization-deserialization-for-P.patch
index 3e6734569e..3e6734569e 100644
--- a/patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0848-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0849-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 7e974ebb59..7e974ebb59 100644
--- a/patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0849-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0851-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0850-Call-BlockPhysicsEvent-more-often.patch
index ea04c3e249..ea04c3e249 100644
--- a/patches/server/0851-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0850-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0852-Configurable-chat-thread-limit.patch b/patches/server/0851-Configurable-chat-thread-limit.patch
index 5e312d3a14..5e312d3a14 100644
--- a/patches/server/0852-Configurable-chat-thread-limit.patch
+++ b/patches/server/0851-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0852-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 764d46a061..764d46a061 100644
--- a/patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0852-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0854-fix-Jigsaw-block-kicking-user.patch b/patches/server/0853-fix-Jigsaw-block-kicking-user.patch
index 6206d8d028..6206d8d028 100644
--- a/patches/server/0854-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0853-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0854-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 39be29edef..39be29edef 100644
--- a/patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0854-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0856-Add-getDrops-to-BlockState.patch b/patches/server/0855-Add-getDrops-to-BlockState.patch
index f1c9e20197..f1c9e20197 100644
--- a/patches/server/0856-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0855-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0856-Fix-a-bunch-of-vanilla-bugs.patch
index 5ef20d44ed..5ef20d44ed 100644
--- a/patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0856-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0857-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 17bbabc57b..17bbabc57b 100644
--- a/patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0857-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0859-Fix-custom-piglin-loved-items.patch b/patches/server/0858-Fix-custom-piglin-loved-items.patch
index 41c934194f..41c934194f 100644
--- a/patches/server/0859-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0858-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0860-EntityPickupItemEvent-fixes.patch b/patches/server/0859-EntityPickupItemEvent-fixes.patch
index d052f8e0a1..d052f8e0a1 100644
--- a/patches/server/0860-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0859-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0860-Correctly-handle-interactions-with-items-on-cooldown.patch
index e49f829afc..e49f829afc 100644
--- a/patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0860-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0861-Add-PlayerInventorySlotChangeEvent.patch
index a39e739eaa..a39e739eaa 100644
--- a/patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0861-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0863-Elder-Guardian-appearance-API.patch b/patches/server/0862-Elder-Guardian-appearance-API.patch
index 309d1be1cc..309d1be1cc 100644
--- a/patches/server/0863-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0862-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0864-Allow-changing-bed-s-occupied-property.patch b/patches/server/0863-Allow-changing-bed-s-occupied-property.patch
index f1d50caf78..f1d50caf78 100644
--- a/patches/server/0864-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0863-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0865-Add-entity-knockback-API.patch b/patches/server/0864-Add-entity-knockback-API.patch
index 2fab1f9c44..2fab1f9c44 100644
--- a/patches/server/0865-Add-entity-knockback-API.patch
+++ b/patches/server/0864-Add-entity-knockback-API.patch
diff --git a/patches/server/0866-Detect-headless-JREs.patch b/patches/server/0865-Detect-headless-JREs.patch
index 21cb522e88..21cb522e88 100644
--- a/patches/server/0866-Detect-headless-JREs.patch
+++ b/patches/server/0865-Detect-headless-JREs.patch
diff --git a/patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0866-fixed-entity-vehicle-collision-event-not-called.patch
index ebd0cc3b2c..ebd0cc3b2c 100644
--- a/patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0866-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0868-optimized-dirt-and-snow-spreading.patch b/patches/server/0867-optimized-dirt-and-snow-spreading.patch
index 08a3761309..08a3761309 100644
--- a/patches/server/0868-optimized-dirt-and-snow-spreading.patch
+++ b/patches/server/0867-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0869-Added-EntityToggleSitEvent.patch b/patches/server/0868-Added-EntityToggleSitEvent.patch
index 31eaca5429..31eaca5429 100644
--- a/patches/server/0869-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0868-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0870-Add-fire-tick-delay-option.patch b/patches/server/0869-Add-fire-tick-delay-option.patch
index 7649d101c9..7649d101c9 100644
--- a/patches/server/0870-Add-fire-tick-delay-option.patch
+++ b/patches/server/0869-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0871-Add-Moving-Piston-API.patch b/patches/server/0870-Add-Moving-Piston-API.patch
index b0b64257f1..b0b64257f1 100644
--- a/patches/server/0871-Add-Moving-Piston-API.patch
+++ b/patches/server/0870-Add-Moving-Piston-API.patch
diff --git a/patches/server/0872-Ignore-impossible-spawn-tick.patch b/patches/server/0871-Ignore-impossible-spawn-tick.patch
index 46cd469266..46cd469266 100644
--- a/patches/server/0872-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0871-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0872-Track-projectile-source-for-fireworks-from-dispenser.patch
index fe9f8e5826..fe9f8e5826 100644
--- a/patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0872-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0873-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index a840f9a576..a840f9a576 100644
--- a/patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0873-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0874-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 0cdc0de2ff..0e7507d0b8 100644
--- a/patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0874-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bc303e7ab3c8db5cffec2c1c3640fbaf59601101..c71011cdc4ab02c4e39f8ef39a5030b1c16f3d8f 100644
+index 45178d204a79eb47b36adf6e4dfa17d71c6b2c3a..f402f9c530b9c98ea6295ba88ed0179ff7670986 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3374,6 +3374,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3353,6 +3353,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              pluginManager.callEvent(entityCombustEvent);
              if (!entityCombustEvent.isCancelled()) {
                  this.setSecondsOnFire(entityCombustEvent.getDuration(), false);
diff --git a/patches/server/0876-Prevent-compass-from-loading-chunks.patch b/patches/server/0875-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0876-Prevent-compass-from-loading-chunks.patch
+++ b/patches/server/0875-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0877-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0876-Add-PrePlayerAttackEntityEvent.patch
index 59e72b4db1..59e72b4db1 100644
--- a/patches/server/0877-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0876-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0877-ensure-reset-EnderDragon-boss-event-name.patch
index 6107fe92f8..6107fe92f8 100644
--- a/patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0877-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0878-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 9780023a35..9780023a35 100644
--- a/patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0878-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0880-Add-Player-Warden-Warning-API.patch b/patches/server/0879-Add-Player-Warden-Warning-API.patch
index 30ed1857b9..30ed1857b9 100644
--- a/patches/server/0880-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0879-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0880-More-vanilla-friendly-methods-to-update-trades.patch
index 667a65e357..667a65e357 100644
--- a/patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0880-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0882-Add-paper-dumplisteners-command.patch b/patches/server/0881-Add-paper-dumplisteners-command.patch
index 9669276c0a..9669276c0a 100644
--- a/patches/server/0882-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0881-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0883-check-global-player-list-where-appropriate.patch b/patches/server/0882-check-global-player-list-where-appropriate.patch
index 1b18c29415..1b18c29415 100644
--- a/patches/server/0883-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0882-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0883-Fix-async-entity-add-due-to-fungus-trees.patch
index a2b4a2f003..a2b4a2f003 100644
--- a/patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0883-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0885-ItemStack-damage-API.patch b/patches/server/0884-ItemStack-damage-API.patch
index 83ab1c3ff4..83ab1c3ff4 100644
--- a/patches/server/0885-ItemStack-damage-API.patch
+++ b/patches/server/0884-ItemStack-damage-API.patch
diff --git a/patches/server/0886-Friction-API.patch b/patches/server/0885-Friction-API.patch
index 7d174e0e49..7d174e0e49 100644
--- a/patches/server/0886-Friction-API.patch
+++ b/patches/server/0885-Friction-API.patch
diff --git a/patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0886-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a019ee3c47..a019ee3c47 100644
--- a/patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0886-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0888-Fix-player-kick-on-shutdown.patch b/patches/server/0887-Fix-player-kick-on-shutdown.patch
index f5de61909f..f5de61909f 100644
--- a/patches/server/0888-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0887-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0889-Sync-offhand-slot-in-menus.patch b/patches/server/0888-Sync-offhand-slot-in-menus.patch
index d54a5a6e67..d54a5a6e67 100644
--- a/patches/server/0889-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0888-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0890-Player-Entity-Tracking-Events.patch b/patches/server/0889-Player-Entity-Tracking-Events.patch
index 7deeb6f655..7deeb6f655 100644
--- a/patches/server/0890-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0889-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0891-Limit-pet-look-distance.patch b/patches/server/0890-Limit-pet-look-distance.patch
index 6b827724a3..6b827724a3 100644
--- a/patches/server/0891-Limit-pet-look-distance.patch
+++ b/patches/server/0890-Limit-pet-look-distance.patch
diff --git a/patches/server/0892-Properly-resend-entities.patch b/patches/server/0891-Properly-resend-entities.patch
index 7fb40cf3fd..d727b5e226 100644
--- a/patches/server/0892-Properly-resend-entities.patch
+++ b/patches/server/0891-Properly-resend-entities.patch
@@ -98,10 +98,10 @@ index bfa2e9919275a1eb5d83403c5ed88eee245e3194..c4425cd7357049e74e825b824e30b969
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ce04374971e679b4883d8a6ebba4c6832b606a65..19a01b59ce3e75a0ed48e8fc7678063576d9a2b0 100644
+index 80d1c6850e7ce3d48cf54297ffcf9f5a2903d216..fd0164d843c2c73d7eaddbaf72d2021ff94ca38c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -357,7 +357,7 @@ public abstract class PlayerList {
+@@ -378,7 +378,7 @@ public abstract class PlayerList {
          ((ServerLevel)player.level()).getChunkSource().chunkMap.addEntity(player); // Paper - track entity now
          // CraftBukkit end
  
diff --git a/patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0892-Fixes-and-additions-to-the-SpawnReason-API.patch
index 2e8a508b26..2e8a508b26 100644
--- a/patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0892-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0894-fix-Instruments.patch b/patches/server/0893-fix-Instruments.patch
index b0d3525e46..b0d3525e46 100644
--- a/patches/server/0894-fix-Instruments.patch
+++ b/patches/server/0893-fix-Instruments.patch
diff --git a/patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0894-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 6c0d7471d6..6c0d7471d6 100644
--- a/patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0894-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0895-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index f318df5bb3..f318df5bb3 100644
--- a/patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0895-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0897-Add-BlockLockCheckEvent.patch b/patches/server/0896-Add-BlockLockCheckEvent.patch
index 860cae73de..860cae73de 100644
--- a/patches/server/0897-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0896-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0898-Add-Sneaking-API-for-Entities.patch b/patches/server/0897-Add-Sneaking-API-for-Entities.patch
index 9106439646..9106439646 100644
--- a/patches/server/0898-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0897-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0899-Improve-logging-and-errors.patch b/patches/server/0898-Improve-logging-and-errors.patch
index 8689ac7c75..8689ac7c75 100644
--- a/patches/server/0899-Improve-logging-and-errors.patch
+++ b/patches/server/0898-Improve-logging-and-errors.patch
diff --git a/patches/server/0900-Improve-PortalEvents.patch b/patches/server/0899-Improve-PortalEvents.patch
index 0ac3f798dc..8c4ad39c14 100644
--- a/patches/server/0900-Improve-PortalEvents.patch
+++ b/patches/server/0899-Improve-PortalEvents.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c71011cdc4ab02c4e39f8ef39a5030b1c16f3d8f..044106ea0907d24ab81c677d568e4433dca6ba1d 100644
+index f402f9c530b9c98ea6295ba88ed0179ff7670986..83d9487f20f42b678682ccb53b5e20c5932a579f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3757,7 +3757,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3736,7 +3736,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          Location enter = bukkitEntity.getLocation();
          Location exit = CraftLocation.toBukkit(exitPosition, exitWorldServer.getWorld());
  
diff --git a/patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0900-Add-config-option-for-spider-worldborder-climbing.patch
index 1a5abc1781..3eaf67b54a 100644
--- a/patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0900-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 044106ea0907d24ab81c677d568e4433dca6ba1d..a5b646d7167234d04232e244e32a977e89476802 100644
+index 83d9487f20f42b678682ccb53b5e20c5932a579f..077f786a00b3954f39194eb645d84f9c083ef8fc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0901-Add-missing-SpigotConfig-logCommands-check.patch
index 6234450db8..6234450db8 100644
--- a/patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0901-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0902-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0902-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0904-Flying-Fall-Damage.patch b/patches/server/0903-Flying-Fall-Damage.patch
index 5dad37d9dc..5dad37d9dc 100644
--- a/patches/server/0904-Flying-Fall-Damage.patch
+++ b/patches/server/0903-Flying-Fall-Damage.patch
diff --git a/patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0904-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index 39ca938316..39ca938316 100644
--- a/patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0904-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0905-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 1e77b38126..2812274b89 100644
--- a/patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0905-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a5b646d7167234d04232e244e32a977e89476802..11a4d679c5b46f52eeb51b844f240a835027216a 100644
+index 077f786a00b3954f39194eb645d84f9c083ef8fc..313e59e24701451115fc8a7b7fa1c8c1d5668e89 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1156,7 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0907-config-for-disabling-entity-tag-tags.patch b/patches/server/0906-config-for-disabling-entity-tag-tags.patch
index acdda06756..acdda06756 100644
--- a/patches/server/0907-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0906-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0908-Use-single-player-info-update-packet-on-join.patch b/patches/server/0907-Use-single-player-info-update-packet-on-join.patch
index 70aff90471..23d3f95cd6 100644
--- a/patches/server/0908-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0907-Use-single-player-info-update-packet-on-join.patch
@@ -18,10 +18,10 @@ index a6630c0aefb31b4b07b62219e27ce724325d291c..f53bb528e9682c554751fefe549fe823
          });
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 19a01b59ce3e75a0ed48e8fc7678063576d9a2b0..1354be9580ca74485fa0b7ba97fe94079292b8a0 100644
+index fd0164d843c2c73d7eaddbaf72d2021ff94ca38c..12bb0c619762ca9fc080ae884ce29de477dbcdc2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -339,6 +339,7 @@ public abstract class PlayerList {
+@@ -360,6 +360,7 @@ public abstract class PlayerList {
          // CraftBukkit start - sendAll above replaced with this loop
          ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player));
  
@@ -29,7 +29,7 @@ index 19a01b59ce3e75a0ed48e8fc7678063576d9a2b0..1354be9580ca74485fa0b7ba97fe9407
          for (int i = 0; i < this.players.size(); ++i) {
              ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
  
-@@ -346,12 +347,17 @@ public abstract class PlayerList {
+@@ -367,12 +368,17 @@ public abstract class PlayerList {
                  entityplayer1.connection.send(packet);
              }
  
diff --git a/patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0908-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 7b2e2d63ae..7b2e2d63ae 100644
--- a/patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0908-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0910-Win-Screen-API.patch b/patches/server/0909-Win-Screen-API.patch
index 70e44adc2b..70e44adc2b 100644
--- a/patches/server/0910-Win-Screen-API.patch
+++ b/patches/server/0909-Win-Screen-API.patch
diff --git a/patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0910-Remove-CraftItemStack-setAmount-null-assignment.patch
index 76965d3ef0..76965d3ef0 100644
--- a/patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0910-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0912-Fix-force-opening-enchantment-tables.patch b/patches/server/0911-Fix-force-opening-enchantment-tables.patch
index 7bdc01b518..7bdc01b518 100644
--- a/patches/server/0912-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0911-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0913-Add-Entity-Body-Yaw-API.patch b/patches/server/0912-Add-Entity-Body-Yaw-API.patch
index e9df66e906..e9df66e906 100644
--- a/patches/server/0913-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0912-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0913-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0913-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0914-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 9af995e790..9af995e790 100644
--- a/patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0914-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0916-Add-EntityFertilizeEggEvent.patch b/patches/server/0915-Add-EntityFertilizeEggEvent.patch
index ea181cda54..ea181cda54 100644
--- a/patches/server/0916-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0915-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0916-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 1a7f1ab11a..1a7f1ab11a 100644
--- a/patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0916-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0917-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 1291727de8..1291727de8 100644
--- a/patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0917-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0918-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0918-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0919-Fix-advancement-triggers-for-entity-damage.patch
index c55eac7b90..c55eac7b90 100644
--- a/patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0919-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0921-Fix-text-display-error-on-spawn.patch b/patches/server/0920-Fix-text-display-error-on-spawn.patch
index 43191b58fb..43191b58fb 100644
--- a/patches/server/0921-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0920-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0921-Fix-certain-inventories-returning-null-Locations.patch
index c5b7ef9a42..c5b7ef9a42 100644
--- a/patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/server/0921-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0923-Add-Shearable-API.patch b/patches/server/0922-Add-Shearable-API.patch
index 53d2faf459..53d2faf459 100644
--- a/patches/server/0923-Add-Shearable-API.patch
+++ b/patches/server/0922-Add-Shearable-API.patch
diff --git a/patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0923-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 6a85431dfa..6a85431dfa 100644
--- a/patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0923-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0925-Optimize-Hoppers.patch b/patches/server/0924-Optimize-Hoppers.patch
index 82b7c42ec0..82b7c42ec0 100644
--- a/patches/server/0925-Optimize-Hoppers.patch
+++ b/patches/server/0924-Optimize-Hoppers.patch
diff --git a/patches/server/0926-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0925-Fix-beehives-generating-from-using-bonemeal.patch
index ebf4eed61e..ebf4eed61e 100644
--- a/patches/server/0926-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0925-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0927-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0926-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 6bd28ec0d8..6bd28ec0d8 100644
--- a/patches/server/0927-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0926-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0928-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0927-Treat-sequence-violations-like-they-should-be.patch
index dda0696a1e..dda0696a1e 100644
--- a/patches/server/0928-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0927-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0929-remove-duplicate-animate-packet-for-records.patch b/patches/server/0928-remove-duplicate-animate-packet-for-records.patch
index 0958982027..0958982027 100644
--- a/patches/server/0929-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0928-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0930-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0929-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 920fe148a5..920fe148a5 100644
--- a/patches/server/0930-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0929-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0931-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0930-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index b0bdc70fe9..b0bdc70fe9 100644
--- a/patches/server/0931-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0930-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0932-Use-array-for-gamerule-storage.patch b/patches/server/0931-Use-array-for-gamerule-storage.patch
index 5c50da11c5..5c50da11c5 100644
--- a/patches/server/0932-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0931-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0933-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0932-Fix-a-couple-of-upstream-bed-issues.patch
index f4a4393fa2..f4a4393fa2 100644
--- a/patches/server/0933-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0932-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0934-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0933-Fix-demo-flag-not-enabling-demo-mode.patch
index 1c9d5aefe4..1c9d5aefe4 100644
--- a/patches/server/0934-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0933-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0935-Add-Mob-Experience-reward-API.patch b/patches/server/0934-Add-Mob-Experience-reward-API.patch
index 941296a95c..941296a95c 100644
--- a/patches/server/0935-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0934-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0936-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0935-Break-redstone-on-top-of-trap-doors-early.patch
index ff295ff960..ff295ff960 100644
--- a/patches/server/0936-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0935-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0937-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0936-Fix-DamageCause-for-Falling-Blocks.patch
index 7fe63b9f63..7fe63b9f63 100644
--- a/patches/server/0937-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0936-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0938-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0937-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0938-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0937-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0939-More-accurate-isInOpenWater-impl.patch b/patches/server/0938-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0939-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0938-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0940-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0939-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 2127f28b00..2127f28b00 100644
--- a/patches/server/0940-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0939-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0941-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0940-Optimise-recalcBlockCounts-for-empty-sections.patch
index 0e23a9a123..0e23a9a123 100644
--- a/patches/server/0941-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0940-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0942-Expand-PlayerItemMendEvent.patch b/patches/server/0941-Expand-PlayerItemMendEvent.patch
index f3745282c6..f3745282c6 100644
--- a/patches/server/0942-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0941-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0943-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0942-Refresh-ProjectileSource-for-projectiles.patch
index 87276faa87..01167eb7b1 100644
--- a/patches/server/0943-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0942-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 11a4d679c5b46f52eeb51b844f240a835027216a..f37790f7f461da9ecdbd1e83d7ac7832bc5c5eda 100644
+index 313e59e24701451115fc8a7b7fa1c8c1d5668e89..1970fa01a6c93f52bbea4874db304c295b3173ba 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -382,6 +382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0944-Add-transient-modifier-API.patch b/patches/server/0943-Add-transient-modifier-API.patch
index e3b704e242..e3b704e242 100644
--- a/patches/server/0944-Add-transient-modifier-API.patch
+++ b/patches/server/0943-Add-transient-modifier-API.patch
diff --git a/patches/server/0945-Fix-block-place-logic.patch b/patches/server/0944-Fix-block-place-logic.patch
index a1c7cee366..a1c7cee366 100644
--- a/patches/server/0945-Fix-block-place-logic.patch
+++ b/patches/server/0944-Fix-block-place-logic.patch
diff --git a/patches/server/0946-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0945-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index da9489efd3..da9489efd3 100644
--- a/patches/server/0946-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0945-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0947-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0946-Ignore-inline-definitions-of-trim-material-pattern.patch
index 2b71534642..2b71534642 100644
--- a/patches/server/0947-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ b/patches/server/0946-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0948-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0947-Call-BlockGrowEvent-for-missing-blocks.patch
index 69fc87cf3f..69fc87cf3f 100644
--- a/patches/server/0948-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0947-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0949-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0948-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index efa2da58fc..efa2da58fc 100644
--- a/patches/server/0949-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0948-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0950-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0949-fix-MapLike-spam-for-missing-key-selector.patch
index 2fee78531f..2fee78531f 100644
--- a/patches/server/0950-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0949-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0951-Fix-sniffer-removeExploredLocation.patch b/patches/server/0950-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0951-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0950-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0952-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0951-Add-method-to-remove-all-active-potion-effects.patch
index 7b09037690..7b09037690 100644
--- a/patches/server/0952-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0951-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0953-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0952-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
index 466d256466..466d256466 100644
--- a/patches/server/0953-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ b/patches/server/0952-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0954-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0953-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index cfcf15909a..cfcf15909a 100644
--- a/patches/server/0954-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0953-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0955-Properly-Cancel-Usable-Items.patch b/patches/server/0954-Properly-Cancel-Usable-Items.patch
index ac735f5582..ac735f5582 100644
--- a/patches/server/0955-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0954-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0956-Add-event-for-player-editing-sign.patch b/patches/server/0955-Add-event-for-player-editing-sign.patch
index d8b7be275f..d8b7be275f 100644
--- a/patches/server/0956-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0955-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0957-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0956-Only-tick-item-frames-if-players-can-see-it.patch
index b3de8c9a7c..b3de8c9a7c 100644
--- a/patches/server/0957-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0956-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0958-Improve-command-function-perm-level-checks.patch b/patches/server/0957-Improve-command-function-perm-level-checks.patch
index 5d912059ff..5d912059ff 100644
--- a/patches/server/0958-Improve-command-function-perm-level-checks.patch
+++ b/patches/server/0957-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0959-Add-option-to-disable-block-updates.patch b/patches/server/0958-Add-option-to-disable-block-updates.patch
index 29e45a4f7d..29e45a4f7d 100644
--- a/patches/server/0959-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0958-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0960-Call-missing-BlockDispenseEvent.patch b/patches/server/0959-Call-missing-BlockDispenseEvent.patch
index 2496dada5e..2496dada5e 100644
--- a/patches/server/0960-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0959-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0961-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0960-Don-t-load-chunks-for-supporting-block-checks.patch
index 21461515af..d7eda4b553 100644
--- a/patches/server/0961-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0960-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f37790f7f461da9ecdbd1e83d7ac7832bc5c5eda..1188fafa153992c9f2d23d22f1faaed3e2c4a1db 100644
+index 1970fa01a6c93f52bbea4874db304c295b3173ba..b28ee70aa98d6a8f3913e11084d0b4a9b09b5e26 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1356,7 +1356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0962-Optimize-player-lookups-for-beacons.patch b/patches/server/0961-Optimize-player-lookups-for-beacons.patch
index 5245e38833..5245e38833 100644
--- a/patches/server/0962-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0961-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0963-Add-Sign-getInteractableSideFor.patch b/patches/server/0962-Add-Sign-getInteractableSideFor.patch
index 0a4aadfb36..0a4aadfb36 100644
--- a/patches/server/0963-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0962-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0964-Array-backed-synched-entity-data.patch b/patches/server/0963-Array-backed-synched-entity-data.patch
index 84bf2095b4..84bf2095b4 100644
--- a/patches/server/0964-Array-backed-synched-entity-data.patch
+++ b/patches/server/0963-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0965-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0964-fix-item-meta-for-tadpole-buckets.patch
index c1d43316d3..c1d43316d3 100644
--- a/patches/server/0965-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0964-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0966-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0965-Suppress-Item-Meta-Validation-Checks.patch
index 660669617a..660669617a 100644
--- a/patches/server/0966-Suppress-Item-Meta-Validation-Checks.patch
+++ b/patches/server/0965-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0967-Fix-BanList-API.patch b/patches/server/0966-Fix-BanList-API.patch
index aeed5fc467..aeed5fc467 100644
--- a/patches/server/0967-Fix-BanList-API.patch
+++ b/patches/server/0966-Fix-BanList-API.patch
diff --git a/patches/server/0968-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0967-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 05fb1ac2ac..05fb1ac2ac 100644
--- a/patches/server/0968-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0967-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0969-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0968-Fix-possible-NPE-on-painting-creation.patch
index 8485ab1255..8485ab1255 100644
--- a/patches/server/0969-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0968-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0970-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0969-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index d72ec05289..d72ec05289 100644
--- a/patches/server/0970-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0969-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0971-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0970-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 49b157ea07..49b157ea07 100644
--- a/patches/server/0971-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0970-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0972-Don-t-tick-signs.patch b/patches/server/0971-Don-t-tick-signs.patch
index 759f4ef4d2..759f4ef4d2 100644
--- a/patches/server/0972-Don-t-tick-signs.patch
+++ b/patches/server/0971-Don-t-tick-signs.patch
diff --git a/patches/server/0973-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0972-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 45166cba2a..45166cba2a 100644
--- a/patches/server/0973-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0972-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0974-Add-whitelist-events.patch b/patches/server/0973-Add-whitelist-events.patch
index 42eff5bfe1..42eff5bfe1 100644
--- a/patches/server/0974-Add-whitelist-events.patch
+++ b/patches/server/0973-Add-whitelist-events.patch
diff --git a/patches/server/0975-Implement-PlayerFailMoveEvent.patch b/patches/server/0974-Implement-PlayerFailMoveEvent.patch
index 9feef646bd..9feef646bd 100644
--- a/patches/server/0975-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0974-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0976-Folia-scheduler-and-owned-region-API.patch b/patches/server/0975-Folia-scheduler-and-owned-region-API.patch
index d407af42b5..8ad6f6d87c 100644
--- a/patches/server/0976-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0975-Folia-scheduler-and-owned-region-API.patch
@@ -1146,10 +1146,10 @@ index 9fff00b3706a97ba71a80f2ba39577b229325e02..1bac9f7894321b5710f5475f6598ec9f
          this.profiler.push("commandFunctions");
          MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1354be9580ca74485fa0b7ba97fe94079292b8a0..46433978ab9fee1602b169aaf7982c849c4bd53f 100644
+index 12bb0c619762ca9fc080ae884ce29de477dbcdc2..80919d247a9204ebf8d0e55df7fc6a2443ed91aa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -630,6 +630,7 @@ public abstract class PlayerList {
+@@ -651,6 +651,7 @@ public abstract class PlayerList {
  
          entityplayer.unRide();
          worldserver.removePlayerImmediately(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
@@ -1158,7 +1158,7 @@ index 1354be9580ca74485fa0b7ba97fe94079292b8a0..46433978ab9fee1602b169aaf7982c84
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1188fafa153992c9f2d23d22f1faaed3e2c4a1db..77d87dcd39147bd617b30a47140852dda750431f 100644
+index b28ee70aa98d6a8f3913e11084d0b4a9b09b5e26..80882abd35199f95610af16698aeb0fe61f8f455 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -246,11 +246,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1186,7 +1186,7 @@ index 1188fafa153992c9f2d23d22f1faaed3e2c4a1db..77d87dcd39147bd617b30a47140852dd
      @Override
      public CommandSender getBukkitSender(CommandSourceStack wrapper) {
          return this.getBukkitEntity();
-@@ -4718,6 +4730,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4697,6 +4709,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              return;
          }
          // Paper end - rewrite chunk system
@@ -1194,7 +1194,7 @@ index 1188fafa153992c9f2d23d22f1faaed3e2c4a1db..77d87dcd39147bd617b30a47140852dd
          if (this.removalReason == null) {
              this.removalReason = reason;
          }
-@@ -4728,12 +4741,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4707,12 +4720,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          if (reason != RemovalReason.UNLOADED_TO_CHUNK) this.getPassengers().forEach(Entity::stopRiding); // Paper - chunk system - don't adjust passenger state when unloading, it's just not safe (and messes with our logic in entity chunk unload)
          this.levelCallback.onRemove(reason);
diff --git a/patches/server/0977-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0976-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0977-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0976-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0978-API-for-updating-recipes-on-clients.patch b/patches/server/0977-API-for-updating-recipes-on-clients.patch
index 2e98d04389..aed3faf1ef 100644
--- a/patches/server/0978-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0977-API-for-updating-recipes-on-clients.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 46433978ab9fee1602b169aaf7982c849c4bd53f..4e7141968d88ca3fbb9cceaadbef60fed0ce64eb 100644
+index 80919d247a9204ebf8d0e55df7fc6a2443ed91aa..3a70b7e1319c3ecab9eb720f8a1a34c0efe21a4b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1518,6 +1518,13 @@ public abstract class PlayerList {
+@@ -1539,6 +1539,13 @@ public abstract class PlayerList {
      }
  
      public void reloadResources() {
@@ -22,7 +22,7 @@ index 46433978ab9fee1602b169aaf7982c849c4bd53f..4e7141968d88ca3fbb9cceaadbef60fe
          // CraftBukkit start
          /*Iterator iterator = this.advancements.values().iterator();
  
-@@ -1533,7 +1540,15 @@ public abstract class PlayerList {
+@@ -1554,7 +1561,15 @@ public abstract class PlayerList {
          }
          // CraftBukkit end
  
diff --git a/patches/server/0979-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0978-Fix-rotation-when-spawning-display-entities.patch
index d0ab343b2d..d0ab343b2d 100644
--- a/patches/server/0979-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0978-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0980-Only-capture-actual-tree-growth.patch b/patches/server/0979-Only-capture-actual-tree-growth.patch
index 7035d46e7a..7035d46e7a 100644
--- a/patches/server/0980-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0979-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0981-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0980-Use-correct-source-for-mushroom-block-spread-event.patch
index 6eb9ff2e4c..6eb9ff2e4c 100644
--- a/patches/server/0981-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0980-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0982-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0981-Respect-randomizeData-on-more-entities-when-spawning.patch
index dd08dc14b0..dd08dc14b0 100644
--- a/patches/server/0982-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0981-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0983-Use-correct-seed-on-api-world-load.patch b/patches/server/0982-Use-correct-seed-on-api-world-load.patch
index 63fc9c60eb..63fc9c60eb 100644
--- a/patches/server/0983-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0982-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0984-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0983-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 56ce0b4a41..56ce0b4a41 100644
--- a/patches/server/0984-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0983-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0985-Cache-map-ids-on-item-frames.patch b/patches/server/0984-Cache-map-ids-on-item-frames.patch
index 9b22a5bbd5..9b22a5bbd5 100644
--- a/patches/server/0985-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0984-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0986-Fix-custom-statistic-criteria-creation.patch b/patches/server/0985-Fix-custom-statistic-criteria-creation.patch
index d027126175..d027126175 100644
--- a/patches/server/0986-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0985-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0987-Bandaid-fix-for-Effect.patch b/patches/server/0986-Bandaid-fix-for-Effect.patch
index 14e9b12cb4..14e9b12cb4 100644
--- a/patches/server/0987-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0986-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0988-SculkCatalyst-bloom-API.patch b/patches/server/0987-SculkCatalyst-bloom-API.patch
index 77742addde..77742addde 100644
--- a/patches/server/0988-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0987-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0989-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0988-API-for-an-entity-s-scoreboard-name.patch
index 76ac7b4d9a..76ac7b4d9a 100644
--- a/patches/server/0989-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0988-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0990-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 2c00652021..2c00652021 100644
--- a/patches/server/0990-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0991-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0990-Deprecate-and-replace-methods-with-old-StructureType.patch
index e45e0c150b..e45e0c150b 100644
--- a/patches/server/0991-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0990-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0992-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0991-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index a7e006f843..a7e006f843 100644
--- a/patches/server/0992-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0991-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0993-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0992-Properly-handle-BlockBreakEvent-isDropItems.patch
index ee56750095..ee56750095 100644
--- a/patches/server/0993-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0992-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0994-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0993-Fire-entity-death-event-for-ender-dragon.patch
index 3c23429d1c..3c23429d1c 100644
--- a/patches/server/0994-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0993-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0995-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0994-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 74202812a3..74202812a3 100644
--- a/patches/server/0995-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0994-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0996-Add-Listing-API-for-Player.patch b/patches/server/0995-Add-Listing-API-for-Player.patch
index ab9b37502d..0ced0f802a 100644
--- a/patches/server/0996-Add-Listing-API-for-Player.patch
+++ b/patches/server/0995-Add-Listing-API-for-Player.patch
@@ -76,10 +76,10 @@ index 32e3f347e2e025e2675e9410116386e472bd6a79..929483116d05a803d317ece7a44861af
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4e7141968d88ca3fbb9cceaadbef60fed0ce64eb..03d2dc7f68d6918065f852057321fbaaf22fb413 100644
+index 3a70b7e1319c3ecab9eb720f8a1a34c0efe21a4b..33abcf12b4426572b74ca4c813e4392c823494bc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -337,14 +337,22 @@ public abstract class PlayerList {
+@@ -358,14 +358,22 @@ public abstract class PlayerList {
          // CraftBukkit end
  
          // CraftBukkit start - sendAll above replaced with this loop
@@ -103,7 +103,7 @@ index 4e7141968d88ca3fbb9cceaadbef60fed0ce64eb..03d2dc7f68d6918065f852057321fbaa
              }
  
              if (entityplayer1 == player || !bukkitPlayer.canSee(entityplayer1.getBukkitEntity())) { // Paper - don't include joining player
-@@ -355,7 +363,7 @@ public abstract class PlayerList {
+@@ -376,7 +384,7 @@ public abstract class PlayerList {
          }
          // Paper start - use single player info update packet
          if (!onlinePlayers.isEmpty()) {
diff --git a/patches/server/0997-Configurable-Region-Compression-Format.patch b/patches/server/0996-Configurable-Region-Compression-Format.patch
index 08de696dde..08de696dde 100644
--- a/patches/server/0997-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0996-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0998-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0997-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 4ab00d4010..4ab00d4010 100644
--- a/patches/server/0998-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/server/0997-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/0999-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0998-Fix-NPE-on-Boat-getStatus.patch
index f2b53faa13..f2b53faa13 100644
--- a/patches/server/0999-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0998-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/1000-Expand-Pose-API.patch b/patches/server/0999-Expand-Pose-API.patch
index 8d8a36f14b..f55d8956e5 100644
--- a/patches/server/1000-Expand-Pose-API.patch
+++ b/patches/server/0999-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 77d87dcd39147bd617b30a47140852dda750431f..d435d04ab50b2f64e6438c6c26639b6048322013 100644
+index 80882abd35199f95610af16698aeb0fe61f8f455..1e05fca2a2ba6e2c0b641b6e27585520889cd8a6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/1001-More-DragonBattle-API.patch b/patches/server/1000-More-DragonBattle-API.patch
index d14bf53224..d14bf53224 100644
--- a/patches/server/1001-More-DragonBattle-API.patch
+++ b/patches/server/1000-More-DragonBattle-API.patch
diff --git a/patches/server/1002-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1001-Deep-clone-unhandled-nbt-tags.patch
index a3b749dd22..a3b749dd22 100644
--- a/patches/server/1002-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/server/1001-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/1003-Add-PlayerPickItemEvent.patch b/patches/server/1002-Add-PlayerPickItemEvent.patch
index e27b097e29..e27b097e29 100644
--- a/patches/server/1003-Add-PlayerPickItemEvent.patch
+++ b/patches/server/1002-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/1004-Improve-performance-of-mass-crafts.patch b/patches/server/1003-Improve-performance-of-mass-crafts.patch
index 183698b5c5..183698b5c5 100644
--- a/patches/server/1004-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1003-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1005-Allow-trident-custom-damage.patch b/patches/server/1004-Allow-trident-custom-damage.patch
index dcbcba2af5..dcbcba2af5 100644
--- a/patches/server/1005-Allow-trident-custom-damage.patch
+++ b/patches/server/1004-Allow-trident-custom-damage.patch
diff --git a/patches/server/1006-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1005-Expose-hand-during-BlockCanBuildEvent.patch
index d14e34ae64..d14e34ae64 100644
--- a/patches/server/1006-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/server/1005-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1007-Optimize-nearest-structure-border-iteration.patch b/patches/server/1006-Optimize-nearest-structure-border-iteration.patch
index 07d0358cbb..07d0358cbb 100644
--- a/patches/server/1007-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/1006-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1008-Implement-OfflinePlayer-isConnected.patch b/patches/server/1007-Implement-OfflinePlayer-isConnected.patch
index b96be3603a..c8b2b10504 100644
--- a/patches/server/1008-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/1007-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 9710cb0d414d33c98cccf6d3811530414a4a221f..2e6fb5111f1b1abcbff674855077dd377290d80d 100644
+index 97ef38f744908a09e4d24c445a5cc39db0e6ee7e..f6bc3a4af1bffe6abf5a93e975848de44965cbe3 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/1009-Fix-inventory-desync.patch b/patches/server/1008-Fix-inventory-desync.patch
index d85eb950fd..d85eb950fd 100644
--- a/patches/server/1009-Fix-inventory-desync.patch
+++ b/patches/server/1008-Fix-inventory-desync.patch
diff --git a/patches/server/1010-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1009-Add-titleOverride-to-InventoryOpenEvent.patch
index f9b2542b7c..f9b2542b7c 100644
--- a/patches/server/1010-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/1009-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1011-Configure-sniffer-egg-hatch-time.patch b/patches/server/1010-Configure-sniffer-egg-hatch-time.patch
index 6c035ed11f..6c035ed11f 100644
--- a/patches/server/1011-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/1010-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1012-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1011-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0244f274f5..0244f274f5 100644
--- a/patches/server/1012-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/1011-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1013-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1012-Skip-POI-finding-if-stuck-in-vehicle.patch
index e45ced771d..e45ced771d 100644
--- a/patches/server/1013-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/1012-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1014-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1013-Add-slot-sanity-checks-in-container-clicks.patch
index c9eb55f978..c9eb55f978 100644
--- a/patches/server/1014-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/1013-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1015-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1014-Call-BlockRedstoneEvents-for-lecterns.patch
index dcb22051b6..dcb22051b6 100644
--- a/patches/server/1015-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/1014-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1016-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1015-Allow-proper-checking-of-empty-item-stacks.patch
index e6510b371c..e6510b371c 100644
--- a/patches/server/1016-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/1015-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1017-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1016-Fix-silent-equipment-change-for-mobs.patch
index 69b6c41e6e..69b6c41e6e 100644
--- a/patches/server/1017-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/1016-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1018-Fix-spigot-s-Forced-Stats.patch b/patches/server/1017-Fix-spigot-s-Forced-Stats.patch
index 8e012f221e..8e012f221e 100644
--- a/patches/server/1018-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/1017-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1019-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1018-Add-missing-InventoryHolders-to-inventories.patch
index b171f93a3c..b171f93a3c 100644
--- a/patches/server/1019-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/1018-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1020-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1019-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 738c4d4886..738c4d4886 100644
--- a/patches/server/1020-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/1019-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1021-Actually-optimise-explosions.patch b/patches/server/1020-Actually-optimise-explosions.patch
index a835a68c02..a835a68c02 100644
--- a/patches/server/1021-Actually-optimise-explosions.patch
+++ b/patches/server/1020-Actually-optimise-explosions.patch
diff --git a/patches/server/1022-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1021-Add-missing-logs-for-log-ips-config-option.patch
index 604b80916e..604b80916e 100644
--- a/patches/server/1022-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/1021-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1023-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1022-Remove-Spigot-Bug-Fix-for-MC-109346.patch
index d3ecc69301..d3ecc69301 100644
--- a/patches/server/1023-Remove-Spigot-Bug-Fix-for-MC-109346.patch
+++ b/patches/server/1022-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1024-Fix-SuspiciousStewMeta.patch b/patches/server/1023-Fix-SuspiciousStewMeta.patch
index 834deff5db..834deff5db 100644
--- a/patches/server/1024-Fix-SuspiciousStewMeta.patch
+++ b/patches/server/1023-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1025-Optimise-chunk-tick-iteration.patch b/patches/server/1024-Optimise-chunk-tick-iteration.patch
index 43a42f52d9..43a42f52d9 100644
--- a/patches/server/1025-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1024-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1026-Lag-compensation-ticks.patch b/patches/server/1025-Lag-compensation-ticks.patch
index ae178899ed..ae178899ed 100644
--- a/patches/server/1026-Lag-compensation-ticks.patch
+++ b/patches/server/1025-Lag-compensation-ticks.patch
diff --git a/patches/server/1027-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1026-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index 34c0a06240..34c0a06240 100644
--- a/patches/server/1027-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/1026-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1027-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/1027-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1028-Fix-team-sidebar-objectives-not-being-cleared.patch
index 6aa46a84f6..6aa46a84f6 100644
--- a/patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/1028-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1030-Optimise-nearby-player-retrieval.patch b/patches/server/1029-Optimise-nearby-player-retrieval.patch
index 114dfb6f4d..114dfb6f4d 100644
--- a/patches/server/1030-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1029-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1031-Remove-streams-for-villager-AI.patch b/patches/server/1030-Remove-streams-for-villager-AI.patch
index a2538da4d0..a2538da4d0 100644
--- a/patches/server/1031-Remove-streams-for-villager-AI.patch
+++ b/patches/server/1030-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1032-Fix-missing-map-initialize-event-call.patch b/patches/server/1031-Fix-missing-map-initialize-event-call.patch
index 76a90f7aec..76a90f7aec 100644
--- a/patches/server/1032-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1031-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/1033-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1032-Update-entity-data-when-attaching-firework-to-entity.patch
index 40c89bc2cc..40c89bc2cc 100644
--- a/patches/server/1033-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/1032-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1034-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1033-Use-correct-variable-for-initializing-CraftLootTable.patch
index bffc71910b..bffc71910b 100644
--- a/patches/server/1034-Use-correct-variable-for-initializing-CraftLootTable.patch
+++ b/patches/server/1033-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1035-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1034-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
index b36b8cf1f6..b36b8cf1f6 100644
--- a/patches/server/1035-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
+++ b/patches/server/1034-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1036-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1035-Fix-UnsafeValues-loadAdvancement.patch
index 2b7c0f8110..2b7c0f8110 100644
--- a/patches/server/1036-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/1035-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1037-Add-player-idle-duration-API.patch b/patches/server/1036-Add-player-idle-duration-API.patch
index 64e41c50dd..64e41c50dd 100644
--- a/patches/server/1037-Add-player-idle-duration-API.patch
+++ b/patches/server/1036-Add-player-idle-duration-API.patch
diff --git a/patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1037-Don-t-check-if-we-can-see-non-visible-entities.patch
index 81712ec1a3..81712ec1a3 100644
--- a/patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/1037-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1039-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1038-Fix-NPE-in-SculkBloomEvent-world-access.patch
index f4db24ce29..f4db24ce29 100644
--- a/patches/server/1039-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/1038-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1039-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index f5b7d3fea1..f5b7d3fea1 100644
--- a/patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1039-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/1041-Optimize-VarInts.patch b/patches/server/1040-Optimize-VarInts.patch
index 19e7fc574a..19e7fc574a 100644
--- a/patches/server/1041-Optimize-VarInts.patch
+++ b/patches/server/1040-Optimize-VarInts.patch
diff --git a/patches/server/1042-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
deleted file mode 100644
index 17028be297..0000000000
--- a/patches/server/1042-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Sat, 28 Oct 2023 23:21:49 -0700
-Subject: [PATCH] Fix NPE when no valid world is found on legacy Players
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 03d2dc7f68d6918065f852057321fbaaf22fb413..30dd56871acff2dd730d96406520bab066229d7a 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -221,9 +221,9 @@ public abstract class PlayerList {
-             Logger logger = PlayerList.LOGGER;
- 
-             Objects.requireNonNull(logger);
--            resourcekey = (ResourceKey) dataresult.resultOrPartial(logger::error).orElse(player.serverLevel().dimension()); // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD
-+            resourcekey = (ResourceKey) dataresult.resultOrPartial(logger::error).orElse(player.serverLevel() != null ? player.serverLevel().dimension() : Level.OVERWORLD); // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD // Paper - account for null level
-         } else {
--            resourcekey = player.serverLevel().dimension(); // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD
-+            resourcekey = player.serverLevel() != null ? player.serverLevel().dimension() : Level.OVERWORLD; // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD // Paper - account for null level
-         }
- 
-         ResourceKey<Level> resourcekey1 = resourcekey;