From 65af80a430b49f3e1bca18f7aee80dd56e2025cf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 17 Mar 2018 20:38:45 -0400
Subject: [PATCH] Default empty descriptions

---
 core/src/main/java/co/aikar/commands/Annotations.java      | 7 ++++++-
 core/src/main/java/co/aikar/commands/CommandParameter.java | 2 +-
 .../src/main/java/co/aikar/commands/RegisteredCommand.java | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/co/aikar/commands/Annotations.java b/core/src/main/java/co/aikar/commands/Annotations.java
index 53146002..f9a05b08 100644
--- a/core/src/main/java/co/aikar/commands/Annotations.java
+++ b/core/src/main/java/co/aikar/commands/Annotations.java
@@ -38,6 +38,7 @@ class Annotations <M extends CommandManager> extends AnnotationLookups {
     public static int LOWERCASE = 1 << 1;
     public static int UPPERCASE = 1 << 2;
     public static int NO_EMPTY = 1 << 3;
+    public static int DEFAULT_EMPTY = 1 << 4;
 
     private final M manager;
 
@@ -77,7 +78,11 @@ class Annotations <M extends CommandManager> extends AnnotationLookups {
         // TODO: Aliases
 
         if (value == null) {
-            return null;
+            if (hasOption(options, DEFAULT_EMPTY)) {
+                value = "";
+            } else {
+                return null;
+            }
         }
 
         // transforms
diff --git a/core/src/main/java/co/aikar/commands/CommandParameter.java b/core/src/main/java/co/aikar/commands/CommandParameter.java
index 92e26c28..82484dbc 100644
--- a/core/src/main/java/co/aikar/commands/CommandParameter.java
+++ b/core/src/main/java/co/aikar/commands/CommandParameter.java
@@ -69,7 +69,7 @@ public class CommandParameter <CEC extends CommandExecutionContext<CEC, ? extend
         Annotations annotations = manager.getAnnotations();
 
         this.defaultValue = annotations.getAnnotationValue(param, Default.class, Annotations.REPLACEMENTS | (type != String.class ? Annotations.NO_EMPTY : 0));
-        this.description = annotations.getAnnotationValue(param, Description.class);
+        this.description = annotations.getAnnotationValue(param, Description.class, Annotations.REPLACEMENTS | Annotations.DEFAULT_EMPTY);
         this.conditions = annotations.getAnnotationValue(param, Conditions.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);
 
         //noinspection unchecked
diff --git a/core/src/main/java/co/aikar/commands/RegisteredCommand.java b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
index 758b99ad..bf8678e7 100644
--- a/core/src/main/java/co/aikar/commands/RegisteredCommand.java
+++ b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
@@ -81,7 +81,7 @@ public class RegisteredCommand <CEC extends CommandExecutionContext<CEC, ? exten
 
         this.permission = annotations.getAnnotationValue(method, CommandPermission.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);
         this.complete   = annotations.getAnnotationValue(method, CommandCompletion.class);
-        this.helpText = annotations.getAnnotationValue(method, Description.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);
+        this.helpText = annotations.getAnnotationValue(method, Description.class, Annotations.REPLACEMENTS | Annotations.DEFAULT_EMPTY);
         this.conditions = annotations.getAnnotationValue(method, Conditions.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);
         this.helpSearchTags = annotations.getAnnotationValue(method, HelpSearchTags.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);