diff --git a/patches/server/0684-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0684-Detail-more-information-in-watchdog-dumps.patch
index 8be8e03bd7..55d94a8ea5 100644
--- a/patches/server/0684-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0684-Detail-more-information-in-watchdog-dumps.patch
@@ -122,7 +122,7 @@ index 418bf659d31c5810d786064a76779cfa39943020..f8bcf1239c18a6334936cec483f2ae31
  
      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 fe750fd202f9a2a02f07752a11b1a4a8368afa5e..eb9f56de921edfefc0655be47449ffbc97145e07 100644
+index fe750fd202f9a2a02f07752a11b1a4a8368afa5e..6b428686941a7fd6644ca1d08ca14e8bb3cef54b 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 {
@@ -168,8 +168,8 @@ index fe750fd202f9a2a02f07752a11b1a4a8368afa5e..eb9f56de921edfefc0655be47449ffbc
          if (this.noPhysics) {
              this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
          } else {
-@@ -1187,6 +1222,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                 return false;
+@@ -1161,6 +1196,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+                 this.level().getProfiler().pop();
              }
          }
 +        // Paper start - detailed watchdog information
@@ -181,7 +181,7 @@ index fe750fd202f9a2a02f07752a11b1a4a8368afa5e..eb9f56de921edfefc0655be47449ffbc
 +        // Paper end - detailed watchdog information
      }
  
-     protected boolean isHorizontalCollisionMinor(Vec3 adjustedMovement) {
+     private boolean isStateClimbable(BlockState state) {
 @@ -4197,7 +4239,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
diff --git a/patches/server/0714-Update-head-rotation-in-missing-places.patch b/patches/server/0714-Update-head-rotation-in-missing-places.patch
index b5d7fa154b..f0f3a534a2 100644
--- a/patches/server/0714-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0714-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb9f56de921edfefc0655be47449ffbc97145e07..d776c95e7c0752cdfcc44fb17509d5dc8605d8a8 100644
+index 6b428686941a7fd6644ca1d08ca14e8bb3cef54b..6349845508772092ac91919063a97c6d605d2a64 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1870,6 +1870,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0723-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0723-don-t-attempt-to-teleport-dead-entities.patch
index 6dc8b6884a..bdc7e2e2b2 100644
--- a/patches/server/0723-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0723-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d776c95e7c0752cdfcc44fb17509d5dc8605d8a8..6068d70f5eb566396d8c6bf6137e2c6cf21e33cf 100644
+index 6349845508772092ac91919063a97c6d605d2a64..19fe9bc6f4eafb18f8f215a24d8bcd52627cabf0 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 {
diff --git a/patches/server/0735-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0735-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index b8de158fc0..19ca972a91 100644
--- a/patches/server/0735-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0735-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1215,7 +1215,7 @@ 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 6068d70f5eb566396d8c6bf6137e2c6cf21e33cf..3f3be1147ef75918eeb3004fe191e40f59fec754 100644
+index 19fe9bc6f4eafb18f8f215a24d8bcd52627cabf0..0309fb9418c8436953d536036895df532da0b9dd 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 {
@@ -1268,42 +1268,16 @@ index 6068d70f5eb566396d8c6bf6137e2c6cf21e33cf..3f3be1147ef75918eeb3004fe191e40f
                      if (this.remainingFireTicks <= 0) {
                          this.setRemainingFireTicks(-this.getFireImmuneTicks());
                      }
-@@ -1193,33 +1228,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1193,7 +1228,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      this.setRemainingFireTicks(-this.getFireImmuneTicks());
                  }
  
 -                this.level().getProfiler().pop();
--            }
--        }
--    }
--
--    private boolean isStateClimbable(BlockState state) {
--        return state.is(BlockTags.CLIMBABLE) || state.is(Blocks.POWDER_SNOW);
--    }
--
--    private boolean vibrationAndSoundEffectsFromBlock(BlockPos pos, BlockState state, boolean playSound, boolean emitEvent, Vec3 movement) {
--        if (state.isAir()) {
--            return false;
--        } else {
--            boolean flag2 = this.isStateClimbable(state);
--
--            if ((this.onGround() || flag2 || this.isCrouching() && movement.y == 0.0D || this.isOnRails()) && !this.isSwimming()) {
--                if (playSound) {
--                    this.walkingStepSound(pos, state);
--                }
--
--                if (emitEvent) {
--                    this.level().gameEvent(GameEvent.STEP, this.position(), GameEvent.Context.of(this, state));
--                }
--
--                return true;
--            } else {
--                return false;
 +                this.level.getProfiler().pop();
              }
          }
          // Paper start - detailed watchdog information
-@@ -1359,32 +1368,78 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1359,32 +1394,78 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Vec3 collide(Vec3 movement) {
@@ -1403,7 +1377,7 @@ index 6068d70f5eb566396d8c6bf6137e2c6cf21e33cf..3f3be1147ef75918eeb3004fe191e40f
      }
  
      public static Vec3 collideBoundingBox(@Nullable Entity entity, Vec3 movement, AABB entityBoundingBox, Level world, List<VoxelShape> collisions) {
-@@ -2578,11 +2633,31 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2578,11 +2659,31 @@ 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/0741-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0741-Forward-CraftEntity-in-teleport-command.patch
index d2fcdcaedc..53ca058cac 100644
--- a/patches/server/0741-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0741-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 3f3be1147ef75918eeb3004fe191e40f59fec754..8cddb06848f7c83adde884549a94c99379ed7465 100644
+index 0309fb9418c8436953d536036895df532da0b9dd..67071108e3c454951382de6c9817fd4ce3f7d377 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3396,6 +3396,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3422,6 +3422,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index 3f3be1147ef75918eeb3004fe191e40f59fec754..8cddb06848f7c83adde884549a94c993
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3477,10 +3484,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3503,10 +3510,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit
                          ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit
                      }