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

Removed static access

Browse source
This commit is contained in:
Sauilitired 2014-11-15 12:53:26 +01:00
parent 0914b7bec9
commit 56cb409a43
3 changed files with 90 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
View file

@ -1252,15 +1252,15 @@ public class PlotMain extends JavaPlugin {
return plots;
}
public static void setAllPlotsRaw(final LinkedHashMap<String, HashMap<PlotId, Plot>> plots) {
PlotMain.plots = plots;
}
public static void setAllPlotsRaw(final HashMap<String, HashMap<PlotId, Plot>> plots) {
PlotMain.plots = new LinkedHashMap<>(plots);
// PlotMain.plots.putAll(plots);
}
public static void setAllPlotsRaw(final LinkedHashMap<String, HashMap<PlotId, Plot>> plots) {
PlotMain.plots = plots;
}
/**
* !!WorldGeneration!!
*/
@ -1347,6 +1347,9 @@ public class PlotMain extends JavaPlugin {
mySQL = new MySQL(this, Settings.DB.HOST_NAME, Settings.DB.PORT, Settings.DB.DATABASE, Settings.DB.USER, Settings.DB.PASSWORD);
connection = mySQL.openConnection();
{
if (DBFunc.dbManager == null) {
DBFunc.dbManager = new SQLManager(connection, Settings.DB.PREFIX);
}
final DatabaseMetaData meta = connection.getMetaData();
ResultSet res = meta.getTables(null, null, Settings.DB.PREFIX + "plot", null);
if (!res.next()) {
@ -1373,9 +1376,6 @@ public class PlotMain extends JavaPlugin {
Bukkit.getPluginManager().disablePlugin(this);
return;
}
if (DBFunc.dbManager == null) {
DBFunc.dbManager = new SQLManager(connection, Settings.DB.PREFIX);
}
plots = DBFunc.getPlots();
}
// TODO: Implement mongo
@ -1386,6 +1386,7 @@ public class PlotMain extends JavaPlugin {
try {
connection = new SQLite(this, Settings.DB.SQLITE_DB + ".db").openConnection();
{
DBFunc.dbManager = new SQLManager(connection, Settings.DB.PREFIX);
final DatabaseMetaData meta = connection.getMetaData();
ResultSet res = meta.getTables(null, null, Settings.DB.PREFIX + "plot", null);
if (!res.next()) {
@ -1407,7 +1408,6 @@ public class PlotMain extends JavaPlugin {
Bukkit.getPluginManager().disablePlugin(this);
return;
}
DBFunc.dbManager = new SQLManager(connection, Settings.DB.PREFIX);
plots = DBFunc.getPlots();
} else {
Logger.add(LogLevel.DANGER, "No storage type is set.");