Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

GUI: fix card hints being shown twice on permanents. (#10675)

Browse source
This commit is contained in:
Susucre 2023-07-27 15:34:38 +02:00 • committed by GitHub
parent 80b25d9c50
commit 9eb7e2870e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Mage/src/main/java/mage/game/permanent/PermanentImpl.java
View file

@ -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<String> 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<String> 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);
}