From f786af9178d86d2e940d6b82f09efbf946296854 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Mon, 20 Mar 2023 23:22:05 +0100 Subject: [PATCH] network: fix 1.8 PositionRotationS2CP reading --- .../packets/s2c/play/entity/move/PositionRotationS2CP.kt | 2 +- .../protocol/packets/s2c/play/entity/move/TeleportS2CP.kt | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt index 83ceba591..fa199c05b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt @@ -27,7 +27,7 @@ import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogMessageType class PositionRotationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { - val position: Vec3d = buffer.readVec3d() + val position: Vec3d = Vec3d(buffer.readDoubleArray(3)) val rotation: EntityRotation var onGround = false private var flags: Int = 0 diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt index ba9c19163..7897bfc4e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt @@ -23,11 +23,7 @@ import de.bixilon.minosoft.util.logging.LogMessageType class TeleportS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val entityId: Int = buffer.readEntityId() - val position: Vec3d = if (buffer.versionId < ProtocolVersions.V_16W06A) { - Vec3d(buffer.readFixedPointNumberInt(), buffer.readFixedPointNumberInt(), buffer.readFixedPointNumberInt()) - } else { - buffer.readVec3d() - } + val position: Vec3d = buffer.readVec3d() val rotation = buffer.readEntityRotation() val onGround = if (buffer.versionId >= ProtocolVersions.V_14W25B) { buffer.readBoolean()