aboutsummaryrefslogtreecommitdiff
path: root/client/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'client/scripts')
-rw-r--r--client/scripts/game.gd3
-rw-r--r--client/scripts/multiplayer.gd4
2 files changed, 4 insertions, 3 deletions
diff --git a/client/scripts/game.gd b/client/scripts/game.gd
index 86277b3f..44875056 100644
--- a/client/scripts/game.gd
+++ b/client/scripts/game.gd
@@ -33,7 +33,8 @@ func _ready():
Multiplayer.connect("remove_player", func(id: int):
var player: Player = players.get(id)
if player != null:
- player.hand.queue_free()
+ if player.hand != null:
+ player.hand.queue_free()
players.erase(id)
player.queue_free()
)
diff --git a/client/scripts/multiplayer.gd b/client/scripts/multiplayer.gd
index 7032b216..18141efa 100644
--- a/client/scripts/multiplayer.gd
+++ b/client/scripts/multiplayer.gd
@@ -100,8 +100,8 @@ func handle_packet(bytes: PackedByteArray):
emit_signal("set_finished", tile, warn)
"set_tile_item":
var tile = pos_to_vec2i(decoded["tile"])
- if decoded.has("item"):
- emit_signal("set_tile_item", tile, decoded["tile"])
+ if decoded.has("item") && decoded["item"] != null:
+ emit_signal("set_tile_item", tile, decoded["item"])
else:
emit_signal("remove_tile_name", tile)
"update_map":