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

Disallow apples to be in the same bag as oranges

Browse Source 
Pears are fine, though
This commit is contained in:
Vgr E. Barry 2017-02-07 20:12:16 -05:00
parent 70b42dceb6
commit 0a18f8e70e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wolfgame.py
View File

@ -989,12 +989,12 @@ def fjoin(var, wrapper, message):
parts = re.split(" +", message) parts = re.split(" +", message)
possible_users = {u.lower().nick for u in wrapper.target.users} possible_users = {u.lower().nick for u in wrapper.target.users}
to_join = []
if not botconfig.DEBUG_MODE: if not botconfig.DEBUG_MODE:
match = complete_one_match(users.lower(parts[0]), possible_users) match = complete_one_match(users.lower(parts[0]), possible_users)
if match: if match:
to_join = [match] to_join.append(match)
else: else:
to_join = []
for i, s in enumerate(parts): for i, s in enumerate(parts):
match = complete_one_match(users.lower(s), possible_users) match = complete_one_match(users.lower(s), possible_users)
if match: if match:
@ -1011,7 +1011,7 @@ def fjoin(var, wrapper, message):
break break
fake = True fake = True
for i in range(int(first), int(last)+1): for i in range(int(first), int(last)+1):
user = users._add(wrapper.client, nick=str(i)) user = users._add(wrapper.client, nick=str(i)) # FIXME
evt.data["join_player"](var, type(wrapper)(user, wrapper.target), forced=True, who=wrapper.source) evt.data["join_player"](var, type(wrapper)(user, wrapper.target), forced=True, who=wrapper.source)
continue continue
if not tojoin: if not tojoin: