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

attach: rework attaching names

Browse Source
This commit is contained in:
Hanmac
2018-11-23 22:24:57 +01:00
parent 3b283b14a7
commit d0857ad696
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/screens/match/views/VField.java
View File

@@ -99,7 +99,7 @@ public class VField extends FContainer {
};
private boolean tryStackCard(CardView card, List<CardView> cardsOfType) {
if (card.isAttached()) {
if (card.isAttachedByCards()) {
return false; //can stack with enchanted or equipped card
}
if (card.getCurrentState().isCreature() && !card.isToken()) {
@@ -107,7 +107,7 @@ public class VField extends FContainer {
}
final String cardName = card.getCurrentState().getName();
for (CardView c : cardsOfType) {
if (!c.isAttached() &&
if (!c.isAttachedByCards() &&
cardName.equals(c.getCurrentState().getName()) &&
card.hasSameCounters(c) &&
card.isToken() == c.isToken()) { //don't stack tokens on top of non-tokens