From c7e4eb83ab1ede2b17149859238e90279f1cb353 Mon Sep 17 00:00:00 2001
From: Krazy <mitchell@krazyweb.net>
Date: Sun, 4 May 2014 04:47:24 +0000
Subject: [PATCH] Fixed creatures row being created when no creatures were on
 the field while creature stacking is enabled.

---
 .../src/main/java/forge/view/arcane/PlayArea.java     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
index f5b58459ae4..0def46d21a5 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
@@ -211,6 +211,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
                     if (!panel.getAttachedPanels().isEmpty()
                             || panel.getCard().isEnchanted()
                             || panel.getCard().isCloned()
+                            || panel.getCard().isCopiedSpell()
                             || !panel.getCard().getCounters().equals(firstPanel.getCard().getCounters())
                             || (panel.getCard().isSick() != firstPanel.getCard().isSick())
                             || (panel.getCard().getNetAttack() != firstPanel.getCard().getNetAttack())
@@ -255,9 +256,17 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
 
         final CardStackRow lands = collectAllLands();
         final CardStackRow tokens = collectAllTokens();
-        final CardStackRow creatures = FModel.getPreferences().getPrefBoolean(FPref.UI_STACK_CREATURES) ? collectAllCreatures() : new CardStackRow(this.getCardPanels(), RowType.CreatureNonToken);
+        final CardStackRow creatures;
         final CardStackRow others = new CardStackRow(this.getCardPanels(), RowType.Other);
         
+        final CardStackRow collectedCreatures = collectAllCreatures();
+
+        if (FModel.getPreferences().getPrefBoolean(FPref.UI_STACK_CREATURES) && !collectedCreatures.isEmpty()) {
+            creatures = collectedCreatures;
+        } else {
+            creatures = new CardStackRow(this.getCardPanels(), RowType.CreatureNonToken);
+        }
+        
         // should find an appropriate width of card
         int maxCardWidth = this.getCardWidthMax();
         setCardWidth(maxCardWidth);