From e0b7061ac3c3b414b59bad61eb8bfee9e0580019 Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Sun, 8 Apr 2018 06:10:37 +0100 Subject: [PATCH] Fix to ensure randomly added cards in deck generation for commander/brawl are not illegal repeat copies of the commander --- .../src/main/java/forge/limited/CardThemedDeckBuilder.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java index bcbbebf6e65..6fb659b2099 100644 --- a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java @@ -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();