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

Fix wonky message ordering if a lynch is forced

Browse Source
This commit is contained in:
skizzerz 2016-01-11 19:14:42 -06:00
parent 30699c69a8
commit 281beda634
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wolfgame.py
View File

@ -3163,7 +3163,10 @@ def del_player(cli, nick, forced_death=False, devoice=True, end_game=True, death
var.ASLEEP.discard(nick) var.ASLEEP.discard(nick)
var.CONSECRATING.discard(nick) var.CONSECRATING.discard(nick)
var.SICK.discard(nick) var.SICK.discard(nick)
chk_decision(cli) # note: PHASE = "day" and GAMEPHASE = "night" during transition_day;
# we only want to induce a lynch if it's actually day
if var.GAMEPHASE == "day":
chk_decision(cli)
elif var.PHASE == "night" and ret: elif var.PHASE == "night" and ret:
chk_nightdone(cli) chk_nightdone(cli)
@ -3825,6 +3828,8 @@ def begin_day(cli):
event = Event("begin_day", {}) event = Event("begin_day", {})
event.dispatch(cli, var) event.dispatch(cli, var)
# induce a lynch if we need to (due to lots of pacifism/impatience totems or whatever)
chk_decision(cli)
@handle_error @handle_error
def night_warn(cli, gameid): def night_warn(cli, gameid):