Unify AvatarEntity offset handling, address clanker reviews

Author: onebeastchris

core/src/main/java/org/geysermc/geyser/entity/type/Entity.java

@@ -104,7 +104,7 @@ public class Entity implements GeyserEntity {
 
     protected Vector3f position;
     protected Vector3f motion;
-    protected float offset;
+    private float offset;
 
     /**
      * x = Yaw, y = Pitch, z = HeadYaw
@@ -701,6 +701,7 @@ public Vector3f bedrockRotation() {
      * Gets the Bedrock edition position with the offset applied
      */
     public Vector3f bedrockPosition() {
+        float offset = getOffset();
         if (offset == 0f) {
             return position;
         }

core/src/main/java/org/geysermc/geyser/entity/type/living/merchant/VillagerEntity.java

@@ -154,7 +154,7 @@ public void moveRelativeRaw(double relX, double relY, double relZ, float yaw, fl
         MoveEntityAbsolutePacket moveEntityPacket = new MoveEntityAbsolutePacket();
         moveEntityPacket.setRuntimeEntityId(geyserId);
         moveEntityPacket.setRotation(Vector3f.from(0, 0, bedRotation));
-        moveEntityPacket.setPosition(Vector3f.from(position.getX() + xOffset, position.getY() + offset, position.getZ() + zOffset));
+        moveEntityPacket.setPosition(Vector3f.from(position.getX() + xOffset, position.getY() + getOffset(), position.getZ() + zOffset));
         moveEntityPacket.setOnGround(isOnGround);
         moveEntityPacket.setTeleported(false);
         session.sendUpstreamPacket(moveEntityPacket);

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

@@ -349,12 +349,12 @@ public void setDimensionsFromPose(Pose pose) {
     }
 
     @Override
-    public Vector3f bedrockPosition() {
-        // Don't apply the full bedrock y offset when le player is sleeping
+    public float getOffset() {
+        // Don't apply the full bedrock y offset when the player is sleeping
         if (bedPosition != null && getFlag(EntityFlag.SLEEPING)) {
-            return position.up(0.2f);
+            return 0.2f;
         }
-        return super.bedrockPosition();
+        return super.getOffset();
     }
 
     public @Nullable String getSkinId() {

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

@@ -172,7 +172,7 @@ public void setYaw(float yaw) {
     public Vector3f bedrockPosition() {
         TeleportCache unconfirmedTeleport = session.getUnconfirmedTeleport();
         if (unconfirmedTeleport != null) {
-            return unconfirmedTeleport.getAdjustedPosition().up(EntityDefinitions.PLAYER.offset());
+            return unconfirmedTeleport.getAdjustedPosition().up(getOffset());
         }
         return super.bedrockPosition();
     }
@@ -232,13 +232,11 @@ public void updateOwnRotation(float yaw, float pitch, float headYaw) {
      * @param position the new position of the Bedrock player
      */
     public void setPositionFromBedrockPos(Vector3f position) {
-        // Special handling: position while sleeping
-        if (bedPosition != null && getFlag(EntityFlag.SLEEPING)) {
-            this.position = position.down(0.2f);
-        } else if (this.vehicle != null) {
+        if (this.vehicle != null) {
             this.position = position.down(this.vehicle.getOffset());
         } else {
-            this.position = position.down(offset);
+            // getOffset will also account for a reduced offset (0.2) when sleeping
+            this.position = position.down(getOffset());
         }
 
         // Player is "above" the void so they're not supposed to no clip.

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

@@ -467,7 +467,7 @@ public Vector3f adjustPositionForBedrock(Vector3f position) {
         // Checks for Bedrock collision differences and adjust the position sent to Bedrock if needed
         // For example: Java teleports to 72.875 on top of a chest, but Bedrock believes chests are 72.95 high... so we fall through instead
         // ...which leads the server to teleport again, et voila.
-        BoundingBox playerBox = session.getCollisionManager().getPlayerBoundingBox().clone();
+        BoundingBox playerBox = playerBoundingBox.clone();
         playerBox.setMiddleX(position.getX());
         playerBox.setMiddleY(position.getY() + (playerBox.getSizeY() / 2.0));
         playerBox.setMiddleZ(position.getZ());

core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerPositionTranslator.java

@@ -135,7 +135,7 @@ public void translate(GeyserSession session, ClientboundPlayerPositionPacket pac
         TeleportCache.TeleportType type = (deltaMovement.distanceSquared(Vector3f.ZERO) > 1.0E-8F) ?
             TeleportCache.TeleportType.KEEP_VELOCITY : TeleportCache.TeleportType.NORMAL;
 
-        // We need to set the unconfirmed teleport to ensure we use the proper Bedrock position in moveAbsolute (see SessionPlayerEntity#adjustPositionForBedrock)
+        // Set the unconfirmed teleport to ensure we send the adjusted Bedrock position in moveAbsolute (see CollisionManager#adjustPositionForBedrock)
         session.setUnconfirmedTeleport(new TeleportCache(session, teleportDestination, deltaMovement, newPitch, newYaw, teleportId, type));
         entity.moveAbsolute(teleportDestination, newYaw, newPitch, false, true);