diff --git a/paper-server/patches/features/0031-Do-not-record-movement-for-vehicles-players-unaffect.patch b/paper-server/patches/features/0031-Do-not-record-movement-for-vehicles-players-unaffect.patch
index 0e1eece0f..ad20395cf 100644
--- a/paper-server/patches/features/0031-Do-not-record-movement-for-vehicles-players-unaffect.patch
+++ b/paper-server/patches/features/0031-Do-not-record-movement-for-vehicles-players-unaffect.patch
@@ -11,7 +11,7 @@ a portal in spectator mode and then later switching to creative mode
 would portal the player.
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5738709f5fa6fee2ed88ba41a7718c976b780e96..882dbb1276c548316938bbc50f5f7e01f8547ff8 100644
+index 366c26b2ca539be189b67d75ae73a587c4102c14..4068132a33f87dd07d6df1033ed11ba16a57313b 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -657,7 +657,7 @@ public class ServerGamePacketListenerImpl
@@ -19,7 +19,7 @@ index 5738709f5fa6fee2ed88ba41a7718c976b780e96..882dbb1276c548316938bbc50f5f7e01
  
                  this.player.serverLevel().getChunkSource().move(this.player);
 -                rootVehicle.recordMovementThroughBlocks(new Vec3(x, y, z), rootVehicle.position());
-+                if (!rootVehicle.isSpectator() && rootVehicle.isAffectedByBlocks()) rootVehicle.recordMovementThroughBlocks(new Vec3(x, y, z), rootVehicle.position());
++                if (!rootVehicle.isSpectator() && rootVehicle.isAffectedByBlocks()) rootVehicle.recordMovementThroughBlocks(new Vec3(x, y, z), rootVehicle.position()); // Paper - Do not record movement for vehicles/players unaffected by blocks
                  Vec3 vec3 = new Vec3(rootVehicle.getX() - x, rootVehicle.getY() - y, rootVehicle.getZ() - z);
                  this.handlePlayerKnownMovement(vec3);
                  rootVehicle.setOnGroundWithMovement(packet.onGround(), vec3);
@@ -28,7 +28,7 @@ index 5738709f5fa6fee2ed88ba41a7718c976b780e96..882dbb1276c548316938bbc50f5f7e01
                                  this.player.setOnGroundWithMovement(packet.isOnGround(), packet.horizontalCollision(), vec3);
                                  this.player.doCheckFallDamage(vec3.x, vec3.y, vec3.z, packet.isOnGround());
 -                                this.player.recordMovementThroughBlocks(new Vec3(x, y, z), this.player.position());
-+                                if (!this.player.isSpectator() && this.player.isAffectedByBlocks()) this.player.recordMovementThroughBlocks(new Vec3(x, y, z), this.player.position());
++                                if (!this.player.isSpectator() && this.player.isAffectedByBlocks()) this.player.recordMovementThroughBlocks(new Vec3(x, y, z), this.player.position()); // Paper - Do not record movement for vehicles/players unaffected by blocks
                                  this.handlePlayerKnownMovement(vec3);
                                  if (flag) {
                                      this.player.resetFallDistance();