diff --git a/Mage.Sets/src/mage/sets/alarareborn/EtherwroughtPage.java b/Mage.Sets/src/mage/sets/alarareborn/EtherwroughtPage.java index b2d9a59ca63..7a0a4562010 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/EtherwroughtPage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/EtherwroughtPage.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java index b9f8abbf935..5cc071af83e 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java @@ -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()); diff --git a/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java b/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java index a364b7fa8be..29463622add 100644 --- a/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java +++ b/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java @@ -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. diff --git a/Mage.Sets/src/mage/sets/alliances/PhyrexianDevourer.java b/Mage.Sets/src/mage/sets/alliances/PhyrexianDevourer.java index 08d68590063..495428477aa 100644 --- a/Mage.Sets/src/mage/sets/alliances/PhyrexianDevourer.java +++ b/Mage.Sets/src/mage/sets/alliances/PhyrexianDevourer.java @@ -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; diff --git a/Mage.Sets/src/mage/sets/apocalypse/WildResearch.java b/Mage.Sets/src/mage/sets/apocalypse/WildResearch.java index 84d50b5364a..b4f0a933479 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/WildResearch.java +++ b/Mage.Sets/src/mage/sets/apocalypse/WildResearch.java @@ -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); diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/FathomFeeder.java b/Mage.Sets/src/mage/sets/battleforzendikar/FathomFeeder.java index 7b2034d276a..e6ec74af254 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/FathomFeeder.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/FathomFeeder.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/KioraMasterOfTheDepths.java b/Mage.Sets/src/mage/sets/battleforzendikar/KioraMasterOfTheDepths.java index 5cad5cf83be..c7919047f80 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/KioraMasterOfTheDepths.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/KioraMasterOfTheDepths.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/SpellShrivel.java b/Mage.Sets/src/mage/sets/battleforzendikar/SpellShrivel.java index 0898f82dc5a..cf0a4d213a2 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/SpellShrivel.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/SpellShrivel.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/TitansPresence.java b/Mage.Sets/src/mage/sets/battleforzendikar/TitansPresence.java index 07469e3e5a1..b71a313b0db 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/TitansPresence.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/TitansPresence.java @@ -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; diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/UnnaturalAggression.java b/Mage.Sets/src/mage/sets/battleforzendikar/UnnaturalAggression.java index 8a5cc623a80..72fcaa06645 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/UnnaturalAggression.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/UnnaturalAggression.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java index 3045e88bdb6..cd1783a5b59 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java index f20848de39f..9de2f375aea 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SatyrWayfinder.java b/Mage.Sets/src/mage/sets/bornofthegods/SatyrWayfinder.java index d820c9cf995..408c1a7a9c1 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SatyrWayfinder.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SatyrWayfinder.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/coldsnap/BlizzardSpecter.java b/Mage.Sets/src/mage/sets/coldsnap/BlizzardSpecter.java index dbebe6e16fc..5bad78d243f 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/BlizzardSpecter.java +++ b/Mage.Sets/src/mage/sets/coldsnap/BlizzardSpecter.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/coldsnap/ScryingSheets.java b/Mage.Sets/src/mage/sets/coldsnap/ScryingSheets.java index c13863000f4..1ae642bd3df 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/ScryingSheets.java +++ b/Mage.Sets/src/mage/sets/coldsnap/ScryingSheets.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/commander/DesecratorHag.java b/Mage.Sets/src/mage/sets/commander/DesecratorHag.java index 057ca561412..a5724d07483 100644 --- a/Mage.Sets/src/mage/sets/commander/DesecratorHag.java +++ b/Mage.Sets/src/mage/sets/commander/DesecratorHag.java @@ -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 { diff --git a/Mage.Sets/src/mage/sets/commander/WhirlpoolWhelm.java b/Mage.Sets/src/mage/sets/commander/WhirlpoolWhelm.java index 45c121f4d0a..97c5d2902b3 100644 --- a/Mage.Sets/src/mage/sets/commander/WhirlpoolWhelm.java +++ b/Mage.Sets/src/mage/sets/commander/WhirlpoolWhelm.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/commander2013/Foster.java b/Mage.Sets/src/mage/sets/commander2013/Foster.java index fa78637ac01..37b0e131171 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Foster.java +++ b/Mage.Sets/src/mage/sets/commander2013/Foster.java @@ -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); diff --git a/Mage.Sets/src/mage/sets/commander2013/StrategicPlanning.java b/Mage.Sets/src/mage/sets/commander2013/StrategicPlanning.java index 6e5e2f88e32..dcb1ecdcc7b 100644 --- a/Mage.Sets/src/mage/sets/commander2013/StrategicPlanning.java +++ b/Mage.Sets/src/mage/sets/commander2013/StrategicPlanning.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/darksteel/PulseOfTheFields.java b/Mage.Sets/src/mage/sets/darksteel/PulseOfTheFields.java index f6666588e51..a0aee9f80ea 100644 --- a/Mage.Sets/src/mage/sets/darksteel/PulseOfTheFields.java +++ b/Mage.Sets/src/mage/sets/darksteel/PulseOfTheFields.java @@ -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; } } diff --git a/Mage.Sets/src/mage/sets/darksteel/PulseOfTheForge.java b/Mage.Sets/src/mage/sets/darksteel/PulseOfTheForge.java index 0771972dbfd..61121acb146 100644 --- a/Mage.Sets/src/mage/sets/darksteel/PulseOfTheForge.java +++ b/Mage.Sets/src/mage/sets/darksteel/PulseOfTheForge.java @@ -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; } } diff --git a/Mage.Sets/src/mage/sets/darksteel/PulseOfTheGrid.java b/Mage.Sets/src/mage/sets/darksteel/PulseOfTheGrid.java index 4226484a4f2..e9832683113 100644 --- a/Mage.Sets/src/mage/sets/darksteel/PulseOfTheGrid.java +++ b/Mage.Sets/src/mage/sets/darksteel/PulseOfTheGrid.java @@ -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; } } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java b/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java index 014f7664b85..6d963193683 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java @@ -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) { diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/FoulRenewal.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/FoulRenewal.java index 3157d968dc8..6a79772ef1c 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/FoulRenewal.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/FoulRenewal.java @@ -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())); diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/GurmagDrowner.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/GurmagDrowner.java index fecfe20865f..facf0554825 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/GurmagDrowner.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/GurmagDrowner.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/NarsetTranscendent.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/NarsetTranscendent.java index 7154581300c..798eafd1e7c 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/NarsetTranscendent.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/NarsetTranscendent.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/VolcanicVision.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/VolcanicVision.java index 7ef3e668e94..721bd1b0047 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/VolcanicVision.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/VolcanicVision.java @@ -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)) { diff --git a/Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java b/Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java index 9a48a8d47aa..2246a6ad618 100644 --- a/Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java +++ b/Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java b/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java index e2969415185..19e72f42765 100644 --- a/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java +++ b/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/fatereforged/SageEyeAvengers.java b/Mage.Sets/src/mage/sets/fatereforged/SageEyeAvengers.java index 3db2a153985..4199dffa9a5 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/SageEyeAvengers.java +++ b/Mage.Sets/src/mage/sets/fatereforged/SageEyeAvengers.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/fatereforged/SoulfireGrandMaster.java b/Mage.Sets/src/mage/sets/fatereforged/SoulfireGrandMaster.java index 9d9d41b2e96..17d284a6ebf 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/SoulfireGrandMaster.java +++ b/Mage.Sets/src/mage/sets/fatereforged/SoulfireGrandMaster.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/fatereforged/TasigurTheGoldenFang.java b/Mage.Sets/src/mage/sets/fatereforged/TasigurTheGoldenFang.java index 3e6192c0901..121a8ff5247 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/TasigurTheGoldenFang.java +++ b/Mage.Sets/src/mage/sets/fatereforged/TasigurTheGoldenFang.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/fatereforged/TemurSabertooth.java b/Mage.Sets/src/mage/sets/fatereforged/TemurSabertooth.java index 7ca451daf08..26d918b8966 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/TemurSabertooth.java +++ b/Mage.Sets/src/mage/sets/fatereforged/TemurSabertooth.java @@ -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); } diff --git a/Mage.Sets/src/mage/sets/futuresight/LinessaZephyrMage.java b/Mage.Sets/src/mage/sets/futuresight/LinessaZephyrMage.java index f5778598c8a..7e7cfe62f2f 100644 --- a/Mage.Sets/src/mage/sets/futuresight/LinessaZephyrMage.java +++ b/Mage.Sets/src/mage/sets/futuresight/LinessaZephyrMage.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/futuresight/LlanowarEmpath.java b/Mage.Sets/src/mage/sets/futuresight/LlanowarEmpath.java index 33ae4d3ab13..5f811ebdf20 100644 --- a/Mage.Sets/src/mage/sets/futuresight/LlanowarEmpath.java +++ b/Mage.Sets/src/mage/sets/futuresight/LlanowarEmpath.java @@ -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; diff --git a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java index 80a410eb41f..0285e4af8bd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java index fe52d89e520..c57464b9e7c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java b/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java index 8a3b28890a2..5e5525d46e1 100644 --- a/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java +++ b/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java @@ -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); diff --git a/Mage.Sets/src/mage/sets/iceage/EnduringRenewal.java b/Mage.Sets/src/mage/sets/iceage/EnduringRenewal.java index 725e5e71c57..fd9a03290a3 100644 --- a/Mage.Sets/src/mage/sets/iceage/EnduringRenewal.java +++ b/Mage.Sets/src/mage/sets/iceage/EnduringRenewal.java @@ -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; } } diff --git a/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java b/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java index 7d722651097..a82e7091eda 100644 --- a/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java +++ b/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java b/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java index 15979ceb39e..f2fd4c67ef5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java +++ b/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java @@ -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()); diff --git a/Mage.Sets/src/mage/sets/innistrad/GhoulcallersBell.java b/Mage.Sets/src/mage/sets/innistrad/GhoulcallersBell.java index a8e1ba69672..b0d43dcca4a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GhoulcallersBell.java +++ b/Mage.Sets/src/mage/sets/innistrad/GhoulcallersBell.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java index 42b075a38fc..67caf3dac4e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java +++ b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java @@ -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); diff --git a/Mage.Sets/src/mage/sets/invasion/Recoil.java b/Mage.Sets/src/mage/sets/invasion/Recoil.java index 58e88fb1f8e..b454d7bc841 100644 --- a/Mage.Sets/src/mage/sets/invasion/Recoil.java +++ b/Mage.Sets/src/mage/sets/invasion/Recoil.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java index fa5f0d1a2c9..0d1400bc912 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DakraMystic.java b/Mage.Sets/src/mage/sets/journeyintonyx/DakraMystic.java index a9cded75e0b..c9635785cf7 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DakraMystic.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DakraMystic.java @@ -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 { diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NessianGameWarden.java b/Mage.Sets/src/mage/sets/journeyintonyx/NessianGameWarden.java index 2926899d604..52b3a19808d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NessianGameWarden.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NessianGameWarden.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/judgment/DeathWish.java b/Mage.Sets/src/mage/sets/judgment/DeathWish.java index a49135b6afb..916406c52d9 100644 --- a/Mage.Sets/src/mage/sets/judgment/DeathWish.java +++ b/Mage.Sets/src/mage/sets/judgment/DeathWish.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java b/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java index bf140cf6f72..544e4564ac3 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java @@ -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); } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java index 640eddc69fa..91fd0210d33 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/magicorigins/EvolutionaryLeap.java b/Mage.Sets/src/mage/sets/magicorigins/EvolutionaryLeap.java index 29b4b9dc852..186b1627c2c 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/EvolutionaryLeap.java +++ b/Mage.Sets/src/mage/sets/magicorigins/EvolutionaryLeap.java @@ -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); } diff --git a/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java b/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java index ef346c00eac..bce8b016e19 100644 --- a/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java +++ b/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java @@ -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; } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/CrystalShard.java b/Mage.Sets/src/mage/sets/mirrodin/CrystalShard.java index df86070406a..ffefc9b1e6c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/CrystalShard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/CrystalShard.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java index e53c67b4e99..7b19e41816f 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java @@ -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); diff --git a/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java b/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java index cd319aeee2e..8883d214e5f 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java +++ b/Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java @@ -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); diff --git a/Mage.Sets/src/mage/sets/odyssey/Entomb.java b/Mage.Sets/src/mage/sets/odyssey/Entomb.java index 5421a0dfe86..b100e8128eb 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Entomb.java +++ b/Mage.Sets/src/mage/sets/odyssey/Entomb.java @@ -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; diff --git a/Mage.Sets/src/mage/sets/odyssey/Predict.java b/Mage.Sets/src/mage/sets/odyssey/Predict.java index e0796cdbdb4..ca56aa00fdc 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Predict.java +++ b/Mage.Sets/src/mage/sets/odyssey/Predict.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/odyssey/ThinkTank.java b/Mage.Sets/src/mage/sets/odyssey/ThinkTank.java index 9f98c86eaf0..7b16afe5650 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThinkTank.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThinkTank.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/onslaught/RummagingWizard.java b/Mage.Sets/src/mage/sets/onslaught/RummagingWizard.java index 55ffd989a3d..1d23e3181fb 100644 --- a/Mage.Sets/src/mage/sets/onslaught/RummagingWizard.java +++ b/Mage.Sets/src/mage/sets/onslaught/RummagingWizard.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight.java b/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight.java index c7eaa582df2..31aa2dcd8e7 100644 --- a/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight.java +++ b/Mage.Sets/src/mage/sets/planeshift/SkyshipWeatherlight.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/ravnica/CloudstoneCurio.java b/Mage.Sets/src/mage/sets/ravnica/CloudstoneCurio.java index f8f3c73190a..16442b4f7b0 100644 --- a/Mage.Sets/src/mage/sets/ravnica/CloudstoneCurio.java +++ b/Mage.Sets/src/mage/sets/ravnica/CloudstoneCurio.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java b/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java index b5397c9ef42..2564e53eb49 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java index f722f8f1323..38b746f6804 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java b/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java index cb1681f4355..d254f9be119 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JaradsOrders.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java b/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java index 0f57cc8ca4b..7e166a9d5e0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Syncopate.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ElderPineOfJukai.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ElderPineOfJukai.java index a718451c0fa..72626f9c5cc 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ElderPineOfJukai.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ElderPineOfJukai.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java index c10b8d363a7..e4aaa1d1405 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java @@ -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; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java index 2143943e5d8..e92f8f66df6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java @@ -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); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java index 99de7634a75..4b68a96d557 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java @@ -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; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GhastlordOfFugue.java b/Mage.Sets/src/mage/sets/shadowmoor/GhastlordOfFugue.java index 0d8b3f391dc..4d4e071ff74 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GhastlordOfFugue.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GhastlordOfFugue.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ImpromptuRaid.java b/Mage.Sets/src/mage/sets/shadowmoor/ImpromptuRaid.java index 5bde901395d..ae20db8145b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ImpromptuRaid.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ImpromptuRaid.java @@ -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)) { diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/CompellingDeterrence.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/CompellingDeterrence.java index fdd1b83eacd..d7e1d9829a3 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/CompellingDeterrence.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/CompellingDeterrence.java @@ -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) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java b/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java index c9f45d050a5..37a4a47bbab 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java @@ -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); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java b/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java index ef27cd18a51..f239c1916aa 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CorpseConnoisseur.java @@ -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); } } } diff --git a/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java b/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java index d67f44a6c01..3eeb728570b 100644 --- a/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java +++ b/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java @@ -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); } diff --git a/Mage.Sets/src/mage/sets/stronghold/MoxDiamond.java b/Mage.Sets/src/mage/sets/stronghold/MoxDiamond.java index 5b4a6162cba..dd283d765d7 100644 --- a/Mage.Sets/src/mage/sets/stronghold/MoxDiamond.java +++ b/Mage.Sets/src/mage/sets/stronghold/MoxDiamond.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/tempest/Intuition.java b/Mage.Sets/src/mage/sets/tempest/Intuition.java index 68a57784fcf..5702eb8381a 100644 --- a/Mage.Sets/src/mage/sets/tempest/Intuition.java +++ b/Mage.Sets/src/mage/sets/tempest/Intuition.java @@ -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); } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Abundance.java b/Mage.Sets/src/mage/sets/tenthedition/Abundance.java index b0c29b289cd..a407e5042f4 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Abundance.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Abundance.java @@ -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); diff --git a/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java b/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java index a9da61ca30a..bd2e5256b6f 100644 --- a/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java +++ b/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java @@ -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); } } diff --git a/Mage.Sets/src/mage/sets/timespiral/MishraArtificerProdigy.java b/Mage.Sets/src/mage/sets/timespiral/MishraArtificerProdigy.java index 51b5c4c707a..385466a1a3f 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MishraArtificerProdigy.java +++ b/Mage.Sets/src/mage/sets/timespiral/MishraArtificerProdigy.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/timespiral/PullFromEternity.java b/Mage.Sets/src/mage/sets/timespiral/PullFromEternity.java index 22b111dffcf..8335671d8b5 100644 --- a/Mage.Sets/src/mage/sets/timespiral/PullFromEternity.java +++ b/Mage.Sets/src/mage/sets/timespiral/PullFromEternity.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/timespiral/ScionOfTheUrDragon.java b/Mage.Sets/src/mage/sets/timespiral/ScionOfTheUrDragon.java index 7cee6c5810e..1b9bf7e43b0 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ScionOfTheUrDragon.java +++ b/Mage.Sets/src/mage/sets/timespiral/ScionOfTheUrDragon.java @@ -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); } diff --git a/Mage.Sets/src/mage/sets/visions/WandOfDenial.java b/Mage.Sets/src/mage/sets/visions/WandOfDenial.java index d694a55cd6d..ce9f5c97312 100644 --- a/Mage.Sets/src/mage/sets/visions/WandOfDenial.java +++ b/Mage.Sets/src/mage/sets/visions/WandOfDenial.java @@ -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; } diff --git a/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java b/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java index 76fafe74dbe..c88c07e2fb0 100644 --- a/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/NemesisTrap.java @@ -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)); diff --git a/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java b/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java index 15856dd8000..77ad6036dd9 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java +++ b/Mage.Sets/src/mage/sets/worldwake/WrexialTheRisenDeep.java @@ -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; diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java index d21d96e185d..8406f49e32b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java @@ -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; diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java index 77171586c40..44ce17cfbb8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java @@ -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 diff --git a/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java index 828b78903d5..66278ba56f2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java @@ -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; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java index c850addfca3..fafa73d8366 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java @@ -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; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java index 5dff087b135..f19f56f863c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java @@ -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; diff --git a/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java b/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java index 8bc5c9857e5..23a63d04288 100644 --- a/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java @@ -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; }