diff --git a/Mage.Sets/src/mage/sets/tenth/Condemn.java b/Mage.Sets/src/mage/sets/tenth/Condemn.java index 847c0d69a1..898ed3b059 100644 --- a/Mage.Sets/src/mage/sets/tenth/Condemn.java +++ b/Mage.Sets/src/mage/sets/tenth/Condemn.java @@ -29,14 +29,13 @@ package mage.sets.tenth; import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -50,7 +49,7 @@ import mage.target.common.TargetAttackingCreature; public class Condemn extends CardImpl { public Condemn(UUID ownerId) { - super(ownerId, 13, "Condemn", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); + super(ownerId, 13, "Condemn", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "10E"; this.color.setWhite(true); // Put target attacking creature on the bottom of its owner's library. diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java b/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java index ea7220ec64..a8c3c1bb1d 100644 --- a/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java @@ -48,7 +48,7 @@ public class CantBeTargetedTargetEffect extends ContinuousRuleModifiyingEffectIm private final FilterStackObject filterSource; public CantBeTargetedTargetEffect(FilterStackObject filterSource, Duration duration) { - super(duration, Outcome.Benefit); + super(duration, Outcome.Benefit, false, false); this.filterSource = filterSource; } diff --git a/Mage/src/mage/target/TargetImpl.java b/Mage/src/mage/target/TargetImpl.java index 440c545b0f..bd4b05f69e 100644 --- a/Mage/src/mage/target/TargetImpl.java +++ b/Mage/src/mage/target/TargetImpl.java @@ -328,7 +328,7 @@ public abstract class TargetImpl implements Target { public boolean isLegal(Ability source, Game game) { //20101001 - 608.2b Set illegalTargets = new HashSet<>(); - int replacedTargets = 0; +// int replacedTargets = 0; for (UUID targetId: targets.keySet()) { Card card = game.getCard(targetId); if (card != null) { @@ -338,7 +338,8 @@ public abstract class TargetImpl implements Target { } } if (!notTarget && game.replaceEvent(GameEvent.getEvent(EventType.TARGET, targetId, source.getSourceId(), source.getControllerId()))) { - replacedTargets++; +// replacedTargets++; + illegalTargets.add(targetId); continue; } if (!canTarget(targetId, source, game)) { @@ -349,9 +350,9 @@ public abstract class TargetImpl implements Target { for (UUID targetId: illegalTargets) { targets.remove(targetId); } - if (replacedTargets > 0 && replacedTargets == targets.size()) { - return false; - } +// if (replacedTargets > 0 && replacedTargets == targets.size()) { +// return false; +// } if (minNumberOfTargets == 0 && targets.isEmpty()) { return true; }