From e44820b3dbe1f691765a70f4c9883f0cc5a0923e Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Tue, 20 Sep 2011 08:28:49 +0000
Subject: [PATCH] - Made getAffectedCards in StaticAbility_Continuous
 compatible with the new AllZoneUtil.getCardsIn function.

---
 .../staticAbility/StaticAbility_Continuous.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java b/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java
index f87c5f21da1..c2f1552079b 100644
--- a/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java
+++ b/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java
@@ -329,15 +329,18 @@ public class StaticAbility_Continuous {
         }
 
         // non - CharacteristicDefining
-        CardList affectedCards;
-        Zone affectedZone = Zone.Battlefield; // default
+        CardList affectedCards = new CardList();
+        String[] affectedZones = null;
 
         if (params.containsKey("AffectedZone")) {
-            affectedZone = Zone.smartValueOf(params.get("AffectedZone"));
+            affectedZones = params.get("AffectedZone").split(",");
+            for (String az : affectedZones) {
+                affectedCards.addAll(AllZoneUtil.getCardsIn(Zone.smartValueOf(az)));
+            }
+        } else {
+            affectedCards = AllZoneUtil.getCardsIn(Zone.Battlefield);
         }
 
-        affectedCards = AllZoneUtil.getCardsIn(affectedZone);
-
         if (params.containsKey("Affected") && !params.get("Affected").contains(",")) {
             if (params.get("Affected").contains("Self")) {
                 affectedCards = new CardList(hostCard);