From ec89ff755bcfd9f593c0458581789a53383a6321 Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Sat, 24 Jul 2021 10:51:26 +0100 Subject: [PATCH] more robust and reliable method to check for card images The getImagefile will be invoked since this method will also account for any difference in `full` and `fullborder` naming for card images. In particular, it will try everything possible before giving up and assume the card has no image. This is **crucial** for cardDB card retrieval, as well as determines the boolean value returned by PaperCard.hasImage method/property --- forge-core/src/main/java/forge/ImageKeys.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index 61baf6c0089..9881668aac8 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -1,15 +1,14 @@ package forge; -import java.io.File; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; - import forge.item.PaperCard; import forge.util.FileUtil; import forge.util.ImageUtil; import forge.util.TextUtil; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; public final class ImageKeys { public static final String CARD_PREFIX = "c:"; @@ -216,6 +215,6 @@ public final class ImageKeys { editionImageLookup.put(pc.getEdition(), editionHasImage); } //avoid checking for file if edition doesn't have any images - return editionHasImage && findFile(CACHE_CARD_PICS_DIR, ImageUtil.getImageKey(pc, false, true)) != null; + return editionHasImage && getImageFile(ImageUtil.getImageKey(pc, false, true)) != null; } }