From 0c773134f21b1211910fb682cc965ed3b6971387 Mon Sep 17 00:00:00 2001
From: DiscordLiz <47602820+DiscordLiz@users.noreply.github.com>
Date: Tue, 27 Aug 2019 09:27:24 -0400
Subject: [PATCH] [Mod] Fix modset deletedelay (#2943)

* [Mod] Fix modset deletedelay

  fixes #2942

* Style guide fix
---
 changelog.d/mod/2924.fix.rst  | 1 +
 redbot/cogs/mod/movetocore.py | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/mod/2924.fix.rst

diff --git a/changelog.d/mod/2924.fix.rst b/changelog.d/mod/2924.fix.rst
new file mode 100644
index 000000000..38dce73f7
--- /dev/null
+++ b/changelog.d/mod/2924.fix.rst
@@ -0,0 +1 @@
+``modset deletedelay`` doesn't delete non-commands.
\ No newline at end of file
diff --git a/redbot/cogs/mod/movetocore.py b/redbot/cogs/mod/movetocore.py
index 35fae7b1c..e358cc742 100644
--- a/redbot/cogs/mod/movetocore.py
+++ b/redbot/cogs/mod/movetocore.py
@@ -21,10 +21,12 @@ class MoveToCore(MixinMeta):
     async def on_command_completion(self, ctx: commands.Context):
         await self._delete_delay(ctx)
 
-    # noinspection PyUnusedLocal
     @commands.Cog.listener()
-    async def on_command_error(self, ctx: commands.Context, error):
-        await self._delete_delay(ctx)
+    async def on_command_error(self, ctx: commands.Context, error: Exception):
+        # Every message which isn't a command but which
+        # starts with a bot prefix is dispatched as a command error
+        if not isinstance(error, commands.CommandNotFound):
+            await self._delete_delay(ctx)
 
     async def _delete_delay(self, ctx: commands.Context):
         """Currently used for: