mirror of
https://github.com/RonanPlugins/BetterRTP.git
synced 2026-04-23 08:37:32 +00:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # pom.xml
This commit is contained in:
@@ -27,7 +27,6 @@ import org.bukkit.command.CommandSender;
|
|||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.logging.Level;
|
|
||||||
|
|
||||||
public class BetterRTP extends JavaPlugin {
|
public class BetterRTP extends JavaPlugin {
|
||||||
private final Permissions perms = new Permissions();
|
private final Permissions perms = new Permissions();
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ package me.SuperRonanCraft.BetterRTP.player.commands;
|
|||||||
import me.SuperRonanCraft.BetterRTP.player.commands.types.*;
|
import me.SuperRonanCraft.BetterRTP.player.commands.types.*;
|
||||||
|
|
||||||
public enum RTPCommandType {
|
public enum RTPCommandType {
|
||||||
BIOME(new CmdBiome()),
|
// TODO @Ronan Fix biomes
|
||||||
|
// BIOME(new CmdBiome()),
|
||||||
EDIT(new CmdEdit()),
|
EDIT(new CmdEdit()),
|
||||||
HELP(new CmdHelp()),
|
HELP(new CmdHelp()),
|
||||||
INFO(new CmdInfo()),
|
INFO(new CmdInfo()),
|
||||||
|
|||||||
@@ -35,8 +35,4 @@ public class DatabaseHandler {
|
|||||||
return BetterRTP.getInstance().getDatabaseHandler().getDatabaseQueue();
|
return BetterRTP.getInstance().getDatabaseHandler().getDatabaseQueue();
|
||||||
}
|
}
|
||||||
|
|
||||||
//public static DatabaseChunkData getChunks() {
|
|
||||||
// return BetterRTP.getInstance().getDatabaseHandler().getDatabaseChunks();
|
|
||||||
//}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,8 @@ public abstract class SQLite {
|
|||||||
return getLocal();
|
return getLocal();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public abstract Connection getConnection();
|
||||||
|
|
||||||
private Connection getLocal() {
|
private Connection getLocal() {
|
||||||
File dataFolder = new File(BetterRTP.getInstance().getDataFolder().getPath() + File.separator + "data", db_file_name + ".db");
|
File dataFolder = new File(BetterRTP.getInstance().getDataFolder().getPath() + File.separator + "data", db_file_name + ".db");
|
||||||
if (!dataFolder.exists()){
|
if (!dataFolder.exists()){
|
||||||
|
|||||||
Reference in New Issue
Block a user