From 33e4aba7cec9684a63f6f3a50e29eca123105718 Mon Sep 17 00:00:00 2001 From: Hellfish Date: Fri, 28 Oct 2011 07:54:21 +0000 Subject: [PATCH] *Fixed there being a way for alternate card faces to be put in the card shop. --- src/main/java/forge/card/BoosterGenerator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/card/BoosterGenerator.java b/src/main/java/forge/card/BoosterGenerator.java index 9bec5d7f9b4..81bd3d487fd 100644 --- a/src/main/java/forge/card/BoosterGenerator.java +++ b/src/main/java/forge/card/BoosterGenerator.java @@ -115,8 +115,7 @@ public class BoosterGenerator { numSpecials = bs.getSpecial(); numDoubleFaced = bs.getDoubleFaced(); - Predicate filter = Predicate.and(CardPrinted.Predicates.printedInSets(cardSet.getCode()), - CardPrinted.Predicates.Presets.nonAlternate); + Predicate filter = CardPrinted.Predicates.printedInSets(cardSet.getCode()); List cardsInThisSet = filter.select(CardDb.instance().getAllCards()); for (CardPrinted c : cardsInThisSet) { @@ -269,6 +268,9 @@ public class BoosterGenerator { } private void addToRarity(final CardPrinted c) { + if(c.isAlternate()) { + return; + } if (c.isDoubleFaced() && numDoubleFaced > 0) { doubleFaced.add(c); } else {