From c12fc9185af2a4cbc382df0e67672413a72dc219 Mon Sep 17 00:00:00 2001
From: slapshot5 <slapshot5@cardforge.org>
Date: Mon, 10 Oct 2011 23:45:53 +0000
Subject: [PATCH] fix Charm targeting when called from a Trigger

---
 src/main/java/forge/GameAction.java                  | 2 --
 src/main/java/forge/card/trigger/TriggerHandler.java | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index 21b0b332f80..09cdf1c11eb 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -2183,8 +2183,6 @@ public class GameAction {
      */
     public void playSpellAbility_NoStack(final SpellAbility sa, final boolean skipTargeting) {
         sa.setActivatingPlayer(AllZone.getHumanPlayer());
-        
-        AbilityFactory_Charm.setupCharmSAs(sa);
 
         if (sa.getPayCosts() != null) {
             Target_Selection ts = new Target_Selection(sa.getTarget(), sa);
diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java
index 1ad95495785..839fa595fe9 100644
--- a/src/main/java/forge/card/trigger/TriggerHandler.java
+++ b/src/main/java/forge/card/trigger/TriggerHandler.java
@@ -11,6 +11,7 @@ import forge.CommandArgs;
 import forge.GameActionUtil;
 import forge.ComputerUtil;
 import forge.card.abilityFactory.AbilityFactory;
+import forge.card.abilityFactory.AbilityFactory_Charm;
 import forge.card.cost.Cost;
 import forge.card.spellability.Ability;
 import forge.card.spellability.Ability_Sub;
@@ -451,6 +452,10 @@ public class TriggerHandler {
 
         sa[0].setActivatingPlayer(host.getController());
         sa[0].setStackDescription(sa[0].toString());
+        //TODO - for Charms to supports AI, this needs to be removed
+        if (sa[0].getActivatingPlayer().isHuman()) {
+            AbilityFactory_Charm.setupCharmSAs(sa[0]);
+        }
         boolean mand = false;
         if (params.containsKey("OptionalDecider")) {
         	sa[0].setOptionalTrigger(true);