diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java index 2eccd5eb3e3..378be39d217 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java @@ -468,7 +468,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl if (card.isAttacking()) { CardFaceSymbols.drawSymbol("attack", g, combatXSymbols, ySymbols); } - if (card.isBlocking()) { + else if (card.isBlocking()) { CardFaceSymbols.drawSymbol("defend", g, combatXSymbols, ySymbols); } diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index e67eb6cd067..372950535d9 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -23,7 +23,6 @@ import forge.assets.ImageCache; import forge.assets.TextRenderer; import forge.card.CardDetailUtil.DetailColors; import forge.card.mana.ManaCost; -import forge.game.zone.ZoneType; import forge.item.IPaperCard; import forge.match.MatchUtil; import forge.model.FModel; @@ -34,8 +33,6 @@ import forge.toolbox.FDialog; import forge.toolbox.FList; import forge.util.Utils; import forge.view.CardView; -import forge.view.CombatView; -import forge.view.IGameView; import forge.view.CardView.CardStateView; import forge.view.ViewUtil; @@ -608,20 +605,14 @@ public class CardRenderer { final float stateXSymbols = (x + (w / 2)) - otherSymbolsSize / 2; final float ySymbols = (y + h) - (h / 8) - otherSymbolsSize / 2; - final IGameView game = MatchUtil.getGameView(); - if (game != null) { - final CombatView combat = game.getCombat(); - if (combat != null) { - if (combat.isAttacking(card)) { - CardFaceSymbols.drawSymbol("attack", g, combatXSymbols, ySymbols, otherSymbolsSize, otherSymbolsSize); - } - if (combat.isBlocking(card)) { - CardFaceSymbols.drawSymbol("defend", g, combatXSymbols, ySymbols, otherSymbolsSize, otherSymbolsSize); - } - } + if (card.isAttacking()) { + CardFaceSymbols.drawSymbol("attack", g, combatXSymbols, ySymbols, otherSymbolsSize, otherSymbolsSize); + } + else if (card.isBlocking()) { + CardFaceSymbols.drawSymbol("defend", g, combatXSymbols, ySymbols, otherSymbolsSize, otherSymbolsSize); } - if (onTop && details.isCreature() && card.isSick() && card.getZone() == ZoneType.Battlefield) { + if (onTop && card.isSick()) { //only needed if on top since otherwise symbol will be hidden CardFaceSymbols.drawSymbol("summonsick", g, stateXSymbols, ySymbols, otherSymbolsSize, otherSymbolsSize); }