mirror of
https://github.com/correl/mage.git
synced 2025-04-07 13:01:06 -09:00
Fixes for source.getSourceId in 2 cards
This commit is contained in:
parent
a2e93986bc
commit
b1b7504618
2 changed files with 7 additions and 8 deletions
Mage.Sets/src/mage/sets
|
@ -132,7 +132,7 @@ class ResearchEffect extends OneShotEffect {
|
||||||
if (player.choose(Outcome.Benefit, filteredCards, target, game)) {
|
if (player.choose(Outcome.Benefit, filteredCards, target, game)) {
|
||||||
Card card = player.getSideboard().get(target.getFirstTarget(), game);
|
Card card = player.getSideboard().get(target.getFirstTarget(), game);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
card.moveToZone(Zone.LIBRARY, source.getId(), game, false);
|
card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false);
|
||||||
count++;
|
count++;
|
||||||
textToAsk = new StringBuilder(choiceText);
|
textToAsk = new StringBuilder(choiceText);
|
||||||
textToAsk.append(" (");
|
textToAsk.append(" (");
|
||||||
|
|
|
@ -27,24 +27,24 @@
|
||||||
*/
|
*/
|
||||||
package mage.sets.judgment;
|
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.Ability;
|
||||||
import mage.abilities.effects.OneShotEffect;
|
import mage.abilities.effects.OneShotEffect;
|
||||||
import mage.cards.Card;
|
import mage.cards.Card;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
import mage.cards.Cards;
|
import mage.cards.Cards;
|
||||||
import mage.cards.CardsImpl;
|
import mage.cards.CardsImpl;
|
||||||
|
import mage.constants.CardType;
|
||||||
import mage.constants.Outcome;
|
import mage.constants.Outcome;
|
||||||
|
import mage.constants.Rarity;
|
||||||
import mage.constants.Zone;
|
import mage.constants.Zone;
|
||||||
import mage.filter.FilterCard;
|
import mage.filter.FilterCard;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.players.Player;
|
import mage.players.Player;
|
||||||
import mage.target.TargetCard;
|
import mage.target.TargetCard;
|
||||||
|
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Plopman
|
* @author Plopman
|
||||||
|
@ -118,8 +118,7 @@ class DeathWishEffect extends OneShotEffect {
|
||||||
if (player.choose(Outcome.Benefit, filteredCards, target, game)) {
|
if (player.choose(Outcome.Benefit, filteredCards, target, game)) {
|
||||||
Card card = player.getSideboard().get(target.getFirstTarget(), game);
|
Card card = player.getSideboard().get(target.getFirstTarget(), game);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
|
card.moveToZone(Zone.HAND, source.getSourceId(), game, false);
|
||||||
card.moveToZone(Zone.HAND, source.getId(), game, false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue