From beb5ffd54c6a88ffd9f744f93213e57b4add49b9 Mon Sep 17 00:00:00 2001 From: "Vgr E. Barry" Date: Thu, 11 Feb 2016 13:26:15 -0500 Subject: [PATCH] derp --- src/wolfgame.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/wolfgame.py b/src/wolfgame.py index eb10881..db381c8 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -3457,12 +3457,6 @@ def rename_player(cli, prefix, nick): var.SPECTATING_WOLFCHAT.remove(prefix) var.SPECTATING_WOLFCHAT.add(nick) - if var.PHASE in ("join", "day", "night"): - if prefix in var.ALL_PLAYERS: - # ALL_PLAYERS needs to keep its ordering for purposes of mad scientist - # it also needs updating after death to disallow epic breakages - var.ALL_PLAYERS[var.ALL_PLAYERS.index(prefix)] = nick - event = Event("rename_player", {}) event.dispatch(cli, var, prefix, nick) @@ -3475,6 +3469,10 @@ def rename_player(cli, prefix, nick): var.ROLES[t].add(nick) var.ROLES[t].remove(prefix) + if prefix in var.ALL_PLAYERS: + # ALL_PLAYERS needs to keep its ordering for purposes of mad scientist + var.ALL_PLAYERS[var.ALL_PLAYERS.index(prefix)] = nick + if var.PHASE in ("night", "day"): for k,v in var.ORIGINAL_ROLES.items(): if prefix in v: @@ -3622,6 +3620,10 @@ def rename_player(cli, prefix, nick): var.START_VOTES.discard(prefix) var.START_VOTES.add(nick) + elif prefix in var.ALL_PLAYERS: + # this needs updating after death to disallow epic breakages + var.ALL_PLAYERS[var.ALL_PLAYERS.index(prefix)] = nick + # Check if player was disconnected if var.PHASE in ("night", "day"): return_to_village(cli, chan, nick, True)