diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index dd7d9fa5eb0..54623ad9445 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -1314,6 +1314,7 @@ public class GameAction { this.canShowWinLose = true; forge.card.trigger.Trigger.resetIDs(); AllZone.getTriggerHandler().clearTriggerSettings(); + AllZone.getTriggerHandler().clearDelayedTrigger(); // friendliness final CardFactoryInterface c = AllZone.getCardFactory(); diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index 5c4c83e3124..bc4141999e7 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -75,6 +75,15 @@ public class TriggerHandler { public final void registerDelayedTrigger(final Trigger trig) { this.delayedTriggers.add(trig); } + + /** + *
+ * clearDelayedTrigger. + *
+ */ + public final void clearDelayedTrigger() { + delayedTriggers.clear(); + } /** *