fix infinite notice for missing tokens

Card-Forge · Nov 15, 2024 · 4b13e55 · 4b13e55
1 parent bd18600
commit 4b13e55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
@@ -85,7 +85,7 @@ public static String getTokenImageName(String tokenKey) {
     }
 
     private static final Map<String, File> cachedCards = new HashMap<>(50000);
-    private static HashSet<String> missingCards = new HashSet<>();
+    public static HashSet<String> missingCards = new HashSet<>();
     public static void clearMissingCards() {
         missingCards.clear();
     }
@@ -310,7 +310,7 @@ public static File getImageFile(String key) {
         }
 
         // System.out.println("File not found, no image created: " + key);
-        //add missing cards - disable for desktop version for compatibility reasons with autodownloader
+        // add missing cards - disable for desktop version for compatibility reasons with autodownloader
         if (isLibGDXPort && !hasSetLookup(filename)) //missing cards with setlookup is handled differently
             missingCards.add(filename);
         return null;

diff --git a/forge-gui/src/main/java/forge/util/ImageFetcher.java b/forge-gui/src/main/java/forge/util/ImageFetcher.java
@@ -228,6 +228,11 @@ public void fetchImage(final String imageKey, final Callback callback) {
                 }
                 if (filename.equalsIgnoreCase("null.jpg"))
                     return;
+
+                if (ImageKeys.missingCards.contains(filename))
+                    return;
+
+                ImageKeys.missingCards.add(filename);
                 System.err.println("No specified file for '" + filename + "'.. Attempting to download from default Url");
                 tokenUrl = String.format("%s%s", ForgeConstants.URL_TOKEN_DOWNLOAD, filename);
             }