From 9eb7e2870e6536152e94c8c886b53c688b6f1aa6 Mon Sep 17 00:00:00 2001 From: Susucre <34709007+Susucre@users.noreply.github.com> Date: Thu, 27 Jul 2023 15:34:38 +0200 Subject: [PATCH] GUI: fix card hints being shown twice on permanents. (#10675) --- .../mage/game/permanent/PermanentImpl.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index 1d52ccfb567..b5bb5e2d128 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -12,7 +12,6 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.RegenerateSourceEffect; -import mage.abilities.hint.Hint; import mage.abilities.hint.HintUtils; import mage.abilities.keyword.*; import mage.cards.Card; @@ -279,18 +278,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { return rules; } - // ability hints - List abilityHints = new ArrayList<>(); - if (HintUtils.ABILITY_HINTS_ENABLE) { - for (Ability ability : getAbilities(game)) { - for (Hint hint : ability.getHints()) { - String s = hint.getText(game, ability); - if (s != null && !s.isEmpty()) { - abilityHints.add(s); - } - } - } - } + // ability hints already collected in super call // restrict hints List restrictHints = new ArrayList<>(); @@ -357,9 +345,10 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { } // total hints - if (!abilityHints.isEmpty() || !restrictHints.isEmpty()) { - rules.add(HintUtils.HINT_START_MARK); - HintUtils.appendHints(rules, abilityHints); + if (!restrictHints.isEmpty()) { + if (rules.stream().noneMatch(s -> s.contains(HintUtils.HINT_START_MARK))) { + rules.add(HintUtils.HINT_START_MARK); + } HintUtils.appendHints(rules, restrictHints); }