Bugfix sending gamemodes

- Make sure to check if the gamemode is explicitly defined

Author: qubard

mcidle.py

@@ -82,7 +82,7 @@ def init():
             if not args.username or not args.password:
                 print("Can't re-auth user because no user or password provided!", flush=True)
                 return
-            print("Username or password wrong, waiting 30 seconds before reconnecting..")
+            print("Username or password wrong, waiting 15 seconds before reconnecting..")
             time.sleep(15)
 
 if __name__ == '__main__':

src/networking/packet_handler/clientbound/login_handler.py

@@ -115,10 +115,13 @@ def join_world(self):
             # Send their last held item
             self.connection.send_packet_raw(HeldItemChangeClientbound(Slot=self.mc_connection.game_state.held_item_slot))
 
-            # Send their current gamemode
-            if self.mc_connection.game_state.gamemode:
+            # Send their current gamemode if it's defined
+            if self.mc_connection.game_state.gamemode is not None:
+                print("Sent gamemode", self.mc_connection.game_state.gamemode, flush=True)
                 self.connection.send_packet_raw(GameState(Reason=3,\
                                                         Value=self.mc_connection.game_state.gamemode))
+            else:
+                print("Gamemode not present", flush=True)
             # Send their inventory
             self.connection.send_single_packet_dict(self.mc_connection.game_state.main_inventory)
 

src/networking/packet_handler/packet_processor.py

@@ -97,6 +97,7 @@ def process_packet(self, packet):
             elif packet.id == GameStateP.id:
                 game_state = GameStateP().read(packet.packet_buffer)
                 if game_state.Reason == 3: # Change Gamemode
+                    print("Set gamemode to ", game_state.Value, flush=True)
                     self.game_state.gamemode = game_state.Value
             elif packet.id == SetSlot.id:
                 set_slot = SetSlot().read(packet.packet_buffer)
@@ -109,11 +110,12 @@ def process_packet(self, packet):
                 # 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
                 # Respawn the player if they're dead..
-                print(update_health, flush=True)
+                print("Health: %s" % update_health.Health, flush=True)
                 if update_health.Health == 0:
                     print("Client died, respawning", flush=True)
                     return ClientStatus(ActionID=0)