From 6b895d90cfc10b861ab03de170fb07c145e4e911 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Fri, 7 Sep 2012 21:11:24 +0400
Subject: [PATCH] Fixed Issue#46: Creature display order on the battlefield
 random

---
 .../main/java/mage/client/game/BattlefieldPanel.java  |  4 ++--
 Mage.Common/src/mage/view/PlayerView.java             | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
index 990a6f65eb1..222dd57f6d7 100644
--- a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
@@ -59,7 +59,7 @@ import java.util.Map.Entry;
  */
 public class BattlefieldPanel extends javax.swing.JLayeredPane {
 
-    private Map<UUID, MagePermanent> permanents = new HashMap<UUID, MagePermanent>();
+    private Map<UUID, MagePermanent> permanents = new LinkedHashMap<UUID, MagePermanent>();
     private UUID gameId;
     private BigCard bigCard;
     private Map<String, JComponent> ui = new HashMap<String, JComponent>();
@@ -184,7 +184,7 @@ public class BattlefieldPanel extends javax.swing.JLayeredPane {
         }
         final MagePermanent perm = Plugins.getInstance().getMagePermanent(permanent, bigCard, cardDimension, gameId, true);
         if (!Plugins.getInstance().isCardPluginLoaded()) {
-            perm.setBounds(findEmptySpace(new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight)));
+            //perm.setBounds(findEmptySpace(new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight)));
         } else {
             //perm.setAlpha(0);
         }
diff --git a/Mage.Common/src/mage/view/PlayerView.java b/Mage.Common/src/mage/view/PlayerView.java
index 8808f382185..b921034497b 100644
--- a/Mage.Common/src/mage/view/PlayerView.java
+++ b/Mage.Common/src/mage/view/PlayerView.java
@@ -28,10 +28,6 @@
 
 package mage.view;
 
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
 import mage.cards.Card;
 import mage.counters.CounterType;
 import mage.game.Game;
@@ -39,6 +35,11 @@ import mage.game.GameState;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
 /**
  *
  * @author BetaSteward_at_googlemail.com
@@ -56,7 +57,7 @@ public class PlayerView implements Serializable {
     private boolean hasLeft;
     private ManaPoolView manaPool;
     private SimpleCardsView graveyard = new SimpleCardsView();
-    private Map<UUID, PermanentView> battlefield = new HashMap<UUID, PermanentView>();
+    private Map<UUID, PermanentView> battlefield = new LinkedHashMap<UUID, PermanentView>();
     private CardView topCard;
     private UserDataView userDataView;