notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix crash when shaman exchanges roles with themselves

Browse Source
This commit is contained in:
jacob1 2015-03-27 14:51:30 -04:00
parent 0e020c3d15
commit ad8f3a720a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/wolfgame.py
View File

@ -3923,11 +3923,14 @@ def choose_target(actor, nick):
# returns true if a swap happened # returns true if a swap happened
# check for that to short-circuit the nightrole # check for that to short-circuit the nightrole
def check_exchange(cli, actor, nick): def check_exchange(cli, actor, nick):
#some roles can act on themselves, ignore this
if actor == nick:
return False
if nick in var.EXCHANGED: if nick in var.EXCHANGED:
var.EXCHANGED.remove(nick) var.EXCHANGED.remove(nick)
actor_role = var.get_role(actor) actor_role = var.get_role(actor)
nick_role = var.get_role(nick) nick_role = var.get_role(nick)
if actor_role == "amnesiac": if actor_role == "amnesiac":
actor_role = var.FINAL_ROLES[actor] actor_role = var.FINAL_ROLES[actor]
elif actor_role == "clone": elif actor_role == "clone":
@ -4047,7 +4050,7 @@ def check_exchange(cli, actor, nick):
if nick in var.ALPHA_WOLVES: if nick in var.ALPHA_WOLVES:
var.ALPHA_WOLVES.remove(nick) var.ALPHA_WOLVES.remove(nick)
var.FINAL_ROLES[actor] = nick_role var.FINAL_ROLES[actor] = nick_role
var.FINAL_ROLES[nick] = actor_role var.FINAL_ROLES[nick] = actor_role
var.ROLES[actor_role].append(nick) var.ROLES[actor_role].append(nick)