2.0.0 part 2

Artillex-Studios · Aug 4, 2024 · 8c891f8 · 8c891f8
1 parent 18266a6
commit 8c891f8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 22 deletions.
diff --git a/src/main/java/com/artillexstudios/axvaults/AxVaults.java b/src/main/java/com/artillexstudios/axvaults/AxVaults.java
@@ -163,10 +163,8 @@ public static void registerCommands() {
     }
 
     public void disable() {
-        for (VaultPlayer vaultPlayer : VaultManager.getPlayers().values()) {
-            for (Vault vault : vaultPlayer.getVaultMap().values()) {
-                AxVaults.getDatabase().saveVault(vault);
-            }
+        for (Vault vault : VaultManager.getVaults()) {
+            AxVaults.getDatabase().saveVault(vault);
         }
         AutoSaveScheduler.stop();
         database.disable();

diff --git a/src/main/java/com/artillexstudios/axvaults/commands/AdminCommand.java b/src/main/java/com/artillexstudios/axvaults/commands/AdminCommand.java
@@ -109,6 +109,7 @@ public void delete(@NotNull Player sender, @NotNull OfflinePlayer player, int nu
                 MESSAGEUTILS.sendLang(sender, "view.not-found", replacements);
                 return;
             }
+            VaultManager.getVaults().remove(vault);
             VaultManager.removeVault(vault);
             AxVaults.getDatabase().deleteVault(player.getUniqueId(), number);
             MESSAGEUTILS.sendLang(sender, "delete", replacements);

diff --git a/src/main/java/com/artillexstudios/axvaults/database/impl/H2.java b/src/main/java/com/artillexstudios/axvaults/database/impl/H2.java
@@ -87,7 +87,7 @@ private void convert() { // todo: clean db
                     }
                 }
             }
-        } catch (SQLException ex) {
+        } catch (Exception ex) {
             ex.printStackTrace();
         }
         Bukkit.getConsoleSender().sendMessage(StringUtils.formatToString("&#33FF33[AxVaults] Successfully converted " + am + " vaults in " + (System.currentTimeMillis() - time) + "ms"));

diff --git a/src/main/java/com/artillexstudios/axvaults/database/impl/SQLite.java b/src/main/java/com/artillexstudios/axvaults/database/impl/SQLite.java
@@ -92,7 +92,7 @@ private void convert() { // todo: clean db
                     }
                 }
             }
-        } catch (SQLException ex) {
+        } catch (Exception ex) {
             ex.printStackTrace();
         }
         Bukkit.getConsoleSender().sendMessage(StringUtils.formatToString("&#33FF33[AxVaults] Successfully converted " + am + " vaults in " + (System.currentTimeMillis() - time) + "ms"));

diff --git a/src/main/java/com/artillexstudios/axvaults/listeners/InventoryCloseListener.java b/src/main/java/com/artillexstudios/axvaults/listeners/InventoryCloseListener.java
@@ -10,7 +10,6 @@
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.Map;
 
 import static com.artillexstudios.axvaults.AxVaults.MESSAGES;
@@ -22,7 +21,7 @@ public class InventoryCloseListener implements Listener {
     public void onClose(@NotNull InventoryCloseEvent event) {
         AxVaults.getThreadedQueue().submit(() -> {
             Vault v = null;
-            for (Vault vault : new ArrayList<>(VaultManager.getVaults())) {
+            for (Vault vault : VaultManager.getVaults()) {
                 if (!vault.getStorage().equals(event.getInventory())) continue;
                 v = vault;
                 break;

diff --git a/src/main/java/com/artillexstudios/axvaults/schedulers/AutoSaveScheduler.java b/src/main/java/com/artillexstudios/axvaults/schedulers/AutoSaveScheduler.java
@@ -1,12 +1,11 @@
 package com.artillexstudios.axvaults.schedulers;
 
-import com.artillexstudios.axapi.scheduler.Scheduler;
 import com.artillexstudios.axvaults.AxVaults;
 import com.artillexstudios.axvaults.vaults.Vault;
 import com.artillexstudios.axvaults.vaults.VaultManager;
-import com.artillexstudios.axvaults.vaults.VaultPlayer;
 import org.bukkit.Bukkit;
 
+import java.util.Iterator;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -23,19 +22,20 @@ public static void start() {
         service = Executors.newSingleThreadScheduledExecutor();
         service.scheduleAtFixedRate(() -> {
             try {
-                for (VaultPlayer vaultPlayer : VaultManager.getPlayers().values()) {
-                    for (Vault vault : vaultPlayer.getVaultMap().values()) {
-                        AxVaults.getDatabase().saveVault(vault);
-                        if (vault.isOpened()) continue;
-                        if (Bukkit.getPlayer(vault.getUUID()) != null) continue;
-                        if (System.currentTimeMillis() - vault.getLastOpen() <= (time - 1) * 1_000L) continue;
-                        Scheduler.get().run(scheduledTask -> VaultManager.removeVault(vault));
-                    }
+                final Iterator<Vault> iterator = VaultManager.getVaults().iterator();
+                while (iterator.hasNext()) {
+                    final Vault vault = iterator.next();
+                    AxVaults.getDatabase().saveVault(vault);
+                    if (vault.isOpened()) continue;
+                    if (Bukkit.getPlayer(vault.getUUID()) != null) continue;
+                    if (System.currentTimeMillis() - vault.getLastOpen() <= (time - 1) * 1_000L) continue;
+                    VaultManager.removeVault(vault);
+                    iterator.remove();
                 }
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
-        }, time, time, TimeUnit.MINUTES); // TODO: MINUTES
+        }, time, time, TimeUnit.MINUTES);
     }
 
     public static void stop() {

diff --git a/src/main/java/com/artillexstudios/axvaults/vaults/VaultManager.java b/src/main/java/com/artillexstudios/axvaults/vaults/VaultManager.java
@@ -5,15 +5,15 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.function.Consumer;
 
 public class VaultManager {
     private static final ConcurrentHashMap<UUID, VaultPlayer> players = new ConcurrentHashMap<>();
-    private static final ArrayList<Vault> vaults = new ArrayList<>();
+    private static final ConcurrentLinkedQueue<Vault> vaults = new ConcurrentLinkedQueue<>();
 
     public static void loadPlayer(@NotNull UUID uuid) {
         getPlayer(uuid, vaultPlayer -> {});
@@ -74,7 +74,7 @@ public static void reload() {
         }
     }
 
-    public static ArrayList<Vault> getVaults() {
+    public static ConcurrentLinkedQueue<Vault> getVaults() {
         return vaults;
     }
 }