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

- Fixed Urza's lands

Browse Source
This commit is contained in:
swordshine
2014-05-22 04:02:22 +00:00
parent 5a1bf1205d
commit 0b8c417b33
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-game/src/main/java/forge/game/GameActionUtil.java
View File

@@ -17,8 +17,10 @@
*/ */
package forge.game; package forge.game;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityFactory;
import forge.game.ability.AbilityFactory.AbilityRecordType; import forge.game.ability.AbilityFactory.AbilityRecordType;
@@ -33,6 +35,7 @@ import forge.game.player.Player;
import forge.game.spellability.*; import forge.game.spellability.*;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.TextUtil; import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
@@ -480,9 +483,9 @@ public final class GameActionUtil {
*/ */
private static boolean hasUrzaLands(final Player p) { private static boolean hasUrzaLands(final Player p) {
final List<Card> landsControlled = p.getCardsIn(ZoneType.Battlefield); final List<Card> landsControlled = p.getCardsIn(ZoneType.Battlefield);
return Iterables.any(landsControlled, CardPredicates.nameEquals("Urza's Mine")) return Iterables.any(landsControlled, Predicates.and(CardPredicates.isType("Urza's"), CardPredicates.isType("Mine")))
&& Iterables.any(landsControlled, CardPredicates.nameEquals("Urza's Tower")) && Iterables.any(landsControlled, Predicates.and(CardPredicates.isType("Urza's"), CardPredicates.isType("Power-Plant")))
&& Iterables.any(landsControlled, CardPredicates.nameEquals("Urza's Power Plant")); && Iterables.any(landsControlled, Predicates.and(CardPredicates.isType("Urza's"), CardPredicates.isType("Tower")));
} }
/** /**