From 7dc03721ffc85c8075aac85dee3f13463eb2e95e Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sat, 30 Jul 2016 19:35:31 +0000 Subject: [PATCH] CardFactoryUtil: Persist/Undying using OncePerEffect to prevent it from triggering itself --- forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 9bb16b9693a..7a7f861d962 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -3060,7 +3060,7 @@ public class CardFactoryUtil { kws.addTrigger(cardTrigger); } } else if (keyword.equals("Persist")) { - final String trigStr = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard " + + final String trigStr = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | OncePerEffect$ True " + " | Execute$ PersistReturn | ValidCard$ Card.Self+counters_EQ0_M1M1 | Secondary$ True" + " | TriggerDescription$ Persist (" + Keyword.getInstance(keyword).getReminderText() + ")"; final String effect = "AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | WithCounters$ M1M1_1"; @@ -3094,7 +3094,7 @@ public class CardFactoryUtil { kws.addTrigger(cardTrigger); } } else if (keyword.equals("Undying")) { - final String trigStr = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard " + + final String trigStr = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | OncePerEffect$ True " + " | Execute$ UndyingReturn | ValidCard$ Card.Self+counters_EQ0_P1P1 | Secondary$ True" + " | TriggerDescription$ Undying (" + Keyword.getInstance(keyword).getReminderText() + ")"; final String effect = "AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | WithCounters$ P1P1_1";