From 3cc6a57859f71e0524c2ab8f764c70f6c8e8f567 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Fri, 22 Oct 2021 13:32:43 +0200
Subject: [PATCH] network: fix BlockPlace packet writing, fix gamemode in
 JoinGame (remove debug statement)

---
 .../minosoft/protocol/packets/c2s/play/BlockPlaceC2SP.kt  | 8 +++++---
 .../minosoft/protocol/packets/s2c/play/JoinGameS2CP.kt    | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/BlockPlaceC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/BlockPlaceC2SP.kt
index 3e0490ac6..e228a5aaa 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/BlockPlaceC2SP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/BlockPlaceC2SP.kt
@@ -51,9 +51,7 @@ class BlockPlaceC2SP(
                 buffer.writeVarInt(hand.ordinal)
             }
         }
-        if (buffer.versionId >= ProtocolVersions.V_19W03A) {
-            buffer.writeBoolean(insideBlock)
-        }
+
         if (buffer.versionId < ProtocolVersions.V_16W39C) {
             buffer.writeByte((cursorPosition.x * 15.0f).toInt())
             buffer.writeByte((cursorPosition.y * 15.0f).toInt())
@@ -63,6 +61,10 @@ class BlockPlaceC2SP(
             buffer.writeFloat(cursorPosition.y)
             buffer.writeFloat(cursorPosition.z)
         }
+
+        if (buffer.versionId >= ProtocolVersions.V_19W03A) {
+            buffer.writeBoolean(insideBlock)
+        }
     }
 
     override fun log() {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/JoinGameS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/JoinGameS2CP.kt
index 5fdd93353..51aec361a 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/JoinGameS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/JoinGameS2CP.kt
@@ -83,8 +83,7 @@ class JoinGameS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket() {
             gamemode = Gamemodes[(gamemodeRaw and (0x8.inv()))]
         } else {
             isHardcore = buffer.readBoolean()
-            buffer.readUnsignedByte()
-            gamemode = Gamemodes.SURVIVAL
+            gamemode = Gamemodes[buffer.readUnsignedByte()]
         }
 
         if (buffer.versionId < ProtocolVersions.V_1_9_1) {