From 9a93f0a16c6def907ce20282f36ad7c1ccda474b Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Sun, 25 May 2025 19:27:13 +0200 Subject: [PATCH] TokenDb: fix Endure Token Images causing crash on Token Viewer (#7679) --- forge-core/src/main/java/forge/token/TokenDb.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/forge-core/src/main/java/forge/token/TokenDb.java b/forge-core/src/main/java/forge/token/TokenDb.java index 1fa8b500b0c..9aa3ea1bd5b 100644 --- a/forge-core/src/main/java/forge/token/TokenDb.java +++ b/forge-core/src/main/java/forge/token/TokenDb.java @@ -72,7 +72,15 @@ public class TokenDb implements ITokenDatabase { } protected PaperToken addTokenInSet(CardEdition edition, String name, CardEdition.EditionEntry t) { - return new PaperToken(rulesByName.get(name), edition, name, t.collectorNumber(), t.artistName()); + CardRules rules; + if (rulesByName.containsKey(name)) { + rules = rulesByName.get(name); + } else if ("w_2_2_spirit".equals(name) || "w_3_3_spirit".equals(name)) { // Hotfix for Endure Token + rules = rulesByName.get("w_x_x_spirit"); + } else { + throw new RuntimeException("wrong token name:" + name); + } + return new PaperToken(rules, edition, name, t.collectorNumber(), t.artistName()); } // try all editions to find token