- Added the boolean function "isInZone" to the card class. It should be a performance upgrade to "AllZone.getZoneOf(c).equals(zone)".

src/main/java/forge/AllZone.java

@@ -496,6 +496,25 @@ public final class AllZone implements NewConstants {
         return null;
     }
     
+    public static boolean isCardInZone(final Card c, Constant.Zone zone) {
+        final FGameState gameState = Singletons.getModel().getGameState();
+        if (gameState == null) {
+            return false;
+        }
+
+        if (zone.equals(Constant.Zone.Stack) && gameState.getStackZone().contains(c)) {
+            return true;
+        }
+
+        else for (Player p : gameState.getPlayers()) {
+            if(p.getZone(zone).contains(c)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * <p>
      * resetZoneMoveTracking.

src/main/java/forge/Card.java

@@ -8092,4 +8092,8 @@ public class Card extends GameEntity implements Comparable<Card> {
         return false;
     }
     
+    public boolean isInZone(final Constant.Zone zone) {
+        return AllZone.isCardInZone(this, zone);
+    }
+
 } // end Card class

src/main/java/forge/card/staticAbility/StaticAbility.java

@@ -303,8 +303,7 @@ public class StaticAbility {
             effectZone = Zone.smartValueOf(this.mapParams.get("EffectZone"));
         }
 
-        if ((effectZone != null)
-                && (!AllZone.getZoneOf(this.hostCard).getZoneType().equals(effectZone) || this.hostCard.isPhasedOut())) {
+        if ((effectZone != null) && (!this.hostCard.isInZone(effectZone) || this.hostCard.isPhasedOut())) {
             return false;
         }