From b32851c43381d85c52b7cfb09ab09ad30aadf3bd Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Thu, 24 Jan 2019 14:47:40 +0200 Subject: [PATCH] Fixed KillsTable removal, RemovePlayerTransaction --- .../transactions/RemovePlayerTransaction.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemovePlayerTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemovePlayerTransaction.java index c306ce983..6066569e4 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemovePlayerTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemovePlayerTransaction.java @@ -48,7 +48,7 @@ public class RemovePlayerTransaction extends Transaction { deleteFromTable(GeoInfoTable.TABLE_NAME); deleteFromTable(NicknamesTable.TABLE_NAME); - deleteFromTable(KillsTable.TABLE_NAME); + deleteFromKillsTable(); deleteFromTable(WorldTimesTable.TABLE_NAME); deleteFromTable(SessionsTable.TABLE_NAME); deleteFromTable(PingTable.TABLE_NAME); @@ -66,11 +66,24 @@ public class RemovePlayerTransaction extends Transaction { } private void deleteFromTable(String tableName) { - execute(new ExecStatement("DELETE FROM " + tableName + " WHERE (uuid=?)") { + execute(new ExecStatement("DELETE FROM " + tableName + " WHERE uuid=?") { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); } }); } + + private void deleteFromKillsTable() { + String sql = "DELETE FROM " + KillsTable.TABLE_NAME + + " WHERE " + KillsTable.KILLER_UUID + "=?" + + " OR " + KillsTable.VICTIM_UUID + "=?"; + execute(new ExecStatement(sql) { + @Override + public void prepare(PreparedStatement statement) throws SQLException { + statement.setString(1, playerUUID.toString()); + statement.setString(2, playerUUID.toString()); + } + }); + } } \ No newline at end of file