From 8aae10fedd925abc2f494b08561467a563549e6f Mon Sep 17 00:00:00 2001 From: Myrd Date: Sat, 14 Feb 2015 05:59:26 +0000 Subject: [PATCH] Fix Simulation AI not being able to target some permanent types. --- .../forge/ai/simulation/PossibleTargetSelector.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java b/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java index 3242700fd77..35e8409732a 100644 --- a/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java +++ b/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java @@ -5,7 +5,6 @@ import java.util.List; import forge.game.Game; import forge.game.GameObject; -import forge.game.card.CardUtil; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; @@ -21,16 +20,8 @@ public class PossibleTargetSelector { this.tgt = sa.getTargetRestrictions(); this.targetIndex = 0; this.validTargets = new ArrayList(); - if (tgt.canTgtPermanent() || tgt.canTgtCreature()) { - // TODO: What about things that target enchantments and such? - validTargets.addAll(CardUtil.getValidCardsToTarget(tgt, sa)); - } - if (tgt.canTgtPlayer()) { - for (Player p : game.getPlayers()) { - if (p != self || !tgt.canOnlyTgtOpponent()) { - validTargets.add(p); - } - } + for (GameObject o : tgt.getAllCandidates(sa, true)) { + validTargets.add(o); } }