Clean things up after players quit in join phase

Fixes #486 Fixes #487
lykoss · Dec 5, 2021 · ab2c61f · ab2c61f
1 parent ce60e00
commit ab2c61f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/gamejoin.py b/src/gamejoin.py
@@ -396,6 +396,9 @@ def leave_game(wrapper: MessageDispatcher, message: str):
 
     add_dying(var, wrapper.source, "bot", "quit", death_triggers=False)
     kill_players(var)
+    if len(get_players(var)) == 0:
+        from src.wolfgame import reset
+        reset(var)
 
 @command("fleave", flag="A", pm=True, phases=("join", "day", "night"))
 def fleave(wrapper: MessageDispatcher, message: str):

diff --git a/src/votes.py b/src/votes.py
@@ -327,6 +327,8 @@ def on_del_player(evt: Event, var: GameState, player: User, allroles: set[str],
 
         if player in ABSTAINS:
             ABSTAINS.remove(player)
+    elif var.current_phase == "join":
+        del GAMEMODE_VOTES[:player:]
 
 @event_listener("transition_day_begin")
 def on_transition_day_begin(evt: Event, var: GameState):