TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-08 21:43:11 +00:00
Code Issues Projects Releases Wiki Activity

A whole load of fixes

Browse source
This commit is contained in:
Sauilitired 2014-11-21 23:45:46 +01:00
parent c25eccf4a0
commit 75a5a76fe9
61 changed files with 401 additions and 626 deletions
Download patch file Download diff file Expand all files Collapse all files

9
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
View file

@ -383,7 +383,7 @@ public class SQLManager implements AbstractDB {
*/
@Override
public LinkedHashMap<String, HashMap<PlotId, Plot>> getPlots() {
final LinkedHashMap<String, HashMap<PlotId, Plot>> newplots = new LinkedHashMap<String, HashMap<PlotId, Plot>>();
final LinkedHashMap<String, HashMap<PlotId, Plot>> newplots = new LinkedHashMap<>();
try {
final DatabaseMetaData data = connection.getMetaData();
ResultSet rs = data.getColumns(null, null, prefix + "plot", "plot_id");
@ -408,12 +408,12 @@ public class SQLManager implements AbstractDB {
} catch (final Exception e) {
e.printStackTrace();
}
final HashMap<Integer, Plot> plots = new HashMap<Integer, Plot>();
final HashMap<Integer, Plot> plots = new HashMap<>();
Statement stmt = null;
try {
Set<String> worlds = new HashSet<String>();
Set<String> worlds = new HashSet<>();
if (PlotMain.config.contains("worlds")) {
worlds = PlotMain.config.getConfigurationSection("worlds").getKeys(false);
}
@ -448,7 +448,7 @@ public class SQLManager implements AbstractDB {
user = UUID.fromString(o);
uuids.put(o, user);
}
p = new Plot(plot_id, user, Biome.FOREST, new ArrayList<UUID>(), new ArrayList<UUID>(), new ArrayList<UUID>(), "", PlotHomePosition.DEFAULT, null, worldname, new boolean[]{false, false, false, false});
p = new Plot(plot_id, user, new ArrayList<UUID>(), new ArrayList<UUID>(), new ArrayList<UUID>(), "", PlotHomePosition.DEFAULT, null, worldname, new boolean[]{false, false, false, false});
plots.put(id, p);
}
// stmt.close();
@ -924,7 +924,6 @@ public class SQLManager implements AbstractDB {
h.put(var, val);
}
stmt.close();
;
} catch (final SQLException e) {
Logger.add(LogLevel.WARNING, "Failed to load settings for plot: " + id);
e.printStackTrace();