From 6baf2c0289e7bad605575f8456065e01e5d4b4eb Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Wed, 24 Oct 2012 17:57:19 +0000
Subject: [PATCH] - Fixed AF ChangeZone with the Origin All.

---
 .../forge/card/abilityfactory/AbilityFactoryChangeZone.java  | 2 +-
 src/main/java/forge/game/zone/ZoneType.java                  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
index da88b956655..80a476f2143 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
@@ -242,7 +242,7 @@ public final class AbilityFactoryChangeZone {
     public static boolean isHidden(final String origin, final boolean hiddenOverride) {
         List<ZoneType> zone = ZoneType.listValueOf(origin);
         
-        if (hiddenOverride || zone == null) {
+        if (hiddenOverride || zone.isEmpty()) {
             return true;
         }
         
diff --git a/src/main/java/forge/game/zone/ZoneType.java b/src/main/java/forge/game/zone/ZoneType.java
index 8f944203af7..7e2d21662cd 100644
--- a/src/main/java/forge/game/zone/ZoneType.java
+++ b/src/main/java/forge/game/zone/ZoneType.java
@@ -61,7 +61,10 @@ public enum ZoneType {
     public static List<ZoneType> listValueOf(final String values) {
         final List<ZoneType> result = new ArrayList<ZoneType>();
         for (final String s : values.split("[, ]+")) {
-            result.add(ZoneType.smartValueOf(s));
+            ZoneType zt = ZoneType.smartValueOf(s);
+            if (zt != null) {
+                result.add(zt);
+            }
         }
         return result;
     }