WhatTheMike/Fox-V3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more waiting

Browse Source
This commit is contained in:
Bobloy 2017-11-13 15:25:17 -05:00
parent ad7d152308
commit c0519b7805
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fight/fight.py
View File

@ -88,10 +88,10 @@ class Fight:
"""Participate in active fights!""" """Participate in active fights!"""
# guild = ctx.message.guild # guild = ctx.message.guild
if not self._activefight(ctx): if not await self._activefight(ctx):
await ctx.send("No tournament currently running!") await ctx.send("No tournament currently running!")
else: else:
await ctx.send("Current tournament ID: " + self._activefight(ctx)) await ctx.send("Current tournament ID: " + await self._activefight(ctx))
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await self.bot.send_cmd_help(ctx) await self.bot.send_cmd_help(ctx)
@ -104,8 +104,8 @@ class Fight:
if not user: if not user:
user = author user = author
currFight = self._getcurrentfight(ctx) currFight = await self._getcurrentfight(ctx)
tID = self._activefight(ctx) tID = await self._activefight(ctx)
if not currFight: if not currFight:
await ctx.send("No tournament currently running!") await ctx.send("No tournament currently running!")
return return
@ -114,7 +114,7 @@ class Fight:
await ctx.send("Tournament currently not accepting new players") await ctx.send("Tournament currently not accepting new players")
return return
if self._infight(ctx, tID, user.id): if await self._infight(ctx, tID, user.id):
await ctx.send("You are already in this tournament!") await ctx.send("You are already in this tournament!")
return return
@ -130,19 +130,19 @@ class Fight:
# guild = ctx.message.guild # guild = ctx.message.guild
# user = ctx.message.author # user = ctx.message.author
currFight = self._getcurrentfight(ctx) currFight = await self._getcurrentfight(ctx)
if not currFight: if not currFight:
await ctx.send("No tournament currently running!") await ctx.send("No tournament currently running!")
return return
if not tID: if not tID:
tID = self._activefight(ctx) tID = await self._activefight(ctx)
if not self._infight(ctx, tID, author.id): if not await self._infight(ctx, tID, author.id):
await ctx.send("You are not in a current tournament") await ctx.send("You are not in a current tournament")
return return
mID = self._parseuser(ctx, tID, author.id) mID = await self._parseuser(ctx, tID, author.id)
if not mID: if not mID:
await ctx.send("You have no match to update!") await ctx.send("You have no match to update!")
return return
@ -158,7 +158,7 @@ class Fight:
user = author user = author
if not tID: if not tID:
tID = self._activefight(ctx) tID = await self._activefight(ctx)
await ctx.send("Todo Leave") await ctx.send("Todo Leave")
# @fight.command(name="leaderboard", pass_context=True) # @fight.command(name="leaderboard", pass_context=True)