external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

CardPredicates: fixed containsKeyword

Browse Source
This commit is contained in:
Hanmac
2017-11-02 05:38:16 +00:00
parent 75bec0a132
commit c4520a0ac2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/card/CardPredicates.java
View File

@@ -23,6 +23,7 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.game.combat.CombatUtil; import forge.game.combat.CombatUtil;
import forge.game.keyword.KeywordInterface;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
@@ -85,7 +86,12 @@ public final class CardPredicates {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
return c.hasStartOfKeyword(keyword); for (KeywordInterface k : c.getKeywords()) {
if (k.getOriginal().startsWith(keyword)) {
return true;
}
}
return false;
//return Iterables.any(c.getKeywords(), PredicateString.contains(keyword)); //return Iterables.any(c.getKeywords(), PredicateString.contains(keyword));
} }
}; };