Merge remote-tracking branch 'upstream/master'

Shanwer · Aug 31, 2024 · 0a212e2 · 0a212e2
2 parents 1bce3e0 + 63e60bc
commit 0a212e2
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/...eysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java b/...eysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java
@@ -58,6 +58,14 @@ public void translate(GeyserSession session, MovePlayerPacket packet) {
             session.confirmTeleport(packet.getPosition().toDouble().sub(0, EntityDefinitions.PLAYER.offset(), 0));
             return;
         }
+
+        if (entity.getBedPosition() != null) {
+            // https://github.com/GeyserMC/Geyser/issues/5001
+            // Bedrock 1.20.22 started sending a MovePlayerPacket as soon as it got into a bed.
+            // This trips up Fabric.
+            return;
+        }
+
         float yaw = packet.getRotation().getY();
         float pitch = packet.getRotation().getX();
         float headYaw = packet.getRotation().getY();