Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed 'bad aliases' error output.

Browse Source
This commit is contained in:
EvilSeph 2011-06-23 15:32:53 -04:00
parent d870a6e3f8
commit f0877250ff
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/bukkit/command/SimpleCommandMap.java
View File

@ -152,7 +152,7 @@ public final class SimpleCommandMap implements CommandMap {
public void registerServerAliases() { public void registerServerAliases() {
Map<String, String[]> values = server.getCommandAliases(); Map<String, String[]> values = server.getCommandAliases();
for (String alias : values.keySet()) { for (String alias : values.keySet()) {
String[] targetNames = values.get(alias); String[] targetNames = values.get(alias);
List<Command> targets = new ArrayList<Command>(); List<Command> targets = new ArrayList<Command>();
@ -162,16 +162,14 @@ public final class SimpleCommandMap implements CommandMap {
Command command = getCommand(name); Command command = getCommand(name);
if (command == null) { if (command == null) {
if (bad.length() > 0) { bad += name + ", ";
bad += ", ";
}
} else { } else {
targets.add(command); targets.add(command);
} }
} }
// We register these as commands so they have absolute priority. // We register these as commands so they have absolute priority.
if (targets.size() > 0) { if (targets.size() > 0) {
knownCommands.put(alias.toLowerCase(), new MultipleCommandAlias(alias.toLowerCase(), targets.toArray(new Command[0]))); knownCommands.put(alias.toLowerCase(), new MultipleCommandAlias(alias.toLowerCase(), targets.toArray(new Command[0])));
} else { } else {
@ -179,6 +177,7 @@ public final class SimpleCommandMap implements CommandMap {
} }
if (bad.length() > 0) { if (bad.length() > 0) {
bad = bad.substring(0, bad.length() - 2);
server.getLogger().warning("The following command(s) could not be aliased under '" + alias + "' because they do not exist: " + bad); server.getLogger().warning("The following command(s) could not be aliased under '" + alias + "' because they do not exist: " + bad);
} }
} }