GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00
Code Issues Releases Activity

Merge branch 'master' into feature/1.21.11

Browse Source
This commit is contained in:
oryxel
2025-12-16 17:30:54 +07:00
committed by GitHub
parent 5b6faf9cfb 9a1d42584e
commit 902d6e6600
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/input/BedrockPlayerAuthInputTranslator.java
View File

@@ -29,6 +29,7 @@ import org.cloudburstmc.math.GenericMath;
import org.cloudburstmc.math.vector.Vector2f; import org.cloudburstmc.math.vector.Vector2f;
import org.cloudburstmc.math.vector.Vector3d; import org.cloudburstmc.math.vector.Vector3d;
import org.cloudburstmc.math.vector.Vector3f; import org.cloudburstmc.math.vector.Vector3f;
import org.cloudburstmc.protocol.bedrock.data.InputInteractionModel;
import org.cloudburstmc.protocol.bedrock.data.InputMode; import org.cloudburstmc.protocol.bedrock.data.InputMode;
import org.cloudburstmc.protocol.bedrock.data.PlayerAuthInputData; import org.cloudburstmc.protocol.bedrock.data.PlayerAuthInputData;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag; import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
@@ -245,7 +246,19 @@ public final class BedrockPlayerAuthInputTranslator extends PacketTranslator<Pla
// TODO: Should we also check for protocol version here? If yes then this should be test on multiple platform first. // TODO: Should we also check for protocol version here? If yes then this should be test on multiple platform first.
boolean inClientPredictedVehicle = packet.getInputData().contains(PlayerAuthInputData.IN_CLIENT_PREDICTED_IN_VEHICLE); boolean inClientPredictedVehicle = packet.getInputData().contains(PlayerAuthInputData.IN_CLIENT_PREDICTED_IN_VEHICLE);
if (vehicle instanceof ClientVehicle) { if (vehicle instanceof ClientVehicle) {
session.getPlayerEntity().setVehicleInput(packet.getMotion()); // Classic input mode for boat vehicle send PADDLE_LEFT/RIGHT instead of motion values.
boolean isMobileAndClassicMovement = packet.getInputMode() == InputMode.TOUCH && packet.getInputInteractionModel() == InputInteractionModel.CLASSIC;
if (isMobileAndClassicMovement && vehicle instanceof BoatEntity) {
// Press both left and right to move forward and press 1 to turn the boat.
boolean left = packet.getInputData().contains(PlayerAuthInputData.PADDLE_LEFT), right = packet.getInputData().contains(PlayerAuthInputData.PADDLE_RIGHT);
if (left && right) {
session.getPlayerEntity().setVehicleInput(Vector2f.UNIT_Y);
} else {
session.getPlayerEntity().setVehicleInput(Vector2f.UNIT_X.mul(left ? 1 : right ? -1 : 0));
}
} else {
session.getPlayerEntity().setVehicleInput(packet.getMotion());
}
} }
boolean sendMovement = false; boolean sendMovement = false;