Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
This commit is contained in:
kristoffer
2023-04-30 23:05:16 +02:00
4 changed files with 4 additions and 6 deletions

View File

@@ -27,7 +27,6 @@ import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.List;
import java.util.logging.Level;
public class BetterRTP extends JavaPlugin {
private final Permissions perms = new Permissions();

View File

@@ -3,7 +3,8 @@ package me.SuperRonanCraft.BetterRTP.player.commands;
import me.SuperRonanCraft.BetterRTP.player.commands.types.*;
public enum RTPCommandType {
BIOME(new CmdBiome()),
// TODO @Ronan Fix biomes
// BIOME(new CmdBiome()),
EDIT(new CmdEdit()),
HELP(new CmdHelp()),
INFO(new CmdInfo()),

View File

@@ -35,8 +35,4 @@ public class DatabaseHandler {
return BetterRTP.getInstance().getDatabaseHandler().getDatabaseQueue();
}
//public static DatabaseChunkData getChunks() {
// return BetterRTP.getInstance().getDatabaseHandler().getDatabaseChunks();
//}
}

View File

@@ -37,6 +37,8 @@ public abstract class SQLite {
return getLocal();
}
public abstract Connection getConnection();
private Connection getLocal() {
File dataFolder = new File(BetterRTP.getInstance().getDataFolder().getPath() + File.separator + "data", db_file_name + ".db");
if (!dataFolder.exists()){