From cd7aac93988d8533ae574cab4dd92c74c6c3706e Mon Sep 17 00:00:00 2001 From: "Vgr E.Barry" Date: Sat, 3 Jan 2015 17:49:29 -0500 Subject: [PATCH] Fix random errors. Blame Vgr. --- modules/wolfgame.py | 2 ++ tools/decorators.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/wolfgame.py b/modules/wolfgame.py index f510e2d..1487289 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -4004,6 +4004,7 @@ def guard(cli, nick, chan, rest): if var.GUARDED.get(nick): pm(cli, nick, "You are already protecting someone tonight.") return + role = var.get_role(nick) victim = get_victim(cli, nick, re.split(" +",rest)[0], role == "bodyguard" or var.GUARDIAN_ANGEL_CAN_GUARD_SELF) if not victim: return @@ -4037,6 +4038,7 @@ def guard(cli, nick, chan, rest): @cmd("observe", chan=False, pm=True, game=True, playing=True, roles=("werecrow", "sorcerer")) def observe(cli, nick, chan, rest): + role = var.get_role(nick) if var.PHASE != "night": if role == "werecrow": pm(cli, nick, "You may only transform into a crow at night.") diff --git a/tools/decorators.py b/tools/decorators.py index 82fc96f..8ead645 100644 --- a/tools/decorators.py +++ b/tools/decorators.py @@ -69,7 +69,7 @@ def generate(fdict, permissions=True, **kwargs): largs[0].notice(nick, "Werewolf is already in play.") return if playing and nick not in var.list_players() or nick in var.DISCONNECTED.keys(): - cli.notice(nick, "You're not currently playing.") + largs[0].notice(nick, "You're not currently playing.") return if roles: for role in roles: