fix(cmd): 修复CommandHandler处理异常的问题

2024-09-19 19:25:45 +00:00 · 2023-02-11 21:11:34 +08:00 · 2023-02-11 21:11:34 +08:00 · 088cc62855
commit 088cc62855
parent 437d0ffb32
16 changed files with 43 additions and 37 deletions
--- a/base/command/pom.xml
+++ b/base/command/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/command/src/main/java/cc/carm/lib/easyplugin/command/CommandHandler.java
+++ b/base/command/src/main/java/cc/carm/lib/easyplugin/command/CommandHandler.java
@ -74,36 +74,42 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {

    @Override
    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+        if (!this.hasPermission(sender)) {
+            noPermission(sender);
+            return true;
+        }
+
        if (args.length == 0) {
            this.noArgs(sender);
-        } else {
-            String input = args[0].toLowerCase();
+            return true;
+        }

-            CommandHandler handler = getHandler(input);
-            if (handler != null) {
-                if (!handler.hasPermission(sender)) {
-                    this.noPermission(sender);
-                } else {
-                    handler.onCommand(sender, command, label, this.shortenArgs(args));
-                }
-            }
+        String input = args[0].toLowerCase();

-            SubCommand<?> sub = getSubCommand(input);
-            if (sub == null) {
-                this.unknownCommand(sender, args);
-            } else if (!sub.hasPermission(sender)) {
+        CommandHandler handler = getHandler(input);
+        if (handler != null) {
+            if (!handler.hasPermission(sender)) {
                this.noPermission(sender);
            } else {
-                try {
-                    sub.execute(this.plugin, sender, this.shortenArgs(args));
-                } catch (ArrayIndexOutOfBoundsException ex) {
-                    this.unknownCommand(sender, args);
-                } catch (Exception ex) {
-                    this.onException(sender, sub, ex);
-                }
+                handler.onCommand(sender, command, label, this.shortenArgs(args));
            }
-
+            return true;
        }
+
+        SubCommand<?> sub = getSubCommand(input);
+        if (sub == null) {
+            this.unknownCommand(sender, args);
+        } else if (!sub.hasPermission(sender)) {
+            this.noPermission(sender);
+        } else {
+            try {
+                sub.execute(this.plugin, sender, this.shortenArgs(args));
+            } catch (Exception ex) {
+                this.onException(sender, sub, ex);
+                ex.printStackTrace();
+            }
+        }
+
        return true;
    }

--- a/base/conf/pom.xml
+++ b/base/conf/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/database/pom.xml
+++ b/base/database/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/gui/pom.xml
+++ b/base/gui/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/listener/pom.xml
+++ b/base/listener/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/main/pom.xml
+++ b/base/main/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/storage/pom.xml
+++ b/base/storage/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/utils/pom.xml
+++ b/base/utils/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/collection/all/pom.xml
+++ b/collection/all/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/collection/bom/pom.xml
+++ b/collection/bom/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/collection/common/pom.xml
+++ b/collection/common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/extension/gh-checker/pom.xml
+++ b/extension/gh-checker/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/extension/papi/pom.xml
+++ b/extension/papi/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/extension/vault/pom.xml
+++ b/extension/vault/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.4.18</version>
+        <version>1.4.19</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -15,7 +15,7 @@
    <groupId>cc.carm.lib</groupId>
    <artifactId>easyplugin-parent</artifactId>
    <packaging>pom</packaging>
-    <version>1.4.18</version>
+    <version>1.4.19</version>
    <modules>
        <module>base/utils</module>