From b3141b59e2bc14ececfdd4ed383be978b072cbdf Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 28 Oct 2011 12:19:20 +0000 Subject: [PATCH] - Fixed continuous static abilities granting temporary triggers (the new trigger getCopy function doesn't copy the temporary status). --- res/cardsfolder/l/lord_of_shatterskull_pass.txt | 2 +- .../forge/card/staticAbility/StaticAbility_Continuous.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/res/cardsfolder/l/lord_of_shatterskull_pass.txt b/res/cardsfolder/l/lord_of_shatterskull_pass.txt index 3f83fe4f33a..3b198267c77 100644 --- a/res/cardsfolder/l/lord_of_shatterskull_pass.txt +++ b/res/cardsfolder/l/lord_of_shatterskull_pass.txt @@ -6,7 +6,7 @@ PT:3/3 K:Level up:1 R K:maxLevel:6 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | CheckSVar$ X | SVarCompare$ EQ1 | Description$ LEVEL 1-5 6/6 -S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddTrigger$ TriggerDamage | AddSVar$ TrigDamage | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 6+ 6/6 Whenever CARDNAME attacks, it deals 6 damage to each creature defending player controls. +S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddTrigger$ TriggerDamage | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 6+ 6/6 Whenever CARDNAME attacks, it deals 6 damage to each creature defending player controls. SVar:X:Count$Valid Card.Self+counters_GE1_LEVEL+counters_LE5_LEVEL SVar:Y:Count$Valid Card.Self+counters_GE6_LEVEL SVar:TriggerDamage:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, it deals 6 damage to each creature defending player controls. diff --git a/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java b/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java index d3c8e9553c9..383594e2c5f 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java +++ b/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java @@ -268,8 +268,7 @@ public class StaticAbility_Continuous { if (addTriggers != null) { for (String trigger : addTriggers) { Trigger actualTrigger = TriggerHandler.parseTrigger(trigger, affectedCard, false); - actualTrigger.setTemporary(true); - affectedCard.addTrigger(actualTrigger); + affectedCard.addTrigger(actualTrigger).setTemporary(true); } }