From 4116b58414756afea7e5297f0595c44043892b77 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Tue, 10 Oct 2017 16:58:40 -0400
Subject: [PATCH] fixed Venser, Shaper Savant and other similar cards not
 properly removing copied spells from the stack (fixes #4072)

---
 .../common/ReturnToHandTargetEffect.java        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java
index 2ab4c455912..2387fbe0241 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java
@@ -27,7 +27,9 @@
  */
 package mage.abilities.effects.common;
 
+import java.util.ArrayList;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import mage.MageObject;
@@ -38,6 +40,7 @@ import mage.cards.Card;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.Game;
+import mage.game.stack.Spell;
 import mage.players.Player;
 import mage.target.Target;
 import mage.util.CardUtil;
@@ -74,12 +77,15 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
         if (controller == null) {
             return false;
         }
+        List<UUID> copyIds = new ArrayList<>();
         Set<Card> cards = new LinkedHashSet<>();
         if (multitargetHandling) {
             for (Target target : source.getTargets()) {
                 for (UUID targetId : target.getTargets()) {
                     MageObject mageObject = game.getObject(targetId);
-                    if (mageObject instanceof Card) {
+                    if (mageObject instanceof Spell && !((Spell) mageObject).isCopy()) {
+                        copyIds.add(targetId);
+                    } else if (mageObject instanceof Card) {
                         cards.add((Card) mageObject);
                     }
                 }
@@ -88,10 +94,17 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
             for (UUID targetId : targetPointer.getTargets(game, source)) {
                 MageObject mageObject = game.getObject(targetId);
                 if (mageObject != null) {
-                    cards.add((Card) mageObject);
+                    if (mageObject instanceof Spell && !((Spell) mageObject).isCopy()) {
+                        copyIds.add(targetId);
+                    } else {
+                        cards.add((Card) mageObject);
+                    }
                 }
             }
         }
+        for (UUID copyId : copyIds) {
+            game.getStack().remove(game.getSpell(copyId));
+        }
         return controller.moveCards(cards, Zone.HAND, source, game);
     }