From 1c19f3663792dca97c3aee91a95071798a9c30a9 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 17 Nov 2019 08:02:11 +0800 Subject: [PATCH 1/2] Fix cards like planes/phenomenon not loading an existing images that have .full/.fullborder --- forge-core/src/main/java/forge/ImageKeys.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index a8425783a25..e63ed5543ab 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -116,6 +116,13 @@ public final class ImageKeys { file = findFile(dir, TextUtil.fastReplace(filename, ".full", ".fullborder")); if (file != null) { return file; } } + //if an image, like phenomenon or planes is missing .full in their filenames but you have an existing images that have .full/.fullborder + if (!filename.contains(".full")) { + file = findFile(dir, filename+".full"); + if (file != null) { return file; } + file = findFile(dir, filename+".fullborder"); + if (file != null) { return file; } + } // some S00 cards are really part of 6ED String s2kAlias = getSetFolder("S00"); if (filename.startsWith(s2kAlias)) { From c600dc3b4f6e9a51129bfea28f8987c4cbb3639e Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 17 Nov 2019 08:10:29 +0800 Subject: [PATCH 2/2] Update --- forge-core/src/main/java/forge/ImageKeys.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index e63ed5543ab..e07f836566d 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -118,9 +118,9 @@ public final class ImageKeys { } //if an image, like phenomenon or planes is missing .full in their filenames but you have an existing images that have .full/.fullborder if (!filename.contains(".full")) { - file = findFile(dir, filename+".full"); + file = findFile(dir, TextUtil.addSuffix(filename,".full")); if (file != null) { return file; } - file = findFile(dir, filename+".fullborder"); + file = findFile(dir, TextUtil.addSuffix(filename,".fullborder")); if (file != null) { return file; } } // some S00 cards are really part of 6ED