From 04bd3dc61d17e321f687c254c95e1a2a8ba541f2 Mon Sep 17 00:00:00 2001 From: Luna Date: Sun, 25 Feb 2018 21:59:37 -0500 Subject: [PATCH] [WIP] Fix restart race condition --- scripts/lobby.gd | 2 +- scripts/objective.gd | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/lobby.gd b/scripts/lobby.gd index 9c63235..f2c5302 100644 --- a/scripts/lobby.gd +++ b/scripts/lobby.gd @@ -258,7 +258,7 @@ func begin_player(peer): remote func begin_player_deferred(peer): call_deferred("begin_player", peer) -func reset_state(): +sync func reset_state(): players_done = [] get_node("/root/Level").queue_free() diff --git a/scripts/objective.gd b/scripts/objective.gd index 4768c2e..f4e859c 100644 --- a/scripts/objective.gd +++ b/scripts/objective.gd @@ -100,7 +100,8 @@ func _process(delta): restart_count += delta / Engine.time_scale if restart_count > restart_time: Engine.time_scale = 1 - get_node("/root/Lobby").reset_state() + if is_network_master(): + get_node("/root/Lobby").rpc("reset_state") # Render the percents var on_left = left