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

Revert "fix wolf cub / traitor turning in chk_win even when end_game is false, + some other random error" 3c53ae19e86ebc67a505006ba4c9a28f5165bba0

Browse Source
This commit is contained in:
jacob1 2014-11-16 21:48:51 -05:00
parent 54d45ba02c
commit 04c4b46a3e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/wolfgame.py
View File

@ -1189,7 +1189,6 @@ def stop_game(cli, winner = ""):
iwon = True iwon = True
elif splr in var.LOVERS and splr in survived: elif splr in var.LOVERS and splr in survived:
for lvr in var.LOVERS[splr]: for lvr in var.LOVERS[splr]:
lvrrol = "" #somehow lvrrol wasn't set and caused a crash once
if lvr in plrl: if lvr in plrl:
lvrrol = plrl[lvr] lvrrol = plrl[lvr]
elif ("(dced)" + lvr) in plrl: elif ("(dced)" + lvr) in plrl:
@ -1631,15 +1630,14 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
# Died during the joining process as a person # Died during the joining process as a person
mass_mode(cli, cmode) mass_mode(cli, cmode)
return not chk_win(cli) return not chk_win(cli)
else: if var.PHASE != "join":
# Died during the game, so quiet! # Died during the game, so quiet!
if var.QUIET_DEAD_PLAYERS and not is_fake_nick(nick): if var.QUIET_DEAD_PLAYERS and not is_fake_nick(nick):
cmode.append(("+q", nick+"!*@*")) cmode.append(("+q", nick+"!*@*"))
mass_mode(cli, cmode) mass_mode(cli, cmode)
if nick not in var.DEAD: if nick not in var.DEAD:
var.DEAD.append(nick) var.DEAD.append(nick)
if end_game: ret = not chk_win(cli, end_game)
ret = not chk_win(cli, end_game)
if var.PHASE in ("night", "day") and ret: if var.PHASE in ("night", "day") and ret:
# remove the player from variables if they're in there # remove the player from variables if they're in there
for a,b in list(var.KILLS.items()): for a,b in list(var.KILLS.items()):