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

fix fail with complete_match

Browse Source
This commit is contained in:
jacob1 2015-01-05 12:56:34 -05:00
parent 784bbe0111
commit fa326b5fb3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/wolfgame.py
View File

@ -2312,7 +2312,7 @@ def goat(cli, nick, chan, rest):
if not rest: if not rest:
cli.notice(nick, 'Not enough parameters.') cli.notice(nick, 'Not enough parameters.')
victim = complete_match(rest.lower(), ull) victim, _ = complete_match(rest.lower(), ull)
if not victim: if not victim:
cli.notice(nick, "\u0002{0}\u0002 is not in this channel.".format(rest)) cli.notice(nick, "\u0002{0}\u0002 is not in this channel.".format(rest))
return return
@ -6270,7 +6270,7 @@ def listroles(cli, nick, chan, rest):
if len(rest[0]) and not rest[0].isdigit(): if len(rest[0]) and not rest[0].isdigit():
gamemode = rest[0] gamemode = rest[0]
if gamemode not in var.GAME_MODES.keys(): if gamemode not in var.GAME_MODES.keys():
gamemode = complete_match(rest[0], var.GAME_MODES.keys() - ["roles"]) gamemode, _ = complete_match(rest[0], var.GAME_MODES.keys() - ["roles"])
if gamemode in var.GAME_MODES.keys() and gamemode != "roles": if gamemode in var.GAME_MODES.keys() and gamemode != "roles":
mode = var.GAME_MODES[gamemode][0]() mode = var.GAME_MODES[gamemode][0]()
if hasattr(mode, "ROLE_INDEX"): if hasattr(mode, "ROLE_INDEX"):
@ -6456,7 +6456,7 @@ def game_stats(cli, nick, chan, rest):
if len(rest) and not rest[0].isdigit(): if len(rest) and not rest[0].isdigit():
gamemode = rest[0] gamemode = rest[0]
if gamemode not in var.GAME_MODES.keys(): if gamemode not in var.GAME_MODES.keys():
gamemode = complete_match(gamemode, var.GAME_MODES.keys()) gamemode, _ = complete_match(gamemode, var.GAME_MODES.keys())
if not gamemode: if not gamemode:
cli.notice(nick, "{0} is not a valid game mode".format(rest[0])) cli.notice(nick, "{0} is not a valid game mode".format(rest[0]))
return return
@ -6558,7 +6558,7 @@ def game(cli, nick, chan, rest):
return return
if gamemode not in var.GAME_MODES.keys(): if gamemode not in var.GAME_MODES.keys():
match = complete_match(gamemode, var.GAME_MODES.keys() - ["roles"]) match, _ = complete_match(gamemode, var.GAME_MODES.keys() - ["roles"])
if not match: if not match:
cli.notice(nick, "\002{0}\002 is not a valid game mode.".format(gamemode)) cli.notice(nick, "\002{0}\002 is not a valid game mode.".format(gamemode))
return return
@ -6703,7 +6703,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
rest = gamemode = rest.strip().lower() rest = gamemode = rest.strip().lower()
if rest not in var.GAME_MODES.keys() and not rest.startswith("roles"): if rest not in var.GAME_MODES.keys() and not rest.startswith("roles"):
rest = rest.split()[0] rest = rest.split()[0]
gamemode = complete_match(rest, var.GAME_MODES.keys()) gamemode, _ = complete_match(rest, var.GAME_MODES.keys())
if not gamemode: if not gamemode:
cli.notice(nick, "\002{0}\002 is not a valid game mode.".format(rest)) cli.notice(nick, "\002{0}\002 is not a valid game mode.".format(rest))
return return