From bced8beeda72a16e31f62bfd2d3975e1814d462f Mon Sep 17 00:00:00 2001 From: PanFritz Date: Tue, 30 Jun 2015 19:11:48 +0200 Subject: [PATCH] Changed quiting arenas to use player object and not name of player. Timing thread added try except --- snowbrawl.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/snowbrawl.py b/snowbrawl.py index a722fb2..724bc83 100644 --- a/snowbrawl.py +++ b/snowbrawl.py @@ -536,7 +536,11 @@ def timings(): current_time = time.time() start_time = arena.start_time if arena.start_time + arena.match_goal < current_time: - arena.end_match() + try: + arena.end_match() + except: + pass + time.sleep(0.1) timingsThread = threading.Thread(target = timings) @@ -699,7 +703,7 @@ def arena_info(sender, args): def quit_match(sender): for arena in arenas: if arena.in_queue(sender.getName()): - arena.remove_player(sender.getName()) + arena.remove_player(sender) msg(sender, "&a-&e Quit arena") return msg(sender, "&a-&e You're not in a queue")