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

KeywordUpdate: fixed more stuff

Browse Source
This commit is contained in:
Hanmac
2017-10-23 20:13:42 +00:00
parent 2030ffcea3
commit 0bac699cbf
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/card/CardFactory.java
View File

@@ -18,14 +18,9 @@
package forge.game.card; package forge.game.card;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import forge.ImageKeys;
import forge.StaticData; import forge.StaticData;
import forge.card.*; import forge.card.*;
import forge.card.CardType.CoreType;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityFactory;
@@ -291,7 +286,6 @@ public class CardFactory {
} }
private static void buildAbilities(final Card card) { private static void buildAbilities(final Card card) {
final String cardName = card.getName();
for (final CardStateName state : card.getStates()) { for (final CardStateName state : card.getStates()) {
if (card.isDoubleFaced() && state == CardStateName.FaceDown) { if (card.isDoubleFaced() && state == CardStateName.FaceDown) {

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

@@ -21,13 +21,11 @@ import java.util.Comparator;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import forge.game.combat.CombatUtil; import forge.game.combat.CombatUtil;
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;
import forge.util.PredicateString;
/** /**
@@ -87,7 +85,8 @@ 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 Iterables.any(c.getKeywords(), PredicateString.contains(keyword)); return c.hasStartOfKeyword(keyword);
//return Iterables.any(c.getKeywords(), PredicateString.contains(keyword));
} }
}; };
} }