Fix defaults with flags everywhere

Incendo · Nov 19, 2022 · 6305a79 · 6305a79
1 parent 947364b
commit 6305a79
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java
@@ -339,7 +339,8 @@ private CommandTree(final @NonNull CommandManager<C> commandManager) {
                 ));
             }
             if (child.getValue() != null) {
-                if (commandQueue.isEmpty()) {
+                // Flag arguments need to be skipped over, so that further defaults are handled
+                if (commandQueue.isEmpty() && !(child.getValue() instanceof FlagArgument)) {
                     if (child.getValue().hasDefaultValue()) {
                         commandQueue.add(child.getValue().getDefaultValue());
                     } else if (!child.getValue().isRequired()) {