From 4a9eddb724d072c37639a17f8b0a0844abcfd675 Mon Sep 17 00:00:00 2001 From: Nathaniel Brandes Date: Wed, 8 Mar 2017 20:59:01 -0800 Subject: [PATCH] Properly fix targeting. The notTarget should only invalidate the canBeTargetedBy return. The Filter should still be relevant. --- Mage/src/main/java/mage/target/common/TargetDefender.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/target/common/TargetDefender.java b/Mage/src/main/java/mage/target/common/TargetDefender.java index 3a3131d6367..802d6a9664e 100644 --- a/Mage/src/main/java/mage/target/common/TargetDefender.java +++ b/Mage/src/main/java/mage/target/common/TargetDefender.java @@ -135,12 +135,12 @@ public class TargetDefender extends TargetImpl { MageObject targetSource = game.getObject(sourceId); for (UUID playerId: game.getState().getPlayersInRange(sourceControllerId, game)) { Player player = game.getPlayer(playerId); - if (notTarget || (player != null && player.canBeTargetedBy(targetSource, sourceControllerId, game) && filter.match(player, game))) { + if (player != null && (player.canBeTargetedBy(targetSource, sourceControllerId, game) || notTarget) && filter.match(player, game)) { possibleTargets.add(playerId); } } for (Permanent permanent: game.getBattlefield().getActivePermanents(new FilterPlaneswalkerPermanent(), sourceControllerId, game)) { - if (notTarget || (permanent.canBeTargetedBy(targetSource, sourceControllerId, game) && filter.match(permanent, game))) { + if ((permanent.canBeTargetedBy(targetSource, sourceControllerId, game) || notTarget) && filter.match(permanent, game)) { possibleTargets.add(permanent.getId()); } }