diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java index 19d0773eaf1..76de92988d4 100644 --- a/forge-core/src/main/java/forge/deck/DeckFormat.java +++ b/forge-core/src/main/java/forge/deck/DeckFormat.java @@ -17,20 +17,10 @@ */ package forge.deck; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; - -import org.apache.commons.lang3.Range; -import org.apache.commons.lang3.tuple.ImmutablePair; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - import forge.StaticData; import forge.card.CardRules; import forge.card.CardRulesPredicates; @@ -43,6 +33,14 @@ import forge.item.IPaperCard; import forge.item.PaperCard; import forge.util.Aggregates; import forge.util.TextUtil; +import org.apache.commons.lang3.Range; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map.Entry; +import java.util.Set; /** * GameType is an enum to determine the type of current game. :) @@ -340,7 +338,7 @@ public enum DeckFormat { IPaperCard simpleCard = StaticData.instance().getCommonCards().getCard(cp.getKey()); if (simpleCard == null) { simpleCard = StaticData.instance().getCustomCards().getCard(cp.getKey()); - if (simpleCard != null && !StaticData.instance().isEnableCustomCardsInDecks()) + if (simpleCard != null && !StaticData.instance().allowCustomCardsInDecksConformance()) 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