From a624cf565a6adf3fd12d968311acecd99cbdd4c9 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Sun, 14 Feb 2021 15:21:12 +0100 Subject: [PATCH] GameAction: copy changed card traits when moving to stack --- forge-game/src/main/java/forge/game/GameAction.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 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 df55cecf0bd..96a568cf3d5 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -207,7 +207,17 @@ public class GameAction { if (!c.isRealToken()) { copied = CardFactory.copyCard(c, false); - if (!zoneTo.is(ZoneType.Stack)) { + if (zoneTo.is(ZoneType.Stack)) { + // when moving to stack, copy changed card infomation + copied.setChangedCardColors(c.getChangedCardColors()); + copied.setChangedCardKeywords(c.getChangedCardKeywords()); + copied.setChangedCardTypes(c.getChangedCardTypesMap()); + copied.setChangedCardNames(c.getChangedCardNames()); + copied.setChangedCardTraits(c.getChangedCardTraits()); + + copied.copyChangedTextFrom(c); + + } else { // when a card leaves the battlefield, ensure it's in its original state // (we need to do this on the object before copying it, or it won't work correctly e.g. // on Transformed objects)