external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

update Card.java getPaperCard

Browse Source
This commit is contained in:
Anthony Calosa
2023-07-11 19:40:16 +08:00
parent 6bbdd854b1
commit da9e1edace
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -6941,10 +6941,29 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
if (StringUtils.isNotBlank(set)) { if (StringUtils.isNotBlank(set)) {
cp = StaticData.instance().getVariantCards().getCard(name, 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); 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);
} }
/** /**