From db9c52a3e292be0f451814d9cf35618cd5225ef5 Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Tue, 23 Dec 2014 23:56:44 +0100 Subject: [PATCH] Fix admin check in fdie and frestart --- modules/wolfgame.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 0f0774e..0ea8e83 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -377,14 +377,12 @@ def make_stasis(nick, penalty): var.STASISED[cloak] += penalty var.set_stasis(cloak, var.STASISED[cloak]) -@pmcmd("fdie", "fbye", raw_nick=True) -@cmd("fdie", "fbye", raw_nick=True) -def forced_exit(cli, raw_nick, chan, *rest): # Admin Only +@pmcmd("fdie", "fbye") +@cmd("fdie", "fbye") +def forced_exit(cli, nick, chan, *rest): # Admin Only """Forces the bot to close.""" - (nick, _, _, cloak) = parse_nick(raw_nick) - - if nick != "" and not var.is_admin(cloak): + if nick != "" and not is_admin(nick): cli.notice(nick, "You are not an admin.") return @@ -405,13 +403,11 @@ def forced_exit(cli, raw_nick, chan, *rest): # Admin Only -@cmd("frestart", raw_nick=True) -def restart_program(cli, raw_nick, chan, rest): +@cmd("frestart") +def restart_program(cli, nick, chan, rest): """Restarts the bot.""" - (nick, _, _, cloak) = parse_nick(raw_nick) - - if nick != "" and not var.is_admin(cloak): + if nick != "" and not is_admin(nick): cli.notice(nick, "You are not an admin.") return