From fafde2ef315535ea82a1e3a5df8c97bd06571a0e Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 8 Jun 2013 02:15:25 +0200
Subject: [PATCH] Fixed bug of TargetCardInYourGraveyard that counted also
 cards in other graveyards (fixes Archaeomancer bug).

---
 .../target/common/TargetCardInYourGraveyard.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Mage/src/mage/target/common/TargetCardInYourGraveyard.java b/Mage/src/mage/target/common/TargetCardInYourGraveyard.java
index c043009a48a..74c62f075f2 100644
--- a/Mage/src/mage/target/common/TargetCardInYourGraveyard.java
+++ b/Mage/src/mage/target/common/TargetCardInYourGraveyard.java
@@ -66,19 +66,22 @@ public class TargetCardInYourGraveyard extends TargetCard<TargetCardInYourGravey
     @Override
     public boolean canTarget(UUID id, Ability source, Game game) {
         Card card = game.getCard(id);
-        if (card != null && game.getState().getZone(card.getId()) == Zone.GRAVEYARD)
-            if (game.getPlayer(source.getControllerId()).getGraveyard().contains(id))
+        if (card != null && game.getState().getZone(card.getId()) == Zone.GRAVEYARD) {
+            if (game.getPlayer(source.getControllerId()).getGraveyard().contains(id)) {
                 return filter.match(card, game);
+            }
+        }
         return false;
     }
 
     @Override
     public boolean canTarget(UUID id, UUID playerId, Ability ability, Game game) {
         Card card = game.getCard(id);
-        if (card != null && game.getState().getZone(card.getId()) == Zone.GRAVEYARD)
+        if (card != null && game.getState().getZone(card.getId()) == Zone.GRAVEYARD) {
             if (game.getPlayer(playerId).getGraveyard().contains(id)) {
                 return filter.match(card, game);
             }
+        }
         return false;
     }
 
@@ -91,10 +94,15 @@ public class TargetCardInYourGraveyard extends TargetCard<TargetCardInYourGravey
      */
     @Override
     public boolean canChoose(UUID sourceControllerId, Game game) {
-        if (game.getPlayer(sourceControllerId).getGraveyard().count(filter, game) >= this.minNumberOfTargets)
+        if (game.getPlayer(sourceControllerId).getGraveyard().count(filter, game) >= this.minNumberOfTargets) {
             return true;
+        }
         return false;
     }
+    @Override
+    public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
+        return canChoose(sourceControllerId, game);
+    }
 
     @Override
     public TargetCardInYourGraveyard copy() {