Fixed some odd debug messages

IllusionTheDev · Oct 25, 2023 · 06fd998 · 06fd998
1 parent c405d18
commit 06fd998
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/...n/src/main/java/me/illusion/skyblockcore/common/database/registry/RegisteredDatabase.java b/...n/src/main/java/me/illusion/skyblockcore/common/database/registry/RegisteredDatabase.java
@@ -9,6 +9,7 @@ public class RegisteredDatabase {
 
     private SkyblockDatabase database;
     private boolean enabled;
+    private boolean attemptedLoad;
 
     public RegisteredDatabase(SkyblockDatabaseProvider provider, String name) {
         this.provider = provider;
@@ -44,4 +45,12 @@ public void setEnabled(boolean enabled) {
     public SkyblockDatabaseProvider getProvider() {
         return provider;
     }
+
+    public boolean hasAttemptedLoad() {
+        return attemptedLoad;
+    }
+
+    public void setAttemptedLoad(boolean attemptedLoad) {
+        this.attemptedLoad = attemptedLoad;
+    }
 }
diff --git a/...main/java/me/illusion/skyblockcore/common/database/registry/SkyblockDatabaseRegistry.java b/...main/java/me/illusion/skyblockcore/common/database/registry/SkyblockDatabaseRegistry.java
@@ -118,12 +118,18 @@ public CompletableFuture<Void> loadPossible(ConfigurationSection section) {
         credentialRegistry.checkCyclicDependencies();
 
         Set<CompletableFuture<?>> temp = new HashSet<>();
+        Collection<String> keys = section.getKeys();
 
         for (RegisteredDatabase registeredDatabase : registeredDatabases.values()) {
             if (registeredDatabase.isEnabled()) {
                 continue;
             }
 
+            if(keys.contains(registeredDatabase.getName())) {
+                registeredDatabase.setAttemptedLoad(true);
+            }
+
+
             temp.add(tryLoad(registeredDatabase));
         }
 
@@ -139,6 +145,10 @@ private CompletableFuture<Boolean> tryLoad(RegisteredDatabase registeredDatabase
         Object credentials = credentialRegistry.get(registeredDatabase.getName());
 
         if (credentials == null) {
+            if (!registeredDatabase.hasAttemptedLoad()) { // The database credentials haven't been loaded yet
+                return CompletableFuture.completedFuture(false);
+            }
+
             warn("Database {0} has no credentials", registeredDatabase.getName());
             return CompletableFuture.completedFuture(false);
         }