github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed that counters on permanents were not shown.

Browse source
This commit is contained in:
LevelX2 2015-03-05 07:50:17 +01:00
parent 15d95f0fee
commit e01301d6f6
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Mage.Common/src/mage/view/CardView.java
View file

@ -210,6 +210,12 @@ public class CardView extends SimpleCardView {
if (!permanent.getControllerId().equals(permanent.getOwnerId())) { if (!permanent.getControllerId().equals(permanent.getOwnerId())) {
controlledByOwner = false; controlledByOwner = false;
} }
if (game != null && permanent.getCounters() != null && !permanent.getCounters().isEmpty()) {
counters = new ArrayList<>();
for (Counter counter: permanent.getCounters().values()) {
counters.add(new CounterView(counter));
}
}
} else { } else {
if (card.isCopy()) { if (card.isCopy()) {
this.mageObjectType = MageObjectType.COPY_CARD; this.mageObjectType = MageObjectType.COPY_CARD;
@ -217,6 +223,12 @@ public class CardView extends SimpleCardView {
this.mageObjectType = MageObjectType.CARD; this.mageObjectType = MageObjectType.CARD;
} }
this.loyalty = ""; this.loyalty = "";
if (game != null && card.getCounters(game) != null && !card.getCounters(game).isEmpty()) {
counters = new ArrayList<>();
for (Counter counter: card.getCounters(game).values()) {
counters.add(new CounterView(counter));
}
}
} }
this.power = Integer.toString(card.getPower().getValue()); this.power = Integer.toString(card.getPower().getValue());
this.toughness = Integer.toString(card.getToughness().getValue()); this.toughness = Integer.toString(card.getToughness().getValue());
@ -248,12 +260,7 @@ public class CardView extends SimpleCardView {
this.rarity = card.getRarity(); this.rarity = card.getRarity();
this.isToken = false; this.isToken = false;
} }
if (game != null && card.getCounters(game) != null && !card.getCounters(game).isEmpty()) {
counters = new ArrayList<>();
for (Counter counter: card.getCounters(game).values()) {
counters.add(new CounterView(counter));
}
}
if (card.getSecondCardFace() != null) { if (card.getSecondCardFace() != null) {
this.secondCardFace = new CardView(card.getSecondCardFace()); this.secondCardFace = new CardView(card.getSecondCardFace());
this.alternateName = secondCardFace.getName(); this.alternateName = secondCardFace.getName();