[F] Fix cancellation order issue

HyDevelop · Apr 21, 2020 · 37a3404 · 37a3404
1 parent e365bdf
commit 37a3404
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/cc/moecraft/icq/command/CommandListener.java b/src/main/java/cc/moecraft/icq/command/CommandListener.java
@@ -45,12 +45,6 @@ public boolean check(EventMessage event)
                 event instanceof EventGroupMessage || event instanceof EventDiscussMessage);
             CommandRunnable runnable = new CommandRunnable(event, args);
 
-            // 取消后续事件
-            if (!event.getBot().getConfig().isCommandsAlsoCallEvents())
-            {
-                return false;
-            }
-
             // 运行指令
             if (event.getBot().getConfig().isUseAsyncCommands())
             {
@@ -63,6 +57,12 @@ public boolean check(EventMessage event)
             {
                 runnable.run();
             }
+
+            // 取消后续事件
+            if (!event.getBot().getConfig().isCommandsAlsoCallEvents())
+            {
+                return false;
+            }
         }
         catch (NotACommandException | CommandNotFoundException e)
         {