Bugfix: Kindred Dominance type choice now works correctly.
@@ -35,6 +35,8 @@ import mage.abilities.effects.common.ChooseCreatureTypeEffect;
import mage.abilities.effects.common.DestroyAllEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
+import mage.choices.Choice;
+import mage.choices.ChoiceCreatureType;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
@@ -55,7 +57,6 @@ public class KindredDominance extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{B}{B}");
// Choose a creature type. Destroy all creatures that are not the chosen type.
- this.getSpellAbility().addEffect(new ChooseCreatureTypeEffect(Outcome.DestroyPermanent));
this.getSpellAbility().addEffect(new KindredDominanceEffect());
}
@@ -88,15 +89,13 @@ class KindredDominanceEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
- MageObject mageObject = game.getObject(source.getSourceId());
- if (controller != null & mageObject != null) {
- SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
- if (subType != null) {
- FilterPermanent filter = new FilterCreaturePermanent("creatures");
- filter.add(Predicates.not(new SubtypePredicate(subType)));
+ Choice typeChoice = new ChoiceCreatureType(game.getObject(source.getSourceId()));
+ if (controller != null && controller.choose(outcome, typeChoice, game)) {
+ game.informPlayers(controller.getLogName() + " has chosen " + typeChoice.getChoice());
+ FilterCreaturePermanent filter = new FilterCreaturePermanent("All creatures not of the chosen type");
+ filter.add(Predicates.not(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))));
return new DestroyAllEffect(filter).apply(game, source);
}
- }
return false;
}
}
