From 8ca8d80a5c6c6225955d835d6a7af575adf359e7 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Sat, 12 Jul 2014 11:20:01 +0400 Subject: [PATCH] [UI] Fixed Issue#454: Enchanted land position is not correct on the layout --- .../client/util/layout/impl/OldCardLayoutStrategy.java | 9 +++++---- .../main/java/org/mage/plugins/card/CardPluginImpl.java | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/util/layout/impl/OldCardLayoutStrategy.java b/Mage.Client/src/main/java/mage/client/util/layout/impl/OldCardLayoutStrategy.java index 09dcc6ccfc..528b702cd0 100644 --- a/Mage.Client/src/main/java/mage/client/util/layout/impl/OldCardLayoutStrategy.java +++ b/Mage.Client/src/main/java/mage/client/util/layout/impl/OldCardLayoutStrategy.java @@ -33,17 +33,18 @@ public class OldCardLayoutStrategy implements CardLayoutStrategy { @Override public void doLayout(JLayeredPane jLayeredPane, int width) { - Map permanents = ((BattlefieldPanel)jLayeredPane).getPermanents(); - JLayeredPane jPanel = ((BattlefieldPanel)jLayeredPane).getMainPanel(); + Map permanents = ((BattlefieldPanel) jLayeredPane).getPermanents(); + JLayeredPane jPanel = ((BattlefieldPanel) jLayeredPane).getMainPanel(); - int height = Plugins.getInstance().sortPermanents(((BattlefieldPanel)jLayeredPane).getUiComponentsList(), permanents.values()); + int height = Plugins.getInstance().sortPermanents(((BattlefieldPanel) jLayeredPane).getUiComponentsList(), permanents.values()); jPanel.setPreferredSize(new Dimension(width - 30, height)); - for (PermanentView permanent: ((BattlefieldPanel)jLayeredPane).getBattlefield().values()) { + for (PermanentView permanent : ((BattlefieldPanel) jLayeredPane).getBattlefield().values()) { if (permanent.getAttachments() != null) { groupAttachments(jLayeredPane, jPanel, permanents, permanent); } } + } private void groupAttachments(JLayeredPane jLayeredPane, JLayeredPane jPanel, Map permanents, PermanentView permanent) { diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java index ad6ac0bffe..356c549860 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java @@ -151,6 +151,11 @@ public class CardPluginImpl implements CardPlugin { } Stack stack = new Stack(); + + if (permanent.getOriginalPermanent().getAttachments() != null) { + stack.setMaxAttachedCount(permanent.getOriginalPermanent().getAttachments().size()); + } + stack.add(permanent); allLands.add(insertIndex == -1 ? allLands.size() : insertIndex, stack); }