From 3c411f3a3ce9f16c4d0dcd854e857be3c21cfb0c Mon Sep 17 00:00:00 2001 From: Sol Date: Fri, 26 Sep 2014 00:22:05 +0000 Subject: [PATCH] - "Effect" effects that contain triggers will now be registered immediately instead of waiting for the next registration time. --- .../main/java/forge/game/ability/effects/EffectEffect.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java index c0baf7732e3..8c3fff7c0cb 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -235,8 +235,11 @@ public class EffectEffect extends SpellAbilityEffect { // TODO: Add targeting to the effect so it knows who it's dealing with game.getTriggerHandler().suppressMode(TriggerType.ChangesZone); - game.getAction().moveTo(ZoneType.Command, eff); + Card cmdEffect = game.getAction().moveTo(ZoneType.Command, eff); game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone); + if (effectTriggers != null) { + game.getTriggerHandler().registerActiveTrigger(cmdEffect, false); + } } }