summaryrefslogtreecommitdiff
path: root/snowbrawl.py
diff options
context:
space:
mode:
authorPanFritz <redstonenoobpan@gmail.com>2015-07-01 17:17:51 +0200
committerPanFritz <redstonenoobpan@gmail.com>2015-07-01 17:17:51 +0200
commit0f47853a41375bc4cbc130d0882a7591354c077b (patch)
tree3d5992e3f9a40934eca9ed4ff55197ec6214d9e8 /snowbrawl.py
parent1c3f2c898cf5daffd475d294f10789141eb46f5d (diff)
Changed name to object
Diffstat (limited to 'snowbrawl.py')
-rw-r--r--snowbrawl.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/snowbrawl.py b/snowbrawl.py
index a722fb2..02e997c 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)
@@ -698,8 +702,8 @@ def arena_info(sender, args):
def quit_match(sender):
for arena in arenas:
- if arena.in_queue(sender.getName()):
- arena.remove_player(sender.getName())
+ if arena.in_queue(sender):
+ arena.remove_player(sender)
msg(sender, "&a-&e Quit arena")
return
msg(sender, "&a-&e You're not in a queue")