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

Don't break when someone leaves during join phase

Browse Source 
Converted PLAYERS to ALL_PLAYERS due to the former storing nicks and the
latter storing users, but it turns out they are populated differently
and we really actually needed PLAYERS here.
This commit is contained in:
skizzerz 2017-12-04 18:21:49 -06:00
parent 0b07d9193f
commit 4edd0122e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wolfgame.py
View File

@ -3132,7 +3132,7 @@ def leave(var, what, user, why=None):
ps = get_players()
# Only mark living players as disconnected, unless they were kicked
if user in var.ALL_PLAYERS and (what == "kick" or user in ps):
if user.nick in var.PLAYERS and (what == "kick" or user in ps): # FIXME: Convert var.PLAYERS
# Prevent duplicate entry in var.ORIGINAL_ROLES
for roleset in var.ORIGINAL_ROLES.values():
if user.nick in roleset: # FIXME: Need to fix this once the role sets hold User instances
@ -3140,7 +3140,7 @@ def leave(var, what, user, why=None):
roleset.add("(dced)" + user.nick) # FIXME: Need to get rid of all the (dced) hacks
break
var.DCED_PLAYERS[user.nick] = var.PLAYERS.pop(user.nick) # FIXME: Need to fix this once var.DCED_PLAYERS hold User instances
var.DCED_PLAYERS[user.nick] = var.PLAYERS.pop(user.nick) # FIXME: Convert var.PLAYERS and var.DCED_PLAYERS
if user not in ps or user in var.DISCONNECTED:
return