funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-06-10 10:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Command Replacements not being applied correctly to aliases - fixes #37

Browse Source
This commit is contained in:
Aikar
2017-05-20 11:47:54 -04:00
parent 798a1d57c9
commit c253dcaed7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/co/aikar/commands/BaseCommand.java
+4 -3
View File
@@ -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);