Fix InvalidCommandException being thrown with incorrect arguments

Revxrsal · Revxrsal · commit 20c0b0e68378 · 2021-10-10T13:57:16.000+03:00
diff --git a/common/src/main/java/revxrsal/commands/core/BaseCommandDispatcher.java b/common/src/main/java/revxrsal/commands/core/BaseCommandDispatcher.java
@@ -52,8 +52,9 @@ public Object eval(@NotNull CommandActor actor, @NotNull ArgumentStack arguments
                     } else if (i == arguments.size() - 1 && defaultAction == null) {
                         throw new NoSubcommandSpecifiedException(cat);
                     }
-                }
-                if (i == arguments.size() - 1 && lastCategory != null && lastCategory.defaultAction != null) {
+                    // once the category is invalid and no such command is found then stop searching
+                } else break;
+                if (i == arguments.size() - 1 && lastCategory.defaultAction != null) {
                     arguments.subList(0, i).clear();
                     return execute(lastCategory.defaultAction, actor, arguments);
                 }
@@ -65,6 +66,7 @@ public Object eval(@NotNull CommandActor actor, @NotNull ArgumentStack arguments
                 } else
                     throw new InvalidSubcommandException(path, path.getLast());
             } else {
+                System.out.println("Last category: " + arguments);
                 if (lastArgument != null)
                     throw new InvalidCommandException(path, lastArgument);
             }

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,9 @@ public Object eval(@NotNull CommandActor actor, @NotNull ArgumentStack arguments`
`52`	`52`	`} else if (i == arguments.size() - 1 && defaultAction == null) {`
`53`	`53`	`throw new NoSubcommandSpecifiedException(cat);`
`54`	`54`	`}`
`55`		`- }`
`56`		`- if (i == arguments.size() - 1 && lastCategory != null && lastCategory.defaultAction != null) {`
	`55`	`+ // once the category is invalid and no such command is found then stop searching`
	`56`	`+ } else break;`
	`57`	`+ if (i == arguments.size() - 1 && lastCategory.defaultAction != null) {`
`57`	`58`	`arguments.subList(0, i).clear();`
`58`	`59`	`return execute(lastCategory.defaultAction, actor, arguments);`
`59`	`60`	`}`
`@@ -65,6 +66,7 @@ public Object eval(@NotNull CommandActor actor, @NotNull ArgumentStack arguments`
`65`	`66`	`} else`
`66`	`67`	`throw new InvalidSubcommandException(path, path.getLast());`
`67`	`68`	`} else {`
	`69`	`+ System.out.println("Last category: " + arguments);`
`68`	`70`	`if (lastArgument != null)`
`69`	`71`	`throw new InvalidCommandException(path, lastArgument);`
`70`	`72`	`}`