From b7f1fd72a17c911ed7f08273e3fcc8dacc641984 Mon Sep 17 00:00:00 2001 From: North Date: Wed, 5 Sep 2012 16:50:26 +0300 Subject: [PATCH] Fixed Break of day and Knight Exemplar (missed controlled Predicate) --- Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java | 4 ++-- Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java b/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java index 1cd6a0f5b73..c6de86e7fe3 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java +++ b/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java @@ -36,7 +36,7 @@ import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.IndestructibleAllEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; -import mage.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterControlledCreaturePermanent; /** * @@ -55,7 +55,7 @@ public class BreakOfDay extends CardImpl { this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); // Fateful hour - If you have 5 or less life, those creatures also are indestructible this turn. this.getSpellAbility().addEffect(new ConditionalContinousEffect( - new IndestructibleAllEffect(new FilterCreaturePermanent("creatures you control"), Duration.EndOfTurn), + new IndestructibleAllEffect(new FilterControlledCreaturePermanent("creatures you control"), Duration.EndOfTurn), FatefulHourCondition.getInstance(), "If you have 5 or less life, those creatures also are indestructible this turn.")); } diff --git a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java index bfccd3f266d..af65cd44bc9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java +++ b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java @@ -32,6 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; +import mage.Constants.TargetController; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +43,7 @@ import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -53,7 +55,6 @@ public class KnightExemplar extends CardImpl { static { filter.add(new SubtypePredicate("Knight")); - filter.add(new AnotherPredicate()); } public KnightExemplar(UUID ownerId) { @@ -70,6 +71,8 @@ public class KnightExemplar extends CardImpl { // Other Knight creatures you control get +1/+1 and are indestructible. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); FilterCreaturePermanent indestructibleFilter = filter.copy(); + indestructibleFilter.add(new AnotherPredicate()); + indestructibleFilter.add(new ControllerPredicate(TargetController.YOU)); indestructibleFilter.setMessage("Other Knight creatures you control"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IndestructibleAllEffect(indestructibleFilter))); }