Plugin: remove useless isOldVersion

Flectone · Sep 2, 2023 · d997183 · d997183
1 parent 342dbed
commit d997183
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/net/flectone/Main.java b/src/main/java/net/flectone/Main.java
@@ -29,8 +29,6 @@ public final class Main extends JavaPlugin implements Listener {
     private static CustomThreadPool dataThreadPool;
     private Database database;
 
-    public static boolean isOldVersion = false;
-
     public static Main getInstance() {
         return instance;
     }

diff --git a/src/main/java/net/flectone/managers/FileManager.java b/src/main/java/net/flectone/managers/FileManager.java
@@ -25,7 +25,6 @@ public static void initialize() {
         String version = Main.getInstance().getDescription().getVersion();
 
         if (!version.equals(config.getString("version"))) {
-            Main.isOldVersion = true;
             Main.warning("⚠ Your configs have been updated to " + version);
 
             config.set("version", version);

diff --git a/src/main/java/net/flectone/sqlite/Database.java b/src/main/java/net/flectone/sqlite/Database.java
@@ -24,6 +24,12 @@
 import java.util.stream.Collectors;
 
 public abstract class Database {
+    private static boolean migrate3_9_0 = false;
+
+    public static void setMigrate3_9_0(boolean migrate3_9_0) {
+        Database.migrate3_9_0 = migrate3_9_0;
+    }
+
     final Main plugin;
     protected static Connection connection;
 
@@ -42,7 +48,7 @@ public void initialize() {
             PreparedStatement ps = connection.prepareStatement("SELECT * FROM players WHERE uuid = ?");
             ps.executeQuery();
 
-            if (Main.isOldVersion) migrateDatabase3_9_0();
+            if (migrate3_9_0) migrateDatabase3_9_0();
 
         } catch (SQLException ex) {
             plugin.getLogger().log(Level.SEVERE, "Unable to retrieve connection", ex);

diff --git a/src/main/java/net/flectone/sqlite/SQLite.java b/src/main/java/net/flectone/sqlite/SQLite.java
@@ -121,10 +121,8 @@ public void load() {
 
             ResultSet rs = md.getColumns(null, null, "players", "mute_time");
             if (rs.next()) {
-                Main.isOldVersion = true;
-            }
+                setMigrate3_9_0(true);
 
-            if (Main.isOldVersion) {
                 File oldFile = new File(plugin.getDataFolder(), dbname + ".db");
                 File newFile = new File(plugin.getDataFolder(), dbname + "-old.db");
                 newFile.createNewFile();