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

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>

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>