From 97d167bfb42579f69e7e502710adc7a3feee98e4 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Fri, 28 Oct 2022 19:19:58 +0800
Subject: [PATCH] @Arg should default to null not empty string

---
 src/main/java/net/citizensnpcs/api/command/Arg.java           | 2 ++
 .../java/net/citizensnpcs/api/command/CommandManager.java     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/api/command/Arg.java b/src/main/java/net/citizensnpcs/api/command/Arg.java
index 2574fdd7..8593d10c 100644
--- 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
index eaea7e91..247e44a8 100644
--- 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();