From c253dcaed759d3f1d9e2c221110d3be1b69569af Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 20 May 2017 11:47:54 -0400
Subject: [PATCH] Fix Command Replacements not being applied correctly to
 aliases - fixes #37

---
 core/src/main/java/co/aikar/commands/BaseCommand.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/co/aikar/commands/BaseCommand.java b/core/src/main/java/co/aikar/commands/BaseCommand.java
index 8bdea0a0..87d405d8 100644
--- a/core/src/main/java/co/aikar/commands/BaseCommand.java
+++ b/core/src/main/java/co/aikar/commands/BaseCommand.java
@@ -112,12 +112,13 @@ public class BaseCommand extends Command {
     void onRegister(CommandManager manager, String cmd) {
         this.manager = manager;
         final Class<? extends BaseCommand> self = this.getClass();
-        CommandAlias rootCmdAlias = self.getAnnotation(CommandAlias.class);
+        CommandAlias rootCmdAliasAnno = self.getAnnotation(CommandAlias.class);
+        String rootCmdAlias = rootCmdAliasAnno != null ? manager.getCommandReplacements().replace(rootCmdAliasAnno.value()).toLowerCase() : null;
         if (cmd == null) {
             if (rootCmdAlias == null) {
                 cmd = "__" + self.getSimpleName();
             } else {
-                cmd = ACFPatterns.PIPE.split(manager.getCommandReplacements().replace(rootCmdAlias.value()))[0];
+                cmd = ACFPatterns.PIPE.split(rootCmdAlias)[0];
             }
             cmd = cmd.toLowerCase();
             try {
@@ -185,7 +186,7 @@ public class BaseCommand extends Command {
 
         if (rootCmdAlias != null) {
             Set<String> cmdList = new HashSet<>();
-            Collections.addAll(cmdList, ACFPatterns.PIPE.split(rootCmdAlias.value().toLowerCase()));
+            Collections.addAll(cmdList, ACFPatterns.PIPE.split(rootCmdAlias));
             cmdList.remove(cmd);
             for (String cmdAlias : cmdList) {
                 register(cmdAlias, this);