Merge branch 'BrawlFormat' into 'master'

Fix to ensure randomly added cards in deck generation for commander/brawl are…

See merge request core-developers/forge!363
This commit is contained in:
Michael Kamensky
2018-04-08 06:40:15 +00:00

View File

@@ -506,6 +506,8 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
&&!card.getRules().getManaCost().isPureGeneric()
&& colors.containsAllColorsFrom(card.getRules().getColorIdentity().getColor())
&& !deckList.contains(card)
&& !keyCard.equals(card)
&& !secondKeyCard.equals(card)
&&!card.getRules().getAiHints().getRemAIDecks()
&&!card.getRules().getAiHints().getRemRandomDecks()
&&!card.getRules().getMainPart().getType().isLand();