From da9e1edace39640535c0d1b08ce1facc2f18f544 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 11 Jul 2023 19:40:16 +0800 Subject: [PATCH] update Card.java getPaperCard --- .../src/main/java/forge/game/card/Card.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index ae647c13939..b6510980f80 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -6941,10 +6941,29 @@ public class Card extends GameEntity implements Comparable, IHasSVars { if (StringUtils.isNotBlank(set)) { cp = StaticData.instance().getVariantCards().getCard(name, set); - return cp == null ? StaticData.instance().getCommonCards().getCard(name, set) : cp; + if (cp != null) { + return cp; + } + cp = StaticData.instance().getCommonCards().getCard(name, set); + if (cp != null) { + return cp; + } } + //no specific set for variant cp = StaticData.instance().getVariantCards().getCard(name); - return cp != null ? cp : StaticData.instance().getCommonCards().getCardFromEditions(name, CardArtPreference.LATEST_ART_ALL_EDITIONS); + if (cp != null) { + return cp; + } + //try to get from user preference if available + CardDb.CardArtPreference cardArtPreference = StaticData.instance().getCardArtPreference(); + if (cardArtPreference == null) //fallback + cardArtPreference = CardArtPreference.ORIGINAL_ART_CORE_EXPANSIONS_REPRINT_ONLY; + cp = StaticData.instance().getCommonCards().getCardFromEditions(name, cardArtPreference); + if (cp != null) { + return cp; + } + //lastoption + return StaticData.instance().getCommonCards().getCard(name); } /**