From 403f8747841329452ac0dbc28df25171e6dc72ec Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Wed, 29 Feb 2012 10:27:38 -0600 Subject: [PATCH] [Bleeding] Fix generics. Addresses BUKKIT-844 --- src/main/java/org/bukkit/craftbukkit/CraftServer.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 7589fe26da..0e46b36438 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -106,6 +106,7 @@ import com.avaje.ebean.config.DataSourceConfig; import com.avaje.ebean.config.ServerConfig; import com.avaje.ebean.config.dbplatform.SQLitePlatform; import com.avaje.ebeaninternal.server.lib.sql.TransactionIsolation; +import com.google.common.collect.ImmutableList; import com.google.common.collect.MapMaker; import jline.ConsoleReader; @@ -810,18 +811,17 @@ public final class CraftServer implements Server { public Iterator recipeIterator() { return new RecipeIterator(); } - + public void clearRecipes() { CraftingManager.getInstance().b.clear(); FurnaceRecipes.getInstance().b().clear(); } - + public void resetRecipes() { CraftingManager.getInstance().b = new CraftingManager().b; FurnaceRecipes.getInstance().b = new FurnaceRecipes().b; } - @SuppressWarnings("unchecked") public Map getCommandAliases() { ConfigurationSection section = configuration.getConfigurationSection("aliases"); Map result = new LinkedHashMap(); @@ -831,10 +831,9 @@ public final class CraftServer implements Server { List commands = null; if (section.isList(key)) { - commands = section.getList(key); + commands = section.getStringList(key); } else { - commands = new ArrayList(); - commands.add(section.getString(key)); + commands = ImmutableList.of(section.getString(key)); } result.put(key, commands.toArray(new String[0]));