From 77a73c04a45f55e70abbf0c0de9ea5fe8bcc8061 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 16 Jul 2021 09:45:48 -0400 Subject: [PATCH] correct for Source that is LKI (coming from ImmediateTrigger, etc) --- .../java/forge/game/ability/effects/ControlGainEffect.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java index 691b149d6d6..9316b455ab9 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java @@ -91,7 +91,12 @@ public class ControlGainEffect extends SpellAbilityEffect { if (sa.hasParam("ControlledByTarget")) { tgtCards = CardLists.filterControlledBy(tgtCards, getTargetPlayers(sa)); - } + } + + // in case source was LKI or still resolving + if (source.isLKI() || source.getZone().is(ZoneType.Stack)) { + source = game.getCardState(source); + } // check for lose control criteria right away if (lose != null && lose.contains("LeavesPlay") && !source.isInZone(ZoneType.Battlefield)) {