Fix BungeeCord autoRegister (Fixes #46)

This commit is contained in:
games647
2016-07-31 09:57:50 +02:00
parent fb357424e6
commit 27c04ff08f
6 changed files with 16 additions and 19 deletions
@@ -11,14 +11,14 @@ import java.sql.Statement;
import java.util.UUID;
import java.util.logging.Level;
public class Storage {
public class AuthStorage {
private static final String PREMIUM_TABLE = "premium";
private final FastLoginCore core;
private final HikariDataSource dataSource;
public Storage(FastLoginCore core, String driver, String host, int port, String databasePath
public AuthStorage(FastLoginCore core, String driver, String host, int port, String databasePath
, String user, String pass) {
this.core = core;
@@ -30,8 +30,6 @@ public class Storage {
databasePath = databasePath.replace("{pluginDir}", core.getDataFolder().getAbsolutePath());
databaseConfig.setThreadFactory(core.getThreadFactory());
String jdbcUrl = "jdbc:";
if (driver.contains("sqlite")) {
jdbcUrl += "sqlite" + "://" + databasePath;
@@ -20,7 +20,7 @@ public abstract class FastLoginCore {
protected final Map<String, String> localeMessages = new ConcurrentHashMap<>();
private MojangApiConnector mojangApiConnector;
private Storage storage;
private AuthStorage storage;
public void setMojangApiConnector(MojangApiConnector mojangApiConnector) {
this.mojangApiConnector = mojangApiConnector;
@@ -30,7 +30,7 @@ public abstract class FastLoginCore {
return mojangApiConnector;
}
public Storage getStorage() {
public AuthStorage getStorage() {
return storage;
}
@@ -49,7 +49,7 @@ public abstract class FastLoginCore {
public abstract void loadConfig();
public boolean setupDatabase(String driver, String host, int port, String database, String user, String password) {
storage = new Storage(this, driver, host, port, database, user, password);
storage = new AuthStorage(this, driver, host, port, database, user, password);
try {
storage.createTables();
return true;