From 1cd8255ab69299214c0ab00aa556976ac3f9d3e1 Mon Sep 17 00:00:00 2001
From: Lyu Zong-Hong <mousep.zhlyu@gmail.com>
Date: Mon, 2 Aug 2021 14:29:53 +0900
Subject: [PATCH] Fix token related crash

---
 .../src/main/java/forge/util/ImageUtil.java   | 23 -------------------
 .../src/main/java/forge/ImageCache.java       |  2 --
 2 files changed, 25 deletions(-)

diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java
index 958e2cf5036..665f543e377 100644
--- a/forge-core/src/main/java/forge/util/ImageUtil.java
+++ b/forge-core/src/main/java/forge/util/ImageUtil.java
@@ -6,7 +6,6 @@ import forge.card.CardDb;
 import forge.card.CardRules;
 import forge.card.CardSplitType;
 import forge.item.PaperCard;
-import forge.item.PaperToken;
 
 public class ImageUtil {
     public static float getNearestHQSize(float baseSize, float actualSize) {
@@ -30,28 +29,6 @@ public class ImageUtil {
         return cp;
     }
 
-    public static PaperToken getPaperTokenFromImageKey(String key) {
-        if ( key == null ) {
-            return null;
-        }
-
-        key = key.substring(2);
-        int index = key.lastIndexOf('_');
-        if (index != -1) {
-            String script = key.substring(0, index);
-            String edition = key.substring(index + 1);
-            if (script.startsWith("emblem"))
-                return null;
-            if (null == StaticData.instance().getCardEdition(edition)) {
-                script = key;
-                edition = "???";
-            }
-            script = script.replaceAll("[0-9]*$", "");
-            return StaticData.instance().getAllTokens().getToken(script, edition);
-        }
-        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-desktop/src/main/java/forge/ImageCache.java b/forge-gui-desktop/src/main/java/forge/ImageCache.java
index 128aa326e6a..9a00023ea49 100644
--- a/forge-gui-desktop/src/main/java/forge/ImageCache.java
+++ b/forge-gui-desktop/src/main/java/forge/ImageCache.java
@@ -165,8 +165,6 @@ public class ImageCache {
             if (StringUtils.isBlank(imageKey)) {
                 return _defaultImage;
             }
-        } else if (imageKey.startsWith(ImageKeys.TOKEN_PREFIX) && cardView != null && cardView.isToken()) {
-            ipc = ImageUtil.getPaperTokenFromImageKey(imageKey);
         }
 
         // Load from file and add to cache if not found in cache initially.