From 4d67b454d14f92d24bb9053628c5f3157d0f92c2 Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 22 Apr 2012 09:07:27 +0000 Subject: [PATCH] - Fixed some changeZone triggers triggering twice. --- src/main/java/forge/card/trigger/TriggerHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index 0649f9b94c9..582e6521d9b 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -307,9 +307,10 @@ public class TriggerHandler { // AP allCards = playerAP.getCardsIn(ZoneType.StaticAbilitiesSourceZones); allCards.addAll(AllZoneUtil.getCardsIn(ZoneType.Stack).getController(playerAP)); - if (runParams.containsKey("Card")) { + if (runParams.containsKey("Destination") && runParams.containsKey("Card")) { + String type = (String) runParams.get("Destination"); Card card = (Card) runParams.get("Card"); - if (!allCards.contains(card)) { + if ((type.equals("Hand") || type.equals("Library")) && !allCards.contains(card)) { allCards.add(card); } }