From dbf34bcbfab1ca627582616092e3b83d92924cd9 Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Thu, 19 Jan 2012 12:25:16 +0000
Subject: [PATCH] First small attempt at "non-sticky" combat panel (needs
 playtesting).

---
 src/main/java/forge/MagicStack.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/forge/MagicStack.java b/src/main/java/forge/MagicStack.java
index beeaa37a9cf..018ca342b94 100644
--- a/src/main/java/forge/MagicStack.java
+++ b/src/main/java/forge/MagicStack.java
@@ -1095,10 +1095,6 @@ public class MagicStack extends MyObservable {
 
         AllZone.getPhaseHandler().setNeedToNextPhase(false);
 
-        if (AllZone.getPhaseHandler().inCombat()) {
-            CombatUtil.showCombat();
-        }
-
         // TODO: change to use forge.view.FView?
         GuiDisplayUtil.updateGUI();