From 6e0fa8627f8999344ef4f23ffb2cf6342c59b78f Mon Sep 17 00:00:00 2001 From: RumbleBBU Date: Mon, 8 Oct 2012 07:30:35 +0000 Subject: [PATCH] The challenge rewards now honor the persistent format if enforced. --- src/main/java/forge/quest/BoosterUtils.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/forge/quest/BoosterUtils.java b/src/main/java/forge/quest/BoosterUtils.java index 6bfad8c0808..81049dac9f9 100644 --- a/src/main/java/forge/quest/BoosterUtils.java +++ b/src/main/java/forge/quest/BoosterUtils.java @@ -28,6 +28,8 @@ import com.google.common.collect.Iterables; +import forge.AllZone; +import forge.Singletons; import forge.card.BoosterGenerator; import forge.card.CardRulesPredicates; import forge.card.CardRules; @@ -259,6 +261,9 @@ public final class BoosterUtils { }; Predicate colorPred = Predicates.compose(col, CardPrinted.FN_GET_RULES); Predicate rarAndColor = Predicates.and(rar, colorPred); + if (AllZone.getQuest().getFormat() != null) { + rarAndColor = Predicates.and(AllZone.getQuest().getFormat().getFilterPrinted(), rarAndColor); + } return new UnOpenedProduct(openWay, new BoosterGenerator(rarAndColor)); // qty)) } }