diff options
author | sk89q <the.sk89q@gmail.com> | 2011-02-16 21:45:15 -0800 |
---|---|---|
committer | sk89q <the.sk89q@gmail.com> | 2011-02-16 21:47:05 -0800 |
commit | 42def68966214628e9d7a6f7846c3159d165b7ff (patch) | |
tree | 95e66f9081bdea4077616c985037f367812be94b /src | |
parent | 69d3880730d9f959c7e6aa461f681e9041115214 (diff) | |
download | bukkit-42def68966214628e9d7a6f7846c3159d165b7ff.tar bukkit-42def68966214628e9d7a6f7846c3159d165b7ff.tar.gz bukkit-42def68966214628e9d7a6f7846c3159d165b7ff.tar.lz bukkit-42def68966214628e9d7a6f7846c3159d165b7ff.tar.xz bukkit-42def68966214628e9d7a6f7846c3159d165b7ff.zip |
Fixed alias parsing for commands. object.toString().split(",") is NOT how you parse a YAML list!
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/command/PluginCommandYamlParser.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java index 9b4f8493..2305e0ed 100644 --- a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java +++ b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java @@ -9,13 +9,13 @@ import org.bukkit.plugin.Plugin; public class PluginCommandYamlParser { + @SuppressWarnings("unchecked") public static List<Command> parse(Plugin plugin) { List<Command> pluginCmds = new ArrayList<Command>(); Object object = plugin.getDescription().getCommands(); if (object == null) return pluginCmds; - @SuppressWarnings("unchecked") Map<String, Map<String, Object>> map = (Map<String, Map<String, Object>>)object; if (map != null) { @@ -34,9 +34,13 @@ public class PluginCommandYamlParser { if (aliases != null) { List<String> aliasList = new ArrayList<String>(); - - for(String a : aliases.toString().split(",")) { - aliasList.add(a); + + if (aliases instanceof List) { + for (Object o : (List<Object>)aliases) { + aliasList.add(o.toString()); + } + } else { + aliasList.add(aliases.toString()); } newCmd.setAliases(aliasList); |