From 698ed8b01955dd480255e8970074bffeeefa39df Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Tue, 13 Sep 2011 21:44:32 +0000
Subject: [PATCH] *Cleaned up and condensed Torpor Orb check.

---
 .../forge/card/trigger/TriggerHandler.java    | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java
index 56aa60fe482..6988d83566d 100644
--- a/src/main/java/forge/card/trigger/TriggerHandler.java
+++ b/src/main/java/forge/card/trigger/TriggerHandler.java
@@ -380,18 +380,25 @@ public class TriggerHandler {
         //Torpor Orb check
         CardList torporOrbs = AllZoneUtil.getCardsInPlay("Torpor Orb");
 
-        if (torporOrbs.size() != 0 && mode.equals("ChangesZone") && ((regtrig.getMapParams().get("ValidCard").contains("Creature")) || (regtrig.getMapParams().get("ValidCard").contains("Self") && regtrig.getHostCard().isCreature() )))
+        if(torporOrbs.size() != 0)
         {
-            return false;
-        }
-        if (torporOrbs.size() != 0 && regtrig.getMapParams().containsKey("Destination"))
-        {
-            if (!regtrig.getMapParams().get("Destination").equals("Battlefield"))
+            if(regtrig.getMapParams().containsKey("Destination"))
             {
-                return false;
+                if ((regtrig.getMapParams().get("Destination").equals("Battlefield") || regtrig.getMapParams().get("Destination").equals("Any")) && mode.equals("ChangesZone") && ((regtrig.getMapParams().get("ValidCard").contains("Creature")) || (regtrig.getMapParams().get("ValidCard").contains("Self") && regtrig.getHostCard().isCreature() )))
+                {
+                    return false;
+                }
             }
+            else
+            {
+                if (mode.equals("ChangesZone") && ((regtrig.getMapParams().get("ValidCard").contains("Creature")) || (regtrig.getMapParams().get("ValidCard").contains("Self") && regtrig.getHostCard().isCreature() )))
+                {
+                    return false;
+                }
+            }
+            
         }
-
+        
         HashMap<String, String> trigParams = regtrig.getMapParams();
         final Player[] decider = new Player[1];