Merge branch 'master' into fix/chest-collisions

Author: onebeastchris

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

@@ -510,6 +510,9 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
     @Setter
     private Vector3i lastInteractionBlockPosition = Vector3i.ZERO;
 
+    @Setter
+    private int lastInteractionBlockFace = -1;
+
     /**
      * Stores the Java position of the player the last time they interacted.
      * Used to verify that the player did not move since their last interaction. <br>

core/src/main/java/org/geysermc/geyser/session/cache/waypoint/WaypointCache.java

@@ -66,7 +66,12 @@ public void handlePacket(ClientboundTrackedWaypointPacket packet) {
     }
 
     public void addEntity(Entity entity) {
-        GeyserWaypoint waypoint = waypoints.get(entity.uuid().toString());
+        UUID uuid = entity.uuid();
+        if (uuid == null) {
+            return;
+        }
+
+        GeyserWaypoint waypoint = waypoints.get(uuid.toString());
         if (waypoint != null) {
             // On 1.26.0 and below:
             // This will remove the fake player packet previously sent to the client,
@@ -91,7 +96,12 @@ public void addEntity(Entity entity) {
     }
 
     public void removeEntity(Entity entity) {
-        GeyserWaypoint waypoint = waypoints.get(entity.uuid().toString());
+        UUID uuid = entity.uuid();
+        if (uuid == null) {
+            return;
+        }
+
+        GeyserWaypoint waypoint = waypoints.get(uuid.toString());
         if (waypoint != null) {
             // On 1.26.0 and below:
             // This will remove the player packet previously sent to the client,

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockInventoryTransactionTranslator.java

@@ -193,9 +193,12 @@ public void translate(GeyserSession session, InventoryTransactionPacket packet)
                         // Check to make sure the client isn't spamming interaction
                         // Based on Nukkit 1.0, with changes to ensure holding down still works
                         boolean hasAlreadyClicked = System.currentTimeMillis() - session.getLastInteractionTime() < 110.0 &&
-                                packetBlockPosition.distanceSquared(session.getLastInteractionBlockPosition()) < 0.00001;
+                                packetBlockPosition.distanceSquared(session.getLastInteractionBlockPosition()) < 0.00001 &&
+                                packet.getBlockFace() == session.getLastInteractionBlockFace();
                         session.setLastInteractionBlockPosition(packetBlockPosition);
                         session.setLastInteractionPlayerPosition(session.getPlayerEntity().position());
+                        session.setLastInteractionBlockFace(packet.getBlockFace());
+
                         if (hasAlreadyClicked) {
                             session.getPlayerInventoryHolder().updateSlot(session.getPlayerInventory().getOffsetForHotbar(packet.getHotbarSlot()));
                             break;
@@ -236,9 +239,13 @@ public void translate(GeyserSession session, InventoryTransactionPacket packet)
                             return;
                         }
 
-                        double clickPositionFullX = (double) packetBlockPosition.getX() + (double) packet.getClickPosition().getX();
-                        double clickPositionFullY = (double) packetBlockPosition.getY() + (double) packet.getClickPosition().getY();
-                        double clickPositionFullZ = (double) packetBlockPosition.getZ() + (double) packet.getClickPosition().getZ();
+                        float cursorX = fixCursorValue(packet.getClickPosition().getX());
+                        float cursorY = fixCursorValue(packet.getClickPosition().getY());
+                        float cursorZ = fixCursorValue(packet.getClickPosition().getZ());
+
+                        double clickPositionFullX = (double) packetBlockPosition.getX() + (double) cursorX;
+                        double clickPositionFullY = (double) packetBlockPosition.getY() + (double) cursorY;
+                        double clickPositionFullZ = (double) packetBlockPosition.getZ() + (double) cursorZ;
 
                         Vector3f blockCenter = Vector3f.from(packetBlockPosition.getX() + 0.5f, packetBlockPosition.getY() + 0.5f, packetBlockPosition.getZ() + 0.5f);
 
@@ -281,7 +288,7 @@ public void translate(GeyserSession session, InventoryTransactionPacket packet)
                                 packet.getBlockPosition(),
                                 Direction.getUntrusted(packet, InventoryTransactionPacket::getBlockFace).mcpl(),
                                 Hand.MAIN_HAND,
-                                packet.getClickPosition().getX(), packet.getClickPosition().getY(), packet.getClickPosition().getZ(),
+                                cursorX, cursorY, cursorZ,
                                 false,
                                 false,
                                 sequence);
@@ -606,4 +613,28 @@ private boolean useItem(GeyserSession session, InventoryTransactionPacket packet
         session.useItem(Hand.MAIN_HAND, useTouchRotation);
         return true;
     }
+
+    /*
+     * In Bedrock Edition behavior(scaffolding-style bridging), the cursor position (packet.getClickPosition())
+     * is based on the player's foot position.
+     *
+     * When performing speed bridging (running/jumping while placing blocks), if there is a wall ahead,
+     * and the last 1–3 blocks are about to touch or are already touching the wall, the click position
+     * in that direction may become values like -1, -1.5, -2, 2, or 3.
+     *
+     * However, the normal max range should be between -0.5 and 1.5 (in java server that will not cancel place), so a temporary restriction is applied.
+     *
+     * This is a temporary fix, but I don’t have a better idea for now...
+     *
+     * Test with client version: 1.21.5x, 1.21.9x, 26.21.
+     */
+    private float fixCursorValue(float value) {
+        if (value <= -0.5f) {
+            return -0.25f;
+        } else if (value >= 2.0f) {
+            return 1.25f;
+        } else {
+            return value;
+        }
+    }
 }

core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaMountScreenOpenTranslator.java

@@ -158,7 +158,7 @@ public void translate(GeyserSession session, ClientboundMountScreenOpenPacket pa
                 slots.add(SADDLE_SLOT);
                 if (entity instanceof NautilusEntity) {
                     slots.add(NAUTILUS_ARMOR_SLOT);
-                } else if (!(entity instanceof SkeletonHorseEntity || entity instanceof ZombieHorseEntity)) {
+                } else if (!(entity instanceof SkeletonHorseEntity)) {
                     slots.add(HORSE_ARMOR_SLOT);
                 }
             }