From 0078da8ea3cf9dab3fd5226fd0349a0f3e3af21a Mon Sep 17 00:00:00 2001 From: Sol Date: Fri, 12 Apr 2013 03:26:15 +0000 Subject: [PATCH] - Reverting wait till Spell resolution to remove SA, since for some reason the SAs for AIs optional triggers aren't matching for some reason. (AI Goblin Arsonist issue) --- src/main/java/forge/game/zone/MagicStack.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/java/forge/game/zone/MagicStack.java b/src/main/java/forge/game/zone/MagicStack.java index 841aa3737a9..ead6c5bc2a3 100644 --- a/src/main/java/forge/game/zone/MagicStack.java +++ b/src/main/java/forge/game/zone/MagicStack.java @@ -593,7 +593,9 @@ public class MagicStack extends MyObservable { this.setResolving(true); // The SpellAbility isn't removed from the Stack until it finishes resolving - final SpellAbility sa = this.top(); + // temporarily reverted removing SAs after resolution + //final SpellAbility sa = this.top(); + final SpellAbility sa = this.pop(); // ActivePlayer gains priority first after Resolve game.getPhaseHandler().resetPriority(); @@ -723,7 +725,8 @@ public class MagicStack extends MyObservable { // remove SA and card from the stack this.removeCardFromStack(sa, fizzle); // SpellAbility is removed from the stack here - this.remove(sa); + // temporarily removed removing SA after resolution + //this.remove(sa); // After SA resolves we have to do a handful of things this.setResolving(false); @@ -955,16 +958,6 @@ public class MagicStack extends MyObservable { } return null; } - - public final SpellAbilityStackInstance getInstanceFromAbilityAndTarget(final SpellAbility sa, final Target tgt) { - // TODO: Confirm this works! - for (final SpellAbilityStackInstance si : this.getStack()) { - if (si.getSpellAbility().equals(sa) && tgt.equals(sa.getTarget())) { - return si; - } - } - return null; - } /** *