From b1b7504618aef2fdbfb923a26413e449e8d9e15f Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail.com>
Date: Tue, 12 Aug 2014 13:40:24 +0400
Subject: [PATCH] Fixes for source.getSourceId in 2 cards

---
 .../mage/sets/dissension/ResearchDevelopment.java   |  2 +-
 Mage.Sets/src/mage/sets/judgment/DeathWish.java     | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/dissension/ResearchDevelopment.java b/Mage.Sets/src/mage/sets/dissension/ResearchDevelopment.java
index 560c96458b1..70c9c67226a 100644
--- a/Mage.Sets/src/mage/sets/dissension/ResearchDevelopment.java
+++ b/Mage.Sets/src/mage/sets/dissension/ResearchDevelopment.java
@@ -132,7 +132,7 @@ class ResearchEffect extends OneShotEffect {
                 if (player.choose(Outcome.Benefit, filteredCards, target, game)) {
                     Card card = player.getSideboard().get(target.getFirstTarget(), game);
                     if (card != null) {
-                        card.moveToZone(Zone.LIBRARY, source.getId(), game, false);
+                        card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false);
                         count++;
                         textToAsk = new StringBuilder(choiceText);
                         textToAsk.append(" (");
diff --git a/Mage.Sets/src/mage/sets/judgment/DeathWish.java b/Mage.Sets/src/mage/sets/judgment/DeathWish.java
index 90e2de28844..99c59eeb4d8 100644
--- a/Mage.Sets/src/mage/sets/judgment/DeathWish.java
+++ b/Mage.Sets/src/mage/sets/judgment/DeathWish.java
@@ -27,24 +27,24 @@
  */
 package mage.sets.judgment;
 
-import java.util.Set;
-import java.util.UUID;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.Cards;
 import mage.cards.CardsImpl;
+import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.TargetCard;
 
+import java.util.Set;
+import java.util.UUID;
+
 /**
  *
  * @author Plopman
@@ -118,8 +118,7 @@ class DeathWishEffect extends OneShotEffect {
                 if (player.choose(Outcome.Benefit, filteredCards, target, game)) {
                     Card card = player.getSideboard().get(target.getFirstTarget(), game);
                     if (card != null) {
-
-                        card.moveToZone(Zone.HAND, source.getId(), game, false);
+                        card.moveToZone(Zone.HAND, source.getSourceId(), game, false);
                     }
                 }
             }