From 39e835fe60765954404077b7db18e0c9206c46e5 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Fri, 16 Jan 2015 01:09:56 -0500 Subject: [PATCH] remove useless variable and if statement check --- modules/wolfgame.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/wolfgame.py b/modules/wolfgame.py index c91877f..249dec5 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -1774,7 +1774,6 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True, pl.remove(dead) if nick != None and (nick == original or nick in pl): nickrole = var.get_role(nick) - nrole = nickrole nicktpls = var.get_templates(nick) var.del_player(nick) # handle roles that trigger on death @@ -1854,7 +1853,7 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True, else: message = "Saddened by the loss of their lover, \u0002{0}\u0002 commits suicide.".format(other) cli.msg(botconfig.CHANNEL, message) - debuglog("{0} ({1}) LOVE SUICIDE: {2} ({3})".format(other, var.get_role(other), nick, nrole)) + debuglog("{0} ({1}) LOVE SUICIDE: {2} ({3})".format(other, var.get_role(other), nick, nickrole)) del_player(cli, other, True, end_game = False, killer_role = killer_role, deadlist = deadlist, original = original) if "assassin" in nicktpls: if nick in var.TARGETED: @@ -1889,7 +1888,7 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True, else: message = "Before dying, \u0002{0}\u0002 quickly slits \u0002{1}\u0002's throat.".format(nick, target) cli.msg(botconfig.CHANNEL, message) - debuglog("{0} ({1}) ASSASSINATE: {2} ({3})".format(nick, nrole, target, var.get_role(target))) + debuglog("{0} ({1}) ASSASSINATE: {2} ({3})".format(nick, nickrole, target, var.get_role(target))) del_player(cli, target, True, end_game = False, killer_role = nickrole, deadlist = deadlist, original = original) if nickrole == "time lord": @@ -6668,7 +6667,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS: if who == "*": who = var.list_players() else: - if not is_fake_nick(who) and who != "*": + if not is_fake_nick(who): ul = list(var.USERS.keys()) ull = [u.lower() for u in ul] if who.lower() not in ull: