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

Patch showing custom card warning properly

Browse Source
This commit is contained in:
leriomaggio
2021-07-12 09:22:15 +01:00
parent e516b00fa9
commit 6b60e478ee
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-core/src/main/java/forge/deck/DeckFormat.java
View File

@@ -338,12 +338,11 @@ public enum DeckFormat {
// should group all cards by name, so that different editions of same card are really counted as the same card
for (final Entry<String, Integer> cp : Aggregates.groupSumBy(allCards, PaperCard.FN_GET_NAME)) {
IPaperCard simpleCard = StaticData.instance().getCommonCards().getCard(cp.getKey());
if (simpleCard == null)
if (simpleCard == null) {
simpleCard = StaticData.instance().getCustomCards().getCard(cp.getKey());
if (simpleCard != null && !StaticData.instance().isEnableCustomCardsInDecks())
return TextUtil.concatWithSpace("contains a Custom Card:", cp.getKey(), "\nPlease Enable Custom Cards in Forge Preferences to use this deck.");
if (simpleCard != null && !StaticData.instance().isEnableCustomCardsInDecks())
return TextUtil.concatWithSpace("contains a Custom Card:", cp.getKey(), "\nPlease Enable Custom Cards in Forge Preferences to use this deck.");
}
// Might cause issues since it ignores "Special" Cards
if (simpleCard == null) {
return TextUtil.concatWithSpace("contains the nonexisting card", cp.getKey());