diff --git a/commands/player/utils.py b/commands/player/utils.py index cc55d9b6..3d65e797 100644 --- a/commands/player/utils.py +++ b/commands/player/utils.py @@ -600,7 +600,7 @@ async def detailed_player_board(bot: CustomClient, custom_player: StatsPlayer, s if member is not None: embed.set_footer(text=str(member), icon_url=member.display_avatar) - ban = await bot.banlist.find_one({"$and": [{"VillageTag": f"{player.tag}"}, {"server": server.id}]}) + ban = await bot.banlist.find_one({"$and": [{"VillageTag": f"{player.tag}"}, {"server": server.id if server else None}]}) if ban is not None: date = ban.get("DateCreated") diff --git a/commands/war/commands.py b/commands/war/commands.py index 6a1de9c3..b1643aff 100644 --- a/commands/war/commands.py +++ b/commands/war/commands.py @@ -28,12 +28,14 @@ plan_text, roster_embed, ) +from utility.discord_utils import user_command class War(commands.Cog): def __init__(self, bot: CustomClient): self.bot = bot + @user_command() @commands.slash_command(name='war') async def war(self, ctx: disnake.ApplicationCommandInteraction): pass diff --git a/discord/events.py b/discord/events.py index f5635957..937fb5ca 100644 --- a/discord/events.py +++ b/discord/events.py @@ -37,7 +37,7 @@ async def on_ready(self): return has_started = True - if self.bot._config.cluster_id == 1: + if self.bot._config.cluster_id <= 1: await self.sync_patchable_commands() if self.bot.user.public_flags.verified_bot: