From 4eff3eac31a8e17c663dff10e5c3cf8082b192f7 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Fri, 1 Jan 2021 20:38:04 +0100 Subject: [PATCH] DelayedTriggerEffect: fix controller of the trigger --- .../java/forge/game/ability/effects/DelayedTriggerEffect.java | 1 + .../java/forge/game/ability/effects/ImmediateTriggerEffect.java | 1 + 2 files changed, 2 insertions(+) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java index 6a33e44b278..b8172eaad7f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java @@ -56,6 +56,7 @@ public class DelayedTriggerEffect extends SpellAbilityEffect { // in case the card moved before the delayed trigger can be created, need to check the latest card state for right timestamp Card gameCard = game.getCardState(host); Card lki = CardUtil.getLKICopy(gameCard); + lki.clearControllers(); lki.setOwner(sa.getActivatingPlayer()); final Trigger delTrig = TriggerHandler.parseTrigger(mapParams, lki, sa.isIntrinsic()); delTrig.setSpawningAbility(sa.copy(lki, sa.getActivatingPlayer(), true)); diff --git a/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java index 499239ef39f..959190819d2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java @@ -55,6 +55,7 @@ public class ImmediateTriggerEffect extends SpellAbilityEffect { // in case the card moved before the delayed trigger can be created, need to check the latest card state for right timestamp Card gameCard = game.getCardState(host); Card lki = CardUtil.getLKICopy(gameCard); + lki.clearControllers(); lki.setOwner(sa.getActivatingPlayer()); final Trigger immediateTrig = TriggerHandler.parseTrigger(mapParams, lki, sa.isIntrinsic()); immediateTrig.setSpawningAbility(sa.copy(lki, sa.getActivatingPlayer(), true));