1
0
Fork 0
mirror of synced 2024-05-24 06:19:39 +12:00

Merge branch 'rewrite' of https://github.com/Phxntxm/Bonfire into rewrite

This commit is contained in:
Phxntxm 2017-07-29 14:36:06 -05:00
commit 29bcea3b21
2 changed files with 3 additions and 1 deletions

View file

@ -21,7 +21,7 @@ class Overwatch:
@commands.group()
@utils.check_restricted()
async def ow(self):
async def ow(self, ctx):
"""Command used to lookup information on your own user, or on another's
When adding your battletag, it is quite picky, use the exact format user#xxxx
Multiple names with the same username can be used, this is why the numbers are needed

View file

@ -170,6 +170,8 @@ class Playlist(EventEmitter):
# Otherwise, wait a second and check again
else:
await asyncio.sleep(1)
# "Refresh" the next entry, in case someone cleared the next song in the queue
entry = self.peek()
# If we've reached here, we have no entries
return None