From 6179c991a06947121ba293e00a549d17fe40a5c7 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 21 Oct 2021 12:18:24 +0800 Subject: [PATCH] fix NPE --- forge-gui-mobile/src/forge/card/CardRenderer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index a484528b293..c4459e9c156 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -222,7 +222,7 @@ public class CardRenderer { public static FImageComplex getCardArt(String imageKey, boolean isSplitCard, boolean isHorizontalCard, boolean isAftermathCard, boolean isSaga, boolean isClass, boolean isDungeon, boolean isFlipCard, boolean isPlanesWalker, boolean isModernFrame) { FImageComplex cardArt = cardArtCache.get(imageKey); - boolean isClassicModule = classicModuleCardtoCrop.contains(imageKey.substring(ImageKeys.CARD_PREFIX.length()).replace(".jpg","").replace(".png", "")); + boolean isClassicModule = imageKey != null && imageKey.length() > 2 && classicModuleCardtoCrop.contains(imageKey.substring(ImageKeys.CARD_PREFIX.length()).replace(".jpg", "").replace(".png", "")); if (cardArt == null) { Texture image = new RendererCachedCardImage(imageKey, true).getImage(); if (image != null) { @@ -307,6 +307,9 @@ public class CardRenderer { cardArtCache.put(imageKey, cardArt); } } + //fix display for effect + if (imageKey == "" && cardArt == null) + return CardImageRenderer.forgeArt; return cardArt; }