summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/game.gd12
1 files changed, 6 insertions, 6 deletions
diff --git a/client/game.gd b/client/game.gd
index a1bb997c..1eee4001 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -108,6 +108,8 @@ func handle_packet(p):
update_players.emit(players)
"remove_player":
var player: Player = players.get(p.id)
+ if player == null:
+ return
if player.is_customer and player.current_item_message != null:
tutorial_queue.erase(player.current_item_message)
pinned_items.clear_item(p.id)
@@ -115,13 +117,11 @@ func handle_packet(p):
is_joined = false
left.emit()
camera.target = $Center
- if player != null:
- if player.hand != null:
- player.hand.queue_free()
- players.erase(p.id)
- player.queue_free()
+ if player.hand != null:
+ player.hand.queue_free()
+ players.erase(p.id)
+ player.queue_free()
update_players.emit(players)
-
"movement":
var player_instance: Player = players[p.player]
player_instance.update_position(p.pos, p.rot, p.boost)