diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java index 0aec9db7c02..f7da2fc91ee 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java @@ -109,7 +109,7 @@ public class NewConquestScreen extends MultiStepWizardScreen { - private final FChoiceList lstPlaneswalkers = add(new FChoiceList(ConquestUtil.getAllPlaneswalkers()) { + private final FChoiceList lstPlaneswalkers = add(new FChoiceList(ConquestUtil.getStartingPlaneswalkerOptions()) { @Override protected void onItemActivate(Integer index, PaperCard value) { advance(); diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java index 6d7623a64e5..328e2e940c6 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java @@ -8,6 +8,7 @@ import java.util.Map.Entry; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import forge.card.CardRules; import forge.card.ColorSet; import forge.deck.CardPool; import forge.deck.Deck; @@ -125,11 +126,12 @@ public class ConquestUtil { return pool; } - public static Iterable getAllPlaneswalkers() { + public static Iterable getStartingPlaneswalkerOptions() { return Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCards(), new Predicate() { @Override public boolean apply(PaperCard card) { - return card.getRules().getType().isPlaneswalker(); + CardRules rules = card.getRules(); + return rules.getType().isPlaneswalker() && !rules.canBeCommander(); //don't allow picking a commander as a starting planeswalker } }); }