diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java index 522a040d7..4876c6d77 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java @@ -185,7 +185,7 @@ public class CommandUseTable extends Table { statement = prepareStatement("SELECT " + columnCommand + ", " + columnTimesUsed + ", " + - serverUUIDColumn + ", " + + serverUUIDColumn + " FROM " + tableName + " JOIN " + serverTable + " on " + serverIDColumn + "=" + columnServerID ); diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java index d6698a0dc..940f91f8a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java @@ -284,7 +284,7 @@ public class ServerTable extends Table { String name = info.getName(); String webAddress = info.getWebAddress(); - if (Verify.notNull(uuid, name, webAddress)) { + if (uuid == null) { continue; } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java index f53ca887c..0c7d72b33 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java @@ -194,7 +194,6 @@ public abstract class Table { if (statement == null) { return; } - endTransaction(statement.getConnection()); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/move/BatchOperationTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/move/BatchOperationTable.java index 88895fabf..4b25673c4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/move/BatchOperationTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/move/BatchOperationTable.java @@ -72,7 +72,7 @@ public class BatchOperationTable extends Table { toDB.removeAllData(); copyServers(toDB); - System.out.println(toDB.getDb().getServerTable().getServerNames().toString()); + System.out.println(toDB.getDb().getServerTable().getBukkitServers().toString()); copyUsers(toDB); System.out.println(toDB.getDb().getSavedUUIDs().toString()); copyWorlds(toDB); @@ -133,6 +133,7 @@ public class BatchOperationTable extends Table { Log.debug("Batch Copy Servers"); ServerTable serverTable = db.getServerTable(); List servers = serverTable.getBukkitServers(); + System.out.println(servers.toString()); serverTable.getBungeeInfo().ifPresent(servers::add); toDB.getDb().getServerTable().insertAllServers(servers); } diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfo.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfo.java index 585a6286f..18879d431 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfo.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfo.java @@ -74,4 +74,15 @@ public class ServerInfo { public int hashCode() { return Objects.hash(uuid, id, name, webAddress); } + + @Override + public String toString() { + return "ServerInfo{" + + "uuid=" + uuid + + ", id=" + id + + ", name='" + name + '\'' + + ", webAddress='" + webAddress + '\'' + + ", maxPlayers=" + maxPlayers + + '}'; + } } \ No newline at end of file