From 3ace3d25e784effd82980d738ffc33a5c847148c Mon Sep 17 00:00:00 2001 From: Sloth Date: Sat, 24 Sep 2011 18:10:29 +0000 Subject: [PATCH] - Completed the fix for delayed triggers. --- src/main/java/forge/card/trigger/TriggerHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index 8f0db8c6127..ad422f11af9 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -315,11 +315,11 @@ public class TriggerHandler { runSingleTrigger(registeredTriggersWorkingCopy.get(i), mode, runParams); } } - for (int i = 0; i < delayedTriggers.size(); i++) { + for (int i = 0; i < delayedTriggersWorkingCopy.size(); i++) { Trigger deltrig = delayedTriggersWorkingCopy.get(i); if (deltrig.getHostCard().getController().equals(playerAP)) { if (runSingleTrigger(deltrig, mode, runParams)) { - delayedTriggers.remove(deltrig); + delayedTriggersWorkingCopy.remove(deltrig); i--; } } @@ -335,7 +335,7 @@ public class TriggerHandler { Trigger deltrig = delayedTriggersWorkingCopy.get(i); if (deltrig.getHostCard().getController().equals(playerAP.getOpponent())) { if (runSingleTrigger(deltrig, mode, runParams)) { - delayedTriggers.remove(deltrig); + delayedTriggersWorkingCopy.remove(deltrig); i--; } }