From bd56decfd31c2a30c8b27097ae2435951c0e979d Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail.com>
Date: Fri, 1 Aug 2014 13:45:41 +0400
Subject: [PATCH] Fixed Issue#470: curses not displayed correctly on the
 battlefield

---
 .../src/main/java/org/mage/plugins/card/CardPluginImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 e56a9bfa92..0522e21ecd 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
@@ -192,6 +192,8 @@ public class CardPluginImpl implements CardPlugin {
             wrap(creatures, rows, -1);
             int afterCreaturesIndex = rows.size();
             wrap(lands, rows, afterCreaturesIndex);
+            int afterLandsIndex = rows.size();
+            wrap(others, rows, afterLandsIndex);
             // Store the current rows and others.
             List<Row> storedRows = new ArrayList<>(rows.size());
             for (Row row : rows) {
@@ -365,7 +367,8 @@ public class CardPluginImpl implements CardPlugin {
                 case other:
                     return !CardUtil.isLand(card) && !CardUtil.isCreature(card);
                 case attached:
-                    return card.getOriginalPermanent().isAttachedTo();
+                    return card.getOriginalPermanent().isAttachedTo()
+                            && !card.getOriginalPermanent().getSubTypes().contains("Curse");
                 default:
                     throw new RuntimeException("Unhandled type: " + this);
             }