Readd 0414 use distance map to optimise entity tracker (#9868)

629 files changed, 193 insertions, 239 deletions

diff --git a/patches/removed/1.20.2/0414-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
index ee2cad7d7d..1b8cff12fd 100644
--- a/patches/removed/1.20.2/0414-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43bc2900b23 100644
+index c10ef2e6af3e6c52eeb8c96cdbf5352d9dd25dd2..3e54982bc60f5368e3515cf337f23d6803f4c967 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -157,6 +157,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -147,6 +147,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      // Paper start - distance maps
      private final com.destroystokyo.paper.util.misc.PooledLinkedHashSets<ServerPlayer> pooledLinkedPlayerHashSets = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets<>();
@@ -32,11 +32,11 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
 +    // Paper end - use distance map to optimise tracker
  
      void addPlayerToDistanceMaps(ServerPlayer player) {
+         int chunkX = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getX());
+@@ -154,6 +171,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         // Note: players need to be explicitly added to distance maps before they can be updated
+         this.nearbyPlayers.addPlayer(player);
          this.level.playerChunkLoader.addPlayer(player); // Paper - replace chunk loader
-@@ -168,6 +185,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             this.playerMobDistanceMap.add(player, chunkX, chunkZ, io.papermc.paper.chunk.system.ChunkSystem.getTickViewDistance(player));
-         }
-         // Paper end - per player mob spawning
 +        // Paper start - use distance map to optimise entity tracker
 +        for (int i = 0, len = TRACKING_RANGE_TYPES.length; i < len; ++i) {
 +            com.destroystokyo.paper.util.misc.PlayerAreaMap trackMap = this.playerEntityTrackerTrackMaps[i];
@@ -48,10 +48,10 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
      }
  
      void removePlayerFromDistanceMaps(ServerPlayer player) {
-@@ -178,6 +203,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             this.playerMobDistanceMap.remove(player);
-         }
-         // Paper end - per player mob spawning
+@@ -162,6 +187,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         // Note: players need to be explicitly added to distance maps before they can be updated
+         this.nearbyPlayers.removePlayer(player);
+         this.level.playerChunkLoader.removePlayer(player); // Paper - replace chunk loader
 +        // Paper start - use distance map to optimise tracker
 +        for (int i = 0, len = TRACKING_RANGE_TYPES.length; i < len; ++i) {
 +            this.playerEntityTrackerTrackMaps[i].remove(player);
@@ -60,10 +60,10 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
      }
  
      void updateMaps(ServerPlayer player) {
-@@ -190,6 +220,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             this.playerMobDistanceMap.update(player, chunkX, chunkZ, io.papermc.paper.chunk.system.ChunkSystem.getTickViewDistance(player));
-         }
-         // Paper end - per player mob spawning
+@@ -170,6 +200,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         // Note: players need to be explicitly added to distance maps before they can be updated
+         this.nearbyPlayers.tickPlayer(player);
+         this.level.playerChunkLoader.updatePlayer(player); // Paper - replace chunk loader
 +        // Paper start - use distance map to optimise entity tracker
 +        for (int i = 0, len = TRACKING_RANGE_TYPES.length; i < len; ++i) {
 +            com.destroystokyo.paper.util.misc.PlayerAreaMap trackMap = this.playerEntityTrackerTrackMaps[i];
@@ -75,10 +75,10 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
      }
      // Paper end
      // Paper start
-@@ -276,6 +314,48 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -257,6 +295,48 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          this.regionManagers.add(this.dataRegionManager);
+         this.nearbyPlayers = new io.papermc.paper.util.player.NearbyPlayers(this.level);
          // Paper end
-         this.playerMobDistanceMap = this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets) : null; // Paper
 +        // Paper start - use distance map to optimise entity tracker
 +        this.playerEntityTrackerTrackMaps = new com.destroystokyo.paper.util.misc.PlayerAreaMap[TRACKING_RANGE_TYPES.length];
 +        this.entityTrackerTrackRanges = new int[TRACKING_RANGE_TYPES.length];
@@ -123,8 +123,8 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
 +        // Paper end - use distance map to optimise entity tracker
      }
  
-     protected ChunkGenerator generator() {
-@@ -960,17 +1040,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     // Paper start
+@@ -930,17 +1010,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      public void move(ServerPlayer player) {
@@ -141,9 +141,9 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
 -        }
 +        // Paper - delay this logic for the entity tracker tick, no need to duplicate it
  
-         int i = SectionPos.blockToSectionCoord(player.getBlockX());
-         int j = SectionPos.blockToSectionCoord(player.getBlockZ());
-@@ -1054,7 +1124,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         SectionPos sectionposition = player.getLastSectionPos();
+         SectionPos sectionposition1 = SectionPos.of((EntityAccess) player);
+@@ -1017,7 +1087,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
                      entity.tracker = playerchunkmap_entitytracker; // Paper - Fast access to tracker
                      this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
@@ -152,10 +152,12 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
                      if (entity instanceof ServerPlayer) {
                          ServerPlayer entityplayer = (ServerPlayer) entity;
  
-@@ -1098,7 +1168,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1061,9 +1131,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          entity.tracker = null; // Paper - We're no longer tracked
      }
  
+-    protected void tick() {
+-        // Paper - replaced by PlayerChunkLoader
 +    // Paper start - optimised tracker
 +    private final void processTrackQueue() {
 +        this.level.timings.tracker1.startTiming();
@@ -179,8 +181,8 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
 +        }
 +    }
 +    // Paper end - optimised tracker
-+
-     protected void tick() {
+ 
++    protected void tick() {
 +        // Paper start - optimized tracker
 +        if (true) {
 +            this.processTrackQueue();
@@ -190,55 +192,7 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
          List<ServerPlayer> list = Lists.newArrayList();
          List<ServerPlayer> list1 = this.level.players();
          ObjectIterator objectiterator = this.entityMap.values().iterator();
-@@ -1205,46 +1305,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         }));
-         // Paper end
-         DebugPackets.sendPoiPacketsForChunk(this.level, chunk.getPos());
--        List<Entity> list = Lists.newArrayList();
--        List<Entity> list1 = Lists.newArrayList();
--        ObjectIterator objectiterator = this.entityMap.values().iterator();
--
--        while (objectiterator.hasNext()) {
--            ChunkMap.TrackedEntity playerchunkmap_entitytracker = (ChunkMap.TrackedEntity) objectiterator.next();
--            Entity entity = playerchunkmap_entitytracker.entity;
--
--            if (entity != player && entity.chunkPosition().equals(chunk.getPos())) {
--                playerchunkmap_entitytracker.updatePlayer(player);
--                if (entity instanceof Mob && ((Mob) entity).getLeashHolder() != null) {
--                    list.add(entity);
--                }
--
--                if (!entity.getPassengers().isEmpty()) {
--                    list1.add(entity);
--                }
--            }
--        }
--
--        Iterator iterator;
--        Entity entity1;
--
--        if (!list.isEmpty()) {
--            iterator = list.iterator();
--
--            while (iterator.hasNext()) {
--                entity1 = (Entity) iterator.next();
--                player.connection.send(new ClientboundSetEntityLinkPacket(entity1, ((Mob) entity1).getLeashHolder()));
--            }
--        }
--
--        if (!list1.isEmpty()) {
--            iterator = list1.iterator();
--
--            while (iterator.hasNext()) {
--                entity1 = (Entity) iterator.next();
--                player.connection.send(new ClientboundSetPassengersPacket(entity1));
--            }
--        }
-+        // Paper - no longer needed - this was used to account for clients bugging out since they needed a chunk to store entities, but they no longer need a chunk
- 
-     }
- 
-@@ -1299,6 +1360,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1213,6 +1311,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.lastSectionPos = SectionPos.of((EntityAccess) entity);
          }
  
@@ -282,10 +236,10 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ce4b2ec2ad6138b754ced976521d1c73eb4193a8..c99d24008792b07d5e2984261215de944482006b 100644
+index 1d2dd9b8ae43f22d875cb530130118df247b87dc..b80e8f05a8f99cc912904470c31092faad0717da 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -57,6 +57,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
+@@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
  import net.minecraft.network.syncher.SynchedEntityData;
  import net.minecraft.resources.ResourceKey;
  import net.minecraft.resources.ResourceLocation;
diff --git a/patches/server/0415-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch
index 070cae85dd..070cae85dd 100644
--- a/patches/server/0415-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0416-Add-permission-for-command-blocks.patch b/patches/server/0417-Add-permission-for-command-blocks.patch
index 9c9308838b..9c9308838b 100644
--- a/patches/server/0416-Add-permission-for-command-blocks.patch
+++ b/patches/server/0417-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0417-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
index 572985f135..8b83857172 100644
--- a/patches/server/0417-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,10 +5,10 @@ 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 1d2dd9b8ae43f22d875cb530130118df247b87dc..d4d151fd8b500e32ca5c0f866bd28d3b5cf68633 100644
+index b80e8f05a8f99cc912904470c31092faad0717da..f2faddf78b5ea591f66d92d9e0f2b7984a3c2124 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -688,8 +688,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -721,8 +721,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void setPos(double x, double y, double z) {
@@ -19,7 +19,7 @@ index 1d2dd9b8ae43f22d875cb530130118df247b87dc..d4d151fd8b500e32ca5c0f866bd28d3b
      }
  
      protected AABB makeBoundingBox() {
-@@ -4190,6 +4190,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4223,6 +4223,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setPosRaw(double x, double y, double z) {
@@ -31,7 +31,7 @@ index 1d2dd9b8ae43f22d875cb530130118df247b87dc..d4d151fd8b500e32ca5c0f866bd28d3b
          // 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());
-@@ -4213,6 +4218,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4246,6 +4251,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.levelCallback.onMove();
          }
  
diff --git a/patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index bb68e859ab..ac9033c81d 100644
--- a/patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -76,7 +76,7 @@ index 474492c3f02f99e801885a983b9c110a8656c7b5..6d7095a62f30b18bc8fb8dbc5a0f3331
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index efce67fb84fe0586c586212bb3c02dd06f72371f..463b8cd52df5ca0d3168ef5c095dbc190b5956f4 100644
+index 49d341605ac7e82c5dcdcc960b6581aa7e1fb8f3..a3c1797549e3b149f425f857bbf8564c5ef1e30e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1204,7 +1204,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0419-Paper-dumpitem-command.patch b/patches/server/0420-Paper-dumpitem-command.patch
index 5722936af7..5722936af7 100644
--- a/patches/server/0419-Paper-dumpitem-command.patch
+++ b/patches/server/0420-Paper-dumpitem-command.patch
diff --git a/patches/server/0420-Improve-Legacy-Component-serialization-size.patch b/patches/server/0421-Improve-Legacy-Component-serialization-size.patch
index 866302739f..866302739f 100644
--- a/patches/server/0420-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0421-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0421-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0422-Optimize-Bit-Operations-by-inlining.patch
index 468568d8aa..468568d8aa 100644
--- a/patches/server/0421-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0422-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 320730933c..320730933c 100644
--- a/patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0423-incremental-chunk-and-player-saving.patch b/patches/server/0424-incremental-chunk-and-player-saving.patch
index e2b9a35c1f..dfa7442af3 100644
--- a/patches/server/0423-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0424-incremental-chunk-and-player-saving.patch
@@ -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 6de4e9f379fe0cb44f14fe68ae1dee55a73d2d99..4a4002b666c70c7065cad0743377cd13e443aa37 100644
+index 6d411d6ccef650225f37275ec7c5033991408f25..4f98f80f6d8bebba33bad37fe6a722f778f93ed8 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;
diff --git a/patches/server/0424-Support-old-UUID-format-for-NBT.patch b/patches/server/0425-Support-old-UUID-format-for-NBT.patch
index fe9c23b739..fe9c23b739 100644
--- a/patches/server/0424-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0425-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch
index 84a140d2ee..84a140d2ee 100644
--- a/patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0426-Remove-some-streams-from-structures.patch b/patches/server/0427-Remove-some-streams-from-structures.patch
index 136b102df3..136b102df3 100644
--- a/patches/server/0426-Remove-some-streams-from-structures.patch
+++ b/patches/server/0427-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch
index b9c37f3a08..b9c37f3a08 100644
--- a/patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0428-Support-components-in-ItemMeta.patch b/patches/server/0429-Support-components-in-ItemMeta.patch
index b2eb6e8d9c..b2eb6e8d9c 100644
--- a/patches/server/0428-Support-components-in-ItemMeta.patch
+++ b/patches/server/0429-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0430-Add-entity-liquid-API.patch b/patches/server/0431-Add-entity-liquid-API.patch
index 4cfcf96366..4cfcf96366 100644
--- a/patches/server/0430-Add-entity-liquid-API.patch
+++ b/patches/server/0431-Add-entity-liquid-API.patch
diff --git a/patches/server/0431-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0432-Update-itemstack-legacy-name-and-lore.patch
index 2c58b8b314..2c58b8b314 100644
--- a/patches/server/0431-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0432-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0432-Spawn-player-in-correct-world-on-login.patch b/patches/server/0433-Spawn-player-in-correct-world-on-login.patch
index 9c088c9864..9c088c9864 100644
--- a/patches/server/0432-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0433-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0433-Add-PrepareResultEvent.patch b/patches/server/0434-Add-PrepareResultEvent.patch
index 963de37d64..963de37d64 100644
--- a/patches/server/0433-Add-PrepareResultEvent.patch
+++ b/patches/server/0434-Add-PrepareResultEvent.patch
diff --git a/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0435-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index e1da360f9f..e1da360f9f 100644
--- a/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0435-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch
index be04919e89..7ac2958bcd 100644
--- a/patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch
@@ -9,7 +9,7 @@ instead of getting stuck in a never despawn state (bubble columns,
 etc).
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index c5512adfb2d38616bb741d03038158c379020ecf..f70f0764d9743dbfa2ead4c90d0df3dbc107672d 100644
+index a8caa11bd0ef045b29cc3cb452dec9fd41948045..53de7f516aee20cb7b5db0648dea1c38d74e5d96 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -200,6 +200,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch
index b99c971369..b99c971369 100644
--- a/patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0437-Fix-SPIGOT-5989.patch b/patches/server/0438-Fix-SPIGOT-5989.patch
index cf17a3f343..cf17a3f343 100644
--- a/patches/server/0437-Fix-SPIGOT-5989.patch
+++ b/patches/server/0438-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index f92eb1a39d..f92eb1a39d 100644
--- a/patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index f5cba763c4..f5cba763c4 100644
--- a/patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 5c1357ca7c..5c1357ca7c 100644
--- a/patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0442-Optimize-NetworkManager-Exception-Handling.patch
index ff42b6bac8..ff42b6bac8 100644
--- a/patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0442-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0442-Fix-some-rails-connecting-improperly.patch b/patches/server/0443-Fix-some-rails-connecting-improperly.patch
index 1db425010e..1db425010e 100644
--- a/patches/server/0442-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0443-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0444-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 68d17065ec..68d17065ec 100644
--- a/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0444-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0444-Brand-support.patch b/patches/server/0445-Brand-support.patch
index 1eac141c5f..1eac141c5f 100644
--- a/patches/server/0444-Brand-support.patch
+++ b/patches/server/0445-Brand-support.patch
diff --git a/patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch
index 2518586ba3..2518586ba3 100644
--- a/patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0446-Don-t-require-FACING-data.patch b/patches/server/0447-Don-t-require-FACING-data.patch
index bc170b7402..bc170b7402 100644
--- a/patches/server/0446-Don-t-require-FACING-data.patch
+++ b/patches/server/0447-Don-t-require-FACING-data.patch
diff --git a/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index ce6d8e5e50..ce6d8e5e50 100644
--- a/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0448-Add-moon-phase-API.patch b/patches/server/0449-Add-moon-phase-API.patch
index df66928ff7..df66928ff7 100644
--- a/patches/server/0448-Add-moon-phase-API.patch
+++ b/patches/server/0449-Add-moon-phase-API.patch
diff --git a/patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 977fecbd78..977fecbd78 100644
--- a/patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0450-Prevent-headless-pistons-from-being-created.patch b/patches/server/0451-Prevent-headless-pistons-from-being-created.patch
index a044172f14..a044172f14 100644
--- a/patches/server/0450-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0451-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0451-Add-BellRingEvent.patch b/patches/server/0452-Add-BellRingEvent.patch
index e10d690b22..e10d690b22 100644
--- a/patches/server/0451-Add-BellRingEvent.patch
+++ b/patches/server/0452-Add-BellRingEvent.patch
diff --git a/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0453-Add-zombie-targets-turtle-egg-config.patch
index e14fe23350..e14fe23350 100644
--- a/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0453-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0453-Buffer-joins-to-world.patch b/patches/server/0454-Buffer-joins-to-world.patch
index a0a51f955d..a0a51f955d 100644
--- a/patches/server/0453-Buffer-joins-to-world.patch
+++ b/patches/server/0454-Buffer-joins-to-world.patch
diff --git a/patches/server/0454-Eigencraft-redstone-implementation.patch b/patches/server/0455-Eigencraft-redstone-implementation.patch
index 5991ef0146..5991ef0146 100644
--- a/patches/server/0454-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0455-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 7ca2866cc1..7ca2866cc1 100644
--- a/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch
index f8591215a4..f8591215a4 100644
--- a/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0457-Add-more-Evoker-API.patch b/patches/server/0458-Add-more-Evoker-API.patch
index 742d85985e..742d85985e 100644
--- a/patches/server/0457-Add-more-Evoker-API.patch
+++ b/patches/server/0458-Add-more-Evoker-API.patch
diff --git a/patches/server/0458-Add-methods-to-get-translation-keys.patch b/patches/server/0459-Add-methods-to-get-translation-keys.patch
index cc9ea76953..cc9ea76953 100644
--- a/patches/server/0458-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0459-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch
index a8eadef392..a8eadef392 100644
--- a/patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0460-Cache-block-data-strings.patch b/patches/server/0461-Cache-block-data-strings.patch
index 16519200a0..16519200a0 100644
--- a/patches/server/0460-Cache-block-data-strings.patch
+++ b/patches/server/0461-Cache-block-data-strings.patch
diff --git a/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 1030fbe503..ab7ec82b37 100644
--- a/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,10 +31,10 @@ 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 d4d151fd8b500e32ca5c0f866bd28d3b5cf68633..b0a73ddd7438b9ecd4462638f9f784d796c62c6c 100644
+index f2faddf78b5ea591f66d92d9e0f2b7984a3c2124..2d416d0d657667d857794bafa315c720dee9762a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -158,6 +158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -159,6 +159,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
@@ -42,7 +42,7 @@ index d4d151fd8b500e32ca5c0f866bd28d3b5cf68633..b0a73ddd7438b9ecd4462638f9f784d7
      static boolean isLevelAtLeast(CompoundTag tag, int level) {
          return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -1831,6 +1832,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1864,6 +1865,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void moveTo(double x, double y, double z, float yaw, float pitch) {
diff --git a/patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch
index 1559443eb8..1559443eb8 100644
--- a/patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index b5d192ac20..b5d192ac20 100644
--- a/patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch
index e6b6d5c3ac..e6b6d5c3ac 100644
--- a/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index fe5405410d..107a2e49b7 100644
--- a/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0466-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 b0a73ddd7438b9ecd4462638f9f784d796c62c6c..71dc4112cb932c6b1305f0f22e99f069517cac08 100644
+index 2d416d0d657667d857794bafa315c720dee9762a..c78df4fc62a347455f8d7b3aa186344863915ab3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4439,4 +4439,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4472,4 +4472,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          void accept(Entity entity, double x, double y, double z);
      }
diff --git a/patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch
index 88b6225968..88b6225968 100644
--- a/patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0467-Entity-isTicking.patch b/patches/server/0468-Entity-isTicking.patch
index 0b46c939ad..77eace6373 100644
--- a/patches/server/0467-Entity-isTicking.patch
+++ b/patches/server/0468-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 71dc4112cb932c6b1305f0f22e99f069517cac08..cfdc8c37d41473300ca9a8c251e27cb2a07ca4c7 100644
+index c78df4fc62a347455f8d7b3aa186344863915ab3..658e47bf5aff1e56462cc3f0a87eeb7349654176 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4444,5 +4444,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4477,5 +4477,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
diff --git a/patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 83811c96bb..83811c96bb 100644
--- a/patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch
index 07c57efa62..07c57efa62 100644
--- a/patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index fd459bdab5..fd459bdab5 100644
--- a/patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch
index 4a53f854d9..4a53f854d9 100644
--- a/patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0472-Optimise-getType-calls.patch b/patches/server/0473-Optimise-getType-calls.patch
index 3ac5b9ed7e..3ac5b9ed7e 100644
--- a/patches/server/0472-Optimise-getType-calls.patch
+++ b/patches/server/0473-Optimise-getType-calls.patch
diff --git a/patches/server/0473-Villager-resetOffers.patch b/patches/server/0474-Villager-resetOffers.patch
index ba42f14185..ba42f14185 100644
--- a/patches/server/0473-Villager-resetOffers.patch
+++ b/patches/server/0474-Villager-resetOffers.patch
diff --git a/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch
index d825fe5c79..d825fe5c79 100644
--- a/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch
index e1ea18140b..e1ea18140b 100644
--- a/patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0476-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0477-Fix-item-locations-dropped-from-campfires.patch
index d8e81d50ef..d8e81d50ef 100644
--- a/patches/server/0476-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0477-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0477-Player-elytra-boost-API.patch b/patches/server/0478-Player-elytra-boost-API.patch
index 15b812e401..192b0e99e2 100644
--- a/patches/server/0477-Player-elytra-boost-API.patch
+++ b/patches/server/0478-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 28c80b15f83947cf44f71da9f9d971f2d6e5dd5b..a0ee2811d691f0088d94a308705dab5529d52810 100644
+index 0656ea43e1d508d8f6af308475942c28d77655a4..aef0fa6fd575c08c75c75463abcc43089aada9e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -626,6 +626,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0478-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0479-Fixed-TileEntityBell-memory-leak.patch
index 0cd7feb8d4..0cd7feb8d4 100644
--- a/patches/server/0478-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0479-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/0480-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/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch
index b71a0f1eba..b71a0f1eba 100644
--- a/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0481-Add-ignore-discounts-API.patch b/patches/server/0482-Add-ignore-discounts-API.patch
index 94293b80ce..94293b80ce 100644
--- a/patches/server/0481-Add-ignore-discounts-API.patch
+++ b/patches/server/0482-Add-ignore-discounts-API.patch
diff --git a/patches/server/0482-Toggle-for-removing-existing-dragon.patch b/patches/server/0483-Toggle-for-removing-existing-dragon.patch
index 0ec8e9d4ef..0ec8e9d4ef 100644
--- a/patches/server/0482-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0483-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0483-Fix-client-lag-on-advancement-loading.patch b/patches/server/0484-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/0484-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0484-Item-no-age-no-player-pickup.patch b/patches/server/0485-Item-no-age-no-player-pickup.patch
index 09109439e5..09109439e5 100644
--- a/patches/server/0484-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0485-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0486-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/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0486-Beacon-API-custom-effect-ranges.patch b/patches/server/0487-Beacon-API-custom-effect-ranges.patch
index 6dd6575eb1..6dd6575eb1 100644
--- a/patches/server/0486-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0487-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0487-Add-API-for-quit-reason.patch b/patches/server/0488-Add-API-for-quit-reason.patch
index f68da0a427..0a76db357f 100644
--- a/patches/server/0487-Add-API-for-quit-reason.patch
+++ b/patches/server/0488-Add-API-for-quit-reason.patch
@@ -25,7 +25,7 @@ index f9d7fec242a059a3b056c569ffaf214a361716d6..33a3c657bd390b9e8bc23af93c1107f5
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 54d0b44eba475f17a908e09d9b56a94a7f050672..bd944ce3308a931391777e3a468daee06d493c73 100644
+index 48985c0577fe1a09838137286e32128b29a60552..9c74a7e1dc74873c16a0fc474de459ccec4d372d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -272,6 +272,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0489-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/0489-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0489-Expose-world-spawn-angle.patch b/patches/server/0490-Expose-world-spawn-angle.patch
index d4805d01c0..d4805d01c0 100644
--- a/patches/server/0489-Expose-world-spawn-angle.patch
+++ b/patches/server/0490-Expose-world-spawn-angle.patch
diff --git a/patches/server/0490-Add-Destroy-Speed-API.patch b/patches/server/0491-Add-Destroy-Speed-API.patch
index eda1608ac3..eda1608ac3 100644
--- a/patches/server/0490-Add-Destroy-Speed-API.patch
+++ b/patches/server/0491-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 9b4da75fb4..defbf49445 100644
--- a/patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 45fa80f600f83f2235e39f5aa4ddb1eaa273d7cd..7392a6d58ec2c767b2982b928e7186eb8dda4cd4 100644
+index e3d6fd978f1f64e980e5729a2ad2712f44923786..192981678ad54bf1b71db4d1f15e6884e88ecebb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2538,7 +2538,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0492-Add-LivingEntity-clearActiveItem.patch b/patches/server/0493-Add-LivingEntity-clearActiveItem.patch
index 3c5a99d1c4..3c5a99d1c4 100644
--- a/patches/server/0492-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0493-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0493-Add-PlayerItemCooldownEvent.patch b/patches/server/0494-Add-PlayerItemCooldownEvent.patch
index 751841d117..751841d117 100644
--- a/patches/server/0493-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0494-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0495-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/0495-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0495-More-lightning-API.patch b/patches/server/0496-More-lightning-API.patch
index 0a4adb0107..0a4adb0107 100644
--- a/patches/server/0495-More-lightning-API.patch
+++ b/patches/server/0496-More-lightning-API.patch
diff --git a/patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch
index e038fd08ce..cebad4dbb1 100644
--- a/patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cfdc8c37d41473300ca9a8c251e27cb2a07ca4c7..5705dd4c89c2e57540a2eaec0568e45e1947d8c6 100644
+index 658e47bf5aff1e56462cc3f0a87eeb7349654176..c35d22e4d54abcb16b7ec932729d2f177fd4a14b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2024,6 +2024,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2057,6 +2057,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean isPushable() {
diff --git a/patches/server/0497-Added-missing-default-perms-for-commands.patch b/patches/server/0498-Added-missing-default-perms-for-commands.patch
index 96adf6f379..96adf6f379 100644
--- a/patches/server/0497-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0498-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0498-Add-PlayerShearBlockEvent.patch b/patches/server/0499-Add-PlayerShearBlockEvent.patch
index 56a84bee18..56a84bee18 100644
--- a/patches/server/0498-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0499-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0499-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch
index e659267ea0..e659267ea0 100644
--- a/patches/server/0499-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0500-Limit-recipe-packets.patch b/patches/server/0501-Limit-recipe-packets.patch
index 77284ad6e1..77284ad6e1 100644
--- a/patches/server/0500-Limit-recipe-packets.patch
+++ b/patches/server/0501-Limit-recipe-packets.patch
diff --git a/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0502-Player-Chunk-Load-Unload-Events.patch b/patches/server/0503-Player-Chunk-Load-Unload-Events.patch
index 504b607773..504b607773 100644
--- a/patches/server/0502-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0503-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch
index d664f7ff69..d664f7ff69 100644
--- a/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0504-Expose-LivingEntity-hurt-direction.patch b/patches/server/0505-Expose-LivingEntity-hurt-direction.patch
index e5c1724c82..e5c1724c82 100644
--- a/patches/server/0504-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0505-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 30dbaa1c3a..30dbaa1c3a 100644
--- a/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index d84f8bed22..d84f8bed22 100644
--- a/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 456c819cfa..456c819cfa 100644
--- a/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0508-Implement-TargetHitEvent.patch b/patches/server/0509-Implement-TargetHitEvent.patch
index 78722933d9..78722933d9 100644
--- a/patches/server/0508-Implement-TargetHitEvent.patch
+++ b/patches/server/0509-Implement-TargetHitEvent.patch
diff --git a/patches/server/0509-MC-4-Fix-item-position-desync.patch b/patches/server/0510-MC-4-Fix-item-position-desync.patch
index 109b4ceace..3de6712684 100644
--- a/patches/server/0509-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0510-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 5705dd4c89c2e57540a2eaec0568e45e1947d8c6..0d96f40ca4d08197f101a31cca7e334525542565 100644
+index c35d22e4d54abcb16b7ec932729d2f177fd4a14b..3acaa05743373b818ba70a0229c6afe63bfd1a97 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4215,6 +4215,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4248,6 +4248,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              return;
          }
          // Paper end - rewrite chunk system
diff --git a/patches/server/0510-Additional-Block-Material-API-s.patch b/patches/server/0511-Additional-Block-Material-API-s.patch
index 1526eefd6e..1526eefd6e 100644
--- a/patches/server/0510-Additional-Block-Material-API-s.patch
+++ b/patches/server/0511-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0511-Fix-harming-potion-dupe.patch b/patches/server/0512-Fix-harming-potion-dupe.patch
index 7b2d745291..7b2d745291 100644
--- a/patches/server/0511-Fix-harming-potion-dupe.patch
+++ b/patches/server/0512-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 754c03c42c..754c03c42c 100644
--- a/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0513-Cache-burn-durations.patch b/patches/server/0514-Cache-burn-durations.patch
index c4372f6401..c4372f6401 100644
--- a/patches/server/0513-Cache-burn-durations.patch
+++ b/patches/server/0514-Cache-burn-durations.patch
diff --git a/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index bd783eafb5..bd783eafb5 100644
--- a/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch
index 38593b84f5..38593b84f5 100644
--- a/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch
index 4670eeb506..4670eeb506 100644
--- a/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0518-Zombie-API-breaking-doors.patch b/patches/server/0519-Zombie-API-breaking-doors.patch
index da4c6d2dce..da4c6d2dce 100644
--- a/patches/server/0518-Zombie-API-breaking-doors.patch
+++ b/patches/server/0519-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0519-Fix-nerfed-slime-when-splitting.patch b/patches/server/0520-Fix-nerfed-slime-when-splitting.patch
index d2beca8665..d2beca8665 100644
--- a/patches/server/0519-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0520-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0520-Add-EntityLoadCrossbowEvent.patch b/patches/server/0521-Add-EntityLoadCrossbowEvent.patch
index 07e5946fbf..07e5946fbf 100644
--- a/patches/server/0520-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0521-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0521-Added-WorldGameRuleChangeEvent.patch b/patches/server/0522-Added-WorldGameRuleChangeEvent.patch
index d6247847f5..d6247847f5 100644
--- a/patches/server/0521-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0522-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0522-Added-ServerResourcesReloadedEvent.patch b/patches/server/0523-Added-ServerResourcesReloadedEvent.patch
index ae3f1de8c5..ae3f1de8c5 100644
--- a/patches/server/0522-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0523-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch
index 54e0d6f0f9..54e0d6f0f9 100644
--- a/patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0525-Implemented-BlockFailedDispenseEvent.patch
index 4269a73f28..4269a73f28 100644
--- a/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0525-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0525-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0526-Added-PlayerLecternPageChangeEvent.patch
index 57485f4ee7..57485f4ee7 100644
--- a/patches/server/0525-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0526-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch
index 93e862a643..93e862a643 100644
--- a/patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0527-Configurable-door-breaking-difficulty.patch b/patches/server/0528-Configurable-door-breaking-difficulty.patch
index 4aab6beaef..4aab6beaef 100644
--- a/patches/server/0527-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0528-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0528-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0529-Empty-commands-shall-not-be-dispatched.patch
index 9b41ebaaf7..9b41ebaaf7 100644
--- a/patches/server/0528-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0529-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0529-Remove-stale-POIs.patch b/patches/server/0530-Remove-stale-POIs.patch
index c89bd2b74a..c89bd2b74a 100644
--- a/patches/server/0529-Remove-stale-POIs.patch
+++ b/patches/server/0530-Remove-stale-POIs.patch
diff --git a/patches/server/0530-Fix-villager-boat-exploit.patch b/patches/server/0531-Fix-villager-boat-exploit.patch
index fab5613f59..fab5613f59 100644
--- a/patches/server/0530-Fix-villager-boat-exploit.patch
+++ b/patches/server/0531-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0531-Add-sendOpLevel-API.patch b/patches/server/0532-Add-sendOpLevel-API.patch
index aa5163a0bf..b6586f72bc 100644
--- a/patches/server/0531-Add-sendOpLevel-API.patch
+++ b/patches/server/0532-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 709c37e41f566a8301ec26ca76eb28c44a9bf1cd..adc96e0c4f81375253b540a3b003a00e
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 47fdb3c21e10f86c34c1634708dac784577cd5f0..7362f0e73533c6b202021b93057cc0a23b5f3e99 100644
+index ec38acdfdbac99fe3f0b40d37e59d8348fcb9c1f..467ab8fbb335617ef419b35c7881ca5606b3e541 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -640,6 +640,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0532-TODO-Registry-Modification-API.patch b/patches/server/0533-TODO-Registry-Modification-API.patch
index 613cd4823c..613cd4823c 100644
--- a/patches/server/0532-TODO-Registry-Modification-API.patch
+++ b/patches/server/0533-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0533-Add-StructuresLocateEvent.patch b/patches/server/0534-Add-StructuresLocateEvent.patch
index 465e85a5f2..465e85a5f2 100644
--- a/patches/server/0533-Add-StructuresLocateEvent.patch
+++ b/patches/server/0534-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0534-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0535-Collision-option-for-requiring-a-player-participant.patch
index ade169f618..efa1626720 100644
--- a/patches/server/0534-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0535-Collision-option-for-requiring-a-player-participant.patch
@@ -5,10 +5,10 @@ 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 0d96f40ca4d08197f101a31cca7e334525542565..027e4f9f9f3464af8f21cf1f67019aec15666c47 100644
+index 3acaa05743373b818ba70a0229c6afe63bfd1a97..6277b3a553a6fe65a11d678701cb4615ec3e3cc6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1894,6 +1894,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1927,6 +1927,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void push(Entity entity) {
          if (!this.isPassengerOfSameVehicle(entity)) {
              if (!entity.noPhysics && !this.noPhysics) {
diff --git a/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 3f7c51ddfe..3f7c51ddfe 100644
--- a/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch
index 17e9def19b..17e9def19b 100644
--- a/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0537-Make-schedule-command-per-world.patch b/patches/server/0538-Make-schedule-command-per-world.patch
index 8e29559590..8e29559590 100644
--- a/patches/server/0537-Make-schedule-command-per-world.patch
+++ b/patches/server/0538-Make-schedule-command-per-world.patch
diff --git a/patches/server/0538-Configurable-max-leash-distance.patch b/patches/server/0539-Configurable-max-leash-distance.patch
index c1ac4b5634..c1ac4b5634 100644
--- a/patches/server/0538-Configurable-max-leash-distance.patch
+++ b/patches/server/0539-Configurable-max-leash-distance.patch
diff --git a/patches/server/0539-Implement-BlockPreDispenseEvent.patch b/patches/server/0540-Implement-BlockPreDispenseEvent.patch
index 7fb05f89fa..7fb05f89fa 100644
--- a/patches/server/0539-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0540-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 03d8cdf4c8..03d8cdf4c8 100644
--- a/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch
index 39e24e6044..39e24e6044 100644
--- a/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch
index 9750570e73..9750570e73 100644
--- a/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index cbc3cf3058..cbc3cf3058 100644
--- a/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch
index cbafb7c5a4..8f6b89c32f 100644
--- a/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bd944ce3308a931391777e3a468daee06d493c73..d942b68c01b202dcad1377e98199bab2f79feebf 100644
+index 9c74a7e1dc74873c16a0fc474de459ccec4d372d..1d7fe0e7d382d2f2aa5a38732cc6212d6c7a11e3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1242,6 +1242,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0545-add-DragonEggFormEvent.patch b/patches/server/0546-add-DragonEggFormEvent.patch
index e4c888b12d..e4c888b12d 100644
--- a/patches/server/0545-add-DragonEggFormEvent.patch
+++ b/patches/server/0546-add-DragonEggFormEvent.patch
diff --git a/patches/server/0546-EntityMoveEvent.patch b/patches/server/0547-EntityMoveEvent.patch
index d396303a91..d396303a91 100644
--- a/patches/server/0546-EntityMoveEvent.patch
+++ b/patches/server/0547-EntityMoveEvent.patch
diff --git a/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch
index db56e9f1a6..db56e9f1a6 100644
--- a/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0548-Inline-shift-direction-fields.patch b/patches/server/0549-Inline-shift-direction-fields.patch
index f0c71d61f2..f0c71d61f2 100644
--- a/patches/server/0548-Inline-shift-direction-fields.patch
+++ b/patches/server/0549-Inline-shift-direction-fields.patch
diff --git a/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch
index e811b5c0a7..e811b5c0a7 100644
--- a/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index a387813cdf..a387813cdf 100644
--- a/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0551-living-entity-allow-attribute-registration.patch b/patches/server/0552-living-entity-allow-attribute-registration.patch
index 84f0585507..84f0585507 100644
--- a/patches/server/0551-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0552-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0552-fix-dead-slime-setSize-invincibility.patch b/patches/server/0553-fix-dead-slime-setSize-invincibility.patch
index 82acef5e68..82acef5e68 100644
--- a/patches/server/0552-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0553-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0554-Expose-Tracked-Players.patch b/patches/server/0555-Expose-Tracked-Players.patch
index c2235d9c2f..c2235d9c2f 100644
--- a/patches/server/0554-Expose-Tracked-Players.patch
+++ b/patches/server/0555-Expose-Tracked-Players.patch
diff --git a/patches/server/0555-Remove-streams-from-SensorNearest.patch b/patches/server/0556-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0555-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0556-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0556-Improve-ServerGUI.patch b/patches/server/0557-Improve-ServerGUI.patch
index cb4eed5f13..cb4eed5f13 100644
--- a/patches/server/0556-Improve-ServerGUI.patch
+++ b/patches/server/0557-Improve-ServerGUI.patch
diff --git a/patches/server/0557-fix-converting-txt-to-json-file.patch b/patches/server/0558-fix-converting-txt-to-json-file.patch
index 948c7cb6e4..948c7cb6e4 100644
--- a/patches/server/0557-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0558-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0558-Add-worldborder-events.patch b/patches/server/0559-Add-worldborder-events.patch
index 176d1259e4..176d1259e4 100644
--- a/patches/server/0558-Add-worldborder-events.patch
+++ b/patches/server/0559-Add-worldborder-events.patch
diff --git a/patches/server/0559-added-PlayerNameEntityEvent.patch b/patches/server/0560-added-PlayerNameEntityEvent.patch
index d5a8060153..d5a8060153 100644
--- a/patches/server/0559-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0560-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0561-Prevent-grindstones-from-overstacking-items.patch
index dc68619ad1..dc68619ad1 100644
--- a/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0561-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0561-Add-recipe-to-cook-events.patch b/patches/server/0562-Add-recipe-to-cook-events.patch
index e7fabd3ae9..e7fabd3ae9 100644
--- a/patches/server/0561-Add-recipe-to-cook-events.patch
+++ b/patches/server/0562-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0562-Add-Block-isValidTool.patch b/patches/server/0563-Add-Block-isValidTool.patch
index f28e5d98e0..f28e5d98e0 100644
--- a/patches/server/0562-Add-Block-isValidTool.patch
+++ b/patches/server/0563-Add-Block-isValidTool.patch
diff --git a/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch
index 56f3e37f2b..b5c3a124e5 100644
--- a/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 63535d38c0f7a7fbf19a1e91747f6989d0f72a60..c6f983b66fa1c61f8d0a7d7806937dced4ea72c1 100644
+index 760d49347b94d5d971aaed5be5fef3471e9758e8..5505b15ce0b7891b4d9329a8f4f7b7c12057c9e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1725,7 +1725,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0564-Expand-world-key-API.patch b/patches/server/0565-Expand-world-key-API.patch
index bd45d36dbb..bd45d36dbb 100644
--- a/patches/server/0564-Expand-world-key-API.patch
+++ b/patches/server/0565-Expand-world-key-API.patch
diff --git a/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0566-Item-Rarity-API.patch b/patches/server/0567-Item-Rarity-API.patch
index 370339eb5f..370339eb5f 100644
--- a/patches/server/0566-Item-Rarity-API.patch
+++ b/patches/server/0567-Item-Rarity-API.patch
diff --git a/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch
index 5cc36baecf..5cc36baecf 100644
--- a/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch
index 6be6c5a54b..6be6c5a54b 100644
--- a/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index e8b8c0ce59..e8b8c0ce59 100644
--- a/patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0570-Expose-protocol-version.patch b/patches/server/0571-Expose-protocol-version.patch
index fad23f6e40..fad23f6e40 100644
--- a/patches/server/0570-Expose-protocol-version.patch
+++ b/patches/server/0571-Expose-protocol-version.patch
diff --git a/patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch
index 1952b16087..1952b16087 100644
--- a/patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 6979c0cf5a..6979c0cf5a 100644
--- a/patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0573-Add-bypass-host-check.patch b/patches/server/0574-Add-bypass-host-check.patch
index 21a11f4ee1..21a11f4ee1 100644
--- a/patches/server/0573-Add-bypass-host-check.patch
+++ b/patches/server/0574-Add-bypass-host-check.patch
diff --git a/patches/server/0574-Set-area-affect-cloud-rotation.patch b/patches/server/0575-Set-area-affect-cloud-rotation.patch
index 963479559a..963479559a 100644
--- a/patches/server/0574-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0575-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch
index f31e2080d6..f31e2080d6 100644
--- a/patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch
index 68c2cd3ffe..68c2cd3ffe 100644
--- a/patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch
index 8f9c69cf16..8f9c69cf16 100644
--- a/patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch
index ecc0f6c3cd..ecc0f6c3cd 100644
--- a/patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch
index 12b81e4815..8cb742badb 100644
--- a/patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d45c8e234332978154f1fafad6ed5edf927f6103..fe0d6841b6ad76fc4a8cf8181393a9707a98423d 100644
+index 7c3cbd489c9d7aaa678db47ebe8f27a3fc2aabc7..133f9d46e204c3f70c9a3ed0c2fe434f90ac6e8c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1894,6 +1894,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0580-Added-PlayerDeepSleepEvent.patch b/patches/server/0581-Added-PlayerDeepSleepEvent.patch
index e77b33f0bb..e77b33f0bb 100644
--- a/patches/server/0580-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0581-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0581-More-World-API.patch b/patches/server/0582-More-World-API.patch
index 7a2d2c268b..7a2d2c268b 100644
--- a/patches/server/0581-More-World-API.patch
+++ b/patches/server/0582-More-World-API.patch
diff --git a/patches/server/0582-Added-PlayerBedFailEnterEvent.patch b/patches/server/0583-Added-PlayerBedFailEnterEvent.patch
index dd4d2712ed..dd4d2712ed 100644
--- a/patches/server/0582-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0583-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch
index 8783bf2f94..8783bf2f94 100644
--- a/patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 6dac578ff6..6dac578ff6 100644
--- a/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0585-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0586-Introduce-beacon-activation-deactivation-events.patch
index d28ff36b79..d28ff36b79 100644
--- a/patches/server/0585-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0586-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 773485081d..8a6c10c1cb 100644
--- a/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fe0d6841b6ad76fc4a8cf8181393a9707a98423d..73ea4907e81d7fd7830b3a9a368c88ac903428bb 100644
+index 133f9d46e204c3f70c9a3ed0c2fe434f90ac6e8c..73f47741a6cc290bb672871aabea112b26d0e8c0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2628,7 +2628,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0587-Add-Channel-initialization-listeners.patch b/patches/server/0588-Add-Channel-initialization-listeners.patch
index 360d19718e..360d19718e 100644
--- a/patches/server/0587-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0588-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch
index d0ff308b9e..d0ff308b9e 100644
--- a/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0589-Add-more-WanderingTrader-API.patch b/patches/server/0590-Add-more-WanderingTrader-API.patch
index 5205274499..5205274499 100644
--- a/patches/server/0589-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0590-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch
index 2ff1e7a041..2ff1e7a041 100644
--- a/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0591-Entity-load-save-limit-per-chunk.patch b/patches/server/0592-Entity-load-save-limit-per-chunk.patch
index f07dc4c039..f07dc4c039 100644
--- a/patches/server/0591-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0592-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 85efd06d0c..85efd06d0c 100644
--- a/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 6db9d8af69..6db9d8af69 100644
--- a/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0594-Inventory-close.patch b/patches/server/0595-Inventory-close.patch
index 9e9df237f4..9e9df237f4 100644
--- a/patches/server/0594-Inventory-close.patch
+++ b/patches/server/0595-Inventory-close.patch
diff --git a/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 33c6b6d97f..33c6b6d97f 100644
--- a/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0596-Add-basic-Datapack-API.patch b/patches/server/0597-Add-basic-Datapack-API.patch
index f18457ab30..f18457ab30 100644
--- a/patches/server/0596-Add-basic-Datapack-API.patch
+++ b/patches/server/0597-Add-basic-Datapack-API.patch
diff --git a/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0598-Add-environment-variable-to-disable-server-gui.patch
index 15f4f2968a..15f4f2968a 100644
--- a/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0598-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch
index d3be632fee..d3be632fee 100644
--- a/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0599-ItemStack-repair-check-API.patch b/patches/server/0600-ItemStack-repair-check-API.patch
index b82fb6d5dd..b82fb6d5dd 100644
--- a/patches/server/0599-ItemStack-repair-check-API.patch
+++ b/patches/server/0600-ItemStack-repair-check-API.patch
diff --git a/patches/server/0600-More-Enchantment-API.patch b/patches/server/0601-More-Enchantment-API.patch
index a065d8b7e3..a065d8b7e3 100644
--- a/patches/server/0600-More-Enchantment-API.patch
+++ b/patches/server/0601-More-Enchantment-API.patch
diff --git a/patches/server/0601-Move-range-check-for-block-placing-up.patch b/patches/server/0602-Move-range-check-for-block-placing-up.patch
index 9a7aee265f..64a3d3d2b1 100644
--- a/patches/server/0601-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0602-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4ba775edd90e716435c9ff5dc5579d96d49507c1..f8b5122ed55574260391206b99f165fa1515bb02 100644
+index 3ad46fcf6706b41fde42abe4e008c5bc86def07c..37e78cda4a41efa4b82fb3c6293bb12597d6e720 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1711,6 +1711,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch
index cb7fbee987..cb7fbee987 100644
--- a/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0603-Add-Mob-lookAt-API.patch b/patches/server/0604-Add-Mob-lookAt-API.patch
index b60d6b1767..b60d6b1767 100644
--- a/patches/server/0603-Add-Mob-lookAt-API.patch
+++ b/patches/server/0604-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0604-Add-Unix-domain-socket-support.patch b/patches/server/0605-Add-Unix-domain-socket-support.patch
index c1d9e612c9..c1d9e612c9 100644
--- a/patches/server/0604-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0605-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0605-Add-EntityInsideBlockEvent.patch b/patches/server/0606-Add-EntityInsideBlockEvent.patch
index aef98d33da..aef98d33da 100644
--- a/patches/server/0605-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0606-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0606-Attributes-API-for-item-defaults.patch b/patches/server/0607-Attributes-API-for-item-defaults.patch
index 3b1bb9e3fd..3b1bb9e3fd 100644
--- a/patches/server/0606-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0607-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch
index 9a9a933443..9a9a933443 100644
--- a/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0608-More-Lidded-Block-API.patch b/patches/server/0609-More-Lidded-Block-API.patch
index e65c6a26cb..e65c6a26cb 100644
--- a/patches/server/0608-More-Lidded-Block-API.patch
+++ b/patches/server/0609-More-Lidded-Block-API.patch
diff --git a/patches/server/0609-Limit-item-frame-cursors-on-maps.patch b/patches/server/0610-Limit-item-frame-cursors-on-maps.patch
index 64dc46158b..64dc46158b 100644
--- a/patches/server/0609-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0610-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0610-Add-PlayerKickEvent-causes.patch b/patches/server/0611-Add-PlayerKickEvent-causes.patch
index d90f5b0d02..d90f5b0d02 100644
--- a/patches/server/0610-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0611-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0611-Add-PufferFishStateChangeEvent.patch b/patches/server/0612-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0611-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0612-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 1dbdf33922..1dbdf33922 100644
--- a/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index e8ae16c851..e8ae16c851 100644
--- a/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch
index 8f2e06ffef..8f2e06ffef 100644
--- a/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0615-Add-BellRevealRaiderEvent.patch b/patches/server/0616-Add-BellRevealRaiderEvent.patch
index ed8e81f6a2..ed8e81f6a2 100644
--- a/patches/server/0615-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0616-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0616-Fix-invulnerable-end-crystals.patch b/patches/server/0617-Fix-invulnerable-end-crystals.patch
index 195d6b8a42..195d6b8a42 100644
--- a/patches/server/0616-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0617-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0618-Add-ElderGuardianAppearanceEvent.patch
index 93e8beb3d3..93e8beb3d3 100644
--- a/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0618-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0618-Fix-dangerous-end-portal-logic.patch b/patches/server/0619-Fix-dangerous-end-portal-logic.patch
index c93cc3a95e..0fc1eef84c 100644
--- a/patches/server/0618-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0619-Fix-dangerous-end-portal-logic.patch
@@ -11,13 +11,13 @@ 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 027e4f9f9f3464af8f21cf1f67019aec15666c47..e2f96c7259df87687cd1f560e46c4fb34d78e126 100644
+index 6277b3a553a6fe65a11d678701cb4615ec3e3cc6..ec6b9781ea95057a202f9ff31cacdb7215923458 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -482,6 +482,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- 
-     public boolean updatingSectionStatus = false;
+@@ -485,6 +485,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // Paper end
+     // Paper start - optimise entity tracking
+     final org.spigotmc.TrackingRange.TrackingRangeType trackingRangeType = org.spigotmc.TrackingRange.getTrackingRangeType(this);
 +    // Paper start - make end portalling safe
 +    public BlockPos portalBlock;
 +    public ServerLevel portalWorld;
@@ -49,9 +49,9 @@ index 027e4f9f9f3464af8f21cf1f67019aec15666c47..e2f96c7259df87687cd1f560e46c4fb3
 +    }
 +    // Paper end - make end portalling safe
  
-     public Entity(EntityType<?> type, Level world) {
-         this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -2838,6 +2868,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+     public boolean isLegacyTrackingEntity = false;
+ 
+@@ -2871,6 +2901,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index ef457d74af..ef457d74af 100644
--- a/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0620-Make-item-validations-configurable.patch b/patches/server/0621-Make-item-validations-configurable.patch
index c080248e33..c080248e33 100644
--- a/patches/server/0620-Make-item-validations-configurable.patch
+++ b/patches/server/0621-Make-item-validations-configurable.patch
diff --git a/patches/server/0621-Line-Of-Sight-Changes.patch b/patches/server/0622-Line-Of-Sight-Changes.patch
index 348480b8db..348480b8db 100644
--- a/patches/server/0621-Line-Of-Sight-Changes.patch
+++ b/patches/server/0622-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0622-add-per-world-spawn-limits.patch b/patches/server/0623-add-per-world-spawn-limits.patch
index b5ff1a2631..a8352ed49b 100644
--- a/patches/server/0622-add-per-world-spawn-limits.patch
+++ b/patches/server/0623-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a08d724c327b8f3eb819f72713b7fe4be18c1940..286db6e246d48fb391c609f4e8a0222f1b294cfc 100644
+index f74b030ead0aa5227adbc23f789756bd08f99931..0103f937e31b7e7b9af846ec80046654c80669df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -213,6 +213,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0623-Fix-potions-splash-events.patch b/patches/server/0624-Fix-potions-splash-events.patch
index e217ede002..e217ede002 100644
--- a/patches/server/0623-Fix-potions-splash-events.patch
+++ b/patches/server/0624-Fix-potions-splash-events.patch
diff --git a/patches/server/0624-Add-more-LimitedRegion-API.patch b/patches/server/0625-Add-more-LimitedRegion-API.patch
index 2a50497e38..2a50497e38 100644
--- a/patches/server/0624-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0625-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 71965c5192..71965c5192 100644
--- a/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0626-Missing-Entity-API.patch b/patches/server/0627-Missing-Entity-API.patch
index 04b4f8487e..04b4f8487e 100644
--- a/patches/server/0626-Missing-Entity-API.patch
+++ b/patches/server/0627-Missing-Entity-API.patch
diff --git a/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 3c993b4430..bf3b5d3599 100644
--- a/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7057bcb958f2ddf71cf6ec28be02a5aa32266436..594a697118debad209aee875eb2e35b3c9707d32 100644
+index 9cd00fce9dadd65020de9c48524416d6d3c82bc4..e084a66544a91cad162b1c9abb4b8f6b982992d7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1095,7 +1095,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 62c862fdb8..62c862fdb8 100644
--- a/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch
index f9e82eef32..f9e82eef32 100644
--- a/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch
index 915947a504..915947a504 100644
--- a/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0631-Adds-PlayerArmSwingEvent.patch b/patches/server/0632-Adds-PlayerArmSwingEvent.patch
index bc131a01dd..318be80dc4 100644
--- a/patches/server/0631-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0632-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 594a697118debad209aee875eb2e35b3c9707d32..07670c7223665237b3a537a7905250321ebb7468 100644
+index e084a66544a91cad162b1c9abb4b8f6b982992d7..7f94c6022f5889f47bdce98b3c8c95da53581a24 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2317,7 +2317,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch
index 52d7a40ffa..420b8af167 100644
--- a/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ec135dca185c0c9cdb5a28c75d44f54681448cf8..56743ae068c4fb665534f3b30545b2323820740b 100644
+index 963af930dc40b30d84c1e5d46be752ef74908a8a..d20fbe3c03e794bee0c29e251aba223953cfed15 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -266,7 +266,6 @@ public class ServerPlayer extends Player {
@@ -50,7 +50,7 @@ index 125a9d1ae394db4b0d5418756d50e32feca83344..20122bf191ebc74c223310aea1f004fd
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 07670c7223665237b3a537a7905250321ebb7468..4e9e08c3f59de9eac87f244939dc0a19b85b9802 100644
+index 7f94c6022f5889f47bdce98b3c8c95da53581a24..a6886bc4dd06675b6fc3b28d4611842b0fa4e411 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1855,6 +1855,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch
index be1d9fc586..be1d9fc586 100644
--- a/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0635-Fix-incorrect-message-for-outdated-client.patch
index 3c1d877b05..3c1d877b05 100644
--- a/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0635-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch
index b1101975e7..2548874b36 100644
--- a/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 56743ae068c4fb665534f3b30545b2323820740b..25f6b4e7ac794431f1b6170e9e680e43c44d10cf 100644
+index d20fbe3c03e794bee0c29e251aba223953cfed15..47e7bc46d349e0f0000676948a5c251f555abeb1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 297c6b3a06..297c6b3a06 100644
--- a/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 4a998000b2..4a998000b2 100644
--- a/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0638-Stinger-API.patch b/patches/server/0639-Stinger-API.patch
index 9e8f26a8d2..9e8f26a8d2 100644
--- a/patches/server/0638-Stinger-API.patch
+++ b/patches/server/0639-Stinger-API.patch
diff --git a/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 5f8b5b11ed..5f8b5b11ed 100644
--- a/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0640-Add-System.out-err-catcher.patch b/patches/server/0641-Add-System.out-err-catcher.patch
index 1f11b3d41a..1f11b3d41a 100644
--- a/patches/server/0640-Add-System.out-err-catcher.patch
+++ b/patches/server/0641-Add-System.out-err-catcher.patch
diff --git a/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index f4242ad30e..f4242ad30e 100644
--- a/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0642-Improve-boat-collision-performance.patch b/patches/server/0643-Improve-boat-collision-performance.patch
index 92f123e9ce..92f123e9ce 100644
--- a/patches/server/0642-Improve-boat-collision-performance.patch
+++ b/patches/server/0643-Improve-boat-collision-performance.patch
diff --git a/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch
index 403f8edd6d..4f88cce17e 100644
--- a/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4e9e08c3f59de9eac87f244939dc0a19b85b9802..ca60102128cd798572a39b3c2eb6c86eba465e90 100644
+index a6886bc4dd06675b6fc3b28d4611842b0fa4e411..2f3fddf5427248c3283173afaed220f7a3fd9e31 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -388,7 +388,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch
index 9fba827e12..9fba827e12 100644
--- a/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0645-Add-PlayerSetSpawnEvent.patch b/patches/server/0646-Add-PlayerSetSpawnEvent.patch
index b0c4474c88..b0c4474c88 100644
--- a/patches/server/0645-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0646-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch
index 45531b8594..45531b8594 100644
--- a/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0648-Optimize-entity-tracker-passenger-checks.patch
index 524e1fabfb..524e1fabfb 100644
--- a/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0648-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0649-Config-option-for-Piglins-guarding-chests.patch
index 63865bec49..63865bec49 100644
--- a/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0649-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0649-Added-EntityDamageItemEvent.patch b/patches/server/0650-Added-EntityDamageItemEvent.patch
index 935084ef4b..935084ef4b 100644
--- a/patches/server/0649-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0650-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0650-Optimize-indirect-passenger-iteration.patch b/patches/server/0651-Optimize-indirect-passenger-iteration.patch
index ea38b0fd48..936797269e 100644
--- a/patches/server/0650-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0651-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 e2f96c7259df87687cd1f560e46c4fb34d78e126..5dc20ea46909eac7bb02bc6594a614621b11cf63 100644
+index ec6b9781ea95057a202f9ff31cacdb7215923458..7812a23c779d4555caddd747f7ad8d96e6f08797 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3876,20 +3876,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3909,20 +3909,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Stream<Entity> getIndirectPassengersStream() {
@@ -43,7 +43,7 @@ index e2f96c7259df87687cd1f560e46c4fb34d78e126..5dc20ea46909eac7bb02bc6594a61462
          return () -> {
              return this.getIndirectPassengersStream().iterator();
          };
-@@ -3906,6 +3920,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3939,6 +3953,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // Paper end - rewrite chunk system
  
      public boolean hasExactlyOnePlayerPassenger() {
diff --git a/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch
index a1e4f933cb..a1e4f933cb 100644
--- a/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0653-Make-EntityUnleashEvent-cancellable.patch
index 17065b886a..17065b886a 100644
--- a/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0653-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0653-Clear-bucket-NBT-after-dispense.patch b/patches/server/0654-Clear-bucket-NBT-after-dispense.patch
index 1f2a7cae78..1f2a7cae78 100644
--- a/patches/server/0653-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0654-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch
index 48c5524ab8..48c5524ab8 100644
--- a/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0655-Add-BlockBreakBlockEvent.patch b/patches/server/0656-Add-BlockBreakBlockEvent.patch
index 2fd4cd307f..2fd4cd307f 100644
--- a/patches/server/0655-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0656-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 1002fe00f7..1002fe00f7 100644
--- a/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0657-More-CommandBlock-API.patch b/patches/server/0658-More-CommandBlock-API.patch
index 162a84f2e6..162a84f2e6 100644
--- a/patches/server/0657-More-CommandBlock-API.patch
+++ b/patches/server/0658-More-CommandBlock-API.patch
diff --git a/patches/server/0658-Add-missing-team-sidebar-display-slots.patch b/patches/server/0659-Add-missing-team-sidebar-display-slots.patch
index a9c7a8fa5b..a9c7a8fa5b 100644
--- a/patches/server/0658-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0659-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0659-Add-back-EntityPortalExitEvent.patch b/patches/server/0660-Add-back-EntityPortalExitEvent.patch
index b349e583a2..020d493778 100644
--- a/patches/server/0659-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0660-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 5dc20ea46909eac7bb02bc6594a614621b11cf63..3b7e54b4348f0486e43b4f7930ada0a16e989650 100644
+index 7812a23c779d4555caddd747f7ad8d96e6f08797..406b2cf18466439f7984497cf5da2bef466de459 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3332,6 +3332,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3365,6 +3365,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              } else {
                  // CraftBukkit start
                  worldserver = shapedetectorshape.world;
@@ -37,7 +37,7 @@ index 5dc20ea46909eac7bb02bc6594a614621b11cf63..3b7e54b4348f0486e43b4f7930ada0a1
                  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);
-@@ -3351,8 +3373,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3384,8 +3406,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
                  if (entity != null) {
                      entity.restoreFrom(this);
diff --git a/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch
index 827935032f..827935032f 100644
--- a/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0661-Get-entity-default-attributes.patch b/patches/server/0662-Get-entity-default-attributes.patch
index afd4c49b4d..afd4c49b4d 100644
--- a/patches/server/0661-Get-entity-default-attributes.patch
+++ b/patches/server/0662-Get-entity-default-attributes.patch
diff --git a/patches/server/0662-Left-handed-API.patch b/patches/server/0663-Left-handed-API.patch
index 367c9ed9bc..367c9ed9bc 100644
--- a/patches/server/0662-Left-handed-API.patch
+++ b/patches/server/0663-Left-handed-API.patch
diff --git a/patches/server/0663-Add-more-advancement-API.patch b/patches/server/0664-Add-more-advancement-API.patch
index ba79527126..ba79527126 100644
--- a/patches/server/0663-Add-more-advancement-API.patch
+++ b/patches/server/0664-Add-more-advancement-API.patch
diff --git a/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch
index ed29983bdd..ed29983bdd 100644
--- a/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0665-Add-critical-damage-API.patch b/patches/server/0666-Add-critical-damage-API.patch
index 2485aabae6..2485aabae6 100644
--- a/patches/server/0665-Add-critical-damage-API.patch
+++ b/patches/server/0666-Add-critical-damage-API.patch
diff --git a/patches/server/0666-Fix-issues-with-mob-conversion.patch b/patches/server/0667-Fix-issues-with-mob-conversion.patch
index 237d313b89..237d313b89 100644
--- a/patches/server/0666-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0667-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0667-Add-isCollidable-methods-to-various-places.patch b/patches/server/0668-Add-isCollidable-methods-to-various-places.patch
index 587957d8af..587957d8af 100644
--- a/patches/server/0667-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0668-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0668-Goat-ram-API.patch b/patches/server/0669-Goat-ram-API.patch
index 443c58b4ee..443c58b4ee 100644
--- a/patches/server/0668-Goat-ram-API.patch
+++ b/patches/server/0669-Goat-ram-API.patch
diff --git a/patches/server/0669-Add-API-for-resetting-a-single-score.patch b/patches/server/0670-Add-API-for-resetting-a-single-score.patch
index 0983cd3cdf..0983cd3cdf 100644
--- a/patches/server/0669-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0670-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch
index 02be891cbf..9f8f4e9c4f 100644
--- a/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,10 +7,10 @@ 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 3b7e54b4348f0486e43b4f7930ada0a16e989650..6512c3ca611233f7541c1d0119521e05f524615a 100644
+index 406b2cf18466439f7984497cf5da2bef466de459..7e461dae8e9a290fc54cb933ca8a880ae821ffa9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2113,6 +2113,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2146,6 +2146,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
      }
  
diff --git a/patches/server/0671-Vanilla-command-permission-fixes.patch b/patches/server/0672-Vanilla-command-permission-fixes.patch
index 6a9ac954d9..6a9ac954d9 100644
--- a/patches/server/0671-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0672-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 26a2297164..ee020e825e 100644
--- a/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -28,7 +28,7 @@ index a11bd2d9f5b2fb248cc322ea61886050fa2e73a9..80f2a1204bee79daf0cae9310ce8d552
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f612363c1530dd66fd57eaa324e285d481fa30e6..3fdf2908d0f6ac994fa05e285d7bc365890964ac 100644
+index 6b92189b6dddee7e632c142430eaa784d22adbca..c6d56a225cdaffc0b08eb4805e6bdcb0223fbd91 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1617,6 +1617,18 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0673-Fix-GameProfileCache-concurrency.patch b/patches/server/0674-Fix-GameProfileCache-concurrency.patch
index 0337248104..0337248104 100644
--- a/patches/server/0673-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0674-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0674-Improve-and-expand-AsyncCatcher.patch b/patches/server/0675-Improve-and-expand-AsyncCatcher.patch
index d7b23540a8..d7b23540a8 100644
--- a/patches/server/0674-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0675-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 80dcd03d0c..3201888a6b 100644
--- a/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -278,7 +278,7 @@ index 9df761f5cf043e8d2dffa711c20ab32fe2992331..d08c7b0b52065980f1f13c5533ff6355
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d2c6ce68b1ec10e83b21fa57ead41b9fcb06367f..38738fa0b19c665d5458286431db46dbe30dbb41 100644
+index 675788beea6c9559d5764501e76d671abcba3f17..146b5bd0a081afa8aee0e268bfaf8eb4390eacee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2184,6 +2184,11 @@ public final class CraftServer implements Server {
@@ -294,7 +294,7 @@ index d2c6ce68b1ec10e83b21fa57ead41b9fcb06367f..38738fa0b19c665d5458286431db46db
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 45147b34c60261fa3a7218529c18d327ea27c110..3dd98ee8c2876c28f45a7c4521e13858ef24d350 100644
+index bf92ff17e5f084df565b682c8b026dc20f580912..a0b9f22160a2b8277486f79205647125a412d8be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1705,9 +1705,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0677-Sanitize-ResourceLocation-error-logging.patch
index 989716f6fd..989716f6fd 100644
--- a/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0677-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0677-Optimise-general-POI-access.patch b/patches/server/0678-Optimise-general-POI-access.patch
index 332786d627..332786d627 100644
--- a/patches/server/0677-Optimise-general-POI-access.patch
+++ b/patches/server/0678-Optimise-general-POI-access.patch
diff --git a/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch
index 0023c8bd8c..0023c8bd8c 100644
--- a/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0680-Manually-inline-methods-in-BlockPosition.patch
index c8b8adfce9..c8b8adfce9 100644
--- a/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0680-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e97fc69558..e97fc69558 100644
--- a/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index ad81d50205..ad81d50205 100644
--- a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 5475ff2092..5475ff2092 100644
--- a/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch
index d931ef54fa..d931ef54fa 100644
--- a/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0684-Time-scoreboard-search.patch b/patches/server/0685-Time-scoreboard-search.patch
index e6b092ac61..e6b092ac61 100644
--- a/patches/server/0684-Time-scoreboard-search.patch
+++ b/patches/server/0685-Time-scoreboard-search.patch
diff --git a/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch
index f005ae7e71..f005ae7e71 100644
--- a/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch
index 75ece1bf8b..75ece1bf8b 100644
--- a/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch b/patches/server/0688-Execute-chunk-tasks-mid-tick.patch
index f4272a0512..f4272a0512 100644
--- a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0688-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0689-Oprimise-map-impl-for-tracked-players.patch
index 63b0b6da7a..87347c9261 100644
--- a/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0689-Oprimise-map-impl-for-tracked-players.patch
@@ -7,10 +7,10 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c10ef2e6af3e6c52eeb8c96cdbf5352d9dd25dd2..c16e84ee54bf2a65d8bd41f8156b7a4edee5e941 100644
+index 1c4d30d7e732685f3fa1acff524eef9900ae7ca8..5c1b7795de57a2879230d2aef7563e4b8f1e30fd 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1204,7 +1204,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1302,7 +1302,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          final Entity entity;
          private final int range;
          SectionPos lastSectionPos;
diff --git a/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0690-Optimise-BlockSoil-nearby-water-lookup.patch
index 08ef0f3bc8..08ef0f3bc8 100644
--- a/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0690-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0690-Optimise-random-block-ticking.patch b/patches/server/0691-Optimise-random-block-ticking.patch
index 981e905456..981e905456 100644
--- a/patches/server/0690-Optimise-random-block-ticking.patch
+++ b/patches/server/0691-Optimise-random-block-ticking.patch
diff --git a/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0a7c36c977..0a7c36c977 100644
--- a/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch
index de7c22c15f..16ce321611 100644
--- a/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7691727bc188912cab74c6fe4546dfd7b4e68bb5..bd906c491a63ec79d5b2d0901e30dde655c0fc8a 100644
+index 61d2f46ed71a8abff05e8295ac764b4af78095de..6da6120bc37b573a5398f1593b72ffc7f569682b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -40,6 +40,11 @@ dependencies {
diff --git a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
index da5cdf4ab8..642e3e16b9 100644
--- a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
@@ -122,10 +122,10 @@ index ab2ba79aa6ef36a86173e47abdac71a115693d02..08027ef81e46a6346b2acedd82f66ffc
  
      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 6512c3ca611233f7541c1d0119521e05f524615a..c02d5e6efcc8d8403b02acb37acb4071f0f33267 100644
+index 7e461dae8e9a290fc54cb933ca8a880ae821ffa9..9fc1ef3d4d59ea2236f668495392520f19ef2145 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -991,7 +991,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1024,7 +1024,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.onGround;
      }
  
@@ -168,7 +168,7 @@ index 6512c3ca611233f7541c1d0119521e05f524615a..c02d5e6efcc8d8403b02acb37acb4071
          if (this.noPhysics) {
              this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
          } else {
-@@ -1161,6 +1196,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1194,6 +1229,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.level().getProfiler().pop();
              }
          }
@@ -182,7 +182,7 @@ index 6512c3ca611233f7541c1d0119521e05f524615a..c02d5e6efcc8d8403b02acb37acb4071
      }
  
      private boolean isStateClimbable(BlockState state) {
-@@ -4218,7 +4260,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4251,7 +4293,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void setDeltaMovement(Vec3 velocity) {
@@ -192,7 +192,7 @@ index 6512c3ca611233f7541c1d0119521e05f524615a..c02d5e6efcc8d8403b02acb37acb4071
      }
  
      public void addDeltaMovement(Vec3 velocity) {
-@@ -4304,7 +4348,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4337,7 +4381,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/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0695-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 429df0d968..429df0d968 100644
--- a/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0695-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0696-Fix-Bukkit-NamespacedKey-shenanigans.patch
index c77b9ae0d6..c77b9ae0d6 100644
--- a/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0696-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0696-Distance-manager-tick-timings.patch b/patches/server/0697-Distance-manager-tick-timings.patch
index c7179fd70d..c7179fd70d 100644
--- a/patches/server/0696-Distance-manager-tick-timings.patch
+++ b/patches/server/0697-Distance-manager-tick-timings.patch
diff --git a/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0698-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 26b94b2d8b..26b94b2d8b 100644
--- a/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0698-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0699-Check-requirement-before-suggesting-root-nodes.patch
index 4f135f41df..4f135f41df 100644
--- a/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0699-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 6ef712fd7a..8f7c7094af 100644
--- a/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7119c6377a86cf33e4bddbaf5db1594414b5032c..e8ca93305e8baaee3e72932b630a2d6907444593 100644
+index 979515ce93ec0cb6589158ac0b1c54f9283f96b6..3f88ea6ce570c1b86651e5095970c28cbf3c2a3d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -734,6 +734,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0700-Add-packet-limiter-config.patch b/patches/server/0701-Add-packet-limiter-config.patch
index 6b454b34dd..6b454b34dd 100644
--- a/patches/server/0700-Add-packet-limiter-config.patch
+++ b/patches/server/0701-Add-packet-limiter-config.patch
diff --git a/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 1914569c27..1914569c27 100644
--- a/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0702-Ensure-valid-vehicle-status.patch b/patches/server/0703-Ensure-valid-vehicle-status.patch
index f0389c43e9..45c65ee8af 100644
--- a/patches/server/0702-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0703-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3fdf2908d0f6ac994fa05e285d7bc365890964ac..b5b86613aea368c524ed2544b9836a834ed833ad 100644
+index c6d56a225cdaffc0b08eb4805e6bdcb0223fbd91..c9eb785457b606d8f7c4fe3f824fd6d0a1d1070e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -569,7 +569,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch
index df49391139..df49391139 100644
--- a/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0706-Don-t-log-debug-logging-being-disabled.patch
index 82e266f96e..82e266f96e 100644
--- a/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0706-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0707-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0707-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0707-Preserve-overstacked-loot.patch b/patches/server/0708-Preserve-overstacked-loot.patch
index 004c7c6f77..004c7c6f77 100644
--- a/patches/server/0707-Preserve-overstacked-loot.patch
+++ b/patches/server/0708-Preserve-overstacked-loot.patch
diff --git a/patches/server/0708-Update-head-rotation-in-missing-places.patch b/patches/server/0709-Update-head-rotation-in-missing-places.patch
index d80dd0df5c..3abb11c491 100644
--- a/patches/server/0708-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0709-Update-head-rotation-in-missing-places.patch
@@ -8,10 +8,10 @@ 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 c02d5e6efcc8d8403b02acb37acb4071f0f33267..51d4870a563ab978b46c07a8e51e2b6849992269 100644
+index 9fc1ef3d4d59ea2236f668495392520f19ef2145..6b07bab1986e66d3e34c6ed3c54035bc8f0473da 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1878,6 +1878,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1911,6 +1911,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
@@ -19,7 +19,7 @@ index c02d5e6efcc8d8403b02acb37acb4071f0f33267..51d4870a563ab978b46c07a8e51e2b68
      }
  
      public void absMoveTo(double x, double y, double z) {
-@@ -1916,6 +1917,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1949,6 +1950,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.setXRot(pitch);
          this.setOldPosAndRot();
          this.reapplyPosition();
diff --git a/patches/server/0709-prevent-unintended-light-block-manipulation.patch b/patches/server/0710-prevent-unintended-light-block-manipulation.patch
index 745b4cd9b5..745b4cd9b5 100644
--- a/patches/server/0709-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0710-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0710-Fix-CraftCriteria-defaults-map.patch b/patches/server/0711-Fix-CraftCriteria-defaults-map.patch
index 65eeffccea..65eeffccea 100644
--- a/patches/server/0710-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0711-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0711-Fix-upstreams-block-state-factories.patch b/patches/server/0712-Fix-upstreams-block-state-factories.patch
index da98b563f3..da98b563f3 100644
--- a/patches/server/0711-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0712-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0712-Configurable-feature-seeds.patch b/patches/server/0713-Configurable-feature-seeds.patch
index 2e7ba7f297..2e7ba7f297 100644
--- a/patches/server/0712-Configurable-feature-seeds.patch
+++ b/patches/server/0713-Configurable-feature-seeds.patch
diff --git a/patches/server/0713-Add-root-admin-user-detection.patch b/patches/server/0714-Add-root-admin-user-detection.patch
index 00bf912738..00bf912738 100644
--- a/patches/server/0713-Add-root-admin-user-detection.patch
+++ b/patches/server/0714-Add-root-admin-user-detection.patch
diff --git a/patches/server/0714-Always-allow-item-changing-in-Fireball.patch b/patches/server/0715-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0714-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0715-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch
index 24d15f8607..3c62c6e020 100644
--- a/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,10 +5,10 @@ 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 51d4870a563ab978b46c07a8e51e2b6849992269..4b135772f8346103c2e6e1473af95f0bfa9754ef 100644
+index 6b07bab1986e66d3e34c6ed3c54035bc8f0473da..0433887a9f6ad19fdd1f8780424a10b0ef3b4c0e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -754,7 +754,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -787,7 +787,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // CraftBukkit start
      public void postTick() {
          // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle
diff --git a/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch
index 9573ff5d6b..9573ff5d6b 100644
--- a/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch
index db5dd67f1b..db5dd67f1b 100644
--- a/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch
index c57379be37..c57379be37 100644
--- a/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 9658237f9b..9658237f9b 100644
--- a/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch
index 9a6d28653c..6553879c95 100644
--- a/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch
@@ -33,7 +33,7 @@ index f1c0ff296b58aa020b00d6681ecf3cb4db09f561..88c543881c8e7453fffc08e1d5a32265
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8959e7d6142025937f9fea3fb8dc25410564cec7..9e1a5eb4cc834305e8959bb1552202c3b64fc869 100644
+index c2d06bd94c829e1e9cf00c20e5e2547c60d4b0ff..e0e9a1a0becd4754f4ee1a53e7a91206da22ac45 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3193,7 +3193,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0721-Fix-Spigot-growth-modifiers.patch b/patches/server/0722-Fix-Spigot-growth-modifiers.patch
index c83c76a287..c83c76a287 100644
--- a/patches/server/0721-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0722-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0724-Add-PlayerItemFrameChangeEvent.patch
index 6214bdbdef..6214bdbdef 100644
--- a/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0724-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0724-Optimize-HashMapPalette.patch b/patches/server/0725-Optimize-HashMapPalette.patch
index 9e2b26701e..9e2b26701e 100644
--- a/patches/server/0724-Optimize-HashMapPalette.patch
+++ b/patches/server/0725-Optimize-HashMapPalette.patch
diff --git a/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch
index 96dde1b0d3..96dde1b0d3 100644
--- a/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0726-Collision-optimisations.patch b/patches/server/0727-Collision-optimisations.patch
index 9922ee6fbb..97c209f43c 100644
--- a/patches/server/0726-Collision-optimisations.patch
+++ b/patches/server/0727-Collision-optimisations.patch
@@ -2204,7 +2204,7 @@ index d0a8092bf57a29ab7c00ec0ddf52a9fdb2a33267..392406722b0a040c1d41fdc1154d75d3
      private Direction(int id, int idOpposite, int idHorizontal, String name, Direction.AxisDirection direction, Direction.Axis axis, Vec3i vector) {
          this.data3d = id;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3e591d1d7487da42d1f2a655a3535cfb538c3141..ca7ca9fcd00a70e5d48ce1028e2af4df9be3a9de 100644
+index e45fc21532911aedacd99315386857e8e54ade32..97054a83f90cd1dc440b7c319c91014b237e36dc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -462,7 +462,7 @@ public class ServerPlayer extends Player {
@@ -2239,10 +2239,10 @@ 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 6474a847f918246b9352f48f8fc55dcf8f125838..b46a1ad08f48a7ed1fdd7775376677c7c4b011d5 100644
+index 0fb3cb6a30810b386b6406481f0bd36eb834004c..cc5c122fe9e3528e3b120d00e0a3600ef947c664 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1177,9 +1177,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1210,9 +1210,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  float f = this.getBlockSpeedFactor();
  
                  this.setDeltaMovement(this.getDeltaMovement().multiply((double) f, 1.0D, (double) f));
@@ -2290,7 +2290,7 @@ index 6474a847f918246b9352f48f8fc55dcf8f125838..b46a1ad08f48a7ed1fdd7775376677c7
                      if (this.remainingFireTicks <= 0) {
                          this.setRemainingFireTicks(-this.getFireImmuneTicks());
                      }
-@@ -1359,32 +1394,86 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1392,32 +1427,86 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Vec3 collide(Vec3 movement) {
@@ -2393,7 +2393,7 @@ index 6474a847f918246b9352f48f8fc55dcf8f125838..b46a1ad08f48a7ed1fdd7775376677c7
      }
  
      public static Vec3 collideBoundingBox(@Nullable Entity entity, Vec3 movement, AABB entityBoundingBox, Level world, List<VoxelShape> collisions) {
-@@ -2586,11 +2675,70 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2619,11 +2708,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/0727-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch
index 07f462e68e..8a8c38fd6a 100644
--- a/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 65f36454b08d7527aca0d3e667979fd58f3dcf6f..b0987c149917513fd00c39da2560277df4e0549b 100644
+index 7bdb23b00cf04e54ba906d6ed10ef96cfb1a2b33..d8f9b5d56ffa79145e1b8a2c809da4d5caad2a23 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -534,7 +534,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 3302cf5d13..3302cf5d13 100644
--- a/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0729-Add-more-Campfire-API.patch b/patches/server/0730-Add-more-Campfire-API.patch
index 5ba5d97bdf..5ba5d97bdf 100644
--- a/patches/server/0729-Add-more-Campfire-API.patch
+++ b/patches/server/0730-Add-more-Campfire-API.patch
diff --git a/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 5c74ea64c9..5c74ea64c9 100644
--- a/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0731-Fix-tripwire-state-inconsistency.patch b/patches/server/0732-Fix-tripwire-state-inconsistency.patch
index eba71d4136..eba71d4136 100644
--- a/patches/server/0731-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0732-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0733-Forward-CraftEntity-in-teleport-command.patch
index 9d024acb9a..7738d9621a 100644
--- a/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0733-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 f91cbf742ee12f29cdebbd0a1481f0ea6db8d50b..da8bd9746a3ddef673230c12370a34c8228aa0c7 100644
+index ede58a9d1f3245a0d8fd22f40731840877f4cabe..7bbe11ed8f42af737063a803769e29a59e127d1e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3494,6 +3494,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3527,6 +3527,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index f91cbf742ee12f29cdebbd0a1481f0ea6db8d50b..da8bd9746a3ddef673230c12370a34c8
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3580,10 +3587,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3613,10 +3620,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/0733-Improve-scoreboard-entries.patch b/patches/server/0734-Improve-scoreboard-entries.patch
index 125efaf657..125efaf657 100644
--- a/patches/server/0733-Improve-scoreboard-entries.patch
+++ b/patches/server/0734-Improve-scoreboard-entries.patch
diff --git a/patches/server/0734-Entity-powdered-snow-API.patch b/patches/server/0735-Entity-powdered-snow-API.patch
index 8ea727a6aa..8ea727a6aa 100644
--- a/patches/server/0734-Entity-powdered-snow-API.patch
+++ b/patches/server/0735-Entity-powdered-snow-API.patch
diff --git a/patches/server/0735-Add-API-for-item-entity-health.patch b/patches/server/0736-Add-API-for-item-entity-health.patch
index 2cd4aeff4a..2cd4aeff4a 100644
--- a/patches/server/0735-Add-API-for-item-entity-health.patch
+++ b/patches/server/0736-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch
index 213b301fc1..213b301fc1 100644
--- a/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch
index 59eb60edd7..59eb60edd7 100644
--- a/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 8c2c2fb117..8c2c2fb117 100644
--- a/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch
index b0884e52bd..b0884e52bd 100644
--- a/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0741-Fix-bees-aging-inside-hives.patch b/patches/server/0742-Fix-bees-aging-inside-hives.patch
index 2be01a557c..2be01a557c 100644
--- a/patches/server/0741-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0742-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0742-Bucketable-API.patch b/patches/server/0743-Bucketable-API.patch
index 4345ec75a6..4345ec75a6 100644
--- a/patches/server/0742-Bucketable-API.patch
+++ b/patches/server/0743-Bucketable-API.patch
diff --git a/patches/server/0743-Validate-usernames.patch b/patches/server/0744-Validate-usernames.patch
index 89ea54ab5e..89ea54ab5e 100644
--- a/patches/server/0743-Validate-usernames.patch
+++ b/patches/server/0744-Validate-usernames.patch
diff --git a/patches/server/0744-Make-water-animal-spawn-height-configurable.patch b/patches/server/0745-Make-water-animal-spawn-height-configurable.patch
index 9e90672eb5..9e90672eb5 100644
--- a/patches/server/0744-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0745-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 3ba6efd94a..83b64455e5 100644
--- a/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -31,7 +31,7 @@ index c103ac154104a1e50ed687a2154a1e0e579b786a..73738d920a7a5776165eb3586ddf0676
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4de85b0f3b77d838c91e79b1126e39d41c1f6132..cabdea2666286956696bc3681dab32b02ab6c0da 100644
+index e0a221639148c0b28c16ecd4cd45e2b3af16699f..d500962858fc9598481ff019bda1d1a7ad1813b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -203,6 +203,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0747-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0747-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0748-Add-new-overload-to-PersistentDataContainer-has.patch
index 2050e579c5..2050e579c5 100644
--- a/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0748-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0748-Multiple-Entries-with-Scoreboards.patch b/patches/server/0749-Multiple-Entries-with-Scoreboards.patch
index 69772b2ea9..69772b2ea9 100644
--- a/patches/server/0748-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0749-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0749-Reset-placed-block-on-exception.patch b/patches/server/0750-Reset-placed-block-on-exception.patch
index 308089d693..308089d693 100644
--- a/patches/server/0749-Reset-placed-block-on-exception.patch
+++ b/patches/server/0750-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0750-Add-configurable-height-for-slime-spawn.patch b/patches/server/0751-Add-configurable-height-for-slime-spawn.patch
index a9aa51d551..a9aa51d551 100644
--- a/patches/server/0750-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0751-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0752-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index cd0f2e16aa..cd0f2e16aa 100644
--- a/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0752-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0753-Fix-xp-reward-for-baby-zombies.patch
index dec1fe13a1..dec1fe13a1 100644
--- a/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0753-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0753-Kick-on-main-for-illegal-chat.patch b/patches/server/0754-Kick-on-main-for-illegal-chat.patch
index d4075b2273..540f62d05d 100644
--- a/patches/server/0753-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0754-Kick-on-main-for-illegal-chat.patch
@@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b0987c149917513fd00c39da2560277df4e0549b..e8302e9be8fda770e1396da40107ed22338de31b 100644
+index d8f9b5d56ffa79145e1b8a2c809da4d5caad2a23..ec1bec4f3ecdabad7ecf0a99f6edc1e2132a2c9e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2021,7 +2021,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0754-Multi-Block-Change-API-Implementation.patch b/patches/server/0755-Multi-Block-Change-API-Implementation.patch
index 750f177fda..750f177fda 100644
--- a/patches/server/0754-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0755-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0755-Fix-NotePlayEvent.patch b/patches/server/0756-Fix-NotePlayEvent.patch
index 5104743fbe..5104743fbe 100644
--- a/patches/server/0755-Fix-NotePlayEvent.patch
+++ b/patches/server/0756-Fix-NotePlayEvent.patch
diff --git a/patches/server/0756-Freeze-Tick-Lock-API.patch b/patches/server/0757-Freeze-Tick-Lock-API.patch
index 37a102caa2..5a79589560 100644
--- a/patches/server/0756-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0757-Freeze-Tick-Lock-API.patch
@@ -5,10 +5,10 @@ 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 da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9b91b030c 100644
+index 7bbe11ed8f42af737063a803769e29a59e127d1e..5ab9a4d588f0f159c97972bfa113dc9b7485d1b5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -401,6 +401,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -402,6 +402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
      private UUID originWorld;
@@ -16,7 +16,7 @@ index da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -800,7 +801,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -833,7 +834,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.setRemainingFireTicks(this.remainingFireTicks - 1);
              }
  
@@ -25,7 +25,7 @@ index da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9
                  this.setTicksFrozen(0);
                  this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
              }
-@@ -2400,6 +2401,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2433,6 +2434,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (fromNetherPortal) {
                  nbt.putBoolean("Paper.FromNetherPortal", true);
              }
@@ -35,7 +35,7 @@ index da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9
              // Paper end
              return nbt;
          } catch (Throwable throwable) {
-@@ -2565,6 +2569,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2598,6 +2602,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/0757-Dolphin-API.patch b/patches/server/0758-Dolphin-API.patch
index e971f87322..e971f87322 100644
--- a/patches/server/0757-Dolphin-API.patch
+++ b/patches/server/0758-Dolphin-API.patch
diff --git a/patches/server/0758-More-PotionEffectType-API.patch b/patches/server/0759-More-PotionEffectType-API.patch
index 43acfd7f8e..43acfd7f8e 100644
--- a/patches/server/0758-More-PotionEffectType-API.patch
+++ b/patches/server/0759-More-PotionEffectType-API.patch
diff --git a/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0760-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 84ed67d62f..84ed67d62f 100644
--- a/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0760-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch
index b92c1c2856..b92c1c2856 100644
--- a/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0761-Add-missing-structure-set-seed-configs.patch b/patches/server/0762-Add-missing-structure-set-seed-configs.patch
index f54b5cc96b..f54b5cc96b 100644
--- a/patches/server/0761-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0762-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0762-Implement-regenerateChunk.patch b/patches/server/0763-Implement-regenerateChunk.patch
index 711322ca1f..205a09260d 100644
--- a/patches/server/0762-Implement-regenerateChunk.patch
+++ b/patches/server/0763-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cabdea2666286956696bc3681dab32b02ab6c0da..056ced9d7b79b96ed33fe5656609863d9cb76b35 100644
+index d500962858fc9598481ff019bda1d1a7ad1813b7..6185477e9fc0ab2ed4e8e5835cc6e8e1adc79ef9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -142,6 +142,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch
index 6c443ed789..6c443ed789 100644
--- a/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 94c24dc109..94c24dc109 100644
--- a/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0765-Add-GameEvent-tags.patch b/patches/server/0766-Add-GameEvent-tags.patch
index 7728d3b25d..7728d3b25d 100644
--- a/patches/server/0765-Add-GameEvent-tags.patch
+++ b/patches/server/0766-Add-GameEvent-tags.patch
diff --git a/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index df4db48d20..df4db48d20 100644
--- a/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0767-Furnace-RecipesUsed-API.patch b/patches/server/0768-Furnace-RecipesUsed-API.patch
index 075cd97b56..075cd97b56 100644
--- a/patches/server/0767-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0768-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0768-Configurable-sculk-sensor-listener-range.patch b/patches/server/0769-Configurable-sculk-sensor-listener-range.patch
index 6d55376b1e..6d55376b1e 100644
--- a/patches/server/0768-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0769-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0770-Add-missing-block-data-mins-and-maxes.patch
index bf5dcd67c2..bf5dcd67c2 100644
--- a/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0770-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index e30c102eaa..e30c102eaa 100644
--- a/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch
index 63add2e773..63add2e773 100644
--- a/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0772-Fix-Entity-Position-Desync.patch b/patches/server/0773-Fix-Entity-Position-Desync.patch
index 1a885e69f8..1a885e69f8 100644
--- a/patches/server/0772-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0773-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0773-Custom-Potion-Mixes.patch b/patches/server/0774-Custom-Potion-Mixes.patch
index b2b98e7214..b2b98e7214 100644
--- a/patches/server/0773-Custom-Potion-Mixes.patch
+++ b/patches/server/0774-Custom-Potion-Mixes.patch
diff --git a/patches/server/0774-Force-close-world-loading-screen.patch b/patches/server/0775-Force-close-world-loading-screen.patch
index 6c99039e87..6c99039e87 100644
--- a/patches/server/0774-Force-close-world-loading-screen.patch
+++ b/patches/server/0775-Force-close-world-loading-screen.patch
diff --git a/patches/server/0775-Fix-falling-block-spawn-methods.patch b/patches/server/0776-Fix-falling-block-spawn-methods.patch
index 546e16b94b..546e16b94b 100644
--- a/patches/server/0775-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0776-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0776-Expose-furnace-minecart-push-values.patch b/patches/server/0777-Expose-furnace-minecart-push-values.patch
index 572d7c5f66..572d7c5f66 100644
--- a/patches/server/0776-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0777-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0778-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 9a608358db..9a608358db 100644
--- a/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0778-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0778-More-Projectile-API.patch b/patches/server/0779-More-Projectile-API.patch
index d43871e79b..d43871e79b 100644
--- a/patches/server/0778-More-Projectile-API.patch
+++ b/patches/server/0779-More-Projectile-API.patch
diff --git a/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0780-Fix-swamp-hut-cat-generation-deadlock.patch
index b2499e69cc..b2499e69cc 100644
--- a/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0780-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index af0968bf69..277372d88a 100644
--- a/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e8302e9be8fda770e1396da40107ed22338de31b..42860936789e66128615d3d2dc7a2a7bf139240b 100644
+index ec1bec4f3ecdabad7ecf0a99f6edc1e2132a2c9e..db7d4a74021873a86a06f39c43d36804d97e4fdb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -463,6 +463,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0781-Implement-getComputedBiome-API.patch b/patches/server/0782-Implement-getComputedBiome-API.patch
index 9644f0562d..9644f0562d 100644
--- a/patches/server/0781-Implement-getComputedBiome-API.patch
+++ b/patches/server/0782-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0782-Make-some-itemstacks-nonnull.patch b/patches/server/0783-Make-some-itemstacks-nonnull.patch
index 153d145fd3..153d145fd3 100644
--- a/patches/server/0782-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0783-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0783-Implement-enchantWithLevels-API.patch b/patches/server/0784-Implement-enchantWithLevels-API.patch
index ab96d4c51c..ab96d4c51c 100644
--- a/patches/server/0783-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0784-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0784-Fix-saving-in-unloadWorld.patch b/patches/server/0785-Fix-saving-in-unloadWorld.patch
index 4b0c1c3d04..4b0c1c3d04 100644
--- a/patches/server/0784-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0785-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0785-Buffer-OOB-setBlock-calls.patch b/patches/server/0786-Buffer-OOB-setBlock-calls.patch
index d17173fb30..d17173fb30 100644
--- a/patches/server/0785-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0786-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0786-Add-TameableDeathMessageEvent.patch b/patches/server/0787-Add-TameableDeathMessageEvent.patch
index b08801fd3d..b08801fd3d 100644
--- a/patches/server/0786-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0787-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 9f348863b2..9f348863b2 100644
--- a/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0789-fix-player-loottables-running-when-mob-loot-gamerule.patch
index f4969cc5bd..f9bd8d3a22 100644
--- a/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0789-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f5fb414087d4346e7d83b8f3ed847731cb03052d..6f7d2990a8562fb670c6800144d67e3becc56c6d 100644
+index 19f94236df83d73686aded9658a6469b3840c0c3..fb7a40e6670a2f7522fe2b1b98d5489c54961d3f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -917,12 +917,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0790-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 585cb7a9ed..2fc10bc3c8 100644
--- a/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0790-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 a1e795810e7e49acf4959b9c88bed1f9b91b030c..b92cfb174d84c32d49786b3fd189b1602ff84ce1 100644
+index 5ab9a4d588f0f159c97972bfa113dc9b7485d1b5..23326931fef470fd96461ef21f8894f15b2dd234 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2808,7 +2808,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2841,7 +2841,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean startRiding(Entity entity, boolean force) {
diff --git a/patches/server/0790-Guard-against-invalid-entity-positions.patch b/patches/server/0791-Guard-against-invalid-entity-positions.patch
index 52c77c6640..0145784265 100644
--- a/patches/server/0790-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0791-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 b92cfb174d84c32d49786b3fd189b1602ff84ce1..cb2b6ac12a93e5080e3d408e9797c011b5dccd09 100644
+index 23326931fef470fd96461ef21f8894f15b2dd234..be059aea19fbfd8d8bdde0ad39c7c0fbe7aaa30b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4489,11 +4489,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4522,11 +4522,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/0791-cache-resource-keys.patch b/patches/server/0792-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0791-cache-resource-keys.patch
+++ b/patches/server/0792-cache-resource-keys.patch
diff --git a/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0793-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 4871e529ae..4871e529ae 100644
--- a/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0793-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0794-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index e9c2bc86cd..e9c2bc86cd 100644
--- a/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0794-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0795-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index c7c36d1add..c7c36d1add 100644
--- a/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0795-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch
index 5619c86549..5619c86549 100644
--- a/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch
index e78af9af5b..e78af9af5b 100644
--- a/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0798-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 7f78aa076d..7f78aa076d 100644
--- a/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0798-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch
index fa7195f297..aaf785c107 100644
--- a/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index c7894892afe97eb3cb453c37a2d9a23d811d70b8..2d06a8f85c5e29688aa0fd4726fd5767
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7f96ba2095bee348cb6bb7796471aa7cdd1999d3..aa3926339c698038560f3eb2671917c9d5882fee 100644
+index 43ee0a36ace19a29f4e63133462ffc63a88b38e4..bea158416ed6c13db633efb742153f7813df5540 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2751,7 +2751,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -167,7 +167,7 @@ index 2e240ad721928a9a68370114ba61c21884ef1472..1a72fc5368731be617f9cab72e9e756d
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3238c3f152ed09eab935a62e044c48ca21d1cf1c..9f46cbc5c9ff75cb67fad6a4f8a62ba3da841c91 100644
+index b964c5e81422a90f605191e2822ece425679396b..c5b6957aca67739a2d265ca985a0cc5b35c9c1e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1950,7 +1950,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0800-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 676f145bb4..676f145bb4 100644
--- a/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0800-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0800-WorldCreator-keepSpawnLoaded.patch b/patches/server/0801-WorldCreator-keepSpawnLoaded.patch
index d83f7422f1..d83f7422f1 100644
--- a/patches/server/0800-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0801-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0802-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index d7281d9015..d7281d9015 100644
--- a/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0802-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0803-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 0a52efe49e..0a52efe49e 100644
--- a/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0803-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0804-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 76380e425b..76380e425b 100644
--- a/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0804-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0805-Fire-CauldronLevelChange-on-initial-fill.patch
index bcc871d7bc..bcc871d7bc 100644
--- a/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0805-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0806-fix-powder-snow-cauldrons-not-turning-to-water.patch
index fec28b7e17..fec28b7e17 100644
--- a/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0806-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0806-Add-PlayerStopUsingItemEvent.patch b/patches/server/0807-Add-PlayerStopUsingItemEvent.patch
index 8557c3e361..8557c3e361 100644
--- a/patches/server/0806-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0807-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0807-Don-t-tick-markers.patch b/patches/server/0808-Don-t-tick-markers.patch
index 48b356285d..48b356285d 100644
--- a/patches/server/0807-Don-t-tick-markers.patch
+++ b/patches/server/0808-Don-t-tick-markers.patch
diff --git a/patches/server/0808-Expand-FallingBlock-API.patch b/patches/server/0809-Expand-FallingBlock-API.patch
index babfefa431..babfefa431 100644
--- a/patches/server/0808-Expand-FallingBlock-API.patch
+++ b/patches/server/0809-Expand-FallingBlock-API.patch
diff --git a/patches/server/0809-Do-not-accept-invalid-client-settings.patch b/patches/server/0810-Do-not-accept-invalid-client-settings.patch
index 443d50fb31..443d50fb31 100644
--- a/patches/server/0809-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0810-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0810-Add-support-for-Proxy-Protocol.patch b/patches/server/0811-Add-support-for-Proxy-Protocol.patch
index 55d8e2f7b5..30de84af65 100644
--- a/patches/server/0810-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0811-Add-support-for-Proxy-Protocol.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index bd906c491a63ec79d5b2d0901e30dde655c0fc8a..cf538869bcf4e89825a96870e24b828880389c5c 100644
+index 6da6120bc37b573a5398f1593b72ffc7f569682b..79beac737c17412913983614bd478d33e3c6ed58 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,6 +30,7 @@ dependencies {
diff --git a/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0812-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 0c622e6685..0c622e6685 100644
--- a/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0812-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0813-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0813-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0814-Sanitize-Sent-BlockEntity-NBT.patch
index b3404362f9..b3404362f9 100644
--- a/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0814-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0815-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0815-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0816-Prevent-entity-loading-causing-async-lookups.patch
index 66bceb6dba..866bb3539c 100644
--- a/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0816-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,10 +5,10 @@ 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 cb2b6ac12a93e5080e3d408e9797c011b5dccd09..bca885b3632c06c51d7d68f9f3ee1964a41bfdf3 100644
+index be059aea19fbfd8d8bdde0ad39c7c0fbe7aaa30b..f040d1757043a4ff5e095df3a0c72b2c4c234dee 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -763,6 +763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -796,6 +796,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      public void baseTick() {
          this.level().getProfiler().push("entityBaseTick");
diff --git a/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch
index 84d0a27729..84d0a27729 100644
--- a/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0818-Add-Alternate-Current-redstone-implementation.patch
index 2615719296..2615719296 100644
--- a/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0818-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0818-Dont-resent-entity-on-art-update.patch b/patches/server/0819-Dont-resent-entity-on-art-update.patch
index 4ce24fc14e..4ce24fc14e 100644
--- a/patches/server/0818-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0819-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0819-Add-WardenAngerChangeEvent.patch b/patches/server/0820-Add-WardenAngerChangeEvent.patch
index eb11b51339..eb11b51339 100644
--- a/patches/server/0819-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0820-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0821-Add-option-for-strict-advancement-dimension-checks.patch
index 7a01fc369e..1a0d9c5a70 100644
--- a/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0821-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,7 +24,7 @@ index d4a673a9fb604876c554f955ed13ad31a2adb217..e75b3df4db9cb618aef4837acb8cde92
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6f7d2990a8562fb670c6800144d67e3becc56c6d..dfc4b41df11a5ce74e490303f56db65cd1df4d9a 100644
+index fb7a40e6670a2f7522fe2b1b98d5489c54961d3f..915126c0ee30180a81e5143086a958fb900929c6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1316,6 +1316,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0822-Add-missing-important-BlockStateListPopulator-method.patch
index d3763517ff..d3763517ff 100644
--- a/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0822-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0822-Nameable-Banner-API.patch b/patches/server/0823-Nameable-Banner-API.patch
index 351d3597e0..351d3597e0 100644
--- a/patches/server/0822-Nameable-Banner-API.patch
+++ b/patches/server/0823-Nameable-Banner-API.patch
diff --git a/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch
index c17c5f4a36..c17c5f4a36 100644
--- a/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0825-Prevent-empty-items-from-being-added-to-world.patch
index a286185139..a286185139 100644
--- a/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0825-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0826-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 6397403478..6397403478 100644
--- a/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0826-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0826-Add-Player-getFishHook.patch b/patches/server/0827-Add-Player-getFishHook.patch
index aa6a534aac..aa6a534aac 100644
--- a/patches/server/0826-Add-Player-getFishHook.patch
+++ b/patches/server/0827-Add-Player-getFishHook.patch
diff --git a/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0828-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 3956916b04..3956916b04 100644
--- a/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0828-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0829-Add-various-missing-EntityDropItemEvent-calls.patch
index c0e8d8fd0c..5d8d9f3850 100644
--- a/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0829-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 bca885b3632c06c51d7d68f9f3ee1964a41bfdf3..781b9c6d2f05535f67322ae6bdd1423c506ab7cd 100644
+index f040d1757043a4ff5e095df3a0c72b2c4c234dee..ca0106627279c581550c5e86bfc9a1ee5a9d6173 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2660,6 +2660,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2693,6 +2693,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/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch
index f79a1a6a1e..7d232d5b1a 100644
--- a/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ba86bc53af2e9574a4fbaaf052df4f4cc5d752bd..6ae39de0ac64e6a5757972c6cee85c37f641d9fd 100644
+index 616ea3055c854872fbb5754bdf0b67deac1b4b58..e6efb852e2454294073968de546b5c61b6131766 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2148,7 +2148,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0830-Fix-Bee-flower-NPE.patch b/patches/server/0831-Fix-Bee-flower-NPE.patch
index bbc40a996b..bbc40a996b 100644
--- a/patches/server/0830-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0831-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 6b2b48140b..2eb8c8b516 100644
--- a/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6ae39de0ac64e6a5757972c6cee85c37f641d9fd..b1be147250d3850930e103a2fa2823a6c992f0dd 100644
+index e6efb852e2454294073968de546b5c61b6131766..3663332ddc408b1f918b9f7b0a461a346073c9a4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2368,7 +2368,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0832-More-Teleport-API.patch b/patches/server/0833-More-Teleport-API.patch
index 519cdbe10e..519cdbe10e 100644
--- a/patches/server/0832-More-Teleport-API.patch
+++ b/patches/server/0833-More-Teleport-API.patch
diff --git a/patches/server/0833-Add-EntityPortalReadyEvent.patch b/patches/server/0834-Add-EntityPortalReadyEvent.patch
index fe77c37130..b391863a8a 100644
--- a/patches/server/0833-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0834-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 781b9c6d2f05535f67322ae6bdd1423c506ab7cd..073bd0e905b258be835b5063ddd5d8d6bb17d106 100644
+index ca0106627279c581550c5e86bfc9a1ee5a9d6173..a60bb065cedc9c70a4c9363d6994a9d00a5c15c9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3062,6 +3062,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3095,6 +3095,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 781b9c6d2f05535f67322ae6bdd1423c506ab7cd..073bd0e905b258be835b5063ddd5d8d6
                      this.setPortalCooldown();
                      // CraftBukkit start
                      if (this instanceof ServerPlayer) {
-@@ -3069,6 +3076,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3102,6 +3109,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      } else {
                          this.changeDimension(worldserver1);
                      }
diff --git a/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch
index 380c4d5c5d..380c4d5c5d 100644
--- a/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0835-Send-block-entities-after-destroy-prediction.patch b/patches/server/0836-Send-block-entities-after-destroy-prediction.patch
index 509dc02f75..d8a6e3fc1f 100644
--- a/patches/server/0835-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0836-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 675467a6552cfc1f951e7c81a9be0d423cae8c44..db5368bf4970c63f21ef1e5fc7428787c90de4dd 100644
+index ca4e4d5f272f2368a966a9eead1ba047c4cbc77a..1c98d65ed237d63faabcef64093957aef3157abf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1751,8 +1751,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch
index af872060f6..af872060f6 100644
--- a/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch
index a4b0fa47b7..a4b0fa47b7 100644
--- a/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch
index dd7008cfb5..dd7008cfb5 100644
--- a/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0839-Collision-API.patch b/patches/server/0840-Collision-API.patch
index 4c9bd750bb..4c9bd750bb 100644
--- a/patches/server/0839-Collision-API.patch
+++ b/patches/server/0840-Collision-API.patch
diff --git a/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index bffcadeb49..bffcadeb49 100644
--- a/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0841-Block-Ticking-API.patch b/patches/server/0842-Block-Ticking-API.patch
index ea73ea61f0..ea73ea61f0 100644
--- a/patches/server/0841-Block-Ticking-API.patch
+++ b/patches/server/0842-Block-Ticking-API.patch
diff --git a/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch
index 85a2ae83e6..85a2ae83e6 100644
--- a/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 02c71ad921..02c71ad921 100644
--- a/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0844-Add-NamespacedKey-biome-methods.patch b/patches/server/0845-Add-NamespacedKey-biome-methods.patch
index 6c282cba3f..6c282cba3f 100644
--- a/patches/server/0844-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0845-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch
index 1255d4ddb9..1255d4ddb9 100644
--- a/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0847-Stop-large-look-changes-from-crashing-the-server.patch
index a083e8e134..9c3d5e3b5f 100644
--- a/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0847-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 67fdb5ea2b11588d17cd6f30766d1aa3d7796b1c..3ac6e5c091077add9bb21675f4b082cd90e946a2 100644
+index 351f6c554a3d50ebe2572671c433be5750ac6dd8..e2ccf8badc02b5a21e3fcd6fcac76155d29e472c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3059,37 +3059,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch
index 4f0d9f51f2..4f0d9f51f2 100644
--- a/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0848-Missing-eating-regain-reason.patch b/patches/server/0849-Missing-eating-regain-reason.patch
index e04644ebf1..e04644ebf1 100644
--- a/patches/server/0848-Missing-eating-regain-reason.patch
+++ b/patches/server/0849-Missing-eating-regain-reason.patch
diff --git a/patches/server/0849-Missing-effect-cause.patch b/patches/server/0850-Missing-effect-cause.patch
index cdde105841..cdde105841 100644
--- a/patches/server/0849-Missing-effect-cause.patch
+++ b/patches/server/0850-Missing-effect-cause.patch
diff --git a/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0851-Added-byte-array-serialization-deserialization-for-P.patch
index b3ca268703..b3ca268703 100644
--- a/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0851-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0852-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 536e9fbff4..536e9fbff4 100644
--- a/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0852-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0853-Call-BlockPhysicsEvent-more-often.patch
index ea04c3e249..ea04c3e249 100644
--- a/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0853-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0853-Configurable-chat-thread-limit.patch b/patches/server/0854-Configurable-chat-thread-limit.patch
index 5e312d3a14..5e312d3a14 100644
--- a/patches/server/0853-Configurable-chat-thread-limit.patch
+++ b/patches/server/0854-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0855-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index dcc6c03d54..dcc6c03d54 100644
--- a/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0855-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0855-fix-Jigsaw-block-kicking-user.patch b/patches/server/0856-fix-Jigsaw-block-kicking-user.patch
index 6206d8d028..6206d8d028 100644
--- a/patches/server/0855-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0856-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0857-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 39be29edef..39be29edef 100644
--- a/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0857-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0857-Add-getDrops-to-BlockState.patch b/patches/server/0858-Add-getDrops-to-BlockState.patch
index 75ef1dadb3..75ef1dadb3 100644
--- a/patches/server/0857-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0858-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0859-Fix-a-bunch-of-vanilla-bugs.patch
index 3119ba20b8..37ace4ee67 100644
--- a/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0859-Fix-a-bunch-of-vanilla-bugs.patch
@@ -111,10 +111,10 @@ index 6cd6d69a20e95e344fc18ab67dc300824537a59b..2e2a7c2cf3081187da817479a9da3eb1
              }
          }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c16e84ee54bf2a65d8bd41f8156b7a4edee5e941..d7dcffde09e099ee2554ec201f553ee079f12274 100644
+index 5c1b7795de57a2879230d2aef7563e4b8f1e30fd..d58c25b639df59212c61bab989a11679852eea26 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -819,7 +819,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -899,7 +899,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
      // Paper end
  
diff --git a/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0860-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 2b050eec64..2b050eec64 100644
--- a/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0860-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0860-Fix-custom-piglin-loved-items.patch b/patches/server/0861-Fix-custom-piglin-loved-items.patch
index 41c934194f..41c934194f 100644
--- a/patches/server/0860-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0861-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0861-EntityPickupItemEvent-fixes.patch b/patches/server/0862-EntityPickupItemEvent-fixes.patch
index d052f8e0a1..d052f8e0a1 100644
--- a/patches/server/0861-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0862-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch
index 21d5cb0b3c..21d5cb0b3c 100644
--- a/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0864-Add-PlayerInventorySlotChangeEvent.patch
index 32c1b2217b..f004546ff1 100644
--- a/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0864-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dfc4b41df11a5ce74e490303f56db65cd1df4d9a..a9cd91adcdbe8589e8662426af8477473326b957 100644
+index 915126c0ee30180a81e5143086a958fb900929c6..bf17062ff3d7eb3085070f5186ab6477e9c1338e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -372,6 +372,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0864-Elder-Guardian-appearance-API.patch b/patches/server/0865-Elder-Guardian-appearance-API.patch
index 36e1626a80..36e1626a80 100644
--- a/patches/server/0864-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0865-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0865-Allow-changing-bed-s-occupied-property.patch b/patches/server/0866-Allow-changing-bed-s-occupied-property.patch
index f1d50caf78..f1d50caf78 100644
--- a/patches/server/0865-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0866-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0866-Add-entity-knockback-API.patch b/patches/server/0867-Add-entity-knockback-API.patch
index a7530e45fb..c08d2b3f95 100644
--- a/patches/server/0866-Add-entity-knockback-API.patch
+++ b/patches/server/0867-Add-entity-knockback-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f0d8000915db9ae497dddb09e9bde87a516a1b4b..f466b51947e1e6ed9e20ee1e5a0a535e9614efaa 100644
+index 8c8431f40e9415b32e43acea4cd91a20d82d8d08..bdaa21becdc17823628542d612daf2e055a273c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1016,5 +1016,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0867-Detect-headless-JREs.patch b/patches/server/0868-Detect-headless-JREs.patch
index 21cb522e88..21cb522e88 100644
--- a/patches/server/0867-Detect-headless-JREs.patch
+++ b/patches/server/0868-Detect-headless-JREs.patch
diff --git a/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0869-fixed-entity-vehicle-collision-event-not-called.patch
index ebd0cc3b2c..ebd0cc3b2c 100644
--- a/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0869-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0869-optimized-dirt-and-snow-spreading.patch b/patches/server/0870-optimized-dirt-and-snow-spreading.patch
index 08a3761309..08a3761309 100644
--- a/patches/server/0869-optimized-dirt-and-snow-spreading.patch
+++ b/patches/server/0870-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0870-Added-EntityToggleSitEvent.patch b/patches/server/0871-Added-EntityToggleSitEvent.patch
index f1617cb3ca..f1617cb3ca 100644
--- a/patches/server/0870-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0871-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0871-Add-fire-tick-delay-option.patch b/patches/server/0872-Add-fire-tick-delay-option.patch
index 7649d101c9..7649d101c9 100644
--- a/patches/server/0871-Add-fire-tick-delay-option.patch
+++ b/patches/server/0872-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0872-Add-Moving-Piston-API.patch b/patches/server/0873-Add-Moving-Piston-API.patch
index b0b64257f1..b0b64257f1 100644
--- a/patches/server/0872-Add-Moving-Piston-API.patch
+++ b/patches/server/0873-Add-Moving-Piston-API.patch
diff --git a/patches/server/0873-Ignore-impossible-spawn-tick.patch b/patches/server/0874-Ignore-impossible-spawn-tick.patch
index 46cd469266..46cd469266 100644
--- a/patches/server/0873-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0874-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch
index fe9f8e5826..fe9f8e5826 100644
--- a/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index a840f9a576..a840f9a576 100644
--- a/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 60fdb149f3..d7fe125f17 100644
--- a/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0877-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 073bd0e905b258be835b5063ddd5d8d6bb17d106..dd0eb9ee56fb41e4488b76a51f9daf6875155c31 100644
+index a60bb065cedc9c70a4c9363d6994a9d00a5c15c9..bff10831c154087077dd21b0d5b37c68b98e42dc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3341,6 +3341,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3374,6 +3374,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/0877-Prevent-compass-from-loading-chunks.patch b/patches/server/0878-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0877-Prevent-compass-from-loading-chunks.patch
+++ b/patches/server/0878-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0879-Add-PrePlayerAttackEntityEvent.patch
index d2c7b4c788..d2c7b4c788 100644
--- a/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0879-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch
index 6107fe92f8..6107fe92f8 100644
--- a/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 9780023a35..9780023a35 100644
--- a/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0881-Add-Player-Warden-Warning-API.patch b/patches/server/0882-Add-Player-Warden-Warning-API.patch
index 6b55e882b7..6b55e882b7 100644
--- a/patches/server/0881-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0882-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch
index 9c5c52b756..9c5c52b756 100644
--- a/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0883-Add-paper-dumplisteners-command.patch b/patches/server/0884-Add-paper-dumplisteners-command.patch
index 9669276c0a..9669276c0a 100644
--- a/patches/server/0883-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0884-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0884-check-global-player-list-where-appropriate.patch b/patches/server/0885-check-global-player-list-where-appropriate.patch
index 0dcf88b979..0dcf88b979 100644
--- a/patches/server/0884-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0885-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch
index a2b4a2f003..a2b4a2f003 100644
--- a/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0886-ItemStack-damage-API.patch b/patches/server/0887-ItemStack-damage-API.patch
index c46fbd71d9..2de74483ab 100644
--- a/patches/server/0886-ItemStack-damage-API.patch
+++ b/patches/server/0887-ItemStack-damage-API.patch
@@ -11,7 +11,7 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f466b51947e1e6ed9e20ee1e5a0a535e9614efaa..4971f918a014ba418f95a0d438aa3531eeef6908 100644
+index bdaa21becdc17823628542d612daf2e055a273c8..725053ca75b0747d69ab3ec8e7035f9b58b82a8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1017,6 +1017,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0887-Friction-API.patch b/patches/server/0888-Friction-API.patch
index 0a3891482d..b18e996baf 100644
--- a/patches/server/0887-Friction-API.patch
+++ b/patches/server/0888-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 34585981d45712d9119a97485ccc611d2c02e452..a28a7de154da42d24f9a96ba2f0a52aefd9febf5 100644
+index 4ed23c6143a96e75b0e2e060861dd7c702ce6a95..a9ee6deb5954e8bb9eaf93897f4eacdd481a61c5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -132,7 +132,7 @@ index 0a075ad3bbe13abc20c1f344cb706278b27bb202..9c0f83ff8113696309265fb9e8f60062
      public int getHealth() {
          return this.getHandle().health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4971f918a014ba418f95a0d438aa3531eeef6908..b4b56bebf5308f4dcc51c1a2815f9689a6918b13 100644
+index 725053ca75b0747d69ab3ec8e7035f9b58b82a8c..6ec847b7928cf4217f4588cbb35224fe8db85fd4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1064,6 +1064,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a019ee3c47..a019ee3c47 100644
--- a/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0889-Fix-player-kick-on-shutdown.patch b/patches/server/0890-Fix-player-kick-on-shutdown.patch
index f5de61909f..f5de61909f 100644
--- a/patches/server/0889-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0890-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0890-Sync-offhand-slot-in-menus.patch b/patches/server/0891-Sync-offhand-slot-in-menus.patch
index 7d2345f4eb..aef2af9e40 100644
--- a/patches/server/0890-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0891-Sync-offhand-slot-in-menus.patch
@@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a9cd91adcdbe8589e8662426af8477473326b957..06b455632ce3fc495cd41a61ce5a8a9f06461b1d 100644
+index bf17062ff3d7eb3085070f5186ab6477e9c1338e..76d513c61eec05edc8b037f2567562fb677f2d95 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -341,6 +341,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0891-Player-Entity-Tracking-Events.patch b/patches/server/0892-Player-Entity-Tracking-Events.patch
index 521a6d3a6e..db19a6b1d1 100644
--- a/patches/server/0891-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0892-Player-Entity-Tracking-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d7dcffde09e099ee2554ec201f553ee079f12274..160e8175fcae33c6643c2f731cc20b397ee86be9 100644
+index d58c25b639df59212c61bab989a11679852eea26..d20112349868f4c76f43882ad0cab7be025a6303 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1276,9 +1276,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1410,9 +1410,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // CraftBukkit end
                  if (flag) {
                      if (this.seenBy.add(player.connection)) {
diff --git a/patches/server/0892-Limit-pet-look-distance.patch b/patches/server/0893-Limit-pet-look-distance.patch
index 6b827724a3..6b827724a3 100644
--- a/patches/server/0892-Limit-pet-look-distance.patch
+++ b/patches/server/0893-Limit-pet-look-distance.patch
diff --git a/patches/server/0893-Properly-resend-entities.patch b/patches/server/0894-Properly-resend-entities.patch
index 7fb40cf3fd..7fb40cf3fd 100644
--- a/patches/server/0893-Properly-resend-entities.patch
+++ b/patches/server/0894-Properly-resend-entities.patch
diff --git a/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch
index 2e8a508b26..2e8a508b26 100644
--- a/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0895-fix-Instruments.patch b/patches/server/0896-fix-Instruments.patch
index 81ec752460..81ec752460 100644
--- a/patches/server/0895-fix-Instruments.patch
+++ b/patches/server/0896-fix-Instruments.patch
diff --git a/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 6c0d7471d6..6c0d7471d6 100644
--- a/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index f318df5bb3..f318df5bb3 100644
--- a/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0898-Add-BlockLockCheckEvent.patch b/patches/server/0899-Add-BlockLockCheckEvent.patch
index b57d228198..b57d228198 100644
--- a/patches/server/0898-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0899-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0899-Add-Sneaking-API-for-Entities.patch b/patches/server/0900-Add-Sneaking-API-for-Entities.patch
index 05d02cc28f..05d02cc28f 100644
--- a/patches/server/0899-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0900-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0900-Improve-logging-and-errors.patch b/patches/server/0901-Improve-logging-and-errors.patch
index 2c50ac6192..2c50ac6192 100644
--- a/patches/server/0900-Improve-logging-and-errors.patch
+++ b/patches/server/0901-Improve-logging-and-errors.patch
diff --git a/patches/server/0901-Improve-PortalEvents.patch b/patches/server/0902-Improve-PortalEvents.patch
index 7e18628f60..0bbf4bfcbc 100644
--- a/patches/server/0901-Improve-PortalEvents.patch
+++ b/patches/server/0902-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 dd0eb9ee56fb41e4488b76a51f9daf6875155c31..e68b8d53cacf179050dbc9cbfd815be7159dc8bc 100644
+index bff10831c154087077dd21b0d5b37c68b98e42dc..7ccaf608d6afb96edbd0cdfdd85d8b9b13b3fa6a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3724,7 +3724,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3757,7 +3757,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/0902-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch
index e15fbaed91..c37cb75cc6 100644
--- a/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,10 +5,10 @@ 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 e68b8d53cacf179050dbc9cbfd815be7159dc8bc..ba9b6bf4ff7c23ca599e09ff2fcbf9ab5d270f5d 100644
+index 7ccaf608d6afb96edbd0cdfdd85d8b9b13b3fa6a..d93ae4c8d2f6bfc8f2114c523ffad44e7ba735a7 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 {
+@@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      @javax.annotation.Nullable
      private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
@@ -16,7 +16,7 @@ index e68b8d53cacf179050dbc9cbfd815be7159dc8bc..ba9b6bf4ff7c23ca599e09ff2fcbf9ab
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -1443,7 +1444,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1476,7 +1477,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  null, null
          );
  
diff --git a/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch
index 6234450db8..6234450db8 100644
--- a/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 50b24fc2c0..50b24fc2c0 100644
--- a/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0905-Flying-Fall-Damage.patch b/patches/server/0906-Flying-Fall-Damage.patch
index 062be73949..062be73949 100644
--- a/patches/server/0905-Flying-Fall-Damage.patch
+++ b/patches/server/0906-Flying-Fall-Damage.patch
diff --git a/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index b80b116381..b80b116381 100644
--- a/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index d7b5ed8806..40033e7a91 100644
--- a/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,10 +6,10 @@ 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 ba9b6bf4ff7c23ca599e09ff2fcbf9ab5d270f5d..7fae13799800478f6244eaaeed59956494b3323b 100644
+index d93ae4c8d2f6bfc8f2114c523ffad44e7ba735a7..5dc48c6cced218be3428b420f4823330ea84ba0a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1123,7 +1123,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1156,7 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      }
  
                      if (!bl.getType().isAir()) {
diff --git a/patches/server/0908-config-for-disabling-entity-tag-tags.patch b/patches/server/0909-config-for-disabling-entity-tag-tags.patch
index acdda06756..acdda06756 100644
--- a/patches/server/0908-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0909-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0909-Use-single-player-info-update-packet-on-join.patch b/patches/server/0910-Use-single-player-info-update-packet-on-join.patch
index a42843df0e..a42843df0e 100644
--- a/patches/server/0909-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0910-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch
index e8a5aa0f29..7b2e2d63ae 100644
--- a/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fbdbf706c589b38b97b6a540b3b4e60157e3b7c8..ee8e341d138418b6512cae55a74cd65fd081c715 100644
+index e579d9cc70115a3fb3388adb309847faa1f9aaab..719f03fe96956c3fc34bbabdfa6c46bc6aca0bc1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1611,7 +1611,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0911-Win-Screen-API.patch b/patches/server/0912-Win-Screen-API.patch
index 5eb460ebe5..5eb460ebe5 100644
--- a/patches/server/0911-Win-Screen-API.patch
+++ b/patches/server/0912-Win-Screen-API.patch
diff --git a/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch
index b85d1dc31d..b85d1dc31d 100644
--- a/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0913-Fix-force-opening-enchantment-tables.patch b/patches/server/0914-Fix-force-opening-enchantment-tables.patch
index 3ebf5a30b4..3ebf5a30b4 100644
--- a/patches/server/0913-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0914-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0914-Add-Entity-Body-Yaw-API.patch b/patches/server/0915-Add-Entity-Body-Yaw-API.patch
index 365ecd7f9d..1eed2eca74 100644
--- a/patches/server/0914-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0915-Add-Entity-Body-Yaw-API.patch
@@ -41,7 +41,7 @@ index d97bc672a8e6fb7c2a0ed668cc15b54bf4254217..314168d162f1242eca67706fd3fa225f
      // Paper Start - Collision API
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b4b56bebf5308f4dcc51c1a2815f9689a6918b13..e997aebe36436570e2461a4685f0fb371ce4ce14 100644
+index 6ec847b7928cf4217f4588cbb35224fe8db85fd4..bb5980b7e265860968bc86216f2f3ad47301830c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1056,6 +1056,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 599ae035d5..599ae035d5 100644
--- a/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0917-Add-EntityFertilizeEggEvent.patch b/patches/server/0918-Add-EntityFertilizeEggEvent.patch
index 14cc635210..14cc635210 100644
--- a/patches/server/0917-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0918-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 75eeab264e..75eeab264e 100644
--- a/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 1291727de8..1291727de8 100644
--- a/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch
index fec2b2ac08..fec2b2ac08 100644
--- a/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch
index 87f1e05a1b..c55eac7b90 100644
--- a/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch
@@ -23,7 +23,7 @@ index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ee8e341d138418b6512cae55a74cd65fd081c715..0af0a1ee44375e17942f641df49c53c7804c50fc 100644
+index 719f03fe96956c3fc34bbabdfa6c46bc6aca0bc1..371f6d2539eac7161a86bb64763b4ee228eccbdf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2304,7 +2304,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0922-Fix-text-display-error-on-spawn.patch b/patches/server/0923-Fix-text-display-error-on-spawn.patch
index 43191b58fb..43191b58fb 100644
--- a/patches/server/0922-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0923-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch
index c5b7ef9a42..c5b7ef9a42 100644
--- a/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0924-Add-Shearable-API.patch b/patches/server/0925-Add-Shearable-API.patch
index dbb764b5e7..dbb764b5e7 100644
--- a/patches/server/0924-Add-Shearable-API.patch
+++ b/patches/server/0925-Add-Shearable-API.patch
diff --git a/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 4c90082c28..4c90082c28 100644
--- a/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0926-Optimize-Hoppers.patch b/patches/server/0927-Optimize-Hoppers.patch
index f74f8f0f52..f74f8f0f52 100644
--- a/patches/server/0926-Optimize-Hoppers.patch
+++ b/patches/server/0927-Optimize-Hoppers.patch
diff --git a/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch
index ebf4eed61e..ebf4eed61e 100644
--- a/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 6bd28ec0d8..6bd28ec0d8 100644
--- a/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
index 73867d90b5..8ab571c188 100644
--- a/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a352011eff0d7c29a349345ce7426ef4f22f404b..acc717c59ccab1102f3e12be67438998fcda6457 100644
+index bbb42a372d314621221688d8d5d6f418e45f4e08..f70ab11877ae04a4c9cc4ef61dc6e07c0f3fe9f2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2011,6 +2011,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0930-remove-duplicate-animate-packet-for-records.patch b/patches/server/0931-remove-duplicate-animate-packet-for-records.patch
index 0958982027..0958982027 100644
--- a/patches/server/0930-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0931-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
index a13ddb0b4f..a13ddb0b4f 100644
--- a/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 960d48879a..960d48879a 100644
--- a/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0933-Use-array-for-gamerule-storage.patch b/patches/server/0934-Use-array-for-gamerule-storage.patch
index 5c50da11c5..5c50da11c5 100644
--- a/patches/server/0933-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0934-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch
index f4a4393fa2..f4a4393fa2 100644
--- a/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch
index 1c9d5aefe4..1c9d5aefe4 100644
--- a/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0936-Add-Mob-Experience-reward-API.patch b/patches/server/0937-Add-Mob-Experience-reward-API.patch
index 47d2f879f2..47d2f879f2 100644
--- a/patches/server/0936-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0937-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch
index 461e4c40ca..461e4c40ca 100644
--- a/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch
index 6490952e0e..6490952e0e 100644
--- a/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0940-More-accurate-isInOpenWater-impl.patch b/patches/server/0941-More-accurate-isInOpenWater-impl.patch
index c782627938..c782627938 100644
--- a/patches/server/0940-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0941-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 2127f28b00..2127f28b00 100644
--- a/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch
index 0e23a9a123..0e23a9a123 100644
--- a/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0943-Expand-PlayerItemMendEvent.patch b/patches/server/0944-Expand-PlayerItemMendEvent.patch
index 88077775bf..88077775bf 100644
--- a/patches/server/0943-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0944-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch
index 1cd93ccf7b..d93fc48631 100644
--- a/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,10 +14,10 @@ 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 7fae13799800478f6244eaaeed59956494b3323b..2ec75c46f53331442d79ef30b7f8acb317f0143b 100644
+index 5dc48c6cced218be3428b420f4823330ea84ba0a..c6fe58b0ce9d0847d139e72316ed271aa6be2d92 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -381,6 +381,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -382,6 +382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean valid;
      public boolean generation;
      public int maxAirTicks = this.getDefaultMaxAirSupply(); // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
diff --git a/patches/server/0945-Add-transient-modifier-API.patch b/patches/server/0946-Add-transient-modifier-API.patch
index e3b704e242..e3b704e242 100644
--- a/patches/server/0945-Add-transient-modifier-API.patch
+++ b/patches/server/0946-Add-transient-modifier-API.patch
diff --git a/patches/server/0946-Fix-block-place-logic.patch b/patches/server/0947-Fix-block-place-logic.patch
index d08e5291bc..d08e5291bc 100644
--- a/patches/server/0946-Fix-block-place-logic.patch
+++ b/patches/server/0947-Fix-block-place-logic.patch
diff --git a/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index da9489efd3..da9489efd3 100644
--- a/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch
index 2b71534642..2b71534642 100644
--- a/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ b/patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch
index 69fc87cf3f..69fc87cf3f 100644
--- a/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index efa2da58fc..efa2da58fc 100644
--- a/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch
index 2fee78531f..2fee78531f 100644
--- a/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0952-Fix-sniffer-removeExploredLocation.patch b/patches/server/0953-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0952-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0953-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch
index c21ed94db8..570cabfbfd 100644
--- a/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e997aebe36436570e2461a4685f0fb371ce4ce14..fe2124694eb080cab685a1ce1f6a66e2fcdf6a17 100644
+index bb5980b7e265860968bc86216f2f3ad47301830c..daadfec2d86f7957072a639e1e36d4082448f35f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -503,6 +503,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
index f4cceaa358..f4cceaa358 100644
--- a/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ b/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index cfcf15909a..cfcf15909a 100644
--- a/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0956-Properly-Cancel-Usable-Items.patch b/patches/server/0957-Properly-Cancel-Usable-Items.patch
index 655263e5a7..655263e5a7 100644
--- a/patches/server/0956-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0957-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0957-Add-event-for-player-editing-sign.patch b/patches/server/0958-Add-event-for-player-editing-sign.patch
index 32a1b7ae72..32a1b7ae72 100644
--- a/patches/server/0957-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0958-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch
index b3de8c9a7c..b3de8c9a7c 100644
--- a/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0959-Improve-command-function-perm-level-checks.patch b/patches/server/0960-Improve-command-function-perm-level-checks.patch
index 5d912059ff..5d912059ff 100644
--- a/patches/server/0959-Improve-command-function-perm-level-checks.patch
+++ b/patches/server/0960-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0960-Add-option-to-disable-block-updates.patch b/patches/server/0961-Add-option-to-disable-block-updates.patch
index ae431df4ef..ae431df4ef 100644
--- a/patches/server/0960-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0961-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0961-Call-missing-BlockDispenseEvent.patch b/patches/server/0962-Call-missing-BlockDispenseEvent.patch
index fa4ada4143..fa4ada4143 100644
--- a/patches/server/0961-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0962-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch
index 95854f4605..faca8da061 100644
--- a/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,10 +5,10 @@ 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 2ec75c46f53331442d79ef30b7f8acb317f0143b..ac7f1f317782a6c6ad41614fbe6c25498da63010 100644
+index c6fe58b0ce9d0847d139e72316ed271aa6be2d92..aa668d0451d96d2f59e3da19e3ae1bd340e17d81 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1323,7 +1323,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1356,7 +1356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      protected BlockPos getOnPos(float offset) {
diff --git a/patches/server/0963-Optimize-player-lookups-for-beacons.patch b/patches/server/0964-Optimize-player-lookups-for-beacons.patch
index 5245e38833..5245e38833 100644
--- a/patches/server/0963-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0964-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0964-Add-Sign-getInteractableSideFor.patch b/patches/server/0965-Add-Sign-getInteractableSideFor.patch
index 2d3d9a47fb..2d3d9a47fb 100644
--- a/patches/server/0964-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0965-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0965-Array-backed-synched-entity-data.patch b/patches/server/0966-Array-backed-synched-entity-data.patch
index 515a256250..515a256250 100644
--- a/patches/server/0965-Array-backed-synched-entity-data.patch
+++ b/patches/server/0966-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch
index 08907c84fd..08907c84fd 100644
--- a/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch
index 4e1d19bbf6..4e1d19bbf6 100644
--- a/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch
+++ b/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0968-Fix-BanList-API.patch b/patches/server/0969-Fix-BanList-API.patch
index 4dbd085a1a..4dbd085a1a 100644
--- a/patches/server/0968-Fix-BanList-API.patch
+++ b/patches/server/0969-Fix-BanList-API.patch
diff --git a/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 05fb1ac2ac..05fb1ac2ac 100644
--- a/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0971-Fix-possible-NPE-on-painting-creation.patch
index 8485ab1255..8485ab1255 100644
--- a/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0971-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 1408560f1a..1408560f1a 100644
--- a/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 24e77389a5..24e77389a5 100644
--- a/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0973-Don-t-tick-signs.patch b/patches/server/0974-Don-t-tick-signs.patch
index 759f4ef4d2..759f4ef4d2 100644
--- a/patches/server/0973-Don-t-tick-signs.patch
+++ b/patches/server/0974-Don-t-tick-signs.patch
diff --git a/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 45166cba2a..45166cba2a 100644
--- a/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0975-Add-whitelist-events.patch b/patches/server/0976-Add-whitelist-events.patch
index 42eff5bfe1..42eff5bfe1 100644
--- a/patches/server/0975-Add-whitelist-events.patch
+++ b/patches/server/0976-Add-whitelist-events.patch
diff --git a/patches/server/0976-Implement-PlayerFailMoveEvent.patch b/patches/server/0977-Implement-PlayerFailMoveEvent.patch
index 994712cea1..42ea363200 100644
--- a/patches/server/0976-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0977-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1c86eaf44e6c797a51e69f14e08bb9a3f91b4c20..18a3546b829c8c696b6d38d2325a09d34c1da3a5 100644
+index 2af12e7dddf872f3b80d6288c0b1bd47fcd2b2f7..6e23c295f77e95564bf132a03397c4640bf9f49e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1291,8 +1291,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch
index 85701fb82a..060b9e9c77 100644
--- a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch
@@ -1158,10 +1158,10 @@ index fb257dac3abcf899d3db1df47cd7c0ce395c585b..2fcca41018e6432211606276ea33170f
          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 ac7f1f317782a6c6ad41614fbe6c25498da63010..426023af3cbed9c17048e669c87a1c66bda4ad1b 100644
+index aa668d0451d96d2f59e3da19e3ae1bd340e17d81..b22f9de22359573ca64e0bf7e2a241f5ed31b698 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -245,11 +245,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -246,11 +246,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public @Nullable Throwable addedToWorldStack; // Paper - entity debug
      public CraftEntity getBukkitEntity() {
          if (this.bukkitEntity == null) {
@@ -1186,7 +1186,7 @@ index ac7f1f317782a6c6ad41614fbe6c25498da63010..426023af3cbed9c17048e669c87a1c66
      @Override
      public CommandSender getBukkitSender(CommandSourceStack wrapper) {
          return this.getBukkitEntity();
-@@ -4685,6 +4697,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4718,6 +4730,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              return;
          }
          // Paper end - rewrite chunk system
@@ -1194,7 +1194,7 @@ index ac7f1f317782a6c6ad41614fbe6c25498da63010..426023af3cbed9c17048e669c87a1c66
          if (this.removalReason == null) {
              this.removalReason = reason;
          }
-@@ -4695,12 +4708,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4728,12 +4741,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/0978-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0979-API-for-updating-recipes-on-clients.patch b/patches/server/0980-API-for-updating-recipes-on-clients.patch
index 2e98d04389..2e98d04389 100644
--- a/patches/server/0979-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0980-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0981-Fix-rotation-when-spawning-display-entities.patch
index d0ab343b2d..d0ab343b2d 100644
--- a/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0981-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0981-Only-capture-actual-tree-growth.patch b/patches/server/0982-Only-capture-actual-tree-growth.patch
index 8686b1f9de..8686b1f9de 100644
--- a/patches/server/0981-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0982-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch
index 6eb9ff2e4c..6eb9ff2e4c 100644
--- a/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch
index dd08dc14b0..dd08dc14b0 100644
--- a/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0984-Use-correct-seed-on-api-world-load.patch b/patches/server/0985-Use-correct-seed-on-api-world-load.patch
index 83354b23f6..83354b23f6 100644
--- a/patches/server/0984-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0985-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 56ce0b4a41..56ce0b4a41 100644
--- a/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0986-Cache-map-ids-on-item-frames.patch b/patches/server/0987-Cache-map-ids-on-item-frames.patch
index 9b22a5bbd5..9b22a5bbd5 100644
--- a/patches/server/0986-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0987-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0987-Fix-custom-statistic-criteria-creation.patch b/patches/server/0988-Fix-custom-statistic-criteria-creation.patch
index d027126175..d027126175 100644
--- a/patches/server/0987-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0988-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0988-Bandaid-fix-for-Effect.patch b/patches/server/0989-Bandaid-fix-for-Effect.patch
index ab9a86f3fb..30fbe85e64 100644
--- a/patches/server/0988-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0989-Bandaid-fix-for-Effect.patch
@@ -45,7 +45,7 @@ index 5a5a8945c786e16ff0df62494ddd1ac85c42b53f..63f9735d356dafd579cee4423d3037eb
          case COMPOSTER_FILL_ATTEMPT:
              datavalue = ((Boolean) data) ? 1 : 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3b2ad8aca2bec9a1ff828e3d25a726948fc6c3fa..27ea9f2616dca02f9ecdd7cb5cc815e0aa2d5eb4 100644
+index a54b8615b9652760eaa72b30dfa5460e77d4440a..4879b585df9a6488922511a8e6603964bd13abcf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1374,7 +1374,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0989-SculkCatalyst-bloom-API.patch b/patches/server/0990-SculkCatalyst-bloom-API.patch
index 8b4fa56999..8b4fa56999 100644
--- a/patches/server/0989-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0990-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch
index aa6761baa2..aa6761baa2 100644
--- a/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 584e55ee4a..b934dbf22c 100644
--- a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 160e8175fcae33c6643c2f731cc20b397ee86be9..1e5ea1db14d7ae4ce25ba91e0bcd5245204af78b 100644
+index d20112349868f4c76f43882ad0cab7be025a6303..984f5bf687f5d7364eea6cff4110a5a33c24d492 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -307,8 +307,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -387,8 +387,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
      }
  
@@ -61,7 +61,7 @@ index dbedc73039f53ddf042999524eec62f032a20d5d..aaaf3a60696389b4e27a45de69743311
                  spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
              } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 06b455632ce3fc495cd41a61ce5a8a9f06461b1d..cacf251db5d60583fe05f571d0fe7844c44900a1 100644
+index 76d513c61eec05edc8b037f2567562fb677f2d95..2919c0562b3cfa48912d81e8619883493da99a36 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -253,6 +253,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
index c4738be9d8..c4738be9d8 100644
--- a/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index d69eb30401..2b8064b545 100644
--- a/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 18a3546b829c8c696b6d38d2325a09d34c1da3a5..ec4add38ebf0329cdc8e8bbdb3bd76cac9948ffc 100644
+index 6e23c295f77e95564bf132a03397c4640bf9f49e..ffa4cee256c387b1ef8489b931cd3aefeaa6f9f4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -805,6 +805,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch
index be4fc3d3c2..be4fc3d3c2 100644
--- a/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch
index be007b3577..be007b3577 100644
--- a/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 4b8d87f7b0..70e8703885 100644
--- a/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable entity tracking range by Y coordinate
 Options to configure entity tracking by Y coordinate, also for each entity category.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 1e5ea1db14d7ae4ce25ba91e0bcd5245204af78b..edbd5d4e2dcf5112148dc3d7a9173bb4d0a5d445 100644
+index 984f5bf687f5d7364eea6cff4110a5a33c24d492..aea643e24ed421419ae890759126f395a1ccd8db 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1286,6 +1286,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1420,6 +1420,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  double d1 = vec3d.x * vec3d.x + vec3d.z * vec3d.z;
                  double d2 = d0 * d0;
                  boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z);
diff --git a/patches/server/0997-Add-Listing-API-for-Player.patch b/patches/server/0998-Add-Listing-API-for-Player.patch
index e92aebc127..e92aebc127 100644
--- a/patches/server/0997-Add-Listing-API-for-Player.patch
+++ b/patches/server/0998-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0998-Configurable-Region-Compression-Format.patch b/patches/server/0999-Configurable-Region-Compression-Format.patch
index 08de696dde..08de696dde 100644
--- a/patches/server/0998-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0999-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index d57e36ca47..d57e36ca47 100644
--- a/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1001-Fix-NPE-on-Boat-getStatus.patch
index 38c2bdfa09..38c2bdfa09 100644
--- a/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/1001-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/1001-Expand-Pose-API.patch b/patches/server/1002-Expand-Pose-API.patch
index 6cfa9f29a9..6916504cfd 100644
--- a/patches/server/1001-Expand-Pose-API.patch
+++ b/patches/server/1002-Expand-Pose-API.patch
@@ -5,10 +5,10 @@ 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 426023af3cbed9c17048e669c87a1c66bda4ad1b..f20ae9153b7098980ce6c0e75fcbbb4da652661b 100644
+index b22f9de22359573ca64e0bf7e2a241f5ed31b698..684190fd12d910c5b2b47a409181330d3882bced 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -416,6 +416,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
      public boolean collidingWithWorldBorder; // Paper
@@ -16,7 +16,7 @@ index 426023af3cbed9c17048e669c87a1c66bda4ad1b..f20ae9153b7098980ce6c0e75fcbbb4d
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -668,6 +669,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -701,6 +702,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void onClientRemoval() {}
  
      public void setPose(net.minecraft.world.entity.Pose pose) {
diff --git a/patches/server/1002-More-DragonBattle-API.patch b/patches/server/1003-More-DragonBattle-API.patch
index 70af2d2d8b..70af2d2d8b 100644
--- a/patches/server/1002-More-DragonBattle-API.patch
+++ b/patches/server/1003-More-DragonBattle-API.patch
diff --git a/patches/server/1003-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1004-Deep-clone-unhandled-nbt-tags.patch
index 20034089ec..20034089ec 100644
--- a/patches/server/1003-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/server/1004-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/1004-Add-PlayerPickItemEvent.patch b/patches/server/1005-Add-PlayerPickItemEvent.patch
index d7cd5f972f..4c67972611 100644
--- a/patches/server/1004-Add-PlayerPickItemEvent.patch
+++ b/patches/server/1005-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ec4add38ebf0329cdc8e8bbdb3bd76cac9948ffc..8bd243a8d5a4be54f907af2b02e96ea833cee62f 100644
+index ffa4cee256c387b1ef8489b931cd3aefeaa6f9f4..34fcdeb0f4039f1fc6c4c8c593cc615560af1ba2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -942,7 +942,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1005-Improve-performance-of-mass-crafts.patch b/patches/server/1006-Improve-performance-of-mass-crafts.patch
index 183698b5c5..183698b5c5 100644
--- a/patches/server/1005-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1006-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1006-Allow-trident-custom-damage.patch b/patches/server/1007-Allow-trident-custom-damage.patch
index dcbcba2af5..dcbcba2af5 100644
--- a/patches/server/1006-Allow-trident-custom-damage.patch
+++ b/patches/server/1007-Allow-trident-custom-damage.patch
diff --git a/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch
index d14e34ae64..d14e34ae64 100644
--- a/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1008-Optimize-nearest-structure-border-iteration.patch b/patches/server/1009-Optimize-nearest-structure-border-iteration.patch
index 07d0358cbb..07d0358cbb 100644
--- a/patches/server/1008-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/1009-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1009-Implement-OfflinePlayer-isConnected.patch b/patches/server/1010-Implement-OfflinePlayer-isConnected.patch
index 2cf0e8deb5..2cf0e8deb5 100644
--- a/patches/server/1009-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/1010-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/1010-Fix-inventory-desync.patch b/patches/server/1011-Fix-inventory-desync.patch
index d85eb950fd..d85eb950fd 100644
--- a/patches/server/1010-Fix-inventory-desync.patch
+++ b/patches/server/1011-Fix-inventory-desync.patch
diff --git a/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch
index 8f67f580b9..f9b2542b7c 100644
--- a/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0a36ec0d3f33d3bfd708cd37c110f40db0f6c42d..d22e75432ff8b0034b8bfffb7a69e3ba8cf5569d 100644
+index 7838c7e051b1c4966e5a10289577d60a58ab16dd..872bd74b581249a8132ec5c37dfdd9e699bfbafa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1560,12 +1560,17 @@ public class ServerPlayer extends Player {
@@ -79,7 +79,7 @@ index 8a6095850cece3203eeae474dbf32090f698a32e..aefb9879b2edadfb4b21d80135d713b9
          if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
          player.containerMenu = container;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a0aeb79966d2efdb9603d59ec9e603a5187e4cb9..d4f90e3073646f067b939006b16ceb567a5f5a7a 100644
+index 975f4fe01ce0c3f98c4467927242558a66bc19f3..249e3f703ef1b40b5401f167d4c30faafb69bb5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1441,10 +1441,21 @@ public class CraftEventFactory {
diff --git a/patches/server/1012-Configure-sniffer-egg-hatch-time.patch b/patches/server/1013-Configure-sniffer-egg-hatch-time.patch
index 6c035ed11f..6c035ed11f 100644
--- a/patches/server/1012-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/1013-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0244f274f5..0244f274f5 100644
--- a/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch
index e45ced771d..e45ced771d 100644
--- a/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch
index c83c1b5818..c83c1b5818 100644
--- a/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch
index dcb22051b6..dcb22051b6 100644
--- a/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch
index f8402dbd00..f8402dbd00 100644
--- a/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1019-Fix-silent-equipment-change-for-mobs.patch
index ffcc2b8e38..ffcc2b8e38 100644
--- a/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/1019-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1019-Fix-spigot-s-Forced-Stats.patch b/patches/server/1020-Fix-spigot-s-Forced-Stats.patch
index 8e012f221e..8e012f221e 100644
--- a/patches/server/1019-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/1020-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch
index 204c301017..204c301017 100644
--- a/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 738c4d4886..738c4d4886 100644
--- a/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1022-Actually-optimise-explosions.patch b/patches/server/1023-Actually-optimise-explosions.patch
index a835a68c02..a835a68c02 100644
--- a/patches/server/1022-Actually-optimise-explosions.patch
+++ b/patches/server/1023-Actually-optimise-explosions.patch
diff --git a/patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1024-Add-missing-logs-for-log-ips-config-option.patch
index 604b80916e..604b80916e 100644
--- a/patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/1024-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1025-Remove-Spigot-Bug-Fix-for-MC-109346.patch
index d3ecc69301..d3ecc69301 100644
--- a/patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch
+++ b/patches/server/1025-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1025-Fix-SuspiciousStewMeta.patch b/patches/server/1026-Fix-SuspiciousStewMeta.patch
index 1bad5d7d04..1bad5d7d04 100644
--- a/patches/server/1025-Fix-SuspiciousStewMeta.patch
+++ b/patches/server/1026-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1026-Optimise-chunk-tick-iteration.patch b/patches/server/1027-Optimise-chunk-tick-iteration.patch
index 8a2ed1ca15..7a6e81fc30 100644
--- a/patches/server/1026-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1027-Optimise-chunk-tick-iteration.patch
@@ -108,18 +108,18 @@ index 2b998bdbe49bf8211b755e0eb7c1bf13ac280eab..5afeb59ff25fed2d565407acacffec83
              List list;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index edbd5d4e2dcf5112148dc3d7a9173bb4d0a5d445..0c2617574e21037d94ac56ad08b490f9bca5c5af 100644
+index aea643e24ed421419ae890759126f395a1ccd8db..0c363f3f43e816fb5e047e81e6d748673164e81e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -162,6 +162,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         // Note: players need to be explicitly added to distance maps before they can be updated
-         this.nearbyPlayers.removePlayer(player);
-         this.level.playerChunkLoader.removePlayer(player); // Paper - replace chunk loader
+@@ -192,6 +192,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+             this.playerEntityTrackerTrackMaps[i].remove(player);
+         }
+         // Paper end - use distance map to optimise tracker
 +        this.playerMobSpawnMap.remove(player); // Paper - optimise chunk tick iteration
      }
  
      void updateMaps(ServerPlayer player) {
-@@ -203,6 +204,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -241,6 +242,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
      public final io.papermc.paper.util.player.NearbyPlayers nearbyPlayers;
      // Paper end
@@ -130,7 +130,7 @@ index edbd5d4e2dcf5112148dc3d7a9173bb4d0a5d445..0c2617574e21037d94ac56ad08b490f9
  
      public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance, boolean dsync) {
          super(session.getDimensionPath(world.dimension()).resolve("region"), dataFixer, dsync);
-@@ -330,7 +335,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -410,7 +415,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
      // Paper end
  
@@ -359,7 +359,7 @@ index aaaf3a60696389b4e27a45de69743311c58e5829..17b6925b46f8386dcfc561483693de51
              gameprofilerfiller.pop();
              this.chunkMap.tick();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5d32ce8112562f368e6ebea064181622b22823ed..76157319b79d7fefe38cb2cc10b2d79c12667e3d 100644
+index ccc2ec523ea6b85ffefb2ae8e27d621499735997..ba972d1661426d7e30f6f61bad3b9608e66ea721 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -318,6 +318,9 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/1027-Lag-compensation-ticks.patch b/patches/server/1028-Lag-compensation-ticks.patch
index 17e883e30f..17e883e30f 100644
--- a/patches/server/1027-Lag-compensation-ticks.patch
+++ b/patches/server/1028-Lag-compensation-ticks.patch
diff --git a/patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1029-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index 34c0a06240..34c0a06240 100644
--- a/patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/1029-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1030-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/1030-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1031-Fix-team-sidebar-objectives-not-being-cleared.patch
index f4bcaa50c7..f4bcaa50c7 100644
--- a/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/1031-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1031-Optimise-nearby-player-retrieval.patch b/patches/server/1032-Optimise-nearby-player-retrieval.patch
index 5486dc0f16..5486dc0f16 100644
--- a/patches/server/1031-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1032-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1032-Remove-streams-for-villager-AI.patch b/patches/server/1033-Remove-streams-for-villager-AI.patch
index a2538da4d0..a2538da4d0 100644
--- a/patches/server/1032-Remove-streams-for-villager-AI.patch
+++ b/patches/server/1033-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1033-Fix-missing-map-initialize-event-call.patch b/patches/server/1034-Fix-missing-map-initialize-event-call.patch
index e9765c3029..e9765c3029 100644
--- a/patches/server/1033-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1034-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1035-Update-entity-data-when-attaching-firework-to-entity.patch
index de60d2ea6f..de60d2ea6f 100644
--- a/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/1035-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1036-Use-correct-variable-for-initializing-CraftLootTable.patch
index bffc71910b..bffc71910b 100644
--- a/patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch
+++ b/patches/server/1036-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1037-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
index b36b8cf1f6..b36b8cf1f6 100644
--- a/patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
+++ b/patches/server/1037-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1038-Fix-UnsafeValues-loadAdvancement.patch
index 0aecd72d28..0aecd72d28 100644
--- a/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/1038-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1040-Don-t-check-if-we-can-see-non-visible-entities.patch
index c387d4170e..81712ec1a3 100644
--- a/patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/1040-Don-t-check-if-we-can-see-non-visible-entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't check if we can see non-visible entities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0c2617574e21037d94ac56ad08b490f9bca5c5af..28c6ec04750daca3d77a0cee2b9f17f2508662cc 100644
+index baa8497a18474ed142535749edfca200ef31f93e..caa73632aee15583c6b6ed12a668c8f49b794708 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1302,7 +1302,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1436,7 +1436,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // Paper end - check Y
  
                  // CraftBukkit start - respect vanish API
diff --git a/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1041-Fix-NPE-in-SculkBloomEvent-world-access.patch
index f4db24ce29..f4db24ce29 100644
--- a/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/1041-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1042-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index e70d4274ff..e70d4274ff 100644
--- a/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1042-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/1042-Optimize-VarInts.patch b/patches/server/1043-Optimize-VarInts.patch
index 19e7fc574a..19e7fc574a 100644
--- a/patches/server/1042-Optimize-VarInts.patch
+++ b/patches/server/1043-Optimize-VarInts.patch
diff --git a/patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch b/patches/server/1044-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch
index 17028be297..17028be297 100644
--- a/patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch
+++ b/patches/server/1044-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch