take 2 on fixing the same issue

efekos · Sep 20, 2023 · f419949 · f419949
1 parent ea019e4
commit f419949
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/main/java/me/efekos/simpler/commands/CoreCommand.java b/src/main/java/me/efekos/simpler/commands/CoreCommand.java
@@ -214,11 +214,12 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab
                                             break a;
                                         }
                                     }
-
-                                    ArgumentHandleResult result = arg.handleCorrection(subArgs[i]);
-                                    if(!result.isPassed()){
-                                        sender.sendMessage(TranslateManager.translateColors(configuration.USAGE.replace("%usage%",getUsage()).replace("%reason%",result.getReason())));
-                                        break a;
+                                    if(subArgs.length-1<i&&subArgs[i]!=null){
+                                        ArgumentHandleResult result = arg.handleCorrection(subArgs[i]);
+                                        if(!result.isPassed()){
+                                            sender.sendMessage(TranslateManager.translateColors(configuration.USAGE.replace("%usage%",getUsage()).replace("%reason%",result.getReason())));
+                                            break a;
+                                        }
                                     }
                                 }
 
@@ -258,11 +259,12 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab
                                         break a;
                                     }
                                 }
-
-                                ArgumentHandleResult handleResult = arg.handleCorrection(subArgs[i]);
-                                if(!handleResult.isPassed()){
-                                    sender.sendMessage(TranslateManager.translateColors(configuration.USAGE.replace("%usage%",getUsage()).replace("%reason%",handleResult.getReason())));
-                                    break a;
+                                if(subArgs.length-1<i&&subArgs[i]!=null){
+                                    ArgumentHandleResult result = arg.handleCorrection(subArgs[i]);
+                                    if(!result.isPassed()){
+                                        sender.sendMessage(TranslateManager.translateColors(configuration.USAGE.replace("%usage%",getUsage()).replace("%reason%",result.getReason())));
+                                        break a;
+                                    }
                                 }
                             }