From 5963f2ec88f66ec8970b453eeb1779bf4a7fc686 Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Sat, 10 Sep 2011 20:47:55 +0000 Subject: [PATCH] finish up removing abilities and triggers for target cards in AF_Animate (may need to add static abilities to this yet also...) --- .../card/abilityFactory/AbilityFactory_Animate.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java index e6c9559cbd2..724c503d1a6 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java @@ -551,14 +551,14 @@ public final class AbilityFactory_Animate { AllZone.getTriggerHandler().registerTrigger(parsedTrigger); } } - + //suppress triggers from the animated card final ArrayList removedTriggers = new ArrayList(); if (params.containsKey("OverwriteTriggers")) { - System.out.println("Suppressing triggers for: "+c); ArrayList triggersToRemove = c.getTriggers(); for (Trigger trigger : triggersToRemove) { trigger.setSuppressed(true); + removedTriggers.add(trigger); } } @@ -586,10 +586,9 @@ public final class AbilityFactory_Animate { public void execute() { doUnanimate(c, af, finalDesc, keywords, addedAbilities, addedTriggers, colorTimestamp, givesStAbs, removedAbilities, timestamp); - + //give back suppressed triggers - for(Trigger t : removedTriggers) { - System.out.println("Unsuppressing triggers for: "+c); + for (Trigger t : removedTriggers) { t.setSuppressed(false); } }