From 2cdcf7263b71da335171b0df5ebc73ec262df8b1 Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 16 Jun 2015 14:24:45 +0000 Subject: [PATCH] - Improved getCurrentColors (no longer wrongly shows the current card colors for face-down Morph creatures controlled by the human player). --- forge-gui/src/main/java/forge/card/CardDetailUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/card/CardDetailUtil.java index f4d6485a93e..cda0733e0b3 100644 --- a/forge-gui/src/main/java/forge/card/CardDetailUtil.java +++ b/forge-gui/src/main/java/forge/card/CardDetailUtil.java @@ -271,7 +271,7 @@ public class CardDetailUtil { if (origPaperCard != null) { origCard = Card.getCardForUi(origPaperCard); // if null, probably a variant card } - origIdent = origCard != null ? getCurrentColors(CardView.get(origCard).getCurrentState()) : ""; + origIdent = origCard != null ? getCurrentColors(origCard.isFaceDown() ? CardView.get(origCard).getState(false) : CardView.get(origCard).getCurrentState()) : ""; } catch(Exception ex) { System.err.println("Unexpected behavior: card " + card.getName() + "[" + card.getId() + "] tripped an exception when trying to process current card colors."); }