From 7fc425fb0afc913c305c8a5c0aa4dd68074c454c Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Tue, 20 Sep 2011 03:23:21 +0000 Subject: [PATCH] isCardInPlayerGraveyard no longer there. --- src/main/java/forge/AllZoneUtil.java | 13 ------------- src/main/java/forge/GameActionUtil.java | 4 ++-- src/main/java/forge/PlayerZone_ComesIntoPlay.java | 4 ++-- .../forge/card/cardFactory/CardFactoryUtil.java | 2 +- .../card/cardFactory/CardFactory_Creatures.java | 2 +- .../card/cardFactory/CardFactory_Sorceries.java | 6 +++--- 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/main/java/forge/AllZoneUtil.java b/src/main/java/forge/AllZoneUtil.java index 20484e265e6..5dc79246274 100644 --- a/src/main/java/forge/AllZoneUtil.java +++ b/src/main/java/forge/AllZoneUtil.java @@ -114,19 +114,6 @@ public abstract class AllZoneUtil { - /** - * answers the question "is a certain, specific card in this player's graveyard?". - * - * @param player the player's hand to check - * @param card the specific card to look for - * @return true if the card is present in this player's hand; false otherwise - */ - public static boolean isCardInPlayerGraveyard(final Player player, final Card card) { - return player.getZone(Constant.Zone.Graveyard).contains(card); - } - - //////// HAND - /** * answers the question "is the given card in any exile zone?". * diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index 48922131f3c..81cc24e4266 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -325,7 +325,7 @@ public final class GameActionUtil { if (controller.isComputer() || GameActionUtil.showYesNoDialog(card, "Return Vengevine from the graveyard?")) { - if (AllZoneUtil.isCardInPlayerGraveyard(controller, card)) { + if (controller.getZone(Zone.Graveyard).contains(card)) { AllZone.getGameAction().moveTo(play, card); } } @@ -921,7 +921,7 @@ public final class GameActionUtil { public void resolve() { Card target = getTargetCard(); if (target != null) { - if (AllZoneUtil.isCardInPlayerGraveyard(src.getController(), target)) { + if (src.getController().getZone(Zone.Graveyard).contains(target)) { PlayerZone hand = src.getController().getZone(Constant.Zone.Hand); AllZone.getGameAction().moveTo(hand, target); } diff --git a/src/main/java/forge/PlayerZone_ComesIntoPlay.java b/src/main/java/forge/PlayerZone_ComesIntoPlay.java index 55f5c7d2ae0..fb1b723f3b0 100644 --- a/src/main/java/forge/PlayerZone_ComesIntoPlay.java +++ b/src/main/java/forge/PlayerZone_ComesIntoPlay.java @@ -184,7 +184,7 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone { public void resolve() { if (crd.getController().isHuman()) { if (GameActionUtil.showYesNoDialog(crd, "Attach " + crd + " to " + c + "?")) { - if (AllZoneUtil.isCardInPlayerGraveyard(player, crd) + if (player.getZone(Zone.Graveyard).contains(crd) && AllZoneUtil.isCardInPlay(c) && c.isCreature() && c.getNetAttack() == 1 && c.getNetDefense() == 1) { @@ -195,7 +195,7 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone { } } else { - if (AllZoneUtil.isCardInPlayerGraveyard(player, crd) + if (player.getZone(Zone.Graveyard).contains(crd) && AllZoneUtil.isCardInPlay(c) && c.isCreature() && c.getNetAttack() == 1 && c.getNetDefense() == 1) { diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index cbc47d744d8..19c6398ecd6 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -863,7 +863,7 @@ public class CardFactoryUtil { public boolean canPlay() { Card sourceCard = this.getSourceCard(); - return AllZoneUtil.isCardInPlayerGraveyard(sourceCard.getController(), sourceCard) + return sourceCard.getController().getZone(Zone.Graveyard).contains(sourceCard) && (sourceCard.isInstant() || Phase.canCastSorcery(sourceCard.getController())); } diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java index 02530b1d78e..ffc3b0c097d 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java @@ -974,7 +974,7 @@ public class CardFactory_Creatures { c = getAIElemental(); } - if (AllZoneUtil.isCardInPlayerGraveyard(card.getController(), c)) { + if (card.getController().getZone(Zone.Graveyard).contains(c)) { PlayerZone play = c.getController().getZone(Constant.Zone.Battlefield); AllZone.getGameAction().moveTo(play, c); } diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java b/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java index 84ad58bf37f..24bf81efd6e 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java @@ -2243,12 +2243,12 @@ public class CardFactory_Sorceries { Card c = getTargetCard(); if (threshold.size() >= 7) { - if (AllZoneUtil.isCardInPlayerGraveyard(card.getController(), c)) { + if (card.getController().getZone(Zone.Graveyard).contains(c)) { PlayerZone play = card.getController().getZone(Constant.Zone.Battlefield); AllZone.getGameAction().moveTo(play, c); } } else { - if (AllZoneUtil.isCardInPlayerGraveyard(card.getController(), c)) { + if (card.getController().getZone(Zone.Graveyard).contains(c)) { PlayerZone hand = card.getController().getZone(Constant.Zone.Hand); AllZone.getGameAction().moveTo(hand, c); } @@ -2827,7 +2827,7 @@ public class CardFactory_Sorceries { if (userChoice.contains(cardChoice[1]) || card.getChoices().contains(cardChoice[1])) { Card c = ab1card[0]; if (c != null) { - if (AllZoneUtil.isCardInPlayerGraveyard(card.getController(), c) && CardFactoryUtil.canTarget(card, c)) { + if (card.getController().getZone(Zone.Graveyard).contains(c) && CardFactoryUtil.canTarget(card, c)) { AllZone.getGameAction().moveToPlay(c); } }