From 351604a7ec937df8ca458fae97a8c85ea5e4f038 Mon Sep 17 00:00:00 2001
From: Magpie <magpie514@users.noreply.github.com>
Date: Thu, 24 Mar 2022 22:39:54 +0100
Subject: [PATCH] Custom content fixes Method to get token data was not good,
 it failed with tokens with image keys different to the script name. Current
 method just checks for the token's edition instead. Removed a few now unused
 bits of code.

---
 forge-core/src/main/java/forge/StaticData.java       | 10 ----------
 forge-core/src/main/java/forge/util/ImageUtil.java   |  9 ---------
 forge-gui/src/main/java/forge/util/ImageFetcher.java |  7 +++++--
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java
index eb1e10ddc4c..b412cbe215a 100644
--- a/forge-core/src/main/java/forge/StaticData.java
+++ b/forge-core/src/main/java/forge/StaticData.java
@@ -227,9 +227,6 @@ public class StaticData {
     public void attemptToLoadCard(String cardName, String setCode) {
         CardRules rules = cardReader.attemptToLoadCard(cardName);
         CardRules customRules = null;
-        if (customCardReader != null) {
-            customRules = customCardReader.attemptToLoadCard(cardName);
-        }
         if (rules != null) {
             if (rules.isVariant()) {
                 variantCards.loadCard(cardName, setCode, rules);
@@ -237,13 +234,6 @@ public class StaticData {
                 commonCards.loadCard(cardName, setCode, rules);
             }
         }
-        if (customRules != null) {
-            if (customRules.isVariant()) {
-                variantCards.loadCard(cardName, setCode, customRules);
-            } else {
-                commonCards.loadCard(cardName, setCode, customRules);
-            }
-        }
     }
 
     /**
diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java
index 2f49a3d3c7c..1b13cebb4e6 100644
--- a/forge-core/src/main/java/forge/util/ImageUtil.java
+++ b/forge-core/src/main/java/forge/util/ImageUtil.java
@@ -27,15 +27,6 @@ public class ImageUtil {
         return cp;
     }
 
-    public static PaperToken getPaperTokenFromImageKey(String key) {
-        if (key == null) return null;
-        String[] data = key.split("[_](?=[^_]*$)");
-        if (data.length == 2) {
-            return StaticData.instance().getAllTokens().getToken(data[0], data[1].toUpperCase());
-        }
-        return null;
-    }
-
     public static String getImageRelativePath(PaperCard cp, boolean backFace, boolean includeSet, boolean isDownloadUrl) {
         final String nameToUse = cp == null ? null : getNameToUse(cp, backFace);
         if (nameToUse == null) {
diff --git a/forge-gui/src/main/java/forge/util/ImageFetcher.java b/forge-gui/src/main/java/forge/util/ImageFetcher.java
index 062164f2850..4024424622d 100644
--- a/forge-gui/src/main/java/forge/util/ImageFetcher.java
+++ b/forge-gui/src/main/java/forge/util/ImageFetcher.java
@@ -115,8 +115,11 @@ public abstract class ImageFetcher {
             final String filename = imageKey.substring(2) + ".jpg";
             String tokenUrl = tokenImages.get(filename);
             if (tokenUrl == null) {
-                PaperToken T = ImageUtil.getPaperTokenFromImageKey(imageKey.substring(2));
-                if (T.getRules().isCustom()) return; //Custom token, do not fetch image.
+                String[] tempdata = imageKey.split("[_](?=[^_]*$)"); //We want to check the edition first.
+                if(tempdata.length == 2){
+                    CardEdition E = StaticData.instance().getEditions().get(tempdata[1]);
+                    if (E.getType() == CardEdition.Type.CUSTOM_SET) return; //Custom set token, skip fetching.
+                }
                 System.err
                         .println("No specified file for '" + filename + "'.. Attempting to download from default Url");
                 tokenUrl = String.format("%s%s", ForgeConstants.URL_TOKEN_DOWNLOAD, filename);