diff --git a/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
index 98389ce614..ca8770c5bd 100644
--- a/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 7678199278324cce4ce736197cb8766c134a0f87..998fe14ef28aaaf9246a05d8670c4caa8306c4d1 100644
+index 7678199278324cce4ce736197cb8766c134a0f87..8a2c135ee7c6fe60a2debf7a7b02fb9ffc3d2c2f 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -257,6 +257,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -13,10 +13,10 @@ index 7678199278324cce4ce736197cb8766c134a0f87..998fe14ef28aaaf9246a05d8670c4caa
  
                  if (entityitem.isMergable()) {
 +                    // Paper Start - Fix items merging through walls
-+                        if (this.level.paperConfig().fixes.fixItemsMergingThroughWalls) {
++                        if (this.level().paperConfig().fixes.fixItemsMergingThroughWalls) {
 +                            net.minecraft.world.level.ClipContext rayTrace = new net.minecraft.world.level.ClipContext(this.position(), entityitem.position(),
 +                                net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, this);
-+                            net.minecraft.world.phys.BlockHitResult rayTraceResult = level.clip(rayTrace);
++                            net.minecraft.world.phys.BlockHitResult rayTraceResult = this.level().clip(rayTrace);
 +                            if (rayTraceResult.getType() == net.minecraft.world.phys.HitResult.Type.BLOCK) continue;
 +                        }
 +                    // Paper End
diff --git a/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
index c06c4a0e7f..ae9e3b0771 100644
--- a/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3a669f8e0cd072fcbd5e5ed4b55abb0f73c009e7..38b0bde34420734c50fe23aa169af82a7de4e1c2 100644
+index 3a669f8e0cd072fcbd5e5ed4b55abb0f73c009e7..212cdc23a443d019829aca5830e39ee9bd9992b1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -13,7 +13,7 @@ index 3a669f8e0cd072fcbd5e5ed4b55abb0f73c009e7..38b0bde34420734c50fe23aa169af82a
              MobEffect mobeffectlist = effect.getEffect();
  
 -            if (mobeffectlist == MobEffects.REGENERATION || mobeffectlist == MobEffects.POISON) {
-+            if ((mobeffectlist == MobEffects.REGENERATION || mobeffectlist == MobEffects.POISON) && this.level.paperConfig().entities.mobEffects.undeadImmuneToCertainEffects) { // Paper
++            if ((mobeffectlist == MobEffects.REGENERATION || mobeffectlist == MobEffects.POISON) && this.level().paperConfig().entities.mobEffects.undeadImmuneToCertainEffects) { // Paper
                  return false;
              }
          }
diff --git a/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch
index 47b600a6f1..de6cc08fd7 100644
--- a/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0640-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 62906422a96995ca4eac5a4d8ad2af3093a6a047..30bc41a609eebbc66826d002453abf65570cdad2 100644
+index 62906422a96995ca4eac5a4d8ad2af3093a6a047..3d9f3e49cc783ace04f5228a5ae33f35799ced4a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -100,6 +100,7 @@ import net.minecraft.util.Mth;
@@ -27,7 +27,7 @@ index 62906422a96995ca4eac5a4d8ad2af3093a6a047..30bc41a609eebbc66826d002453abf65
      @Override
      public boolean isInvulnerableTo(DamageSource damageSource) {
 -        return super.isInvulnerableTo(damageSource) || this.isChangingDimension();
-+        return super.isInvulnerableTo(damageSource) || this.isChangingDimension()  || !level.paperConfig().collisions.allowPlayerCrammingDamage && damageSource == damageSources().cramming(); // Paper - disable player cramming
++        return super.isInvulnerableTo(damageSource) || this.isChangingDimension()  || !this.level().paperConfig().collisions.allowPlayerCrammingDamage && damageSource == damageSources().cramming(); // Paper - disable player cramming
      }
  
      @Override
diff --git a/patches/server/0648-Improve-boat-collision-performance.patch b/patches/server/0648-Improve-boat-collision-performance.patch
index 90e67b9efd..bec2781e82 100644
--- a/patches/server/0648-Improve-boat-collision-performance.patch
+++ b/patches/server/0648-Improve-boat-collision-performance.patch
@@ -17,7 +17,7 @@ index 7354711e194ab58b11b68f447c1fc795fe611a65..5579dad0ba8f2e4ce43883e7d36059c2
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 38b0bde34420734c50fe23aa169af82a7de4e1c2..3017e7a6c2685e4ab82a425025c363133209222d 100644
+index 212cdc23a443d019829aca5830e39ee9bd9992b1..0c931f8bb093c5592f52c266be6a284492a72041 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1383,7 +1383,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0651-Add-PlayerSetSpawnEvent.patch b/patches/server/0651-Add-PlayerSetSpawnEvent.patch
index 0fe0d1b348..ce8970da29 100644
--- a/patches/server/0651-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0651-Add-PlayerSetSpawnEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerSetSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java b/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
-index a2d0699e8427b2262a2396495111125eccafbb66..c29340eb3e4044f6c342146bcd1ddbed6b9a5969 100644
+index a2d0699e8427b2262a2396495111125eccafbb66..d797637f61bdf8a424f56fbb48e28b7c9117d604 100644
 --- a/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
-@@ -38,11 +38,23 @@ public class SetSpawnCommand {
+@@ -38,24 +38,34 @@ public class SetSpawnCommand {
          ResourceKey<Level> resourcekey = source.getLevel().dimension();
          Iterator iterator = targets.iterator();
  
@@ -26,15 +26,30 @@ index a2d0699e8427b2262a2396495111125eccafbb66..c29340eb3e4044f6c342146bcd1ddbed
 +        // Paper start
 +        if (actualTargets.isEmpty()) {
 +            return 0;
-+        } else {
-+            targets = actualTargets;
 +        }
 +        // Paper end
  
          String s = resourcekey.location().toString();
  
+-        if (targets.size() == 1) {
++        if (actualTargets.size() == 1) { // Paper
+             source.sendSuccess(() -> {
+-                return Component.translatable("commands.spawnpoint.success.single", pos.getX(), pos.getY(), pos.getZ(), angle, s, ((ServerPlayer) targets.iterator().next()).getDisplayName());
++                return Component.translatable("commands.spawnpoint.success.single", pos.getX(), pos.getY(), pos.getZ(), angle, s, ((ServerPlayer) actualTargets.iterator().next()).getDisplayName()); // Paper
+             }, true);
+         } else {
+             source.sendSuccess(() -> {
+-                return Component.translatable("commands.spawnpoint.success.multiple", pos.getX(), pos.getY(), pos.getZ(), angle, s, targets.size());
++                return Component.translatable("commands.spawnpoint.success.multiple", pos.getX(), pos.getY(), pos.getZ(), angle, s, actualTargets.size()); // Paper
+             }, true);
+         }
+ 
+-        return targets.size();
++        return actualTargets.size(); // Paper
+     }
+ }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 30bc41a609eebbc66826d002453abf65570cdad2..ca9732bc1be9035ee6dd4184b362f73f4db82768 100644
+index 3d9f3e49cc783ace04f5228a5ae33f35799ced4a..fc0ef295241036230e2a0a12775445983df4a861 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1349,7 +1349,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 25656434bb..0e4125e124 100644
--- a/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -28,7 +28,7 @@ index 5795836844691ce4bcfaf3df8ae6dc28b80df47a..00508122ab504b1a84ef050145749fa9
          }
          // 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 ca9732bc1be9035ee6dd4184b362f73f4db82768..6fa598820b54559a5c7739f050be08ff36a020e7 100644
+index fc0ef295241036230e2a0a12775445983df4a861..9c7bb62646fff8ba0ab9e666dcf706ef5c5dc041 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1615,6 +1615,18 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0680-Improve-and-expand-AsyncCatcher.patch b/patches/server/0680-Improve-and-expand-AsyncCatcher.patch
index f7c7d429a6..e90e309be0 100644
--- a/patches/server/0680-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0680-Improve-and-expand-AsyncCatcher.patch
@@ -29,7 +29,7 @@ index ca8ceca79ee191b7366c5c84fffa47852de61ec0..ee5f58ae4c276b4529d7dd35aa5cfa51
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3017e7a6c2685e4ab82a425025c363133209222d..dffce1de1254f0194db2f28b797155846d3beeb0 100644
+index 0c931f8bb093c5592f52c266be6a284492a72041..12f5e702e5b242b93b8bf13d9c8f21aa478f2237 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1120,7 +1120,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index 6d99fc6e6e..c5fba4edcb 100644
--- a/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -334,7 +334,7 @@ index 604e1f1113457d7dbd368d40a668aab7c7466d40..8f1949cf33bdc35d6d024dd82faae37f
                      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6fa598820b54559a5c7739f050be08ff36a020e7..c9b07d321a22060086a8608c6ff5f8f0608d988f 100644
+index 9c7bb62646fff8ba0ab9e666dcf706ef5c5dc041..63765c837d1becaba6a8d9c71929f47486683530 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -273,6 +273,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0715-Ensure-valid-vehicle-status.patch b/patches/server/0715-Ensure-valid-vehicle-status.patch
index 736fbe4610..9189776594 100644
--- a/patches/server/0715-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0715-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 c9b07d321a22060086a8608c6ff5f8f0608d988f..768f9ef872ed1bb3157c6fa122e1e3d76417a4b6 100644
+index 63765c837d1becaba6a8d9c71929f47486683530..c6ff2f5d1a13b4357229244cbd375461b51d1779 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -568,7 +568,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch
index a260d7f616..7a956bb34d 100644
--- a/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dffce1de1254f0194db2f28b797155846d3beeb0..8b01e2fb891339867256ae45a5178af0beadc8cb 100644
+index 12f5e702e5b242b93b8bf13d9c8f21aa478f2237..ef5c3d7888426b4f88b0aadecf138935bb660dad 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2655,13 +2655,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch
index e67a9b2561..2165668150 100644
--- a/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,7 +34,7 @@ index 09f6948a52721b27ccd7c761a7efd09bfd7a183c..71a8812365503d840f6702a21d504a37
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8b01e2fb891339867256ae45a5178af0beadc8cb..8e7fb632e5ab2c2d7c890fcab2133ea431ed0380 100644
+index ef5c3d7888426b4f88b0aadecf138935bb660dad..71d5b386b0e0fa1c5c1e30f1ee5bdd9cb7c290da 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3164,7 +3164,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch
index 417a12ff40..5e7ecdcbdb 100644
--- a/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch
@@ -33,7 +33,7 @@ index 2b6e315d275cf5e303663c175745a5fe2e35969f..13e73042653909f194cfc909a9637065
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8e7fb632e5ab2c2d7c890fcab2133ea431ed0380..29a8b2bddf4257e74db27bf990c8aa1fd99c341b 100644
+index 71d5b386b0e0fa1c5c1e30f1ee5bdd9cb7c290da..843be459302226f7a2b6d02878aebe600e2af5ee 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3166,7 +3166,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -56,7 +56,7 @@ index 8e7fb632e5ab2c2d7c890fcab2133ea431ed0380..29a8b2bddf4257e74db27bf990c8aa1f
 +        }
 +
 +        final ItemStack copy = copyItemStack ? itemStack.copy() : itemStack;
-+        if (level.paperConfig().anticheat.obfuscation.items.hideDurability) {
++        if (this.level().paperConfig().anticheat.obfuscation.items.hideDurability) {
 +            // Only show damage values for elytra's, since they show a different texture when broken.
 +            if (!copy.is(Items.ELYTRA) || copy.getDamageValue() < copy.getMaxDamage() - 1) {
 +                copy.setDamageValue(0);
@@ -64,7 +64,7 @@ index 8e7fb632e5ab2c2d7c890fcab2133ea431ed0380..29a8b2bddf4257e74db27bf990c8aa1f
 +        }
 +
 +        final CompoundTag tag = copy.getTag();
-+        if (level.paperConfig().anticheat.obfuscation.items.hideItemmeta) {
++        if (this.level().paperConfig().anticheat.obfuscation.items.hideItemmeta) {
 +            // Some resource packs show different textures when there is more than one item. Since this shouldn't provide a big advantage,
 +            // we'll tell the client if there's one or (more than) two items.
 +            copy.setCount(copy.getCount() > 1 ? 2 : 1);
@@ -99,7 +99,7 @@ index 8e7fb632e5ab2c2d7c890fcab2133ea431ed0380..29a8b2bddf4257e74db27bf990c8aa1f
 +            }
 +        }
 +
-+        if (level.paperConfig().anticheat.obfuscation.items.hideItemmetaWithVisualEffects && tag != null) {
++        if (this.level().paperConfig().anticheat.obfuscation.items.hideItemmetaWithVisualEffects && tag != null) {
 +            // Lodestone compasses
 +            tag.remove("LodestonePos");
 +            if (tag.contains("LodestoneDimension")) {
diff --git a/patches/server/0742-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0742-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 878bb4a16b..6462f64d9f 100644
--- a/patches/server/0742-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0742-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1180,7 +1180,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 768f9ef872ed1bb3157c6fa122e1e3d76417a4b6..fd93a4bda08882c098b10cb4abeb254a11814957 100644
+index c6ff2f5d1a13b4357229244cbd375461b51d1779..68e7342a72509fb41734ee23638ffb562007ae90 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -461,7 +461,7 @@ public class ServerPlayer extends Player {
@@ -1215,18 +1215,16 @@ index 5f957a28e9d30144f724ebdc581d5f0b80bf6dc1..23ab7960120c1e2a76880f634787a089
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 19fe9bc6f4eafb18f8f215a24d8bcd52627cabf0..db2a24b668622f68730cc3cafff974272bebe133 100644
+index 19fe9bc6f4eafb18f8f215a24d8bcd52627cabf0..84686bb4938d40771a578b475d34b2528bd4fadf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1176,10 +1176,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                 this.tryCheckInsideBlocks();
+@@ -1177,9 +1177,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  float f = this.getBlockSpeedFactor();
  
--                this.setDeltaMovement(this.getDeltaMovement().multiply((double) f, 1.0D, (double) f));
+                 this.setDeltaMovement(this.getDeltaMovement().multiply((double) f, 1.0D, (double) f));
 -                if (this.level().getBlockStatesIfLoaded(this.getBoundingBox().deflate(1.0E-6D)).noneMatch((iblockdata2) -> {
 -                    return iblockdata2.is(BlockTags.FIRE) || iblockdata2.is(Blocks.LAVA);
 -                })) {
-+                this.setDeltaMovement(this.getDeltaMovement().multiply((double) f2, 1.0D, (double) f2));
 +                // Paper start - remove expensive streams from here
 +                boolean noneMatch = true;
 +                AABB fireSearchBox = this.getBoundingBox().deflate(1.0E-6D);
diff --git a/patches/server/0748-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0748-Forward-CraftEntity-in-teleport-command.patch
index e0cb3cccfe..9f2743f0ec 100644
--- a/patches/server/0748-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0748-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index db2a24b668622f68730cc3cafff974272bebe133..90f53767b3bedcfdb5fad41cc407464d2307cc65 100644
+index 84686bb4938d40771a578b475d34b2528bd4fadf..70b9ce108506b636fe33885664806ba8313d15fc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3422,6 +3422,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0772-Freeze-Tick-Lock-API.patch b/patches/server/0772-Freeze-Tick-Lock-API.patch
index 54a0b29df5..f1e5801c54 100644
--- a/patches/server/0772-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0772-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 90f53767b3bedcfdb5fad41cc407464d2307cc65..e0245c5cef697d9cc304fbfc269fc4d1b735c333 100644
+index 70b9ce108506b636fe33885664806ba8313d15fc..b57e6a0698f7e227a398c10a5fbaf28a30d8f4fc 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 {
@@ -46,7 +46,7 @@ index 90f53767b3bedcfdb5fad41cc407464d2307cc65..e0245c5cef697d9cc304fbfc269fc4d1
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 29a8b2bddf4257e74db27bf990c8aa1fd99c341b..c629e03d5281e566050ca22d2c3a16626f7a57cc 100644
+index 843be459302226f7a2b6d02878aebe600e2af5ee..4c49da60cbeec4272fbdbdd47f52ef830863096d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3424,7 +3424,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0804-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0804-fix-player-loottables-running-when-mob-loot-gamerule.patch
index cc357f30fd..34a373a439 100644
--- a/patches/server/0804-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0804-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,14 +5,14 @@ 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 fd93a4bda08882c098b10cb4abeb254a11814957..72da912363681685809aa04cf35f1e5a8f8b93a8 100644
+index 68e7342a72509fb41734ee23638ffb562007ae90..4285510cbe281044376927d94a4e20439bfcf8ec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -916,12 +916,14 @@ public class ServerPlayer extends Player {
                  }
              }
          }
-+        if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper - preserve this check from vanilla
++        if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper - preserve this check from vanilla
          // SPIGOT-5071: manually add player loot tables (SPIGOT-5195 - ignores keepInventory rule)
          this.dropFromLootTable(damageSource, this.lastHurtByPlayerTime > 0);
          for (org.bukkit.inventory.ItemStack item : this.drops) {
diff --git a/patches/server/0805-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0805-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 8701a8c76c..f699934236 100644
--- a/patches/server/0805-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0805-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e0245c5cef697d9cc304fbfc269fc4d1b735c333..a4134d1c6e6ab73c00842bf1c22fd2a2756499e9 100644
+index b57e6a0698f7e227a398c10a5fbaf28a30d8f4fc..eedc3a591d2bce0b5793b2388be92ecb4867b246 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2811,6 +2811,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0806-Guard-against-invalid-entity-positions.patch b/patches/server/0806-Guard-against-invalid-entity-positions.patch
index 9fd4b205c6..73fb0b7c12 100644
--- a/patches/server/0806-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0806-Guard-against-invalid-entity-positions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a4134d1c6e6ab73c00842bf1c22fd2a2756499e9..4deb28538dafced0241c3f8031668b5cc6f24c8d 100644
+index eedc3a591d2bce0b5793b2388be92ecb4867b246..128b3d63ca4d2d373dc988d84174da9c9f180e59 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4427,11 +4427,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0811-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0811-Prevent-tile-entity-copies-loading-chunks.patch
index eab8144f86..772180c58b 100644
--- a/patches/server/0811-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0811-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 912c831ca4c52810ff16d4c8f4659d71347ddfa5..12f6305e15a4339d581c502586cd1ddfdd80c7c5 100644
+index 912c831ca4c52810ff16d4c8f4659d71347ddfa5..52021f110bb873cfedacd874a9d7a74055a537bb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3307,7 +3307,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -15,8 +15,8 @@ index 912c831ca4c52810ff16d4c8f4659d71347ddfa5..12f6305e15a4339d581c502586cd1ddf
 -                    BlockEntity tileentity = this.player.level().getBlockEntity(blockposition);
 +                    // Paper start
 +                    BlockEntity tileentity = null;
-+                    if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.getLevel().isLoadedAndInBounds(blockposition)) {
-+                        tileentity = this.player.level.getBlockEntity(blockposition);
++                    if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.serverLevel().isLoadedAndInBounds(blockposition)) {
++                        tileentity = this.player.level().getBlockEntity(blockposition);
 +                    }
 +                    // Paper end
  
diff --git a/patches/server/0814-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0814-Pass-ServerLevel-for-gamerule-callbacks.patch
index a61f9d0423..02ba46df0c 100644
--- a/patches/server/0814-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0814-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index 9951e999b1440ef623f14bdd46b5e42a90387f1e..91e6161449dc5625331e467d9e837575
  
              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 12f6305e15a4339d581c502586cd1ddfdd80c7c5..4be069e435b63ad2ae4627235977915f7a5ca463 100644
+index 52021f110bb873cfedacd874a9d7a74055a537bb..67c39acfc811eaef9ea58f76c9da9dcb10a031a2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2897,7 +2897,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -26,7 +26,7 @@ index 12f6305e15a4339d581c502586cd1ddfdd80c7c5..4be069e435b63ad2ae4627235977915f
                      if (this.server.isHardcore()) {
                          this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper
 -                        ((GameRules.BooleanValue) this.player.level().getGameRules().getRule(GameRules.RULE_SPECTATORSGENERATECHUNKS)).set(false, this.server);
-+                        ((GameRules.BooleanValue) this.player.level().getGameRules().getRule(GameRules.RULE_SPECTATORSGENERATECHUNKS)).set(false, this.player.getLevel()); // Paper
++                        ((GameRules.BooleanValue) this.player.level().getGameRules().getRule(GameRules.RULE_SPECTATORSGENERATECHUNKS)).set(false, this.player.serverLevel()); // Paper
                      }
                  }
                  break;
diff --git a/patches/server/0821-Add-PlayerStopUsingItemEvent.patch b/patches/server/0821-Add-PlayerStopUsingItemEvent.patch
index c3a25d6c76..569318746b 100644
--- a/patches/server/0821-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0821-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c629e03d5281e566050ca22d2c3a16626f7a57cc..9ee16dc1f425e4f0795eec3dcc18affc70e85a31 100644
+index 4c49da60cbeec4272fbdbdd47f52ef830863096d..452fdec9123d1ee591fa1639b70e9558a07d8f84 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3967,6 +3967,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0824-Do-not-accept-invalid-client-settings.patch b/patches/server/0824-Do-not-accept-invalid-client-settings.patch
index 4f328fa013..bf0cf0e10e 100644
--- a/patches/server/0824-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0824-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4be069e435b63ad2ae4627235977915f7a5ca463..d73563cf84a4d6d7a369dde56b670b9010edfac2 100644
+index 67c39acfc811eaef9ea58f76c9da9dcb10a031a2..7675bb14e02322ea58cfde1dd6837c0ddefdd798 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3449,6 +3449,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0830-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0830-Prevent-entity-loading-causing-async-lookups.patch
index bd020740aa..d04278d8be 100644
--- a/patches/server/0830-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0830-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4deb28538dafced0241c3f8031668b5cc6f24c8d..af3cdef67ca516cfe85dea7580b3e93554350115 100644
+index 128b3d63ca4d2d373dc988d84174da9c9f180e59..ebe74938dced87288339b6b08e2aebed8e448b15 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 {
diff --git a/patches/server/0835-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0835-Add-option-for-strict-advancement-dimension-checks.patch
index 16c70e9447..c95ba56d09 100644
--- a/patches/server/0835-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0835-Add-option-for-strict-advancement-dimension-checks.patch
@@ -11,7 +11,7 @@ distance trigger. This adds a config option to ignore that
 and use the exact dimension key of the worlds involved.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 72da912363681685809aa04cf35f1e5a8f8b93a8..81b6b6f0e74bc3940b211846ed084b545a8c46db 100644
+index 4285510cbe281044376927d94a4e20439bfcf8ec..bde2f86029bced34358517ef65515c6cddbc02eb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1315,6 +1315,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0839-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0839-Prevent-empty-items-from-being-added-to-world.patch
index d1aa944dad..2ded85641e 100644
--- a/patches/server/0839-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0839-Prevent-empty-items-from-being-added-to-world.patch
@@ -19,7 +19,7 @@ index 4e2b2223c90f1e994dcd584dfa570953caf37a55..6369fba72d7bf2db00f7df0642425616
              if (captureDrops != null && entity instanceof net.minecraft.world.entity.item.ItemEntity) {
                  captureDrops.add((net.minecraft.world.entity.item.ItemEntity) entity);
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 998fe14ef28aaaf9246a05d8670c4caa8306c4d1..310a24c1d79541311cfad43fa2bb14867128e7b9 100644
+index 8a2c135ee7c6fe60a2debf7a7b02fb9ffc3d2c2f..b1ae4702d7165794600b257fe8563a4ac48d922c 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -515,7 +515,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0841-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0841-Don-t-print-component-in-resource-pack-rejection-mes.patch
index 2eb5794354..5a5bd60f2a 100644
--- a/patches/server/0841-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0841-Don-t-print-component-in-resource-pack-rejection-mes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d73563cf84a4d6d7a369dde56b670b9010edfac2..fdc03edbdc404d2e6836a5df498f9ebb709675b0 100644
+index 7675bb14e02322ea58cfde1dd6837c0ddefdd798..cb7146db52b59e7d51146d79a1655292e52ab286 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2031,7 +2031,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0844-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0844-Add-various-missing-EntityDropItemEvent-calls.patch
index 992dd9d644..26cf5d22cd 100644
--- a/patches/server/0844-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0844-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index af3cdef67ca516cfe85dea7580b3e93554350115..8fef49ba8a46e4490356efdc9dd4ae8ca255421a 100644
+index ebe74938dced87288339b6b08e2aebed8e448b15..44821989e2a21de518583ddad21bfbd896128fe4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2644,6 +2644,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0845-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0845-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 2efe21c631..0614843ce5 100644
--- a/patches/server/0845-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0845-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 fdc03edbdc404d2e6836a5df498f9ebb709675b0..aa0b2dd0b3be942d1d2ffed08228afb98b7c91f4 100644
+index cb7146db52b59e7d51146d79a1655292e52ab286..3e8d06db9f182ce7a09887f850f4d0a8556e5ae1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2289,7 +2289,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0847-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0847-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index bc81b838f0..0c14e78441 100644
--- a/patches/server/0847-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0847-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 aa0b2dd0b3be942d1d2ffed08228afb98b7c91f4..791f04d75f4d942bc0ef8d04ef4a401161acdc1c 100644
+index 3e8d06db9f182ce7a09887f850f4d0a8556e5ae1..e197c14ff64ef38a2c7a911906c62178b83002fd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2536,7 +2536,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0848-More-Teleport-API.patch b/patches/server/0848-More-Teleport-API.patch
index b11c2fe09a..6e4ed8b2ef 100644
--- a/patches/server/0848-More-Teleport-API.patch
+++ b/patches/server/0848-More-Teleport-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API
 public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 791f04d75f4d942bc0ef8d04ef4a401161acdc1c..d74d9493bb6fd4677aa3244b4b1b26d02f6b5b86 100644
+index e197c14ff64ef38a2c7a911906c62178b83002fd..6c132a65916520ad7c4f09c65aed1ce5d0cc6f49 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1707,11 +1707,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0849-Add-EntityPortalReadyEvent.patch b/patches/server/0849-Add-EntityPortalReadyEvent.patch
index 11c2dac81d..f5b2d0d856 100644
--- a/patches/server/0849-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0849-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8fef49ba8a46e4490356efdc9dd4ae8ca255421a..9ed5882c09e241eaeae258ae15d013d5da98376f 100644
+index 44821989e2a21de518583ddad21bfbd896128fe4..26f339bc8178ed6ced41a1d7a3a0317200c52cb2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3000,6 +3000,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0850-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0850-Don-t-use-level-random-in-entity-constructors.patch
index 532ce1e010..c3f35be4a5 100644
--- a/patches/server/0850-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0850-Don-t-use-level-random-in-entity-constructors.patch
@@ -31,7 +31,7 @@ index ea4ca82388f1526fc5af01f6cc406306d79b7499..f6062bf8c888baeb7b421150a2c64bf1
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 310a24c1d79541311cfad43fa2bb14867128e7b9..6ee24fbe6528f91306a0eb38b766f77b2228b4aa 100644
+index b1ae4702d7165794600b257fe8563a4ac48d922c..00ecef0ba7530ff2533fa9d5eaa8489da8796ead 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -63,7 +63,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0851-Send-block-entities-after-destroy-prediction.patch b/patches/server/0851-Send-block-entities-after-destroy-prediction.patch
index 68a7d2b85f..f6527ac1ca 100644
--- a/patches/server/0851-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0851-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 0f0cf4fdfcbf8537696f15f98f3fb7e68baeb27c..c38268b11dd5a76d5b3c2013c241063c
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d74d9493bb6fd4677aa3244b4b1b26d02f6b5b86..eb3e0bf223d1d2bb5be8c47e79489abda8607d1d 100644
+index 6c132a65916520ad7c4f09c65aed1ce5d0cc6f49..8011128c540f964cebec0b8730a0caffb007c138 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1853,8 +1853,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0857-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0857-Remove-invalid-signature-login-stacktrace.patch
index e355f3ccca..b542de176b 100644
--- a/patches/server/0857-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0857-Remove-invalid-signature-login-stacktrace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eb3e0bf223d1d2bb5be8c47e79489abda8607d1d..f52b01bca1b4221b389b2e980f2f75b0f1eca077 100644
+index 8011128c540f964cebec0b8730a0caffb007c138..ee2043891c04b95fccccbd19c79b91d7b8fcb436 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3584,7 +3584,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch
index eba26ba4da..def4248cf6 100644
--- a/patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0863-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 <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9ee16dc1f425e4f0795eec3dcc18affc70e85a31..de67999120b52daafa4fb40dd32a348f39ce8df3 100644
+index 452fdec9123d1ee591fa1639b70e9558a07d8f84..83d6f3d4981ef0ed418239e134597fa060a79c64 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3034,37 +3034,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch
index 7d90f99b40..2ae4584d34 100644
--- a/patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0880-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 81b6b6f0e74bc3940b211846ed084b545a8c46db..fcd79bb4c231b1c91e6b094d9be90b35835717a6 100644
+index bde2f86029bced34358517ef65515c6cddbc02eb..53d4b897e5b1616133d35fd0df2e4624b76990ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -371,6 +371,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 3e8f8ffefe..137bb8366d 100644
--- a/patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,7 +6,7 @@ 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 9ed5882c09e241eaeae258ae15d013d5da98376f..c588460cb26c4d723428a11fe3d360d81ae39433 100644
+index 26f339bc8178ed6ced41a1d7a3a0317200c52cb2..db17a3b2dcd051b533ca2d5e9ebc081990282daf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3275,6 +3275,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0901-check-global-player-list-where-appropriate.patch b/patches/server/0901-check-global-player-list-where-appropriate.patch
index 35d7c35b5c..c2c99300b2 100644
--- a/patches/server/0901-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0901-check-global-player-list-where-appropriate.patch
@@ -24,7 +24,7 @@ index 83267ae18c606116cf0c0b55549dc732f269a5d7..a97926b5d36c92d5696c6b7a547ada30
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index de67999120b52daafa4fb40dd32a348f39ce8df3..cbe672e213b53b1939ba0dcb2e9640ec16d83807 100644
+index 83d6f3d4981ef0ed418239e134597fa060a79c64..b1565fc7458c72bb8db65ebbf7a069cb26c47ad4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3620,7 +3620,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -32,7 +32,7 @@ index de67999120b52daafa4fb40dd32a348f39ce8df3..cbe672e213b53b1939ba0dcb2e9640ec
  
      public void onItemPickup(ItemEntity item) {
 -        Entity entity = item.getOwner();
-+        Entity entity = item.thrower != null ? this.level.getGlobalPlayerByUUID(item.thrower) : null; // Paper - check all players
++        Entity entity = item.thrower != null ? this.level().getGlobalPlayerByUUID(item.thrower) : null; // Paper - check all players
  
          if (entity instanceof ServerPlayer) {
              CriteriaTriggers.THROWN_ITEM_PICKED_UP_BY_ENTITY.trigger((ServerPlayer) entity, item.getItem(), this);
diff --git a/patches/server/0904-Friction-API.patch b/patches/server/0904-Friction-API.patch
index 60a8da9ebb..cccdb805be 100644
--- a/patches/server/0904-Friction-API.patch
+++ b/patches/server/0904-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 cbe672e213b53b1939ba0dcb2e9640ec16d83807..7a6caded7f5c711e96fa0d6b177923c2a49004e4 100644
+index b1565fc7458c72bb8db65ebbf7a069cb26c47ad4..7afd151aa40754d96846d5bd48acfc61f2c47c87 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -54,7 +54,7 @@ index cbe672e213b53b1939ba0dcb2e9640ec16d83807..7a6caded7f5c711e96fa0d6b177923c2
          if (nbt.contains("Attributes", 9) && this.level() != null && !this.level().isClientSide) {
              this.getAttributes().load(nbt.getList("Attributes", 10));
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 6ee24fbe6528f91306a0eb38b766f77b2228b4aa..d59841d65c76abd740e391cfdba09a0e167ec591 100644
+index 00ecef0ba7530ff2533fa9d5eaa8489da8796ead..3d41dbe0285f8fec8adae1e93010cf464df9b08c 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -54,6 +54,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0907-Sync-offhand-slot-in-menus.patch b/patches/server/0907-Sync-offhand-slot-in-menus.patch
index 3721b4090e..d58c97aaa6 100644
--- a/patches/server/0907-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0907-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 fcd79bb4c231b1c91e6b094d9be90b35835717a6..870963afbe74272bbc67447476631ba84ed8cef2 100644
+index 53d4b897e5b1616133d35fd0df2e4624b76990ad..5fad40fa88f697108e42461c41012d5964ed7d75 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -340,6 +340,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0908-Player-Entity-Tracking-Events.patch b/patches/server/0908-Player-Entity-Tracking-Events.patch
index c7e603e107..003f0b3e13 100644
--- a/patches/server/0908-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0908-Player-Entity-Tracking-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c588460cb26c4d723428a11fe3d360d81ae39433..fc31b564eacfac185434222883fe89e48de59288 100644
+index db17a3b2dcd051b533ca2d5e9ebc081990282daf..bac69ebae072925973f2c1c5cc9f5e1de144dd82 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3997,9 +3997,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0910-Properly-resend-entities.patch b/patches/server/0910-Properly-resend-entities.patch
index a394b38e9d..28f7ca3d1c 100644
--- a/patches/server/0910-Properly-resend-entities.patch
+++ b/patches/server/0910-Properly-resend-entities.patch
@@ -66,7 +66,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..9e7a9e2fc19a0ac7a80a07efacf9cd23
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f52b01bca1b4221b389b2e980f2f75b0f1eca077..9b00b18e5c80c69b0c44299b48cef1937168f38a 100644
+index ee2043891c04b95fccccbd19c79b91d7b8fcb436..d4c683b99bdc8fa76749b8edd1136303f7367101 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2795,7 +2795,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0918-Improve-PortalEvents.patch b/patches/server/0918-Improve-PortalEvents.patch
index c944167ec2..45957ee862 100644
--- a/patches/server/0918-Improve-PortalEvents.patch
+++ b/patches/server/0918-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ 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 fc31b564eacfac185434222883fe89e48de59288..f200a50d09e50fec0005fa7db77c5777e4384504 100644
+index bac69ebae072925973f2c1c5cc9f5e1de144dd82..dd7d0af819e2a3bf6941bbe240e99e76bfe5fcdb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3653,7 +3653,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch
index 76f698efd9..64369d3113 100644
--- a/patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f200a50d09e50fec0005fa7db77c5777e4384504..84c7564c1357cf413c5d3f8b2195265606d94f38 100644
+index dd7d0af819e2a3bf6941bbe240e99e76bfe5fcdb..0be84922c1cf73075f210da511f238acda7be6a0 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 {
diff --git a/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch
index b2c84903bb..eb49640d47 100644
--- a/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9b00b18e5c80c69b0c44299b48cef1937168f38a..da358acebe3286b32af0ea251d9f8297453e3416 100644
+index d4c683b99bdc8fa76749b8edd1136303f7367101..60d1a2ec1f7b800d66f923ae3149db2c6a62691b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2253,7 +2253,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 4d54af0815..06ad63d988 100644
--- a/patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 84c7564c1357cf413c5d3f8b2195265606d94f38..13e22235eccb2456112eb6a5f0e7ccd788379f89 100644
+index 0be84922c1cf73075f210da511f238acda7be6a0..8e5dacfcf4e8a1cb20070d67c7b38a1cc3ccc9bb 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 {
diff --git a/patches/server/0926-Use-single-player-info-update-packet-on-join.patch b/patches/server/0926-Use-single-player-info-update-packet-on-join.patch
index a2d8b27188..8668aa1437 100644
--- a/patches/server/0926-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0926-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index da358acebe3286b32af0ea251d9f8297453e3416..94f9dc6074b93c3c53f46f966763ecfb4cb9f3de 100644
+index 60d1a2ec1f7b800d66f923ae3149db2c6a62691b..9ca6a2e610b6a82286bb617177bec657fbb13c72 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3599,7 +3599,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 6de3ec1964..a3f83b96e6 100644
--- a/patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0927-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 7a6caded7f5c711e96fa0d6b177923c2a49004e4..16e98ca278c9005d7695a73582de2123abb68ac4 100644
+index 7afd151aa40754d96846d5bd48acfc61f2c47c87..5e5221b4613dc04ede1f18a15ca1eb4913187cdb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1592,7 +1592,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch
index 5e6a4c35aa..dcd358c9be 100644
--- a/patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0938-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 16e98ca278c9005d7695a73582de2123abb68ac4..b9ce657ebe12e17a718f83d3575071e1f44e0995 100644
+index 5e5221b4613dc04ede1f18a15ca1eb4913187cdb..a6d730eaee1df1c5c61aa0f8731b8c055080a9a6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2280,7 +2280,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0948-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0948-Treat-sequence-violations-like-they-should-be.patch
index 2ffef6455c..33bf73e6a7 100644
--- a/patches/server/0948-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0948-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 94f9dc6074b93c3c53f46f966763ecfb4cb9f3de..250709d0770b1f2b23eb53f497489631c78a72e4 100644
+index 9ca6a2e610b6a82286bb617177bec657fbb13c72..ed54d3f9ab92b3391d459bcd92b7b00adc6e6238 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2123,6 +2123,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 770aa67aba..fd51cb23be 100644
--- a/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 23e0e6937e28f09271a4ec7c35e0076a576cf3d3..4aa8b483841028fbcc43f9ed47730881
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 250709d0770b1f2b23eb53f497489631c78a72e4..4862d8911d0dc3facaf02fdbb4f17d8c948ec0ca 100644
+index ed54d3f9ab92b3391d459bcd92b7b00adc6e6238..705181a7cc203b7f60d7038d1f341c2d52cec6b1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -296,6 +296,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch
index d7ff74fa14..f7cd642809 100644
--- a/patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch
@@ -9,7 +9,7 @@ Previously, after the entity reloaded, Projectile#getShooter
 would return null, while the entity still had an owner.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 13e22235eccb2456112eb6a5f0e7ccd788379f89..aacd6b18c3cbd49e569496b186a7235857ebeafc 100644
+index 8e5dacfcf4e8a1cb20070d67c7b38a1cc3ccc9bb..1b04bb350e6d561b0a92d121d80fc4a17f0d1c2f 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 {