From 74a97f5d34aef03ec05d03fafe257e89a14eab58 Mon Sep 17 00:00:00 2001 From: montlikadani Date: Mon, 27 Apr 2020 19:33:51 +0200 Subject: [PATCH] Lets delete the columns from explore database when the world is not exist --- .../com/gamingmesh/jobs/config/ExploreManager.java | 4 +--- src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/config/ExploreManager.java b/src/main/java/com/gamingmesh/jobs/config/ExploreManager.java index 139eca7d..3250a2f7 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ExploreManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ExploreManager.java @@ -96,9 +96,7 @@ public class ExploreManager { String names = res.getString(ExploreDataTableFields.playerNames.getCollumn()); int id = res.getInt("id"); - JobsWorld jobsWorld = null; - if (worldName != null) - jobsWorld = Util.getJobsWorld(worldName); + JobsWorld jobsWorld = Util.getJobsWorld(worldName); if (jobsWorld == null) jobsWorld = Util.getJobsWorld(worldId); diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java index cce91117..df39fd8a 100644 --- a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java +++ b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java @@ -2463,7 +2463,16 @@ public abstract class JobsDAO { prest = conn.prepareStatement("SELECT * FROM `" + DBTables.ExploreDataTable.getTableName() + "`;"); res = prest.executeQuery(); while (res.next()) { - Jobs.getExplore().load(res); + String worldName = res.getString(ExploreDataTableFields.worldname.getCollumn()); + if (worldName == null || Bukkit.getWorld(worldName) == null) { + PreparedStatement prest2 = null; + prest2 = conn.prepareStatement("DELETE FROM `" + DBTables.ExploreDataTable.getTableName() + "` WHERE `" + ExploreDataTableFields.worldname.getCollumn() + "` = ?;"); + prest2.setString(1, worldName); + prest2.execute(); + close(prest2); + } else { + Jobs.getExplore().load(res); + } } } catch (SQLException e) { e.printStackTrace();