external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Lands and tokens with different amounts/types of counters will no longer stack.

Browse Source
This commit is contained in:
Sloth
2011-10-06 13:50:20 +00:00
parent 8e8c04a5ba
commit cfc9f22188
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/arcane/ui/PlayArea.java
View File

@@ -82,7 +82,8 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
insertIndex = i; insertIndex = i;
break; break;
} }
if (!panel.attachedPanels.isEmpty() || firstPanel.gameCard.isEnchanted() || stack.size() == landStackMax) { if (!panel.attachedPanels.isEmpty() || !panel.gameCard.getCounters().equals(firstPanel.gameCard.getCounters())
|| firstPanel.gameCard.isEnchanted() || 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;
@@ -118,7 +119,8 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
insertIndex = i; insertIndex = i;
break; break;
} }
if (!panel.attachedPanels.isEmpty() || stack.size() == tokenStackMax) { if (!panel.attachedPanels.isEmpty() || !panel.gameCard.getCounters().equals(firstPanel.gameCard.getCounters())
|| stack.size() == tokenStackMax) {
// If this token has attachments or the stack is full, put it to the right. // If this token has attachments or the stack is full, put it to the right.
insertIndex = i + 1; insertIndex = i + 1;
continue; continue;