From 0b8c417b334ca4953bf509858e4de8c0e374594e Mon Sep 17 00:00:00 2001 From: swordshine Date: Thu, 22 May 2014 04:02:22 +0000 Subject: [PATCH] - Fixed Urza's lands --- forge-game/src/main/java/forge/game/GameActionUtil.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java index 087424c7db2..d55701b9ead 100644 --- a/forge-game/src/main/java/forge/game/GameActionUtil.java +++ b/forge-game/src/main/java/forge/game/GameActionUtil.java @@ -17,8 +17,10 @@ */ package forge.game; +import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; + import forge.card.MagicColor; import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityFactory.AbilityRecordType; @@ -33,6 +35,7 @@ import forge.game.player.Player; import forge.game.spellability.*; import forge.game.zone.ZoneType; import forge.util.TextUtil; + import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -480,9 +483,9 @@ public final class GameActionUtil { */ private static boolean hasUrzaLands(final Player p) { final List landsControlled = p.getCardsIn(ZoneType.Battlefield); - return Iterables.any(landsControlled, CardPredicates.nameEquals("Urza's Mine")) - && Iterables.any(landsControlled, CardPredicates.nameEquals("Urza's Tower")) - && Iterables.any(landsControlled, CardPredicates.nameEquals("Urza's Power Plant")); + return Iterables.any(landsControlled, Predicates.and(CardPredicates.isType("Urza's"), CardPredicates.isType("Mine"))) + && Iterables.any(landsControlled, Predicates.and(CardPredicates.isType("Urza's"), CardPredicates.isType("Power-Plant"))) + && Iterables.any(landsControlled, Predicates.and(CardPredicates.isType("Urza's"), CardPredicates.isType("Tower"))); } /**