From b7aaba3e2924a5b150e2ef3886a89e02c391aac6 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sun, 20 Sep 2015 08:10:46 +0000
Subject: [PATCH] - Fixed Venser, Shaper Savant not countering spells.

---
 .../java/forge/game/ability/effects/ChangeZoneEffect.java     | 4 ++--
 forge-gui/res/cardsfolder/d/deep_slumber_titan.txt            | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index 64f6dd4c020..f95cd045795 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -237,7 +237,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
         sb.append(" ");
 
         final ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination"));
-        final ZoneType origin = ZoneType.smartValueOf(sa.getParam("Origin"));
+        final ZoneType origin = ZoneType.listValueOf(sa.getParam("Origin")).get(0);
 
         final StringBuilder sbTargets = new StringBuilder();
 
@@ -531,7 +531,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     if (sa.hasParam("Fizzle")) {
                         final FCollectionView<SpellAbility> spells = tgtC.getSpellAbilities();
                         for (SpellAbility spell : spells) {
-                            if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand)) {
+                            if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand) || tgtC.isInZone(ZoneType.Stack)) {
                                 final SpellAbilityStackInstance si = game.getStack().getInstanceFromSpellAbility(spell);
                                 if (si != null) { 
                                     game.getStack().remove(si);
diff --git a/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt b/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
index dbed96b7b3e..ab2a8d19471 100644
--- a/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
+++ b/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
@@ -5,6 +5,7 @@ PT:7/7
 K:CARDNAME enters the battlefield tapped.
 K:CARDNAME doesn't untap during your untap step.
 T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME is dealt damage, untap it.
-SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
+SVar:TrigUntap:AB$ Untap | Cost$ 0 | Defined$ Self
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deep_slumber_titan.jpg
 Oracle:Deep-Slumber Titan enters the battlefield tapped.\nDeep-Slumber Titan doesn't untap during your untap step.\nWhenever Deep-Slumber Titan is dealt damage, untap it.