From be10997f8ee426b50a1d3b5dd9aa9dccdcfa0094 Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Sat, 1 Jun 2013 11:55:01 +0000
Subject: [PATCH] *Fixed early morning code

---
 .../forge/card/replacement/ReplaceMoved.java  | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/forge/card/replacement/ReplaceMoved.java b/src/main/java/forge/card/replacement/ReplaceMoved.java
index 3b3829655a7..f538bb1dd33 100644
--- a/src/main/java/forge/card/replacement/ReplaceMoved.java
+++ b/src/main/java/forge/card/replacement/ReplaceMoved.java
@@ -35,22 +35,34 @@ public class ReplaceMoved extends ReplacementEffect {
                 return false;
             }
         }
+        
+        boolean matchedZone = false;
         if (this.getMapParams().containsKey("Origin")) {
             for(ZoneType z : ZoneType.listValueOf(this.getMapParams().get("Origin"))) {
                 if(z == (ZoneType) runParams.get("Origin"))
-                    return true;
+                    matchedZone =  true;
             }
             
-            return false;
-        }
-        if (this.getMapParams().containsKey("Destination")) {            
+            if(!matchedZone)
+            {
+                return false;
+            }
+        }        
+        
+        if (this.getMapParams().containsKey("Destination")) {
+            matchedZone = false;
             for(ZoneType z : ZoneType.listValueOf(this.getMapParams().get("Destination"))) {
                 if(z == (ZoneType) runParams.get("Destination"))
-                    return true;
+                    matchedZone =  true;
             }
             
-            return false;
+            if(!matchedZone)
+            {
+                return false;
+            }
         }
+        
+        
         return true;
     }