External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 12:02:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2014-08-27 17:10:40 +02:00
commit a2bbfbd55b
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
View file

@ -6,6 +6,7 @@ import mage.constants.Rarity;
import mage.interfaces.plugin.CardPlugin; import mage.interfaces.plugin.CardPlugin;
import mage.utils.CardUtil; import mage.utils.CardUtil;
import mage.view.CardView; import mage.view.CardView;
import mage.view.CounterView;
import mage.view.PermanentView; import mage.view.PermanentView;
import net.xeoh.plugins.base.annotations.PluginImplementation; import net.xeoh.plugins.base.annotations.PluginImplementation;
import net.xeoh.plugins.base.annotations.events.Init; import net.xeoh.plugins.base.annotations.events.Init;
@ -134,11 +135,24 @@ public class CardPluginImpl implements CardPlugin {
insertIndex = i; insertIndex = i;
break; break;
} }
List<CounterView> counters = firstPanel.getOriginalPermanent().getCounters();
if (counters != null && counters.size() > 0) {
// don't put to first panel if it has counters
insertIndex = i;
break;
}
if (!empty(permanent.getOriginalPermanent().getAttachments()) || stack.size() == landStackMax) { if (!empty(permanent.getOriginalPermanent().getAttachments()) || stack.size() == landStackMax) {
// If this land has attachments or the stack is full, put it to the right. // If this land has attachments or the stack is full, put it to the right.
insertIndex = i + 1; insertIndex = i + 1;
continue; continue;
} }
counters = permanent.getOriginalPermanent().getCounters();
if (counters != null && counters.size() > 0) {
// if a land has counter, put it to the right
insertIndex = i + 1;
continue;
}
// Add to stack. // Add to stack.
stack.add(0, permanent); stack.add(0, permanent);
continue outerLoop; continue outerLoop;