diff options
Diffstat (limited to 'bot')
| -rw-r--r-- | bot/exts/fun/battleship.py | 4 | ||||
| -rw-r--r-- | bot/exts/fun/connect_four.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bot/exts/fun/battleship.py b/bot/exts/fun/battleship.py index beff196f..77e38427 100644 --- a/bot/exts/fun/battleship.py +++ b/bot/exts/fun/battleship.py @@ -110,8 +110,8 @@ class Game: self.gameover: bool = False - self.turn: Optional[discord.Member] = None - self.next: Optional[discord.Member] = None + self.turn: Optional[Player] = None + self.next: Optional[Player] = None self.match: Optional[re.Match] = None self.surrender: bool = False diff --git a/bot/exts/fun/connect_four.py b/bot/exts/fun/connect_four.py index f53695d5..1b88d065 100644 --- a/bot/exts/fun/connect_four.py +++ b/bot/exts/fun/connect_four.py @@ -5,6 +5,7 @@ from typing import Optional, Union import discord import emojis +from discord import ClientUser, Member from discord.ext import commands from bot.bot import Bot @@ -71,7 +72,9 @@ class Game: await self.message.add_reaction(CROSS_EMOJI) await self.message.edit(content=None, embed=embed) - async def game_over(self, action: str, player1: discord.user, player2: discord.user) -> None: + async def game_over( + self, action: str, player1: Union[ClientUser, Member], player2: Union[ClientUser, Member] + ) -> None: """Announces to public chat.""" if action == "win": await self.channel.send(f"Game Over! {player1.mention} won against {player2.mention}") |