From ac516168e49d4a3917bf4bd9c04d421ca1c01f1e Mon Sep 17 00:00:00 2001 From: Lyu Zong-Hong Date: Sat, 31 Jul 2021 13:44:38 +0900 Subject: [PATCH] Fix crash when create token with unknown edition --- forge-core/src/main/java/forge/util/ImageUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java index 9e9955a2185..2a5dccfd499 100644 --- a/forge-core/src/main/java/forge/util/ImageUtil.java +++ b/forge-core/src/main/java/forge/util/ImageUtil.java @@ -42,6 +42,10 @@ public class ImageUtil { String edition = key.substring(index + 1); if (script.startsWith("emblem")) return null; + if (null == StaticData.instance().getCardEdition(edition)) { + script = key; + edition = "???"; + } script = script.replaceAll("[0-9]*$", ""); return StaticData.instance().getAllTokens().getToken(script, edition); }