From 8876a27af1087f4a1eb40eb5678fd771fc7d21e1 Mon Sep 17 00:00:00 2001 From: elcnesh Date: Tue, 12 Aug 2014 20:20:40 +0000 Subject: [PATCH] Fix GenericChoice to not fizzle when the choosing player can't be targeted, and isn't. --- .../java/forge/game/ability/effects/ChooseGenericEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java index fe24cc4522e..4930229a057 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java @@ -41,7 +41,7 @@ public class ChooseGenericEffect extends SpellAbilityEffect { final TargetRestrictions tgt = sa.getTargetRestrictions(); for (final Player p : tgtPlayers) { - if (tgt != null && !p.canBeTargetedBy(sa)) { + if (tgt != null && sa.getTargets().isTargeting(p) && !p.canBeTargetedBy(sa)) { continue; }