Merge branch 'master' into misc-fixes

GeyserMC · Mar 3, 2025 · becce3e · becce3e
2 parents c20e8af + ce15359
commit becce3e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -126,6 +126,7 @@
 import org.geysermc.geyser.entity.EntityDefinitions;
 import org.geysermc.geyser.entity.GeyserEntityData;
 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.entity.type.ItemFrameEntity;
 import org.geysermc.geyser.entity.type.Tickable;
@@ -1370,7 +1371,7 @@ public void activateArmAnimationTicking() {
      * You can't break blocks, attack entities, or use items while driving in a boat
      */
     public boolean isHandsBusy() {
-        return steeringRight || steeringLeft;
+        return playerEntity.getVehicle() instanceof BoatEntity && (steeringRight || steeringLeft);
     }
 
     /**

diff --git a/.../geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java b/.../geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java
@@ -78,6 +78,10 @@ public void translate(GeyserSession session, InteractPacket packet) {
                 ServerboundPlayerCommandPacket sneakPacket = new ServerboundPlayerCommandPacket(entity.getEntityId(), PlayerState.START_SNEAKING);
                 session.sendDownstreamGamePacket(sneakPacket);
 
+                // Reset steering to avoid these accidentally triggering session#isHandsBusy
+                session.setSteeringLeft(false);
+                session.setSteeringRight(false);
+
                 Entity currentVehicle = session.getPlayerEntity().getVehicle();
                 if (currentVehicle != null) {
                     session.setMountVehicleScheduledFuture(session.scheduleInEventLoop(() -> {

diff --git a/...ser/translator/protocol/bedrock/entity/player/input/BedrockPlayerAuthInputTranslator.java b/...ser/translator/protocol/bedrock/entity/player/input/BedrockPlayerAuthInputTranslator.java
@@ -39,7 +39,6 @@
 import org.cloudburstmc.protocol.bedrock.packet.LevelEventPacket;
 import org.cloudburstmc.protocol.bedrock.packet.PlayerActionPacket;
 import org.cloudburstmc.protocol.bedrock.packet.PlayerAuthInputPacket;
-import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.entity.EntityDefinitions;
 import org.geysermc.geyser.entity.type.BoatEntity;
 import org.geysermc.geyser.entity.type.Entity;
@@ -168,7 +167,9 @@ public void translate(GeyserSession session, PlayerAuthInputPacket packet) {
                 }
             }
         }
-        if (entity.getVehicle() instanceof BoatEntity) {
+
+        // Only set steering values when the vehicle is a boat and when the client is actually in it
+        if (entity.getVehicle() instanceof BoatEntity && inputData.contains(PlayerAuthInputData.IN_CLIENT_PREDICTED_IN_VEHICLE)) {
             boolean up = inputData.contains(PlayerAuthInputData.UP);
             // Yes. These are flipped. It's always been an issue with Geyser. That's what it's like working with this codebase.
             // Hi random stranger. I am six days into updating for 1.21.3. How's it going?

diff --git a/...java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetPassengersTranslator.java b/...java/org/geysermc/geyser/translator/protocol/java/entity/JavaSetPassengersTranslator.java
@@ -106,6 +106,10 @@ public void translate(GeyserSession session, ClientboundSetPassengersPacket pack
                         session.getMountVehicleScheduledFuture().cancel(false);
                     }
 
+                    // Reset steering to avoid session#isHandsBusy from triggering
+                    session.setSteeringLeft(false);
+                    session.setSteeringRight(false);
+
                     if (entity instanceof ClientVehicle clientVehicle) {
                         clientVehicle.getVehicleComponent().onDismount();
                     }