diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java index 5fbbfe620f5..0ca767c35ed 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java @@ -158,7 +158,11 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { buffer.append(""); - buffer.append(""); + buffer.append(""); buffer.append("
"); buffer.append(pt).append("").append(card.getMageObjectType().toString()).append(""); + if (!card.isControlledByOwner()) { + buffer.append("[only controlled] "); + } + buffer.append(card.getMageObjectType().toString()).append("
"); StringBuilder rule = new StringBuilder("
"); diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 7d56747eea8..99fe334b5ac 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -101,6 +101,8 @@ public class CardView extends SimpleCardView { protected boolean paid; protected List counters; + protected boolean controlledByOwner = true; + public CardView(Card card, UUID cardId) { this(card); this.id = cardId; @@ -146,6 +148,9 @@ public class CardView extends SimpleCardView { this.toughness = Integer.toString(card.getToughness().getValue()); this.loyalty = Integer.toString(permanent.getCounters().getCount(CounterType.LOYALTY)); this.pairedCard = permanent.getPairedCard(); + if (!permanent.getControllerId().equals(permanent.getOwnerId())) { + controlledByOwner = false; + } } else { if (card.isCopy()) { @@ -544,4 +549,9 @@ public class CardView extends SimpleCardView { public List getCounters() { return counters; } + + public boolean isControlledByOwner() { + return controlledByOwner; + } + }