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

Fix fspectate

Browse Source
This commit is contained in:
Vgr E. Barry 2017-01-13 11:59:24 -05:00
parent a620860cc5
commit 52f6b9238a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wolfgame.py
View File

@ -7223,7 +7223,7 @@ def can_run_restricted_cmd(user):
def fspectate(var, wrapper, message): def fspectate(var, wrapper, message):
"""Spectate wolfchat or deadchat.""" """Spectate wolfchat or deadchat."""
if not can_run_restricted_cmd(wrapper.source): if not can_run_restricted_cmd(wrapper.source):
pm(cli, nick, messages["fspectate_restricted"]) wrapper.pm(messages["fspectate_restricted"])
return return
params = message.split(" ") params = message.split(" ")
@ -7240,20 +7240,20 @@ def fspectate(var, wrapper, message):
if on == "off": if on == "off":
if what == "wolfchat": if what == "wolfchat":
var.SPECTATING_WOLFCHAT.discard(nick) var.SPECTATING_WOLFCHAT.discard(wrapper.source.nick)
else: else:
var.SPECTATING_DEADCHAT.discard(nick) var.SPECTATING_DEADCHAT.discard(wrapper.source.nick)
wrapper.pm(messages["fspectate_off"].format(what)) wrapper.pm(messages["fspectate_off"].format(what))
else: else:
players = [] players = []
if what == "wolfchat": if what == "wolfchat":
var.SPECTATING_WOLFCHAT.add(nick) var.SPECTATING_WOLFCHAT.add(wrapper.source.nick)
players = (p for p in list_players() if in_wolflist(p, p)) players = (p for p in list_players() if in_wolflist(p, p))
elif var.ENABLE_DEADCHAT: elif var.ENABLE_DEADCHAT:
if wrapper.source.nick in var.DEADCHAT_PLAYERS: # FIXME if wrapper.source.nick in var.DEADCHAT_PLAYERS: # FIXME
wrapper.pm(messages["fspectate_in_deadchat"]) wrapper.pm(messages["fspectate_in_deadchat"])
return return
var.SPECTATING_DEADCHAT.add(nick) var.SPECTATING_DEADCHAT.add(wrapper.source.nick)
players = var.DEADCHAT_PLAYERS players = var.DEADCHAT_PLAYERS
else: else:
wrapper.pm(messages["fspectate_deadchat_disabled"]) wrapper.pm(messages["fspectate_deadchat_disabled"])