From 5b8014cb3b2b925bcb2997d019d452b39e30299a Mon Sep 17 00:00:00 2001
From: Myrd <myrd@cardforge.org>
Date: Tue, 2 Dec 2014 03:16:04 +0000
Subject: [PATCH] If the pic for a token doesn't exist, try loading one that
 doesn't have the set name suffix.

---
 forge-core/src/main/java/forge/ImageKeys.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
index d87fc8e472e..ab5d6fdeaaa 100644
--- a/forge-core/src/main/java/forge/ImageKeys.java
+++ b/forge-core/src/main/java/forge/ImageKeys.java
@@ -130,8 +130,15 @@ public class ImageKeys {
             if (file != null) { return file; }
         }
 
-        // try without set prefix
-        if (filename.contains("/")) {
+        // try without set name
+        if (dir == CACHE_TOKEN_PICS_DIR) {
+            int index = filename.lastIndexOf('_');
+            if (index != -1) {
+                String setlessFilename = filename.substring(0, index);
+                file = findFile(dir, setlessFilename);
+                if (file != null) { return file; }
+            }
+        } else if (filename.contains("/")) {
             String setlessFilename = filename.substring(filename.indexOf('/') + 1);
             file = findFile(dir, setlessFilename);
             if (file != null) { return file; }