From d60d350fcb8af902dbb23e8c006f192b730d11e9 Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Fri, 16 Feb 2018 17:56:38 -0700 Subject: [PATCH] token-artwork - try removing variant as a fallback Signed-off-by: Jamin W. Collins --- forge-core/src/main/java/forge/ImageKeys.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index 385abf38f99..946bb85f181 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -130,6 +130,11 @@ public final class ImageKeys { // try without set name file = findFile(dir, setlessFilename); if (file != null) { return file; } + // if there's an art variant try without it + if (setlessFilename.matches(".*[0-9]*$")) { + file = findFile(dir, setlessFilename.replaceAll("[0-9]*$", "")); + if (file != null) { return file; } + } } } else if (filename.contains("/")) { String setlessFilename = filename.substring(filename.indexOf('/') + 1);