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

don't ping alt connections of players who have joined, set() changes

Browse Source
This commit is contained in:
jacob1 2015-05-28 22:31:19 -04:00
parent 338f24aa66
commit 21391f9261
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/wolfgame.py
View File

@ -418,8 +418,8 @@ def reset():
var.ROLES = {"person" : []} var.ROLES = {"person" : []}
var.JOINED_THIS_GAME = [] # keeps track of who already joined this game at least once (cloaks) var.JOINED_THIS_GAME = [] # keeps track of who already joined this game at least once (cloaks)
var.JOINED_THIS_GAME_ACCS = [] # same, except accounts var.JOINED_THIS_GAME_ACCS = [] # same, except accounts
var.PINGED_ALREADY = [] var.PINGED_ALREADY = set()
var.PINGED_ALREADY_ACCS = [] var.PINGED_ALREADY_ACCS = set()
var.NO_LYNCH = [] var.NO_LYNCH = []
var.FGAMED = False var.FGAMED = False
var.GAMEMODE_VOTES = {} #list of players who have used !game var.GAMEMODE_VOTES = {} #list of players who have used !game
@ -846,6 +846,7 @@ def join_timer_handler(cli):
checker = [] checker = []
chk_acc = [] chk_acc = []
# Add accounts/hosts to the list of possible players to ping
for num in var.PING_IF_NUMS_ACCS: for num in var.PING_IF_NUMS_ACCS:
if num <= len(pl): if num <= len(pl):
chk_acc.extend(var.PING_IF_NUMS_ACCS[num]) chk_acc.extend(var.PING_IF_NUMS_ACCS[num])
@ -855,6 +856,11 @@ def join_timer_handler(cli):
if num <= len(pl): if num <= len(pl):
checker.extend(var.PING_IF_NUMS[num]) checker.extend(var.PING_IF_NUMS[num])
# Don't ping alt connections of users that have already joined
for acc in [var.USERS[player]["account"] for player in pl if player in var.USERS]:
var.PINGED_ALREADY_ACCS.add(acc)
# Remove players who have already been pinged from the list of possible players to ping
for acc in chk_acc[:]: for acc in chk_acc[:]:
if acc in var.PINGED_ALREADY_ACCS: if acc in var.PINGED_ALREADY_ACCS:
chk_acc.remove(acc) chk_acc.remove(acc)
@ -863,6 +869,7 @@ def join_timer_handler(cli):
if cloak in var.PINGED_ALREADY: if cloak in var.PINGED_ALREADY:
checker.remove(cloak) checker.remove(cloak)
# If there is nobody to ping, do nothing
if not chk_acc and not checker: if not chk_acc and not checker:
var.PINGING_IFS = False var.PINGING_IFS = False
return return
@ -874,14 +881,15 @@ def join_timer_handler(cli):
return return
# Create list of players to ping
if acc and acc != "*": if acc and acc != "*":
if acc in chk_acc: if acc in chk_acc:
to_ping.append(user) to_ping.append(user)
var.PINGED_ALREADY_ACCS.append(acc) var.PINGED_ALREADY_ACCS.add(acc)
elif not var.ACCOUNTS_ONLY: elif not var.ACCOUNTS_ONLY:
to_ping.append(user) to_ping.append(user)
var.PINGED_ALREADY.append(cloak) var.PINGED_ALREADY.add(cloak)
@hook("endofwho", hookid=387) @hook("endofwho", hookid=387)
def fetch_altpingers(*stuff): def fetch_altpingers(*stuff):
@ -975,8 +983,8 @@ def join_player(cli, player, chan, who = None, forced = False):
var.WAIT_TB_TOKENS = var.WAIT_TB_INIT var.WAIT_TB_TOKENS = var.WAIT_TB_INIT
var.WAIT_TB_LAST = time.time() var.WAIT_TB_LAST = time.time()
var.GAME_ID = time.time() var.GAME_ID = time.time()
var.PINGED_ALREADY_ACCS = [] var.PINGED_ALREADY_ACCS = set()
var.PINGED_ALREADY = [] var.PINGED_ALREADY = set()
if cloak: if cloak:
var.JOINED_THIS_GAME.append(cloak) var.JOINED_THIS_GAME.append(cloak)
if acc: if acc: