From 3be59f7dab8f2f3ef2882efcbc3e1294ca94c328 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Tue, 30 Apr 2024 22:49:07 -0400 Subject: [PATCH] Fix dead VG regaining voice when doing !swap, fixes #523 --- src/wolfgame.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/wolfgame.py b/src/wolfgame.py index 95d4da09..6226ebfa 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -339,7 +339,8 @@ def replace(wrapper: MessageDispatcher, message: str): var = wrapper.game_state - if wrapper.source in get_players(var): + pl = get_players(var) + if wrapper.source in pl: wrapper.pm(messages["you_already_playing"]) return @@ -347,12 +348,12 @@ def replace(wrapper: MessageDispatcher, message: str): wrapper.pm(messages["not_logged_in"]) return - pl = get_participants(var) + participants = get_participants(var) target: Optional[User] = None for user in var.players: if context.equals(user.account, wrapper.source.account): - if user is wrapper.source or user not in pl: + if user is wrapper.source or user not in participants: continue elif target is None: target = user @@ -370,7 +371,7 @@ def replace(wrapper: MessageDispatcher, message: str): cmodes = [] - if config.Main.get("gameplay.nightchat") or var.current_phase != "night": + if (config.Main.get("gameplay.nightchat") or var.current_phase != "night") and target in pl: cmodes += [("-v", target), ("+v", wrapper.source)] toggle_modes = config.Main.get("transports[0].channels.main.auto_mode_toggle", ())