Potential fix for archived consoles #1009

Author: eccentricdevotion

src/main/java/me/eccentric_nz/TARDIS/desktop/TARDISFullThemeRunnable.java

@@ -147,6 +147,12 @@ public void run() {
                     // abort
                     Player cp = plugin.getServer().getPlayer(uuid);
                     plugin.getMessenger().send(cp, TardisModule.TARDIS, "ARCHIVE_NOT_FOUND");
+                    // reset next archive back to 0
+                    new ArchiveReset(plugin, uuid.toString(), 1,0).resetUse();
+                    if (tud.getPrevious().getPermission().equals("archive")) {
+                        // reset previous back to 1
+                        new ArchiveReset(plugin, uuid.toString(), 2,1).resetUse();
+                    }
                     // cancel task
                     plugin.getServer().getScheduler().cancelTask(taskID);
                     return;
@@ -163,6 +169,12 @@ public void run() {
                     // abort
                     Player cp = plugin.getServer().getPlayer(uuid);
                     plugin.getMessenger().send(cp, TardisModule.TARDIS, "ARCHIVE_NOT_FOUND");
+                    if (tud.getSchematic().getPermission().equals("archive")) {
+                        // reset next back to 0
+                        new ArchiveReset(plugin, uuid.toString(), 1,0).resetUse();
+                    }
+                    // reset previous archive back to 1
+                    new ArchiveReset(plugin, uuid.toString(), 2,1).resetUse();
                     // cancel task
                     plugin.getServer().getScheduler().cancelTask(taskID);
                     return;
@@ -218,6 +230,14 @@ public void run() {
                 wherea.put("uuid", uuid.toString());
                 int amount = plugin.getArtronConfig().getInt("upgrades." + tud.getSchematic().getPermission());
                 plugin.getQueryFactory().alterEnergyLevel("tardis", amount, wherea, player);
+                if (tud.getSchematic().getPermission().equals("archive")) {
+                    // reset next archive back to 0
+                    new ArchiveReset(plugin, uuid.toString(), 1,0).resetUse();
+                }
+                if (tud.getPrevious().getPermission().equals("archive")) {
+                    // reset previous back to 1
+                    new ArchiveReset(plugin, uuid.toString(), 2,1).resetUse();
+                }
             }
             Tardis tardis = rs.getTardis();
             slot = tardis.getTIPS();
@@ -477,9 +497,9 @@ public void run() {
                 where.put("tardis_id", id);
                 plugin.getQueryFactory().doUpdate("tardis", set, where);
             }
-            if (!tud.getSchematic().getPermission().equals("archive")) {
-                // reset archive use back to 0
-                new ArchiveReset(plugin, uuid.toString(), 0).resetUse();
+            // reset archive use back to 0
+            if (tud.getPrevious().getPermission().equals("archive") && !tud.getSchematic().getPermission().equals("archive")) {
+                new ArchiveReset(plugin, uuid.toString(), 1, 0).resetUse();
             }
             // jettison blocks if downgrading to smaller size
             if (downgrade) {

src/main/java/me/eccentric_nz/TARDIS/desktop/TARDISThemeProcessor.java

@@ -89,6 +89,12 @@ public void changeDesktop() {
                 // abort
                 Player cp = plugin.getServer().getPlayer(uuid);
                 plugin.getMessenger().send(cp, TardisModule.TARDIS, "ARCHIVE_NOT_FOUND");
+                // reset next archive back to 0
+
+                if (tud.getPrevious().getPermission().equals("archive")) {
+                    // reset previous back to 1
+
+                }
                 return;
             }
         } else {
@@ -120,6 +126,12 @@ public void changeDesktop() {
                 // abort
                 Player cp = plugin.getServer().getPlayer(uuid);
                 plugin.getMessenger().send(cp, TardisModule.TARDIS, "ARCHIVE_NOT_FOUND");
+                if (tud.getSchematic().getPermission().equals("archive")) {
+                    // reset next back to 0
+
+                }
+                // reset previous archive back to 1
+
                 return;
             }
         } else {
@@ -147,7 +159,11 @@ public void changeDesktop() {
                 plugin.getMessenger().send(cp, TardisModule.TARDIS, "UPGRADE_PERCENT_REASON");
                 if (tud.getPrevious().getPermission().equals("archive")) {
                     // reset archive use back to 1
-                    new ArchiveReset(plugin, uuid.toString(), 1).resetUse();
+                    if (tud.getSchematic().getPermission().equals("archive")) {
+                        // reset next back to 0
+                        new ArchiveReset(plugin, uuid.toString(), 1, 0).resetUse();
+                    }
+                    new ArchiveReset(plugin, uuid.toString(), 2, 1).resetUse();
                 }
                 return;
             }
@@ -158,9 +174,13 @@ public void changeDesktop() {
             if (checkARSGrid(size_prev, size_next, uuid)) {
                 plugin.getMessenger().send(plugin.getServer().getPlayer(uuid), TardisModule.TARDIS, "UPGRADE_ABORT_SPACE");
                 plugin.getTrackerKeeper().getUpgrades().remove(uuid);
+                if (tud.getSchematic().getPermission().equals("archive")) {
+                    // reset next archive back to 0
+                    new ArchiveReset(plugin, uuid.toString(), 1,0).resetUse();
+                }
                 if (tud.getPrevious().getPermission().equals("archive")) {
-                    // reset archive use back to 1
-                    new ArchiveReset(plugin, uuid.toString(), 1).resetUse();
+                    // reset previous back to 1
+                    new ArchiveReset(plugin, uuid.toString(), 2,1).resetUse();
                 }
                 return;
             }

src/main/java/me/eccentric_nz/TARDIS/desktop/TARDISThemeRepairRunnable.java

@@ -376,10 +376,6 @@ public void run() {
                 where.put("tardis_id", id);
                 plugin.getQueryFactory().doUpdate("tardis", set, where);
             }
-            if (!tud.getSchematic().getPermission().equals("archive")) {
-                // reset archive use back to 0
-                new ArchiveReset(plugin, uuid.toString(), 0).resetUse();
-            }
             if (tud.getSchematic().getPermission().equals("coral") && tud.getPrevious().getConsoleSize().equals(ConsoleSize.TALL)) {
                 // clean up space above coral console
                 int tidy = starty + h;

src/main/java/me/eccentric_nz/TARDIS/schematic/ArchiveReset.java

@@ -33,31 +33,34 @@ public class ArchiveReset {
     private final Connection connection = service.getConnection();
     private final TARDIS plugin;
     private final String uuid;
-    private final int use;
+    private final int from;
+    private final int to;
     private final String prefix;
 
-    public ArchiveReset(TARDIS plugin, String uuid, int use) {
+    public ArchiveReset(TARDIS plugin, String uuid, int from, int to) {
         this.plugin = plugin;
         this.uuid = uuid;
-        this.use = use;
+        this.from = from;
+        this.to = to;
         prefix = this.plugin.getPrefix();
     }
 
     public void resetUse() {
         PreparedStatement statement = null;
         PreparedStatement ps = null;
         ResultSet rs = null;
-        String query = "SELECT archive_id FROM " + prefix + "archive WHERE uuid = ? AND `use` IN (1,2)";
+        String query = "SELECT archive_id FROM " + prefix + "archive WHERE uuid = ? AND `use` = ?";
         try {
             service.testConnection(connection);
             statement = connection.prepareStatement(query);
             statement.setString(1, uuid);
+            statement.setInt(2, from);
             rs = statement.executeQuery();
             if (rs.isBeforeFirst()) {
                 String update = "UPDATE " + prefix + "archive SET `use` = ? WHERE archive_id = ?";
                 ps = connection.prepareStatement(update);
                 while (rs.next()) {
-                    ps.setInt(1, use);
+                    ps.setInt(1, to);
                     ps.setInt(2, rs.getInt("archive_id"));
                     ps.executeUpdate();
                 }