github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-07 20:53:18 -10:00
Code Issues Projects Releases Packages Wiki Activity

Deprecated cards function caller move, part 2.

Browse source 
Now with less accidental riders.
This commit is contained in:
Nathaniel Brandes 2016-05-13 23:30:19 -07:00
parent 5e6d8f49a7
commit 06ec3f16ac
91 changed files with 97 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/alarareborn/EtherwroughtPage.java
View file

@ -112,7 +112,7 @@ class EtherwroughtPageEffect extends OneShotEffect {
cards.add(card);
controller.lookAtCards("Etherwrought Page", cards, game);
if (controller.chooseUse(Outcome.Neutral, "Do you wish to put the card into your graveyard?", source, game)) {
return controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
return controller.moveCards(card, Zone.GRAVEYARD, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java
View file

@ -94,7 +94,7 @@ class VengefulRebirthEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
Card card = (Card)game.getObject(source.getFirstTarget());
if (controller != null && card != null && controller.removeFromGraveyard(card, game)) {
controller.moveCards(card, Zone.GRAVEYARD, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
if (!card.getCardType().contains(CardType.LAND)) {
int damage = card.getConvertedManaCost();
Permanent permanent = game.getPermanent(source.getTargets().get(1).getFirstTarget());

2
Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java
View file

@ -106,7 +106,7 @@ class HelmOfObedienceEffect extends OneShotEffect {
while(targetOpponent.getLibrary().size() > 0) {
Card card = targetOpponent.getLibrary().removeFromTop(game);
if (card != null){
if (targetOpponent.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game)) {
if (targetOpponent.moveCards(card, Zone.GRAVEYARD, source, game)) {
if(card.getCardType().contains(CardType.CREATURE)){
// If a creature card is put into that graveyard this way, sacrifice Helm of Obedience
// and put that card onto the battlefield under your control.

2
Mage.Sets/src/mage/sets/alliances/PhyrexianDevourer.java
View file

@ -165,7 +165,7 @@ class ExileTopCardLibraryCost extends CostImpl {
if (controller != null) {
card = controller.getLibrary().getFromTop(game);
if (card != null) {
paid = controller.moveCards(card, null, Zone.EXILED, ability, game);
paid = controller.moveCards(card, Zone.EXILED, ability, game);
}
}
return paid;

2
Mage.Sets/src/mage/sets/apocalypse/WildResearch.java
View file

@ -113,7 +113,7 @@ class WildResearchEffect extends OneShotEffect {
if (target.getTargets().size() > 0) {
Card card = controller.getLibrary().remove(target.getFirstTarget(), game);
if (card != null) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
Cards cards = new CardsImpl();
cards.add(card);
controller.revealCards(sourceObject.getIdName(), cards, game, true);

2
Mage.Sets/src/mage/sets/battleforzendikar/FathomFeeder.java
View file

@ -109,7 +109,7 @@ class FathomFeederEffect extends OneShotEffect {
if (player != null) {
Card card = player.getLibrary().getFromTop(game);
if (card != null) {
player.moveCards(card, Zone.LIBRARY, Zone.EXILED, source, game);
player.moveCards(card, Zone.EXILED, source, game);
}
}
}

4
Mage.Sets/src/mage/sets/battleforzendikar/KioraMasterOfTheDepths.java
View file

@ -178,7 +178,7 @@ class KioraRevealEffect extends OneShotEffect {
Card card = cards.get(target.getFirstTarget(), game);
if (card != null) {
cards.remove(card);
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
}
@ -187,7 +187,7 @@ class KioraRevealEffect extends OneShotEffect {
Card card = cards.get(target.getFirstTarget(), game);
if (card != null) {
cards.remove(card);
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/battleforzendikar/SpellShrivel.java
View file

@ -105,7 +105,7 @@ class SpellShrivelCounterUnlessPaysEffect extends OneShotEffect {
if (stackObject != null && !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER, source.getFirstTarget(), source.getSourceId(), stackObject.getControllerId()))) {
game.informPlayers(sourceObject.getIdName() + ": cost wasn't payed - countering " + stackObject.getName());
game.rememberLKI(source.getFirstTarget(), Zone.STACK, (Spell) stackObject);
controller.moveCards((Spell) spell, null, Zone.EXILED, source, game);
controller.moveCards((Spell) spell, Zone.EXILED, source, game);
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.COUNTERED, source.getFirstTarget(), source.getSourceId(), stackObject.getControllerId()));
return true;
}

2
Mage.Sets/src/mage/sets/battleforzendikar/TitansPresence.java
View file

@ -101,7 +101,7 @@ class TitansPresenceEffect extends OneShotEffect {
if (!revealedCards.isEmpty()) {
Card card = revealedCards.iterator().next();
if (card != null && card.getPower().getValue() >= creature.getPower().getValue()) {
controller.moveCards(creature, null, Zone.EXILED, source, game);
controller.moveCards(creature, Zone.EXILED, source, game);
}
}
return true;

2
Mage.Sets/src/mage/sets/battleforzendikar/UnnaturalAggression.java
View file

@ -126,7 +126,7 @@ class DealtDamageToOpponentsCreatureDiesEffect extends ReplacementEffectImpl {
Permanent permanent = ((ZoneChangeEvent) event).getTarget();
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && permanent != null) {
return controller.moveCards(permanent, null, Zone.EXILED, source, game);
return controller.moveCards(permanent, Zone.EXILED, source, game);
}
return false;
}

2
Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java
View file

@ -84,7 +84,7 @@ public class HeedTheMists extends CardImpl {
Card card = controller.getLibrary().removeFromTop(game);
if (card != null) {
int cmc = card.getConvertedManaCost();
controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
controller.moveCards(card, Zone.GRAVEYARD, source, game);
controller.drawCards(cmc, game);
}
}

2
Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java
View file

@ -132,7 +132,7 @@ public class QuillmaneBaku extends CardImpl {
}
Permanent permanent = game.getPermanent(this.getTargetPointer().getFirst(game, source));
if (permanent != null) {
controller.moveCards(permanent, null, Zone.HAND, source, game);
controller.moveCards(permanent, Zone.HAND, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/bornofthegods/SatyrWayfinder.java
View file

@ -109,7 +109,7 @@ class SatyrWayfinderEffect extends OneShotEffect {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
cards.remove(card);
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
}

2
Mage.Sets/src/mage/sets/coldsnap/BlizzardSpecter.java
View file

@ -113,7 +113,7 @@ class ReturnToHandEffect extends OneShotEffect {
targetPlayer.chooseTarget(Outcome.ReturnToHand, target, source, game);
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null) {
targetPlayer.moveCards(permanent, null, Zone.HAND, source, game);
targetPlayer.moveCards(permanent, Zone.HAND, source, game);
}
}

2
Mage.Sets/src/mage/sets/coldsnap/ScryingSheets.java
View file

@ -103,7 +103,7 @@ class ScryingSheetsEffect extends OneShotEffect {
controller.lookAtCards(sourceObject.getIdName(), cards, game);
if (card.getSupertype().contains("Snow")) {
if (controller.chooseUse(outcome, "Reveal " + card.getLogName() + " and put it into your hand?", source, game)) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
controller.revealCards(sourceObject.getIdName(), cards, game);
}
}

2
Mage.Sets/src/mage/sets/commander/DesecratorHag.java
View file

@ -120,7 +120,7 @@ class DesecratorHagEffect extends OneShotEffect {
if (target != null) {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
return you.moveCards(card, null, Zone.HAND, source, game);
return you.moveCards(card, Zone.HAND, source, game);
}
}
} else {

2
Mage.Sets/src/mage/sets/commander/WhirlpoolWhelm.java
View file

@ -94,7 +94,7 @@ class WhirlpoolWhelmEffect extends OneShotEffect {
if (topOfLibrary) {
controller.moveCardToLibraryWithInfo(creature, source.getSourceId(), game, Zone.BATTLEFIELD, true, true);
} else {
controller.moveCards(creature, null, Zone.HAND, source, game);
controller.moveCards(creature, Zone.HAND, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/commander2013/Foster.java
View file

@ -123,7 +123,7 @@ class FosterEffect extends OneShotEffect {
if (!cards.isEmpty()) {
controller.revealCards(sourceObject.getName(), cards, game);
if (cardFound != null) {
controller.moveCards(cardFound, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(cardFound, Zone.HAND, source, game);
cards.remove(cardFound);
}
controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game);

2
Mage.Sets/src/mage/sets/commander2013/StrategicPlanning.java
View file

@ -97,7 +97,7 @@ class StrategicPlanningEffect extends OneShotEffect {
if (controller.choose(Outcome.Benefit, cards, target, game)) {
Card card = cards.get(target.getFirstTarget(), game);
if (card != null) {
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
cards.remove(card);
}
}

2
Mage.Sets/src/mage/sets/darksteel/PulseOfTheFields.java
View file

@ -89,7 +89,7 @@ class PulseOfTheFieldsReturnToHandEffect extends OneShotEffect {
Player player = game.getPlayer(playerId);
if (player != null && player.getLife() > controller.getLife()) {
Card card = game.getCard(source.getSourceId());
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
return true;
}
}

2
Mage.Sets/src/mage/sets/darksteel/PulseOfTheForge.java
View file

@ -90,7 +90,7 @@ class PulseOfTheForgeReturnToHandEffect extends OneShotEffect {
Player player = game.getPlayer(source.getFirstTarget());
if (player != null && player.getLife() > controller.getLife()) {
Card card = game.getCard(source.getSourceId());
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
return true;
}
}

2
Mage.Sets/src/mage/sets/darksteel/PulseOfTheGrid.java
View file

@ -89,7 +89,7 @@ class PulseOfTheGridReturnToHandEffect extends OneShotEffect {
Player player = game.getPlayer(playerId);
if (player != null && player.getHand().size() > controller.getHand().size()) {
Card card = game.getCard(source.getSourceId());
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
return true;
}
}

2
Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java
View file

@ -91,7 +91,7 @@ class MorgueBurstEffect extends OneShotEffect {
if (card != null) {
Player player = game.getPlayer(card.getOwnerId());
if (player != null) {
player.moveCards(card, null, Zone.HAND, source, game);
player.moveCards(card, Zone.HAND, source, game);
int damage = card.getPower().getValue();
Permanent creature = game.getPermanent(source.getTargets().get(1).getTargets().get(0));
if (creature != null) {

2
Mage.Sets/src/mage/sets/dragonsoftarkir/FoulRenewal.java
View file

@ -95,7 +95,7 @@ class FoulRenewalEffect extends OneShotEffect {
Card card = game.getCard(targetPointer.getFirst(game, source));
if (card != null) {
int xValue = card.getToughness().getValue() * -1;
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
if (xValue != 0) {
ContinuousEffect effect = new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn);
effect.setTargetPointer(new FixedTarget(source.getTargets().get(1).getFirstTarget()));

2
Mage.Sets/src/mage/sets/dragonsoftarkir/GurmagDrowner.java
View file

@ -107,7 +107,7 @@ class GurmagDrownerEffect extends OneShotEffect {
if (controller.choose(Outcome.Benefit, cards, target, game)) {
Card card = cards.get(target.getFirstTarget(), game);
if (card != null) {
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
cards.remove(card);
}
}

2
Mage.Sets/src/mage/sets/dragonsoftarkir/NarsetTranscendent.java
View file

@ -119,7 +119,7 @@ class NarsetTranscendentEffect1 extends OneShotEffect {
controller.lookAtCards(sourceObject.getIdName(), cards, game);
if (!card.getCardType().contains(CardType.CREATURE) && !card.getCardType().contains(CardType.LAND)) {
if (controller.chooseUse(outcome, "Reveal " + card.getLogName() + " and put it into your hand?", source, game)) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
controller.revealCards(sourceObject.getIdName(), cards, game);
}
}

2
Mage.Sets/src/mage/sets/dragonsoftarkir/VolcanicVision.java
View file

@ -105,7 +105,7 @@ class VolcanicVisionReturnToHandTargetEffect extends OneShotEffect {
case GRAVEYARD:
Card card = game.getCard(targetId);
if (card != null) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
int damage = card.getConvertedManaCost();
if (damage > 0) {
for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {

2
Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java
View file

@ -153,7 +153,7 @@ class EndlessHorizonsEffect2 extends OneShotEffect {
} else {
card = exZone.getRandom(game);
}
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/exodus/ErraticPortal.java
View file

@ -106,7 +106,7 @@ class ErraticPortalEffect extends OneShotEffect {
cost.pay(source, game, targetCreature.getControllerId(), targetCreature.getControllerId(), false, null);
}
if (!cost.isPaid()) {
controller.moveCards(targetCreature, Zone.BATTLEFIELD, Zone.HAND, source, game);
controller.moveCards(targetCreature, Zone.HAND, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/fatereforged/SageEyeAvengers.java
View file

@ -100,7 +100,7 @@ class SageEyeAvengersEffect extends OneShotEffect {
if (sourceObject != null && controller != null) {
Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source));
if (targetCreature != null && targetCreature.getPower().getValue() < sourceObject.getPower().getValue()) {
controller.moveCards(targetCreature, null, Zone.HAND, source, game);
controller.moveCards(targetCreature, Zone.HAND, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/fatereforged/SoulfireGrandMaster.java
View file

@ -207,7 +207,7 @@ class SoulfireGrandMasterCastFromHandReplacementEffect extends ReplacementEffect
if (sourceCard != null) {
Player player = game.getPlayer(sourceCard.getOwnerId());
if (player != null) {
player.moveCards(sourceCard, null, Zone.HAND, source, game);
player.moveCards(sourceCard, Zone.HAND, source, game);
discard();
return true;
}

2
Mage.Sets/src/mage/sets/fatereforged/TasigurTheGoldenFang.java
View file

@ -120,7 +120,7 @@ class TasigurTheGoldenFangEffect extends OneShotEffect {
opponent.chooseTarget(outcome, target, source, game);
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/fatereforged/TemurSabertooth.java
View file

@ -109,7 +109,7 @@ class TemurSabertoothEffect extends OneShotEffect {
&& controller.chooseTarget(outcome, target, source, game)) {
Permanent toHand = game.getPermanent(target.getFirstTarget());
if (toHand != null) {
controller.moveCards(toHand, null, Zone.HAND, source, game);
controller.moveCards(toHand, Zone.HAND, source, game);
}
game.addEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), source);
}

8
Mage.Sets/src/mage/sets/futuresight/LinessaZephyrMage.java
View file

@ -136,7 +136,7 @@ class LinessaZephyrMageEffect extends OneShotEffect {
if (target.choose(Outcome.ReturnToHand, targetPlayer.getId(), source.getSourceId(), game)) {
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null) {
targetPlayer.moveCards(permanent, null, Zone.HAND, source, game);
targetPlayer.moveCards(permanent, Zone.HAND, source, game);
}
}
@ -148,7 +148,7 @@ class LinessaZephyrMageEffect extends OneShotEffect {
if (target.choose(Outcome.ReturnToHand, targetPlayer.getId(), source.getSourceId(), game)) {
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null) {
targetPlayer.moveCards(permanent, null, Zone.HAND, source, game);
targetPlayer.moveCards(permanent, Zone.HAND, source, game);
}
}
@ -160,7 +160,7 @@ class LinessaZephyrMageEffect extends OneShotEffect {
if (target.choose(Outcome.ReturnToHand, targetPlayer.getId(), source.getSourceId(), game)) {
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null) {
targetPlayer.moveCards(permanent, null, Zone.HAND, source, game);
targetPlayer.moveCards(permanent, Zone.HAND, source, game);
}
}
@ -172,7 +172,7 @@ class LinessaZephyrMageEffect extends OneShotEffect {
if (target.choose(Outcome.ReturnToHand, targetPlayer.getId(), source.getSourceId(), game)) {
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null) {
targetPlayer.moveCards(permanent, null, Zone.HAND, source, game);
targetPlayer.moveCards(permanent, Zone.HAND, source, game);
}
}

2
Mage.Sets/src/mage/sets/futuresight/LlanowarEmpath.java
View file

@ -105,7 +105,7 @@ class LlanowarEmpathEffect extends OneShotEffect {
cards.add(card);
controller.revealCards(sourceObject.getName(), cards, game);
if (card.getCardType().contains(CardType.CREATURE)) {
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
}
return true;

2
Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java
View file

@ -95,7 +95,7 @@ class DinrovaHorrorEffect extends OneShotEffect {
if (target != null) {
Player controller = game.getPlayer(target.getControllerId());
if (controller != null) {
controller.moveCards(target, null, Zone.HAND, source, game);
controller.moveCards(target, Zone.HAND, source, game);
controller.discard(1, false, source, game);
return true;
}

2
Mage.Sets/src/mage/sets/gatecrash/DomriRade.java
View file

@ -122,7 +122,7 @@ class DomriRadeEffect1 extends OneShotEffect {
controller.lookAtCards(sourceObject.getName(), cards, game);
if (card.getCardType().contains(CardType.CREATURE)) {
if (controller.chooseUse(outcome, "Reveal " + card.getName() + " and put it into your hand?", source, game)) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
controller.revealCards(sourceObject.getIdName(), cards, game);
}
}

2
Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java
View file

@ -118,7 +118,7 @@ class DemonicConsultationEffect extends OneShotEffect {
}
}
}
controller.moveCards(cardToHand, null, Zone.HAND, source, game);
controller.moveCards(cardToHand, Zone.HAND, source, game);
controller.revealCards(sourceObject.getIdName(), cardsToReaveal, game);
cardsToReaveal.remove(cardToHand);
controller.moveCards(cardsToReaveal, null, Zone.EXILED, source, game);

2
Mage.Sets/src/mage/sets/iceage/EnduringRenewal.java
View file

@ -122,7 +122,7 @@ class EnduringRenewalReplacementEffect extends ReplacementEffectImpl {
cards.add(card);
controller.revealCards("Top card of " + controller.getName() + "'s library", cards, game);
if (card.getCardType().contains(CardType.CREATURE)) {
controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
controller.moveCards(card, Zone.GRAVEYARD, source, game);
return true;
}
}

2
Mage.Sets/src/mage/sets/iceage/ZursWeirding.java
View file

@ -115,7 +115,7 @@ class ZursWeirdingReplacementEffect extends ReplacementEffectImpl {
currentPlayer.getLife() >= 2 &&
currentPlayer.chooseUse(Outcome.Benefit, message, source, game)) {
currentPlayer.loseLife(2, game);
player.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
player.moveCards(card, Zone.GRAVEYARD, source, game);
// game.getState().getRevealed().reset();
return true;
}

2
Mage.Sets/src/mage/sets/innistrad/CellarDoor.java
View file

@ -93,7 +93,7 @@ class CellarDoorEffect extends OneShotEffect {
if (player != null && player.getLibrary().size() > 0) {
Card card = player.getLibrary().removeFromBottom(game);
if (card != null) {
player.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
player.moveCards(card, Zone.GRAVEYARD, source, game);
if (card.getCardType().contains(CardType.CREATURE)) {
ZombieToken token = new ZombieToken();
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());

2
Mage.Sets/src/mage/sets/innistrad/GhoulcallersBell.java
View file

@ -89,7 +89,7 @@ class GhoulcallersBellEffect extends OneShotEffect {
if (player.getLibrary().size() > 0) {
Card card = player.getLibrary().removeFromTop(game);
if (card != null) {
player.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
player.moveCards(card, Zone.GRAVEYARD, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java
View file

@ -97,7 +97,7 @@ class MindshriekerEffect extends OneShotEffect {
if (targetPlayer.getLibrary().size() > 0) {
Card card = targetPlayer.getLibrary().removeFromTop(game);
if (card != null) {
targetPlayer.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
targetPlayer.moveCards(card, Zone.GRAVEYARD, source, game);
int amount = card.getConvertedManaCost();
if (amount > 0) {
game.addEffect(new BoostSourceEffect(amount, amount, Duration.EndOfTurn), source);

2
Mage.Sets/src/mage/sets/invasion/Recoil.java
View file

@ -87,7 +87,7 @@ class RecoilEffect extends OneShotEffect {
Permanent target = game.getPermanent(source.getFirstTarget());
Player controller = game.getPlayer(target.getControllerId());
if (target != null && controller != null) {
controller.moveCards(target, null, Zone.HAND, source, game);
controller.moveCards(target, Zone.HAND, source, game);
controller.discard(1, false, source, game);
return true;
}

2
Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java
View file

@ -138,7 +138,7 @@ class AthreosGodOfPassageReturnEffect extends OneShotEffect {
}
if (opponent == null || !paid) {
if (game.getState().getZone(creature.getId()).equals(Zone.GRAVEYARD)) {
controller.moveCards(game.getCard(creatureId), null, Zone.HAND, source, game);
controller.moveCards(game.getCard(creatureId), Zone.HAND, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/journeyintonyx/DakraMystic.java
View file

@ -107,7 +107,7 @@ class DakraMysticEffect extends OneShotEffect {
for(UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId);
if (player != null && player.getLibrary().size() > 0) {
player.moveCards(player.getLibrary().getFromTop(game), Zone.LIBRARY, Zone.GRAVEYARD, source, game);
player.moveCards(player.getLibrary().getFromTop(game), Zone.GRAVEYARD, source, game);
}
}
} else {

2
Mage.Sets/src/mage/sets/journeyintonyx/NessianGameWarden.java
View file

@ -119,7 +119,7 @@ class NessianGameWardenEffect extends OneShotEffect {
if (card != null) {
controller.revealCards(sourcePermanent.getName(), new CardsImpl(card), game);
cards.remove(card);
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/judgment/DeathWish.java
View file

@ -99,7 +99,7 @@ class DeathWishEffect extends OneShotEffect {
if (controller.choose(Outcome.Benefit, cards, target, game)) {
Card card = controller.getSideboard().get(target.getFirstTarget(), game);
if (card != null) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java
View file

@ -117,7 +117,7 @@ class ScoutTheBordersEffect extends OneShotEffect {
if (properCardFound && controller.choose(Outcome.DrawCard, cards, target, game)) {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
cards.remove(card);
}

2
Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java
View file

@ -104,7 +104,7 @@ class SultaiSoothsayerEffect extends OneShotEffect {
if (controller.choose(Outcome.Benefit, cards, target, game)) {
Card card = cards.get(target.getFirstTarget(), game);
if (card != null) {
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
cards.remove(card);
}
}

2
Mage.Sets/src/mage/sets/magicorigins/EvolutionaryLeap.java
View file

@ -112,7 +112,7 @@ class EvolutionaryLeapEffect extends OneShotEffect {
controller.revealCards(sourceObject.getIdName(), cards, game);
if (filter.match(card, game)) {
// put creature card in hand
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
// remove it from revealed card list
cards.remove(card);
}

2
Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java
View file

@ -100,7 +100,7 @@ class ForbiddenCryptDrawCardReplacementEffect extends ReplacementEffectImpl {
if (target.choose(Outcome.ReturnToHand, controller.getId(), source.getSourceId(), game)) {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
cardReturned = true;
}
}

2
Mage.Sets/src/mage/sets/mirrodin/CrystalShard.java
View file

@ -110,7 +110,7 @@ class CrystalShardEffect extends OneShotEffect {
cost.pay(source, game, targetCreature.getControllerId(), targetCreature.getControllerId(), false, null);
}
if (!cost.isPaid()) {
controller.moveCards(targetCreature, Zone.BATTLEFIELD, Zone.HAND, source, game);
controller.moveCards(targetCreature, Zone.HAND, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java
View file

@ -100,7 +100,7 @@ class SpoilsOfTheVaultEffect extends OneShotEffect {
if (card != null) {
cardsToReveal.add(card);
if (card.getName().equals(cardName)) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
break;
} else {
cardsToExile.add(card);

2
Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java
View file

@ -98,7 +98,7 @@ class PetalsOfInsightEffect extends OneShotEffect {
controller.putCardsOnBottomOfLibrary(cards, game, source, true);
Card spellCard = game.getStack().getSpell(source.getSourceId()).getCard();
if (spellCard != null) {
controller.moveCards(spellCard, null, Zone.HAND, source, game);
controller.moveCards(spellCard, Zone.HAND, source, game);
}
} else {
controller.drawCards(3, game);

2
Mage.Sets/src/mage/sets/odyssey/Entomb.java
View file

@ -88,7 +88,7 @@ class SearchLibraryPutInGraveyard extends SearchEffect {
return false;
}
if (controller.searchLibrary(target, game)) {
controller.moveCards(game.getCard(target.getFirstTarget()), Zone.LIBRARY, Zone.GRAVEYARD, source, game);
controller.moveCards(game.getCard(target.getFirstTarget()), Zone.GRAVEYARD, source, game);
}
controller.shuffleLibrary(source, game);
return true;

2
Mage.Sets/src/mage/sets/odyssey/Predict.java
View file

@ -94,7 +94,7 @@ class PredictEffect extends OneShotEffect {
int amount = 1;
Card card = targetPlayer.getLibrary().getFromTop(game);
if (card != null) {
controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
controller.moveCards(card, Zone.GRAVEYARD, source, game);
if (card.getName().equals(cardName)) {
amount = 2;
}

2
Mage.Sets/src/mage/sets/odyssey/ThinkTank.java
View file

@ -95,7 +95,7 @@ class ThinkTankLookLibraryEffect extends OneShotEffect {
cards.add(card);
controller.lookAtCards("Think Tank", cards, game);
if (controller.chooseUse(Outcome.Neutral, "Do you wish to put the card into your graveyard?", source, game)) {
return controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
return controller.moveCards(card, Zone.GRAVEYARD, source, game);
}
}

2
Mage.Sets/src/mage/sets/onslaught/RummagingWizard.java
View file

@ -98,7 +98,7 @@ class RummagingWizardLookLibraryEffect extends OneShotEffect {
cards.add(card);
controller.lookAtCards("Rummaging Wizard", cards, game);
if (controller.chooseUse(Outcome.Neutral, "Do you wish to put the card into your graveyard?", source, game)) {
return controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
return controller.moveCards(card, Zone.GRAVEYARD, source, game);
}
}

2
Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight.java
View file

@ -133,7 +133,7 @@ class SkyshipWeatherlightEffect2 extends OneShotEffect {
if (sourceObject != null && controller != null) {
ExileZone exZone = game.getExile().getExileZone(CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter()));
if (exZone != null) {
controller.moveCards(exZone.getRandom(game), null, Zone.HAND, source, game);
controller.moveCards(exZone.getRandom(game), Zone.HAND, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/ravnica/CloudstoneCurio.java
View file

@ -120,7 +120,7 @@ class CloudstoneCurioEffect extends OneShotEffect {
if (target.canChoose(controller.getId(), game) && controller.chooseTarget(outcome, target, source, game)) {
Permanent returningCreature = game.getPermanent(target.getFirstTarget());
if (returningCreature != null) {
controller.moveCards(returningCreature, null, Zone.HAND, source, game);
controller.moveCards(returningCreature, Zone.HAND, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java
View file

@ -112,7 +112,7 @@ class GrislySalvageEffect extends OneShotEffect {
controller.choose(Outcome.DrawCard, cards, target, game)) {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
cards.remove(card);
}
}

2
Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java
View file

@ -252,7 +252,7 @@ class JaceArchitectOfThoughtEffect2 extends OneShotEffect {
for (UUID cardUuid : cardsToHand) {
Card card = cardsToHand.get(cardUuid, game);
if (card != null) {
player.moveCards(card, null, Zone.HAND, source, game);
player.moveCards(card, Zone.HAND, source, game);
}
}

6
Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java
View file

@ -104,13 +104,13 @@ class JaradsOrdersEffect extends OneShotEffect {
TargetCard target2 = new TargetCard(Zone.LIBRARY, filter);
controller.choose(Outcome.Benefit, revealed, target2, game);
Card card = revealed.get(target2.getFirstTarget(), game);
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
revealed.remove(card);
card = revealed.getCards(game).iterator().next();
controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
controller.moveCards(card, Zone.GRAVEYARD, source, game);
} else if (target.getTargets().size() == 1) {
Card card = revealed.getCards(game).iterator().next();
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
}

2
Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java
View file

@ -100,7 +100,7 @@ class SyncopateCounterUnlessPaysEffect extends OneShotEffect {
if (stackObject != null && !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER, source.getFirstTarget(), source.getSourceId(), stackObject.getControllerId()))) {
game.informPlayers(sourceObject.getIdName() + ": cost wasn't payed - countering " + stackObject.getName());
game.rememberLKI(source.getFirstTarget(), Zone.STACK, (Spell) stackObject);
controller.moveCards((Spell) spell, null, Zone.EXILED, source, game);
controller.moveCards((Spell) spell, Zone.EXILED, source, game);
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.COUNTERED, source.getFirstTarget(), source.getSourceId(), stackObject.getControllerId()));
return true;
}

2
Mage.Sets/src/mage/sets/saviorsofkamigawa/ElderPineOfJukai.java
View file

@ -105,7 +105,7 @@ class ElderPineOfJukaiEffect extends OneShotEffect {
controller.revealCards(sourceObject.getName(), cards, game);
for (Card card : cards.getCards(game)) {
if (card.getCardType().contains(CardType.LAND)) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
cards.remove(card);
}
}

2
Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java
View file

@ -101,7 +101,7 @@ class CerebralEruptionEffect extends OneShotEffect {
if (card.getCardType().contains(CardType.LAND)) {
Card spellCard = game.getStack().getSpell(source.getSourceId()).getCard();
if (spellCard != null) {
player.moveCards(spellCard, null, Zone.HAND, source, game);
player.moveCards(spellCard, Zone.HAND, source, game);
}
}
return true;

2
Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java
View file

@ -154,7 +154,7 @@ class MimicVatEffect extends OneShotEffect {
// return older cards to graveyard
for (UUID imprinted : permanent.getImprinted()) {
Card card = game.getCard(imprinted);
controller.moveCards(card, Zone.EXILED, Zone.GRAVEYARD, source, game);
controller.moveCards(card, Zone.GRAVEYARD, source, game);
}
permanent.clearImprinted(game);

2
Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java
View file

@ -85,7 +85,7 @@ class PsychicMiasmaEffect extends OneShotEffect {
if (discardedCard != null && discardedCard.getCardType().contains(CardType.LAND)) {
Card spellCard = game.getStack().getSpell(source.getSourceId()).getCard();
if (spellCard != null) {
player.moveCards(spellCard, null, Zone.HAND, source, game);
player.moveCards(spellCard, Zone.HAND, source, game);
}
}
return true;

2
Mage.Sets/src/mage/sets/shadowmoor/GhastlordOfFugue.java
View file

@ -111,7 +111,7 @@ class GhastlordOfFugueEffect extends OneShotEffect {
chosenCard = game.getCard(target.getFirstTarget());
}
if (chosenCard != null) {
controller.moveCards(chosenCard, Zone.HAND, Zone.EXILED, source, game);
controller.moveCards(chosenCard, Zone.EXILED, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/shadowmoor/ImpromptuRaid.java
View file

@ -114,7 +114,7 @@ class ImpromptuRaidEffect extends OneShotEffect {
cards.add(card);
controller.revealCards(sourceObject.getName(), cards, game);
if (filterPutInGraveyard.match(card, source.getSourceId(), source.getControllerId(), game)) {
controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
controller.moveCards(card, Zone.GRAVEYARD, source, game);
return true;
}
if (controller.moveCards(card, Zone.BATTLEFIELD, source, game)) {

2
Mage.Sets/src/mage/sets/shadowsoverinnistrad/CompellingDeterrence.java
View file

@ -89,7 +89,7 @@ class CompellingDeterrenceEffect extends OneShotEffect {
Player player = game.getPlayer(target.getControllerId());
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && player != null) {
player.moveCards(target, null, Zone.HAND, source, game);
player.moveCards(target, Zone.HAND, source, game);
FilterPermanent FILTER = new FilterPermanent();
FILTER.add(new SubtypePredicate("Zombie"));
if (game.getState().getBattlefield().countAll(FILTER, controller.getId(), game) > 0) {

2
Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java
View file

@ -91,7 +91,7 @@ class AdNauseamEffect extends OneShotEffect {
while (controller.chooseUse(outcome, message, source, game) && controller.getLibrary().size() > 0) {
Card card = controller.getLibrary().removeFromTop(game);
if (card != null) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
int cmc = card.getConvertedManaCost();
if (cmc > 0) {
controller.loseLife(cmc, game);

2
Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java
View file

@ -101,7 +101,7 @@ class SearchLibraryPutInGraveyard extends SearchEffect {
if (target.getTargets().size() > 0) {
Card card = controller.getLibrary().getCard(target.getFirstTarget(), game);
if (card != null) {
controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
controller.moveCards(card, Zone.GRAVEYARD, source, game);
}
}
}

2
Mage.Sets/src/mage/sets/stronghold/HermitDruid.java
View file

@ -112,7 +112,7 @@ class HermitDruidEffect extends OneShotEffect {
if (card != null) {
if (filter.match(card, game)) {
player.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
player.moveCards(card, Zone.HAND, source, game);
} else {
cards.add(card);
}

2
Mage.Sets/src/mage/sets/stronghold/MoxDiamond.java
View file

@ -110,7 +110,7 @@ class MoxDiamondReplacementEffect extends ReplacementEffectImpl {
else{
Card card = game.getCard(event.getTargetId());
if (card != null) {
player.moveCards(card, Zone.STACK, Zone.GRAVEYARD, source, game);
player.moveCards(card, Zone.GRAVEYARD, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/tempest/Intuition.java
View file

@ -120,7 +120,7 @@ class IntuitionEffect extends SearchEffect {
Card card = cards.get(targetCard.getFirstTarget(), game);
if (card != null) {
cards.remove(card);
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
}

2
Mage.Sets/src/mage/sets/tenthedition/Abundance.java
View file

@ -108,7 +108,7 @@ class AbundanceReplacementEffect extends ReplacementEffectImpl {
while (controller.getLibrary().size() > 0) {
Card card = controller.getLibrary().removeFromTop(game);
if (filter.match(card, source.getSourceId(), source.getControllerId(), game)) {
controller.moveCards(card, null, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
break;
}
cards.add(card);

2
Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java
View file

@ -118,7 +118,7 @@ class CommuneWithTheGodsEffect extends OneShotEffect {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
cards.remove(card);
controller.moveCards(card, Zone.LIBRARY, Zone.HAND, source, game);
controller.moveCards(card, Zone.HAND, source, game);
}
}

2
Mage.Sets/src/mage/sets/timespiral/MishraArtificerProdigy.java
View file

@ -167,7 +167,7 @@ class MishraArtificerProdigyEffect extends OneShotEffect {
}
// Put on battlefield
if (card != null) {
controller.moveCards(card, null, Zone.BATTLEFIELD, source, game);
controller.moveCards(card, Zone.BATTLEFIELD, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/timespiral/PullFromEternity.java
View file

@ -98,7 +98,7 @@ class PullFromEternityEffect extends OneShotEffect {
if (controller != null) {
Card card = game.getCard(getTargetPointer().getFirst(game, source));
if (card != null) {
controller.moveCards(card, Zone.EXILED, Zone.GRAVEYARD, source, game);
controller.moveCards(card, Zone.GRAVEYARD, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/timespiral/ScionOfTheUrDragon.java
View file

@ -113,7 +113,7 @@ class ScionOfTheUrDragonEffect extends SearchEffect {
for (UUID cardId : target.getTargets()) {
Card card = player.getLibrary().getCard(cardId, game);
if (card != null) {
player.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
player.moveCards(card, Zone.GRAVEYARD, source, game);
CopyEffect copyEffect = new CopyEffect(Duration.EndOfTurn, card, source.getSourceId());
game.addEffect(copyEffect, source);
}

2
Mage.Sets/src/mage/sets/visions/WandOfDenial.java
View file

@ -100,7 +100,7 @@ class WandOfDenialEffect extends OneShotEffect {
&& controller.getLife() >= 2
&& controller.chooseUse(Outcome.Neutral, "Pay 2 life to put " + card.getLogName() + " into graveyard?", source, game)) {
controller.loseLife(2, game);
controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
controller.moveCards(card, Zone.GRAVEYARD, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java
View file

@ -111,7 +111,7 @@ class NemesisTrapEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && targetedCreature != null) {
// exile target
controller.moveCards(targetedCreature, null, Zone.EXILED, source, game);
controller.moveCards(targetedCreature, Zone.EXILED, source, game);
// create token
PutTokenOntoBattlefieldCopyTargetEffect effect = new PutTokenOntoBattlefieldCopyTargetEffect();
effect.setTargetPointer(new FixedTarget(targetedCreature, game));

2
Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java
View file

@ -170,7 +170,7 @@ class WrexialReplacementEffect extends ReplacementEffectImpl {
Player controller = game.getPlayer(source.getControllerId());
if (card != null && controller != null) {
if (card instanceof Card) {
return controller.moveCards((Card) card, null, Zone.EXILED, source, game);
return controller.moveCards((Card) card, Zone.EXILED, source, game);
}
}
return false;

2
Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java
View file

@ -162,7 +162,7 @@ class GoblinGuideEffect extends OneShotEffect {
cards.add(card);
defender.revealCards(sourceObject.getName(), cards, game);
if (card.getCardType().contains(CardType.LAND)) {
defender.moveCards(card, null, Zone.HAND, source, game);
defender.moveCards(card, Zone.HAND, source, game);
}
}
return true;

2
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -1859,7 +1859,7 @@ public class TestPlayer implements Player {
@Override
@Deprecated
public boolean moveCards(Card card, Zone fromZone, Zone toZone, Ability source, Game game) {
return computerPlayer.moveCards(card, fromZone, toZone, source, game);
return computerPlayer.moveCards(card, toZone, source, game);
}
@Override

2
Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java
View file

@ -104,7 +104,7 @@ public class CipherEffect extends OneShotEffect {
if (!game.isSimulation()) {
game.informPlayers(new StringBuilder(sourceCard.getLogName()).append(": Spell ciphered to ").append(targetCreature.getLogName()).toString());
}
return controller.moveCards(sourceCard, null, Zone.EXILED, source, game);
return controller.moveCards(sourceCard, Zone.EXILED, source, game);
} else {
return false;
}

2
Mage/src/main/java/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java
View file

@ -60,7 +60,7 @@ public class ClashWinReturnToHandSpellEffect extends OneShotEffect implements Ma
if (ClashEffect.getInstance().apply(game, source)) {
Card spellCard = game.getStack().getSpell(source.getSourceId()).getCard();
if (spellCard != null) {
controller.moveCards(spellCard, null, Zone.HAND, source, game);
controller.moveCards(spellCard, Zone.HAND, source, game);
}
}
return true;

2
Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java
View file

@ -31,7 +31,7 @@ public class ReturnToHandSpellEffect extends OneShotEffect implements MageSingle
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Card spellCard = game.getStack().getSpell(source.getSourceId()).getCard();
controller.moveCards(spellCard, null, Zone.HAND, source, game);
controller.moveCards(spellCard, Zone.HAND, source, game);
return true;
}
return false;

2
Mage/src/main/java/mage/abilities/keyword/IngestAbility.java
View file

@ -62,7 +62,7 @@ class IngestEffect extends OneShotEffect {
if (targetPlayer != null) {
Card card = targetPlayer.getLibrary().getFromTop(game);
if (card != null) {
targetPlayer.moveCards(card, Zone.LIBRARY, Zone.EXILED, source, game);
targetPlayer.moveCards(card, Zone.EXILED, source, game);
}
return true;
}