diff --git a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java index b5d45a4c92a..9115ea209cd 100644 --- a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java +++ b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java @@ -147,10 +147,13 @@ public class AdventureEventData implements Serializable { return draft; } - private static final Predicate filterPioneer = FModel.getFormats().getPioneer().editionLegalPredicate; - private static final Predicate filterModern = FModel.getFormats().getModern().editionLegalPredicate; - private static final Predicate filterVintage = FModel.getFormats().getVintage().editionLegalPredicate; private static final Predicate filterStandard = FModel.getFormats().getStandard().editionLegalPredicate; + private static final Predicate filterPioneer = + FModel.getFormats().getPioneer().editionLegalPredicate.and(filterStandard.negate()); + private static final Predicate filterModern = + FModel.getFormats().getModern().editionLegalPredicate.and(FModel.getFormats().getPioneer().editionLegalPredicate.negate()); + private static final Predicate filterVintage = + FModel.getFormats().getVintage().editionLegalPredicate.and(FModel.getFormats().getModern().editionLegalPredicate.negate()); public static Predicate selectSetPool() { // Should we negate any of these to avoid overlap?