CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-09-29 08:51:53 +13:00
Code Issues Releases Wiki Activity

Changed the order of operations, in case the bot doesn't have permissions to delete/send a message

Browse source
This commit is contained in:
Phxntxm 2016-08-07 08:46:30 -05:00
parent 8e2c343cc1
commit 425cf30965
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cogs/interaction.py
View file

@ -122,6 +122,7 @@ class Interaction:
battleP2 = ctx.message.author
fmt = config.battleWins[random.randint(0, len(config.battleWins) - 1)]
battlingOff(ctx.message.author.id)
if random.randint(1, 100) < 50:
await self.bot.say(fmt.format(battleP1.mention, battleP2.mention))
@ -129,9 +130,8 @@ class Interaction:
else:
await self.bot.say(fmt.format(battleP2.mention, battleP1.mention))
updateBattleRecords(battleP2, battleP1)
await self.bot.delete_message(ctx.message)
battlingOff(ctx.message.author.id)
@commands.command(pass_context=True, no_pm=True)
@checks.customPermsOrRole(send_messages=True)
@ -149,9 +149,9 @@ class Interaction:
battleP1 = discord.utils.find(lambda m: m.id == p1[0], ctx.message.server.members)
battleP2 = ctx.message.author
battlingOff(ctx.message.author.id)
await self.bot.say("{0} has chickened out! What a loser~".format(battleP2.mention, battleP1.mention))
await self.bot.delete_message(ctx.message)
battlingOff(ctx.message.author.id)
@commands.command(pass_context=True, no_pm=True)
@commands.cooldown(1, 180, BucketType.user)