Fixed Ojutai, Soul of Winter's triggered ability being unable to target noncreature nonland permanents.

This commit is contained in:
Duncan Townsend 2015-06-21 22:52:04 -04:00
parent fb313be1b6
commit 16cadde43f

View file

@ -40,7 +40,9 @@ import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.SetTargetPointer; import mage.constants.SetTargetPointer;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
@ -51,13 +53,13 @@ import mage.target.TargetPermanent;
*/ */
public class OjutaiSoulOfWinter extends CardImpl { public class OjutaiSoulOfWinter extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon you control"); private static final FilterCreaturePermanent filterDragon = new FilterCreaturePermanent("Dragon you control");
private static final FilterCreaturePermanent filterPermanent = new FilterCreaturePermanent("permanent an opponent controls"); private static final FilterPermanent filterNonlandPermanent = new FilterNonlandPermanent("nonland permanent an opponent controls");
static { static {
filter.add(new SubtypePredicate("Dragon")); filterDragon.add(new SubtypePredicate("Dragon"));
filter.add(new ControllerPredicate(TargetController.YOU)); filterDragon.add(new ControllerPredicate(TargetController.YOU));
filterPermanent.add(new ControllerPredicate(TargetController.OPPONENT)); filterNonlandPermanent.add(new ControllerPredicate(TargetController.OPPONENT));
} }
public OjutaiSoulOfWinter(UUID ownerId) { public OjutaiSoulOfWinter(UUID ownerId) {
@ -75,9 +77,9 @@ public class OjutaiSoulOfWinter extends CardImpl {
// Whenever a Dragon you control attacks, tap target nonland permanent an opponent controls. That permanent doesn't untap during its controller's next untap step. // Whenever a Dragon you control attacks, tap target nonland permanent an opponent controls. That permanent doesn't untap during its controller's next untap step.
Ability ability = new AttacksAllTriggeredAbility( Ability ability = new AttacksAllTriggeredAbility(
new TapTargetEffect(), new TapTargetEffect(),
false, filter, SetTargetPointer.NONE, false); false, filterDragon, SetTargetPointer.NONE, false);
ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("That permanent")); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("That permanent"));
ability.addTarget(new TargetPermanent(filterPermanent)); ability.addTarget(new TargetPermanent(filterNonlandPermanent));
this.addAbility(ability); this.addAbility(ability);
} }