From fb204d4471dff8c97049318ed3e64aded6b465e4 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Thu, 16 Jun 2022 12:23:50 +0200 Subject: [PATCH] Better check for mutated commanders when not on top --- forge-game/src/main/java/forge/game/GameAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index a662981fd3c..018984f425e 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -326,7 +326,7 @@ public class GameAction { CardCollectionView comCards = c.getOwner().getCardsIn(ZoneType.Command); for (final Card effCard : comCards) { for (final ReplacementEffect re : effCard.getReplacementEffects()) { - if (re.hasParam("CommanderMoveReplacement") && effCard.getEffectSource().getName().equals(c.getRealCommander().getName())) { + if (re.hasParam("CommanderMoveReplacement") && c.getMergedCards().contains(effCard.getEffectSource())) { commanderEffect = effCard; break; }