From d0857ad6968e1df7bf9c07eecfdd4faeff99842b Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@gmx.de>
Date: Fri, 23 Nov 2018 22:24:57 +0100
Subject: [PATCH] attach: rework attaching names

---
 forge-game/src/main/java/forge/game/card/CardView.java | 10 +++++-----
 .../main/java/forge/trackable/TrackableProperty.java   |  2 +-
 .../src/forge/screens/match/views/VField.java          |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java
index ed41f247b36..3c2519d9136 100644
--- a/forge-game/src/main/java/forge/game/card/CardView.java
+++ b/forge-game/src/main/java/forge/game/card/CardView.java
@@ -442,22 +442,22 @@ public class CardView extends GameEntityView {
         return get(TrackableProperty.EncodedCards);
     }
 
-    public GameEntityView getAttaching() {
-        return get(TrackableProperty.Attaching);
+    public GameEntityView getAttachingEntity() {
+        return get(TrackableProperty.AttachingEntity);
     }
     void updateAttaching(Card c) {
-        set(TrackableProperty.Attaching, GameEntityView.get(c.getAttachingEntity()));
+        set(TrackableProperty.AttachingEntity, GameEntityView.get(c.getAttachingEntity()));
     }
 
     public CardView getAttachingCard() {
-        GameEntityView enchanting = getAttaching();
+        GameEntityView enchanting = getAttachingEntity();
         if (enchanting instanceof CardView) {
             return (CardView) enchanting;
         }
         return null;
     }
     public PlayerView getAttachingPlayer() {
-        GameEntityView enchanting = getAttaching();
+        GameEntityView enchanting = getAttachingEntity();
         if (enchanting instanceof PlayerView) {
             return (PlayerView) enchanting;
         }
diff --git a/forge-game/src/main/java/forge/trackable/TrackableProperty.java b/forge-game/src/main/java/forge/trackable/TrackableProperty.java
index e324887f40b..a8d05db057a 100644
--- a/forge-game/src/main/java/forge/trackable/TrackableProperty.java
+++ b/forge-game/src/main/java/forge/trackable/TrackableProperty.java
@@ -43,7 +43,7 @@ public enum TrackableProperty {
     NamedCard(TrackableTypes.StringType),
     PlayerMayLook(TrackableTypes.PlayerViewCollectionType, FreezeMode.IgnoresFreeze),
     PlayerMayLookTemp(TrackableTypes.PlayerViewCollectionType, FreezeMode.IgnoresFreeze),
-    Attaching(TrackableTypes.GameEntityViewType),
+    AttachingEntity(TrackableTypes.GameEntityViewType),
     EncodedCards(TrackableTypes.CardViewCollectionType),
     GainControlTargets(TrackableTypes.CardViewCollectionType),
     CloneOrigin(TrackableTypes.CardViewType),
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VField.java b/forge-gui-mobile/src/forge/screens/match/views/VField.java
index c49c128f2d9..4c7d6482307 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VField.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VField.java
@@ -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