From 4aed00d9544e578e8f6bebd011d4c79567dc3489 Mon Sep 17 00:00:00 2001 From: Sloth Date: Tue, 2 Jul 2013 15:29:00 +0000 Subject: [PATCH] - Fixed cards moving to the library not creating CombatLKI's. --- src/main/java/forge/game/GameAction.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java index 80fab949f27..68e868e5aef 100644 --- a/src/main/java/forge/game/GameAction.java +++ b/src/main/java/forge/game/GameAction.java @@ -640,10 +640,6 @@ public class GameAction { return this.moveTo(removed, c); } - if (p != null) { - p.remove(c); - } - if (c.isToken()) { return c; } @@ -666,6 +662,14 @@ public class GameAction { library.add(c, libPosition); } + if (p != null) { + if (p.is(ZoneType.Battlefield) && c.isCreature() && game.getCombat() != null) { + game.getCombat().saveLKI(lastKnownInfo); + game.getCombat().removeFromCombat(c); + } + p.remove(c); + } + final HashMap runParams = new HashMap(); runParams.put("Card", lastKnownInfo); if (p != null) {