Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-17 05:20:05 +01:00
Code Issues Projekte Releases Wiki Aktivität

[Bleeding] Fix generics. Addresses BUKKIT-844

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Wesley Wolfe 2012-02-29 10:27:38 -06:00 committet von EvilSeph
Ursprung 257fd16242
Commit 403f874784
1 geänderte Dateien mit 5 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

11
src/main/java/org/bukkit/craftbukkit/CraftServer.java
Datei anzeigen

@ -106,6 +106,7 @@ import com.avaje.ebean.config.DataSourceConfig;
import com.avaje.ebean.config.ServerConfig; import com.avaje.ebean.config.ServerConfig;
import com.avaje.ebean.config.dbplatform.SQLitePlatform; import com.avaje.ebean.config.dbplatform.SQLitePlatform;
import com.avaje.ebeaninternal.server.lib.sql.TransactionIsolation; import com.avaje.ebeaninternal.server.lib.sql.TransactionIsolation;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.MapMaker; import com.google.common.collect.MapMaker;
import jline.ConsoleReader; import jline.ConsoleReader;
@ -810,18 +811,17 @@ public final class CraftServer implements Server {
public Iterator<Recipe> recipeIterator() { public Iterator<Recipe> recipeIterator() {
return new RecipeIterator(); return new RecipeIterator();
} }
public void clearRecipes() { public void clearRecipes() {
CraftingManager.getInstance().b.clear(); CraftingManager.getInstance().b.clear();
FurnaceRecipes.getInstance().b().clear(); FurnaceRecipes.getInstance().b().clear();
} }
public void resetRecipes() { public void resetRecipes() {
CraftingManager.getInstance().b = new CraftingManager().b; CraftingManager.getInstance().b = new CraftingManager().b;
FurnaceRecipes.getInstance().b = new FurnaceRecipes().b; FurnaceRecipes.getInstance().b = new FurnaceRecipes().b;
} }
@SuppressWarnings("unchecked")
public Map<String, String[]> getCommandAliases() { public Map<String, String[]> getCommandAliases() {
ConfigurationSection section = configuration.getConfigurationSection("aliases"); ConfigurationSection section = configuration.getConfigurationSection("aliases");
Map<String, String[]> result = new LinkedHashMap<String, String[]>(); Map<String, String[]> result = new LinkedHashMap<String, String[]>();
@ -831,10 +831,9 @@ public final class CraftServer implements Server {
List<String> commands = null; List<String> commands = null;
if (section.isList(key)) { if (section.isList(key)) {
commands = section.getList(key); commands = section.getStringList(key);
} else { } else {
commands = new ArrayList<String>(); commands = ImmutableList.<String>of(section.getString(key));
commands.add(section.getString(key));
} }
result.put(key, commands.toArray(new String[0])); result.put(key, commands.toArray(new String[0]));