From 1908ad7583b822542ffc9ea446943eed90d1669f Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Mon, 24 Jun 2013 16:10:08 +0000
Subject: [PATCH] added inCombat check to controllerChangeZoneCorrection

---
 src/main/java/forge/game/GameAction.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index 0570ab70446..6a918f0092b 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -439,7 +439,8 @@ public class GameAction {
         if (c.hasStartOfKeyword("Echo")) {
             c.addExtrinsicKeyword("(Echo unpaid)");
         }
-        game.getCombat().removeFromCombat(c);
+        if ( game.getPhaseHandler().inCombat() )
+            game.getCombat().removeFromCombat(c);
 
         c.setTurnInZone(tiz);