From ed16a20b51c7f48fb73515d122c0559c33592b14 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sat, 7 Dec 2013 09:30:43 -0600 Subject: [PATCH] - Little fix Twilight Shepherd --- Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java index 2b251929cb..386d42a91d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java @@ -110,7 +110,9 @@ class TwilightShepherdEffect extends OneShotEffect { Set cardsInGraveyardId = watcher.getCardsPutToGraveyardFromBattlefield(); for (UUID cardId : cardsInGraveyardId) { Card card = game.getCard(cardId); - if (card != null && card.getOwnerId().equals(source.getControllerId())) { + if (card != null + && card.getOwnerId().equals(source.getControllerId()) + && game.getState().getZone(card.getId()).match(Zone.GRAVEYARD)) { applied = card.moveToZone(Zone.HAND, source.getSourceId(), game, false); } }