Fix storages command not detecting if a map is loaded or not correctly

Author: TBlueF

common/src/main/java/de/bluecolored/bluemap/common/commands/commands/StoragesCommand.java

@@ -37,13 +37,10 @@
 import de.bluecolored.bluemap.common.rendermanager.StorageDeleteTask;
 import de.bluecolored.bluemap.common.serverinterface.CommandSource;
 import de.bluecolored.bluemap.core.map.BmMap;
-import de.bluecolored.bluemap.core.storage.MapStorage;
 import de.bluecolored.bluemap.core.storage.Storage;
 import de.bluecolored.bluemap.core.storage.file.FileStorage;
 import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
-import net.kyori.adventure.text.format.TextDecoration;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -84,14 +81,8 @@ private Component formatStorageEntry(String id, StorageConfig storage, boolean l
     public Component storage(CommandSource source, @Argument("storage") @Parser("storage-id") String storageId)
             throws ConfigurationException, InterruptedException, IOException {
 
-        Map<String, Storage> loadedStorages = plugin.getBlueMap().getLoadedStorages();
-        Storage storage = loadedStorages.get(storageId);
         StorageConfig storageConfig = plugin.getBlueMap().getConfig().getStorageConfigs().get(storageId);
-
-        if (storage == null) {
-            source.sendMessage(format("Initializing storage '%'...", storageId).color(BASE_COLOR));
-            storage = plugin.getBlueMap().getOrLoadStorage(storageId);
-        }
+        Storage storage = getOrLoadStorage(storageId, source);
 
         List<Component> lines = new LinkedList<>();
 
@@ -124,41 +115,22 @@ public Component storage(CommandSource source, @Argument("storage") @Parser("sto
         lines.add(text("Maps:").color(BASE_COLOR));
         storage.mapIds()
                 .limit(20)
-                .map(this::formatMapEntry)
+                .map(mapId -> formatMapEntry(mapId, storage))
                 .forEach(lines::add);
 
         return paragraph("Storage '%s'".formatted(storageId), lines(lines));
     }
 
-    private Component formatMapEntry(String id) {
-        BmMap map = plugin.getBlueMap().getMaps().get(id);
-
-        Component loadedIcon = map != null ?
-                text("✔").color(POSITIVE_COLOR):
-                text("❌").color(BASE_COLOR);
-
-        return format("% %",
-                loadedIcon,
-                text(id).color(HIGHLIGHT_COLOR)
-        ).color(BASE_COLOR);
-    }
-
     @Command("storages <storage> delete <map>")
     @Permission("bluemap.storages.delete")
     public void deleteMap(
             CommandSource source,
             @Argument("storage") @Parser("storage-id") String storageId,
             @Argument("map") String mapId
     ) throws ConfigurationException, InterruptedException {
-        Map<String, Storage> loadedStorages = plugin.getBlueMap().getLoadedStorages();
-        Storage storage = loadedStorages.get(storageId);
-
-        if (storage == null) {
-            source.sendMessage(format("Initializing storage %...", storageId).color(BASE_COLOR));
-            storage = plugin.getBlueMap().getOrLoadStorage(storageId);
-        }
+        Storage storage = getOrLoadStorage(storageId, source);
 
-        if (plugin.getBlueMap().getMaps().containsKey(mapId)) {
+        if (isMapLoaded(mapId, storage)) {
             source.sendMessage(text("Can't delete a loaded map!").color(NEGATIVE_COLOR)
                     .append(format("""
                             Unload the map by removing it's config-file first,
@@ -183,4 +155,29 @@ public void deleteMap(
         ));
     }
 
+    private Storage getOrLoadStorage(String storageId, CommandSource source) throws ConfigurationException, InterruptedException {
+        Map<String, Storage> loadedStorages = plugin.getBlueMap().getLoadedStorages();
+        Storage storage = loadedStorages.get(storageId);
+        if (storage != null) return storage;
+
+        source.sendMessage(format("Initializing storage '%'...", storageId).color(BASE_COLOR));
+        return plugin.getBlueMap().getOrLoadStorage(storageId);
+    }
+
+    private boolean isMapLoaded(String mapId, Storage storage) {
+        BmMap map = plugin.getBlueMap().getMaps().get(mapId);
+        return map != null && map.getStorage().equals(storage.map(mapId));
+    }
+
+    private Component formatMapEntry(String id, Storage storage) {
+        Component loadedIcon = isMapLoaded(id, storage) ?
+                text("✔").color(POSITIVE_COLOR):
+                text("❌").color(BASE_COLOR);
+
+        return format("% %",
+                loadedIcon,
+                text(id).color(HIGHLIGHT_COLOR)
+        ).color(BASE_COLOR);
+    }
+
 }

core/src/main/java/de/bluecolored/bluemap/core/storage/file/FileStorage.java

@@ -58,6 +58,7 @@ public FileMapStorage map(String mapId) {
     @SuppressWarnings("resource")
     @Override
     public Stream<String> mapIds() throws IOException {
+        if (!Files.exists(root)) return Stream.empty();
         return Files.list(root)
                 .filter(Files::isDirectory)
                 .map(Path::getFileName)