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

remove useless variable and if statement check

Browse Source
This commit is contained in:
jacob1 2015-01-16 01:09:56 -05:00
parent 7f2e3153e7
commit 39e835fe60
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/wolfgame.py
View File

@ -1774,7 +1774,6 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
pl.remove(dead) pl.remove(dead)
if nick != None and (nick == original or nick in pl): if nick != None and (nick == original or nick in pl):
nickrole = var.get_role(nick) nickrole = var.get_role(nick)
nrole = nickrole
nicktpls = var.get_templates(nick) nicktpls = var.get_templates(nick)
var.del_player(nick) var.del_player(nick)
# handle roles that trigger on death # handle roles that trigger on death
@ -1854,7 +1853,7 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
else: else:
message = "Saddened by the loss of their lover, \u0002{0}\u0002 commits suicide.".format(other) message = "Saddened by the loss of their lover, \u0002{0}\u0002 commits suicide.".format(other)
cli.msg(botconfig.CHANNEL, message) 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) del_player(cli, other, True, end_game = False, killer_role = killer_role, deadlist = deadlist, original = original)
if "assassin" in nicktpls: if "assassin" in nicktpls:
if nick in var.TARGETED: if nick in var.TARGETED:
@ -1889,7 +1888,7 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
else: else:
message = "Before dying, \u0002{0}\u0002 quickly slits \u0002{1}\u0002's throat.".format(nick, target) message = "Before dying, \u0002{0}\u0002 quickly slits \u0002{1}\u0002's throat.".format(nick, target)
cli.msg(botconfig.CHANNEL, message) 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) del_player(cli, target, True, end_game = False, killer_role = nickrole, deadlist = deadlist, original = original)
if nickrole == "time lord": if nickrole == "time lord":
@ -6668,7 +6667,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
if who == "*": if who == "*":
who = var.list_players() who = var.list_players()
else: else:
if not is_fake_nick(who) and who != "*": if not is_fake_nick(who):
ul = list(var.USERS.keys()) ul = list(var.USERS.keys())
ull = [u.lower() for u in ul] ull = [u.lower() for u in ul]
if who.lower() not in ull: if who.lower() not in ull: