aboutsummaryrefslogtreecommitdiffstats
path: root/bot/bot.py
diff options
context:
space:
mode:
authorGravatar kwzrd <[email protected]>2020-03-15 19:57:11 +0100
committerGravatar kwzrd <[email protected]>2020-03-15 19:57:11 +0100
commitb9808a82c41c81d0501a713f854e93a0e5f2054a (patch)
tree1175115cce8e36d4ab4a3c28b4c67806da928dd9 /bot/bot.py
parentDeseasonify: move the branding module from seasons to bot directory (diff)
parentMerge pull request #371 from ks129/help (diff)
Merge branch 'master' into seasonal-purge
This merges the newly added help cog. Resolve slight conflict in the __main__ module caused by the the master branch still assuming the presence of the legacy season manager cog.
Diffstat (limited to 'bot/bot.py')
-rw-r--r--bot/bot.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bot/bot.py b/bot/bot.py
index 2443852c..c6ec3357 100644
--- a/bot/bot.py
+++ b/bot/bot.py
@@ -32,7 +32,7 @@ class SeasonalBot(commands.Bot):
# Unload all cogs
extensions = list(self.extensions.keys())
for extension in extensions:
- if extension != "bot.seasons": # We shouldn't unload the manager.
+ if extension not in ["bot.branding", "bot.help"]: # We shouldn't unload the manager and help.
self.unload_extension(extension)
# Load in the list of cogs that was passed in here