diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java index 206fffaa29b..0db9037fa74 100644 --- a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java +++ b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java @@ -341,6 +341,10 @@ public class GameCopier { zoneOwner = playerMap.get(c.getController()); newCard.setController(zoneOwner, 0); + if (c.isBattle()) { + newCard.setProtectingPlayer(playerMap.get(c.getProtectingPlayer())); + } + newCard.setCameUnderControlSinceLastUpkeep(c.cameUnderControlSinceLastUpkeep()); newCard.setPTTable(c.getSetPTTable()); diff --git a/forge-game/src/main/java/forge/game/GameLogFormatter.java b/forge-game/src/main/java/forge/game/GameLogFormatter.java index d1b5ffb1d9e..628d415860d 100644 --- a/forge-game/src/main/java/forge/game/GameLogFormatter.java +++ b/forge-game/src/main/java/forge/game/GameLogFormatter.java @@ -271,7 +271,7 @@ public class GameLogFormatter extends IGameEventVisitor.Base { Card c = ((Card)defender); controllerName = c.isBattle() ? c.getProtectingPlayer().getName() : c.getController().getName(); } else { - controllerName= defender.getName(); + controllerName = defender.getName(); } boolean firstAttacker = true;