Changed quiting arenas to use player object and not name of player. Timing thread added try except

This commit is contained in:
PanFritz
2015-06-30 19:11:48 +02:00
parent 168d99d9a1
commit bced8beeda

View File

@@ -536,7 +536,11 @@ def timings():
current_time = time.time() current_time = time.time()
start_time = arena.start_time start_time = arena.start_time
if arena.start_time + arena.match_goal < current_time: if arena.start_time + arena.match_goal < current_time:
try:
arena.end_match() arena.end_match()
except:
pass
time.sleep(0.1)
timingsThread = threading.Thread(target = timings) timingsThread = threading.Thread(target = timings)
@@ -699,7 +703,7 @@ def arena_info(sender, args):
def quit_match(sender): def quit_match(sender):
for arena in arenas: for arena in arenas:
if arena.in_queue(sender.getName()): if arena.in_queue(sender.getName()):
arena.remove_player(sender.getName()) arena.remove_player(sender)
msg(sender, "&a-&e Quit arena") msg(sender, "&a-&e Quit arena")
return return
msg(sender, "&a-&e You're not in a queue") msg(sender, "&a-&e You're not in a queue")