External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 11:32:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hints: removed duplicated hints from popup;

Browse source
This commit is contained in:
Oleg Agafonov 2019-02-09 12:28:29 +04:00
parent f341d35ece
commit 7e4767fd30
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/abilities/hint/HintUtils.java
View file

@ -1,6 +1,10 @@
package mage.abilities.hint; package mage.abilities.hint;
import com.sun.istack.internal.NotNull;
import java.awt.*; import java.awt.*;
import java.util.HashSet;
import java.util.List;
/** /**
* @author JayDi85 * @author JayDi85
@ -40,4 +44,15 @@ public class HintUtils {
return res; return res;
} }
public static void appendHints(@NotNull List<String> destList, @NotNull List<String> newHints) {
// append only unique hints
HashSet<String> used = new HashSet<>();
for (String s : newHints) {
if (!used.contains(s)) {
destList.add(s);
used.add(s);
}
}
}
} }

2
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -274,7 +274,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
// total hints // total hints
if (!abilityHints.isEmpty()) { if (!abilityHints.isEmpty()) {
rules.add(HintUtils.HINT_START_MARK); rules.add(HintUtils.HINT_START_MARK);
rules.addAll(abilityHints); HintUtils.appendHints(rules, abilityHints);
} }
} }
return rules; return rules;

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

@ -295,8 +295,8 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
// total hints // total hints
if (!abilityHints.isEmpty() || !restrictHints.isEmpty()) { if (!abilityHints.isEmpty() || !restrictHints.isEmpty()) {
rules.add(HintUtils.HINT_START_MARK); rules.add(HintUtils.HINT_START_MARK);
rules.addAll(abilityHints); HintUtils.appendHints(rules, abilityHints);
rules.addAll(restrictHints); HintUtils.appendHints(rules, restrictHints);
} }
return rules; return rules;