Various improvements to movement, teleport, collisions (#5703)

* Initial work.

* Fixed keep velocity desync.

* More work.

* More work.

* Fix this comment.

* Little oopsie.

* Save player motion when updating rotation.

* Implement ROTATE_DELTA.

* More work.

* Fixed void floor properly.

* Always set isOnGround to false if near the void floor.

* Fixed collision correction.

* Also use recalculate position method for this one.

* Make no clip void conditional.

* Update core/src/main/java/org/geysermc/geyser/session/cache/TeleportCache.java

Co-authored-by: chris <[email protected]>

* Some changes.

* Fix: Collision check, there's more than one bamboo/dripstone block state, and minor touchups

* Use Math.toRadians.

* Oops, make this compile.

* Specify the teleportation cause.

* Only specify the teleport cause if mode is teleport.

---------

Co-authored-by: chris <[email protected]>

Author: oryxel1

core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java

@@ -204,16 +204,15 @@ public void moveAbsolute(Vector3f position, float yaw, float pitch, float headYa
         movePlayerPacket.setPosition(this.position);
         movePlayerPacket.setRotation(getBedrockRotation());
         movePlayerPacket.setOnGround(isOnGround);
-        movePlayerPacket.setMode(teleported ? MovePlayerPacket.Mode.TELEPORT : MovePlayerPacket.Mode.NORMAL);
-
-        if (teleported) {
-            movePlayerPacket.setTeleportationCause(MovePlayerPacket.TeleportationCause.UNKNOWN);
+        movePlayerPacket.setMode(this instanceof SessionPlayerEntity || teleported ? MovePlayerPacket.Mode.TELEPORT : MovePlayerPacket.Mode.NORMAL);
+        if (movePlayerPacket.getMode() == MovePlayerPacket.Mode.TELEPORT) {
+            movePlayerPacket.setTeleportationCause(MovePlayerPacket.TeleportationCause.BEHAVIOR);
         }
 
         session.sendUpstreamPacket(movePlayerPacket);
 
-        if (teleported) {
-            // As of 1.19.0, head yaw seems to be ignored during teleports.
+        if (teleported && !(this instanceof SessionPlayerEntity)) {
+            // As of 1.19.0, head yaw seems to be ignored during teleports, also don't do this for session player.
             updateHeadLookRotation(headYaw);
         }
 
@@ -239,17 +238,21 @@ public void moveRelative(double relX, double relY, double relZ, float yaw, float
         movePlayerPacket.setPosition(position);
         movePlayerPacket.setRotation(getBedrockRotation());
         movePlayerPacket.setOnGround(isOnGround);
-        movePlayerPacket.setMode(MovePlayerPacket.Mode.NORMAL);
+        movePlayerPacket.setMode(this instanceof SessionPlayerEntity ? MovePlayerPacket.Mode.TELEPORT : MovePlayerPacket.Mode.NORMAL);
         // If the player is moved while sleeping, we have to adjust their y, so it appears
         // correctly on Bedrock. This fixes GSit's lay.
         if (getFlag(EntityFlag.SLEEPING)) {
             if (bedPosition != null && (bedPosition.getY() == 0 || bedPosition.distanceSquared(position.toInt()) > 4)) {
                 // Force the player movement by using a teleport
                 movePlayerPacket.setPosition(Vector3f.from(position.getX(), position.getY() - definition.offset() + 0.2f, position.getZ()));
                 movePlayerPacket.setMode(MovePlayerPacket.Mode.TELEPORT);
-                movePlayerPacket.setTeleportationCause(MovePlayerPacket.TeleportationCause.UNKNOWN);
             }
         }
+
+        if (movePlayerPacket.getMode() == MovePlayerPacket.Mode.TELEPORT) {
+            movePlayerPacket.setTeleportationCause(MovePlayerPacket.TeleportationCause.BEHAVIOR);
+        }
+
         session.sendUpstreamPacket(movePlayerPacket);
         if (leftParrot != null) {
             leftParrot.moveRelative(relX, relY, relZ, yaw, pitch, headYaw, true);

core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java

@@ -36,14 +36,14 @@
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
 import org.cloudburstmc.protocol.bedrock.packet.MovePlayerPacket;
+import org.cloudburstmc.protocol.bedrock.packet.SetEntityMotionPacket;
 import org.cloudburstmc.protocol.bedrock.packet.UpdateAttributesPacket;
 import org.geysermc.geyser.entity.EntityDefinitions;
 import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
 import org.geysermc.geyser.entity.type.BoatEntity;
 import org.geysermc.geyser.entity.type.Entity;
 import org.geysermc.geyser.inventory.GeyserItemStack;
 import org.geysermc.geyser.item.Items;
-import org.geysermc.geyser.level.BedrockDimension;
 import org.geysermc.geyser.level.block.Blocks;
 import org.geysermc.geyser.level.block.property.Properties;
 import org.geysermc.geyser.level.block.type.BlockState;
@@ -117,15 +117,6 @@ public class SessionPlayerEntity extends PlayerEntity {
     @Getter @Setter
     private Vector2f bedrockInteractRotation = Vector2f.ZERO;
 
-    /**
-     * Determines if our position is currently out-of-sync with the Java server
-     * due to our workaround for the void floor
-     * <p>
-     * Must be reset when dying, switching worlds, or being teleported out of the void
-     */
-    @Getter @Setter
-    private boolean voidPositionDesynched;
-
     public SessionPlayerEntity(GeyserSession session) {
         super(session, -1, 1, null, Vector3f.ZERO, Vector3f.ZERO, 0, 0, 0, null, null);
 
@@ -152,29 +143,18 @@ public void spawnEntity() {
 
     @Override
     public void moveRelative(double relX, double relY, double relZ, float yaw, float pitch, float headYaw, boolean isOnGround) {
-        if (voidPositionDesynched) {
-            if (!isBelowVoidFloor()) {
-                voidPositionDesynched = false; // No need to fix our offset; we've been moved
-            }
-        }
         super.moveRelative(relX, relY, relZ, yaw, pitch, headYaw, isOnGround);
         session.getCollisionManager().updatePlayerBoundingBox(this.position.down(definition.offset()));
     }
 
-    @Override
-    public void moveAbsolute(Vector3f position, float yaw, float pitch, float headYaw, boolean isOnGround, boolean teleported) {
-        if (voidPositionDesynched) {
-            if (!isBelowVoidFloor()) {
-                voidPositionDesynched = false; // No need to fix our offset; we've been moved
-            }
-        }
-        super.moveAbsolute(position, yaw, pitch, headYaw, isOnGround, teleported);
-    }
-
     @Override
     public void setPosition(Vector3f position) {
         if (valid) { // Don't update during session init
             session.getCollisionManager().updatePlayerBoundingBox(position);
+
+            if (session.isNoClip() && position.getY() >= session.getBedrockDimension().minY() - 5) {
+                session.setNoClip(false);
+            }
         }
         this.position = position.add(0, definition.offset(), 0);
     }
@@ -200,6 +180,12 @@ public void updateOwnRotation(float yaw, float pitch, float headYaw) {
         movePlayerPacket.setTeleportationCause(MovePlayerPacket.TeleportationCause.BEHAVIOR);
 
         session.sendUpstreamPacket(movePlayerPacket);
+
+        // We're just setting rotation, player shouldn't lose motion, send motion packet to account for that.
+        SetEntityMotionPacket entityMotionPacket = new SetEntityMotionPacket();
+        entityMotionPacket.setRuntimeEntityId(geyserId);
+        entityMotionPacket.setMotion(motion);
+        session.sendUpstreamPacket(entityMotionPacket);
     }
 
     /**
@@ -211,6 +197,11 @@ public void updateOwnRotation(float yaw, float pitch, float headYaw) {
      */
     public void setPositionManual(Vector3f position) {
         this.position = position;
+
+        // Player is "above" the void so they're not supposed to no clip.
+        if (session.isNoClip() && position.getY() - EntityDefinitions.PLAYER.offset() >= session.getBedrockDimension().minY() - 5) {
+            session.setNoClip(false);
+        }
     }
 
     /**
@@ -360,9 +351,6 @@ public void setLastDeathPosition(@Nullable GlobalPos pos) {
         } else {
             dirtyMetadata.put(EntityDataTypes.PLAYER_HAS_DIED, false);
         }
-
-        // We're either respawning or switching worlds, either way, we are no longer desynched
-        this.setVoidPositionDesynched(false);
     }
 
     @Override
@@ -448,51 +436,7 @@ public void setVehicle(Entity entity) {
 
         super.setVehicle(entity);
     }
-
-    private boolean isBelowVoidFloor() {
-        return position.getY() < voidFloorPosition();
-    }
-
-    public int voidFloorPosition() {
-        // The void floor is offset about 40 blocks below the bottom of the world
-        BedrockDimension bedrockDimension = session.getBedrockDimension();
-        return bedrockDimension.minY() - 40;
-    }
-
-    /**
-     * This method handles teleporting the player below or above the Bedrock void floor.
-     * The Java server should never see this desync as we adjust the position that we send to it
-     *
-     * @param up in which direction to teleport - true to resync our position, or false to be
-     *           teleported below the void floor.
-     */
-    public void teleportVoidFloorFix(boolean up) {
-        // Safety to avoid double teleports
-        if ((voidPositionDesynched && !up) || (!voidPositionDesynched && up)) {
-            return;
-        }
-
-        // Work around there being a floor at the bottom of the world and teleport the player below it
-        // Moving from below to above the void floor works fine
-        Vector3f newPosition = this.getPosition();
-        if (up) {
-            newPosition = newPosition.up(4f);
-            voidPositionDesynched = false;
-        } else {
-            newPosition = newPosition.down(4f);
-            voidPositionDesynched = true;
-        }
-
-        this.setPositionManual(newPosition);
-        MovePlayerPacket movePlayerPacket = new MovePlayerPacket();
-        movePlayerPacket.setRuntimeEntityId(geyserId);
-        movePlayerPacket.setPosition(newPosition);
-        movePlayerPacket.setRotation(getBedrockRotation());
-        movePlayerPacket.setMode(MovePlayerPacket.Mode.TELEPORT);
-        movePlayerPacket.setTeleportationCause(MovePlayerPacket.TeleportationCause.BEHAVIOR);
-        session.sendUpstreamPacketImmediately(movePlayerPacket);
-    }
-
+  
     /**
      * Used to calculate player jumping velocity for ground status calculation.
      */

core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java

@@ -34,7 +34,7 @@
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
-import org.cloudburstmc.protocol.bedrock.packet.MovePlayerPacket;
+import org.cloudburstmc.protocol.bedrock.packet.UpdateClientInputLocksPacket;
 import org.geysermc.erosion.util.BlockPositionIterator;
 import org.geysermc.geyser.entity.EntityDefinitions;
 import org.geysermc.geyser.entity.type.player.PlayerEntity;
@@ -166,7 +166,7 @@ public BoundingBox getActiveBoundingBox() {
         }
         // We need to parse the float as a string since casting a float to a double causes us to
         // lose precision and thus, causes players to get stuck when walking near walls
-        double javaY = bedrockPosition.getY() - EntityDefinitions.PLAYER.offset();
+        double javaY = Double.parseDouble(Float.toString(bedrockPosition.getY() - EntityDefinitions.PLAYER.offset()));
 
         Vector3d position = Vector3d.from(Double.parseDouble(Float.toString(bedrockPosition.getX())), javaY,
                 Double.parseDouble(Float.toString(bedrockPosition.getZ())));
@@ -197,18 +197,19 @@ public BoundingBox getActiveBoundingBox() {
             return null;
         }
 
-        position = playerBoundingBox.getBottomCenter();
-
         boolean newOnGround = adjustedMovement.getY() != movement.getY() && movement.getY() < 0 || onGround;
         // Send corrected position to Bedrock if they differ by too much to prevent de-syncs
-        if (onGround != newOnGround || movement.distanceSquared(adjustedMovement) > INCORRECT_MOVEMENT_THRESHOLD) {
+        if (onGround != newOnGround || position.distanceSquared(playerBoundingBox.getBottomCenter()) > INCORRECT_MOVEMENT_THRESHOLD) {
             PlayerEntity playerEntity = session.getPlayerEntity();
             // Client will dismount if on a vehicle
             if (playerEntity.getVehicle() == null && pistonCache.getPlayerMotion().equals(Vector3f.ZERO) && !pistonCache.isPlayerSlimeCollision()) {
-                playerEntity.moveAbsolute(position.toFloat(), playerEntity.getYaw(), playerEntity.getPitch(), playerEntity.getHeadYaw(), onGround, true);
+                recalculatePosition();
+                return null;
             }
         }
 
+        position = playerBoundingBox.getBottomCenter();
+
         if (!newOnGround) {
             // Trim the position to prevent rounding errors that make Java think we are clipping into a block
             position = Vector3d.from(position.getX(), Double.parseDouble(DECIMAL_FORMAT.format(position.getY())), position.getZ());
@@ -217,18 +218,14 @@ public BoundingBox getActiveBoundingBox() {
         return new CollisionResult(position, TriState.byBoolean(onGround));
     }
 
-    // TODO: This makes the player look upwards for some reason, rotation values must be wrong
     public void recalculatePosition() {
         PlayerEntity entity = session.getPlayerEntity();
-        // Gravity might need to be reset...
-        entity.updateBedrockMetadata(); // TODO may not be necessary
-
-        MovePlayerPacket movePlayerPacket = new MovePlayerPacket();
-        movePlayerPacket.setRuntimeEntityId(entity.getGeyserId());
-        movePlayerPacket.setPosition(entity.getPosition());
-        movePlayerPacket.setRotation(entity.getBedrockRotation());
-        movePlayerPacket.setMode(MovePlayerPacket.Mode.NORMAL);
-        session.sendUpstreamPacket(movePlayerPacket);
+
+        // This does the job and won't interrupt velocity + rotation.
+        UpdateClientInputLocksPacket inputLocksPacket = new UpdateClientInputLocksPacket();
+        inputLocksPacket.setLockComponentData(0); // Don't actually lock anything.
+        inputLocksPacket.setServerPosition(entity.getPosition());
+        session.sendUpstreamPacket(inputLocksPacket);
     }
 
     public BlockPositionIterator collidableBlocksIterator(BoundingBox box) {
@@ -280,7 +277,15 @@ public boolean correctPlayerPosition() {
 
         // Main correction code
         for (iter.reset(); iter.hasNext(); iter.next()) {
-            BlockCollision blockCollision = BlockUtils.getCollision(blocks[iter.getIteration()]);
+            final int blockId = blocks[iter.getIteration()];
+
+            // These block have different offset between BE and JE so we ignore them because if we "correct" the position
+            // it will lead to complication and more inaccurate movement.
+            if (session.getBlockMappings().getCollisionIgnoredBlocks().contains(blockId)) {
+                continue;
+            }
+
+            BlockCollision blockCollision = BlockUtils.getCollision(blockId);
             if (blockCollision != null) {
                 if (!blockCollision.correctPosition(session, iter.getX(), iter.getY(), iter.getZ(), playerBoundingBox)) {
                     return false;

core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java

@@ -32,6 +32,7 @@
 import com.google.common.collect.Interners;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -243,6 +244,7 @@ private static void registerBedrockBlocks() {
                     .toList();
             Map<Block, NbtMap> flowerPotBlocks = new Object2ObjectOpenHashMap<>();
             Map<NbtMap, BlockDefinition> itemFrames = new Object2ObjectOpenHashMap<>();
+            IntArrayList collisionIgnoredBlocks = new IntArrayList();
 
             Set<BlockDefinition> jigsawDefinitions = new ObjectOpenHashSet<>();
             Map<String, BlockDefinition> structureBlockDefinitions = new Object2ObjectOpenHashMap<>();
@@ -308,6 +310,10 @@ private static void registerBedrockBlocks() {
                     netherPortalBlockDefinition = bedrockDefinition;
                 }
 
+                if (block == Blocks.BAMBOO || block == Blocks.POINTED_DRIPSTONE) {
+                    collisionIgnoredBlocks.add(javaRuntimeId);
+                }
+
                 boolean waterlogged = blockState.getValue(Properties.WATERLOGGED, false)
                         || block == Blocks.BUBBLE_COLUMN || block == Blocks.KELP || block == Blocks.KELP_PLANT
                         || block == Blocks.SEAGRASS || block == Blocks.TALL_SEAGRASS;
@@ -326,6 +332,8 @@ private static void registerBedrockBlocks() {
                 javaToBedrockBlocks[javaRuntimeId] = bedrockDefinition;
             }
 
+            builder.collisionIgnoredBlocks(collisionIgnoredBlocks);
+
             if (commandBlockDefinition == null) {
                 throw new AssertionError("Unable to find command block in palette");
             }

core/src/main/java/org/geysermc/geyser/registry/type/BlockMappings.java

@@ -26,6 +26,7 @@
 package org.geysermc.geyser.registry.type;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import lombok.Builder;
 import lombok.Value;
@@ -66,6 +67,8 @@ public class BlockMappings implements DefinitionRegistry<BlockDefinition> {
     BlockDefinition mobSpawnerBlock;
     BlockDefinition netherPortalBlock;
 
+    IntArrayList collisionIgnoredBlocks;
+
     Map<NbtMap, BlockDefinition> itemFrames;
     Map<Block, NbtMap> flowerPotBlocks;