@arg should default to null not empty string

CitizensDev · Oct 28, 2022 · 97d167b · 97d167b
1 parent 9f21659
commit 97d167b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/command/Arg.java b/src/main/java/net/citizensnpcs/api/command/Arg.java
@@ -19,6 +19,8 @@
 
     Class<? extends CompletionsProvider> completionsProvider() default CompletionsProvider.Identity.class;
 
+    String defValue() default "";
+
     Class<? extends FlagValidator<?>> validator() default FlagValidator.Identity.class;
 
     int value();

diff --git a/src/main/java/net/citizensnpcs/api/command/CommandManager.java b/src/main/java/net/citizensnpcs/api/command/CommandManager.java
@@ -688,11 +688,11 @@ private static class InjectedCommandArgument {
         private FlagValidator<?> validator;
 
         public InjectedCommandArgument(Class<?> paramType, Arg arg) {
-            this.defaultValue = "";
-            this.names = new String[] {};
             this.paramType = paramType;
+            this.names = new String[] {};
             this.index = arg.value();
             this.completions = arg.completions();
+            this.defaultValue = arg.defValue().isEmpty() ? null : arg.defValue();
             if (arg.validator() != FlagValidator.Identity.class) {
                 try {
                     this.validator = arg.validator().getConstructor().newInstance();