Track gamemode changes in Respawn and JoinId properly

- `packet_log` clause was breaking this earlier
- Still needs to be tested to see if this fixes respawning on 2b

Author: qubard

src/networking/connection.py

@@ -5,7 +5,7 @@
 from src.networking.encryption import *
 from src.networking.packet_handler.serverbound import LoginHandler as ServerboundLoginHandler
 from src.networking.packet_handler.clientbound import LoginHandler as ClientboundLoginHandler
-from src.networking.packets.clientbound import Respawn
+from src.networking.packets.clientbound import Respawn, JoinGame
 
 from src.networking.packet_handler import WorkerProcessor, ClientboundProcessor
 
@@ -145,7 +145,7 @@ def __init__(self, username, ip, protocol, port=25565, server_port=1001, profile
         self.listen_thread = listen_thread
 
         # JoinGame, ServerDifficulty, SpawnPosition, Respawn, Experience
-        join_ids = [0x23, 0x0D, 0x46, Respawn.id, 0x40]
+        join_ids = [JoinGame.id, 0x0D, 0x46, Respawn.id, 0x40]
         self.game_state = GameState(join_ids)
 
         self.packet_processor = ClientboundProcessor(self.game_state)

src/networking/packet_handler/packet_processor.py

@@ -1,7 +1,7 @@
 from src.networking.packets.serverbound import KeepAlive as KeepAliveServerbound, TeleportConfirm, ClientStatus
 from src.networking.packets.clientbound import ChunkData, UnloadChunk, SpawnEntity, \
     DestroyEntities, KeepAlive, ChatMessage, PlayerPositionAndLook, TimeUpdate, \
-    HeldItemChange, SetSlot, PlayerListItem, PlayerAbilities, Respawn, UpdateHealth
+    HeldItemChange, SetSlot, PlayerListItem, PlayerAbilities, Respawn, UpdateHealth, JoinGame
 
 from src.networking.packets.clientbound import GameState as GameStateP
 
@@ -67,6 +67,16 @@ def chunk_load(self, packet):
 
     def process_packet(self, packet):
         with self.game_state.state_lock:
+            if packet.id == Respawn.id:
+                # In case the gamemode is changed through a respawn packet
+                respawn = Respawn().read(packet.packet_buffer)
+                self.game_state.gamemode = respawn.Gamemode
+                print("Set gamemode to", respawn.Gamemode, flush=True)
+            if packet.id == JoinGame.id:
+                join_game = JoinGame().read(packet.packet_buffer)
+                self.game_state.gamemode = join_game.Gamemode & 3 # Bit 4 (0x8) is the hardcore flaga
+                print("Set gamemode to", self.game_state.gamemode, "JoinGame", flush=True)
+
             if packet.id in self.game_state.join_ids:
                 self.game_state.packet_log[packet.id] = packet
             elif packet.id == ChunkData.id:  # ChunkData
@@ -111,11 +121,6 @@ def process_packet(self, packet):
                 self.player_list(packet)
             elif packet.id == PlayerAbilities.id:
                 self.game_state.abilities = PlayerAbilities().read(packet.packet_buffer)
-            elif packet.id == Respawn.id:
-                # In case the gamemode is changed through a respawn packet
-                respawn = Respawn().read(packet.packet_buffer)
-                self.game_state.gamemode = respawn.Gamemode
-                print("Set gamemode to", respawn.Gamemode, flush=True)
             elif packet.id == UpdateHealth.id:
                 update_health = UpdateHealth().read(packet.packet_buffer)
                 self.game_state.update_health = update_health
@@ -125,4 +130,5 @@ def process_packet(self, packet):
                     print("Client died, respawning", flush=True)
                     return ClientStatus(ActionID=0)
 
+
         return None

src/networking/packets/clientbound/__init__.py

@@ -49,6 +49,19 @@ class LoginSuccess(Packet):
     }
 
 
+class JoinGame(Packet):
+    id = 0x23
+    definition = {
+        "EntityID": Integer,
+        "Gamemode": UnsignedByte,
+        "Dimension": Integer,
+        "Difficulty": UnsignedByte,
+        "MaxPlayers": UnsignedByte,
+        "LevelType": String,
+        "Debug": Boolean,
+    }
+
+
 class SetCompression(Packet):
     id = 0x03
     definition = {