Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-10-03 05:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor remake xD

Browse Source
This commit is contained in:
Sauilitired 2014-11-15 12:29:30 +01:00
parent 8f8fa01389
commit 0914b7bec9
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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!!
*/
@ -1343,10 +1343,6 @@ public class PlotMain extends JavaPlugin {
// Use mysql?
if (Settings.DB.USE_MYSQL) {
// TODO: Remake SQLManager
if (DBFunc.dbManager == null) {
DBFunc.dbManager = new SQLManager(connection, Settings.DB.PREFIX);
}
try {
mySQL = new MySQL(this, Settings.DB.HOST_NAME, Settings.DB.PORT, Settings.DB.DATABASE, Settings.DB.USER, Settings.DB.PASSWORD);
connection = mySQL.openConnection();
@ -1377,15 +1373,16 @@ 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
else if (Settings.DB.USE_MONGO) {
// DBFunc.dbManager = new MongoManager();
sendConsoleSenderMessage(C.PREFIX.s() + "MongoDB is not yet implemented");
} else if (Settings.DB.USE_SQLITE) {
DBFunc.dbManager = new SQLManager(connection, Settings.DB.PREFIX);
try {
connection = new SQLite(this, Settings.DB.SQLITE_DB + ".db").openConnection();
{
@ -1410,6 +1407,7 @@ 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.");

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java
View File

@ -95,7 +95,7 @@ public enum Command {
/**
*
*/
DEBUG("debug", "database", new CommandPermission("plots.admin")),
DEBUG("debug", "debug", new CommandPermission("plots.admin")),
/**
*
*/