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

fix error when returning to the game via /nick

Browse Source
This commit is contained in:
jacob1 2015-10-11 21:59:00 -04:00
parent 3845d4e0b3
commit a83911f054
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wolfgame.py
View File

@ -828,7 +828,7 @@ def replace(cli, nick, chan, rest):
rename_player(cli, target, nick) rename_player(cli, target, nick)
# Make sure to remove player from var.DISCONNECTED if they were in there # Make sure to remove player from var.DISCONNECTED if they were in there
if var.PHASE in ("day", "night"): if var.PHASE in ("day", "night"):
return_to_village(target, False) return_to_village(cli, chan, target, False)
mass_mode(cli, [("-v", target), ("+v", nick)], []) mass_mode(cli, [("-v", target), ("+v", nick)], [])
@ -3212,7 +3212,7 @@ def fgoat(cli, nick, chan, rest):
cli.msg(chan, "\u0002{0}\u0002's goat walks by and {1} \u0002{2}\u0002.".format(nick, goatact, togoat)) cli.msg(chan, "\u0002{0}\u0002's goat walks by and {1} \u0002{2}\u0002.".format(nick, goatact, togoat))
def return_to_village(nick, show_message): def return_to_village(cli, chan, nick, show_message):
with var.GRAVEYARD_LOCK: with var.GRAVEYARD_LOCK:
if nick in var.DISCONNECTED.keys(): if nick in var.DISCONNECTED.keys():
hm = var.DISCONNECTED[nick][1] hm = var.DISCONNECTED[nick][1]
@ -3471,7 +3471,7 @@ def rename_player(cli, prefix, nick):
# Check if player was disconnected # Check if player was disconnected
if var.PHASE in ("night", "day"): if var.PHASE in ("night", "day"):
return_to_village(nick, True) return_to_village(cli, chan, nick, True)
if prefix in var.NO_LYNCH: if prefix in var.NO_LYNCH:
var.NO_LYNCH.remove(prefix) var.NO_LYNCH.remove(prefix)