From 4b25332a9d1a6d7bbcedd3913cc55abecd20d101 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Tue, 16 Feb 2021 22:42:46 +0100 Subject: [PATCH] Refactor --- .../src/main/java/forge/view/arcane/CardPanel.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 f4e47ad8aa0..9e43a4d1aa4 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 @@ -700,14 +700,13 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl else { String keywordKey = card.getCurrentState().getKeywordKey(); String abilityText = card.getCurrentState().getAbilityText(); - if ((keywordKey.indexOf("Flash") != -1) + if (((keywordKey.indexOf("Flashback") == -1) + && (keywordKey.indexOf("Flash") != -1)) || ((abilityText.indexOf("May be played by") != -1) - && (abilityText.indexOf("and as though it has flash") != -1))){ - if (keywordKey.indexOf("Flashback") == -1) { + && (abilityText.indexOf("and as though it has flash") != -1))) { hasFlash = !card.isFaceDown() && ((!ZoneType.Library.equals(card.getZone()) && !ZoneType.Hand.equals(card.getZone())) || matchUI.mayView(card)); if (hasFlash) { CardFaceSymbols.drawAbilitySymbol("flash", g, cardXOffset + (cardWidth / 2) + (cardWidth / 3), cardWidth < 200 ? cardYOffset + 25 : cardYOffset + 50, cardWidth / 7, cardWidth / 7); - } } } }