Fixed Issue#470: curses not displayed correctly on the battlefield

This commit is contained in:
magenoxx 2014-08-01 13:45:41 +04:00
parent 11cf5ab4fe
commit bd56decfd3

View file

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