From 35a1daf11657b01c58369ecd88750a89e67ad05e Mon Sep 17 00:00:00 2001
From: Myrd <myrd@cardforge.org>
Date: Wed, 31 Dec 2014 03:33:47 +0000
Subject: [PATCH] Fix a bug and more visiting.

---
 .../java/forge/game/trigger/TriggerHandler.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index 6a63682a766..853ea6f835e 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -185,13 +185,16 @@ public class TriggerHandler {
 
     public final void resetActiveTriggers() {
         activeTriggers.clear();
-        for (final Card c : game.getCardsInGame()) {
-            for (final Trigger t : c.getTriggers()) {
-                if (isTriggerActive(t)) {
-                    activeTriggers.add(t);
+        game.forEachCardInGame(new Visitor<Card>() {
+            @Override
+            public void visit(Card c) {
+                for (final Trigger t : c.getTriggers()) {
+                    if (isTriggerActive(t)) {
+                        activeTriggers.add(t);
+                    }
                 }
             }
-        }
+        });
     }
 
     public final void clearInstrinsicActiveTriggers(final Card c) {