From 7b5b85ec8c7b33b8f9641c0bc03d1617b989ba36 Mon Sep 17 00:00:00 2001 From: Sol Date: Sat, 18 Jul 2015 17:16:36 +0000 Subject: [PATCH] - Triggers shouldn't activate themselves, if they are already active (Fix for Flame-Wreath Phoenix) --- .../src/main/java/forge/game/trigger/TriggerHandler.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 d2d969a6750..c8ea27e9d34 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -379,6 +379,15 @@ public class TriggerHandler { if (!regtrig.zonesCheck(game.getZoneOf(regtrig.getHostCard()))) { return false; // Host card isn't where it needs to be. } + + for (Trigger t : this.activeTriggers) { + // If an ID that matches this ID is already active, don't add it + if (regtrig.getId() == t.getId()) { + return false; + } + } + + // Check if a trigger with the same ID is already in activeTriggers return true; }