From 0dbfc078e05154275c481b17d02b30e35c2c1fd9 Mon Sep 17 00:00:00 2001 From: Sol Date: Sun, 7 Apr 2013 01:03:06 +0000 Subject: [PATCH] - Temporarily reverted the change that removes SAs in finishResolving instead of before because it reintroduces the multi-activation bug. --- src/main/java/forge/game/zone/MagicStack.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/game/zone/MagicStack.java b/src/main/java/forge/game/zone/MagicStack.java index 1421d67fdf0..c0c14a37939 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.freezeStack(); this.setResolving(true); - final SpellAbility sa = this.top(); + final SpellAbility sa = this.pop(); + // Sol(2012/04/06) Temporarily changed to fix multiple activation bug + //final SpellAbility sa = this.top(); // ActivePlayer gains priority first after Resolve game.getPhaseHandler().resetPriority(); @@ -722,7 +724,8 @@ public class MagicStack extends MyObservable { // remove SA and card from the stack this.removeCardFromStack(sa, fizzle); - this.remove(sa); + // Sol(2012/04/06) Temporarily removed to fix multiple activation bug + //this.remove(sa); // After SA resolves we have to do a handful of things this.setResolving(false);