diff --git a/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java b/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java index 4b9adcfa15a..33eee1be489 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java +++ b/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java @@ -246,7 +246,7 @@ public class StaticAbility_Continuous { if (params.containsKey("RemoveTriggers") || params.containsKey("RemoveAllAbilities")) { ArrayList triggers = affectedCard.getTriggers(); for (Trigger trigger : triggers) { - trigger.setSuppressed(true); + trigger.setTemporarilySuppressed(true); } } //affectedCard.updateObservers(); diff --git a/src/main/java/forge/card/trigger/Trigger.java b/src/main/java/forge/card/trigger/Trigger.java index dadc6a1bc37..044db09472c 100644 --- a/src/main/java/forge/card/trigger/Trigger.java +++ b/src/main/java/forge/card/trigger/Trigger.java @@ -525,12 +525,17 @@ public abstract class Trigger { } protected boolean suppressed = false; + protected boolean temporarilySuppressed = false; - public void setSuppressed(boolean supp) { + /*public void setSuppressed(boolean supp) { suppressed = supp; + }*/ + + public void setTemporarilySuppressed(boolean supp) { + temporarilySuppressed = supp; } public boolean isSuppressed() { - return suppressed; + return (suppressed || temporarilySuppressed); } } diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index df22d21301a..f6255d34788 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -261,7 +261,7 @@ public class TriggerHandler { } } for (int i = 0; i < registeredTriggers.size(); i++) { - registeredTriggers.get(i).setSuppressed(false); + registeredTriggers.get(i).setTemporarilySuppressed(false); } }