diff --git a/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java b/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java index 0fe7d721b9f..c7e82231fc6 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java @@ -104,7 +104,7 @@ class MindFuneralEffect extends OneShotEffect { cards.add(card); } opponent.revealCards("Mind Funeral", cards, game); - opponent.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + opponent.moveCards(cards, Zone.GRAVEYARD, source, game); return true; } diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/BaneOfBalaGed.java b/Mage.Sets/src/mage/sets/battleforzendikar/BaneOfBalaGed.java index 77237357823..e57887451b4 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/BaneOfBalaGed.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/BaneOfBalaGed.java @@ -93,7 +93,7 @@ class BaneOfBalaGedEffect extends OneShotEffect { if (defendingPlayer != null) { Target target = new TargetControlledPermanent(2); defendingPlayer.chooseTarget(outcome, target, source, game); - defendingPlayer.moveCards(new CardsImpl(target.getTargets()), null, Zone.EXILED, source, game); + defendingPlayer.moveCards(new CardsImpl(target.getTargets()), Zone.EXILED, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/BlightHerder.java b/Mage.Sets/src/mage/sets/battleforzendikar/BlightHerder.java index 51ba0d733fa..8ef26523373 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/BlightHerder.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/BlightHerder.java @@ -107,7 +107,7 @@ class BlightHerderEffect extends OneShotEffect { if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { if (controller.chooseTarget(outcome, target, source, game)) { Cards cardsToGraveyard = new CardsImpl(target.getTargets()); - controller.moveCards(cardsToGraveyard, null, Zone.GRAVEYARD, source, game); + controller.moveCards(cardsToGraveyard, Zone.GRAVEYARD, source, game); return new CreateTokenEffect(new EldraziScionToken(), 3).apply(game, source); } } diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/KioraMasterOfTheDepths.java b/Mage.Sets/src/mage/sets/battleforzendikar/KioraMasterOfTheDepths.java index c7919047f80..efccd05d309 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/KioraMasterOfTheDepths.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/KioraMasterOfTheDepths.java @@ -192,7 +192,7 @@ class KioraRevealEffect extends OneShotEffect { } } } - controller.moveCards(cards, null, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/UlamogsDespoiler.java b/Mage.Sets/src/mage/sets/battleforzendikar/UlamogsDespoiler.java index 4943bc184c4..2ecd8cc067e 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/UlamogsDespoiler.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/UlamogsDespoiler.java @@ -108,7 +108,7 @@ class UlamogsDespoilerEffect extends OneShotEffect { if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { if (controller.chooseTarget(outcome, target, source, game)) { Cards cardsToGraveyard = new CardsImpl(target.getTargets()); - controller.moveCards(cardsToGraveyard, null, Zone.GRAVEYARD, source, game); + controller.moveCards(cardsToGraveyard, Zone.GRAVEYARD, source, game); return new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)).apply(game, source); } } diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/UlamogsNullifier.java b/Mage.Sets/src/mage/sets/battleforzendikar/UlamogsNullifier.java index dcdff1c328f..54cbfa219e8 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/UlamogsNullifier.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/UlamogsNullifier.java @@ -123,7 +123,7 @@ class UlamogsNullifierEffect extends OneShotEffect { if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { if (controller.chooseTarget(outcome, target, source, game)) { Cards cardsToGraveyard = new CardsImpl(target.getTargets()); - controller.moveCards(cardsToGraveyard, null, Zone.GRAVEYARD, source, game); + controller.moveCards(cardsToGraveyard, Zone.GRAVEYARD, source, game); game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game); return true; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java index 0e4f8ff9428..eb3fe8b0f41 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SwayOfTheStars.java @@ -91,8 +91,8 @@ class SwayOfTheStarsEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - player.moveCards(player.getHand(), Zone.HAND, Zone.LIBRARY, source, game); - player.moveCards(player.getGraveyard(), Zone.GRAVEYARD, Zone.LIBRARY, source, game); + player.moveCards(player.getHand(), Zone.LIBRARY, source, game); + player.moveCards(player.getGraveyard(), Zone.LIBRARY, source, game); FilterPermanent filter = new FilterPermanent(); filter.add(new OwnerIdPredicate(playerId)); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, controller.getId(), source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SatyrWayfinder.java b/Mage.Sets/src/mage/sets/bornofthegods/SatyrWayfinder.java index 408c1a7a9c1..7c69c8281f3 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SatyrWayfinder.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SatyrWayfinder.java @@ -113,7 +113,7 @@ class SatyrWayfinderEffect extends OneShotEffect { } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java index 2ad8724c368..73fe0d0429d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java @@ -119,8 +119,8 @@ class GiftsUngivenEffect extends OneShotEffect { } } - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); - player.moveCards(cardsToKeep, Zone.LIBRARY, Zone.HAND, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); + player.moveCards(cardsToKeep, Zone.HAND, source, game); } player.shuffleLibrary(source, game); return true; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java index 01b06c60d7c..f8e6173418b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java @@ -98,7 +98,7 @@ class InameDeathAspectEffect extends SearchEffect { Player player = game.getPlayer(source.getControllerId()); if (player != null && player.searchLibrary(target, game)) { if (target.getTargets().size() > 0) { - player.moveCards(new CardsImpl(target.getTargets()), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(new CardsImpl(target.getTargets()), Zone.GRAVEYARD, source, game); } player.shuffleLibrary(source, game); return true; diff --git a/Mage.Sets/src/mage/sets/commander/BuriedAlive.java b/Mage.Sets/src/mage/sets/commander/BuriedAlive.java index 50a31595713..9201cdcf2f8 100644 --- a/Mage.Sets/src/mage/sets/commander/BuriedAlive.java +++ b/Mage.Sets/src/mage/sets/commander/BuriedAlive.java @@ -89,7 +89,7 @@ class BuriedAliveEffect extends SearchEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { if (controller.searchLibrary(target, game)) { - controller.moveCards(new CardsImpl(target.getTargets()), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(new CardsImpl(target.getTargets()), Zone.GRAVEYARD, source, game); } controller.shuffleLibrary(source, game); return true; diff --git a/Mage.Sets/src/mage/sets/commander/DesecratorHag.java b/Mage.Sets/src/mage/sets/commander/DesecratorHag.java index a5724d07483..fd5824cead5 100644 --- a/Mage.Sets/src/mage/sets/commander/DesecratorHag.java +++ b/Mage.Sets/src/mage/sets/commander/DesecratorHag.java @@ -124,7 +124,7 @@ class DesecratorHagEffect extends OneShotEffect { } } } else { - return you.moveCards(cards, null, Zone.HAND, source, game); + return you.moveCards(cards, Zone.HAND, source, game); } } return false; diff --git a/Mage.Sets/src/mage/sets/commander2013/Foster.java b/Mage.Sets/src/mage/sets/commander2013/Foster.java index 37b0e131171..509d514db37 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Foster.java +++ b/Mage.Sets/src/mage/sets/commander2013/Foster.java @@ -126,7 +126,7 @@ class FosterEffect extends OneShotEffect { controller.moveCards(cardFound, Zone.HAND, source, game); cards.remove(cardFound); } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/commander2013/StrategicPlanning.java b/Mage.Sets/src/mage/sets/commander2013/StrategicPlanning.java index dcb1ecdcc7b..1db8513711b 100644 --- a/Mage.Sets/src/mage/sets/commander2013/StrategicPlanning.java +++ b/Mage.Sets/src/mage/sets/commander2013/StrategicPlanning.java @@ -101,7 +101,7 @@ class StrategicPlanningEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/commander2014/GraveSifter.java b/Mage.Sets/src/mage/sets/commander2014/GraveSifter.java index 8dffb1f83ca..9ce16fc6c13 100644 --- a/Mage.Sets/src/mage/sets/commander2014/GraveSifter.java +++ b/Mage.Sets/src/mage/sets/commander2014/GraveSifter.java @@ -111,7 +111,7 @@ class GraveSifterEffect extends OneShotEffect { filter.add(new SubtypePredicate(typeChoice.getChoice())); Target target = new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, filter); player.chooseTarget(outcome, target, source, game); - player.moveCards(new CardsImpl(target.getTargets()), null, Zone.HAND, source, game); + player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); } } diff --git a/Mage.Sets/src/mage/sets/commander2014/StitcherGeralf.java b/Mage.Sets/src/mage/sets/commander2014/StitcherGeralf.java index 66079a6dc84..54409f0b92d 100644 --- a/Mage.Sets/src/mage/sets/commander2014/StitcherGeralf.java +++ b/Mage.Sets/src/mage/sets/commander2014/StitcherGeralf.java @@ -108,7 +108,7 @@ class StitcherGeralfEffect extends OneShotEffect { cards.addAll(player.getLibrary().getTopCards(game, 3)); } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); TargetCard target = new TargetCard(0,2,Zone.GRAVEYARD, new FilterCreatureCard("creature cards to exile")); controller.chooseTarget(outcome, cards, target, source, game); int power = 0; diff --git a/Mage.Sets/src/mage/sets/conflux/TeleminPerformance.java b/Mage.Sets/src/mage/sets/conflux/TeleminPerformance.java index 9574a17f72d..3096f19222d 100644 --- a/Mage.Sets/src/mage/sets/conflux/TeleminPerformance.java +++ b/Mage.Sets/src/mage/sets/conflux/TeleminPerformance.java @@ -104,7 +104,7 @@ class TeleminPerformanceEffect extends OneShotEffect { } if (!cards.isEmpty()) { opponent.revealCards("Telemin Performance", cards, game); - opponent.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + opponent.moveCards(cards, Zone.GRAVEYARD, source, game); } if (creature != null) { return creature.putOntoBattlefield(game, Zone.LIBRARY, source.getSourceId(), source.getControllerId()); diff --git a/Mage.Sets/src/mage/sets/darkascension/TrackersInstincts.java b/Mage.Sets/src/mage/sets/darkascension/TrackersInstincts.java index 3274bbb3c15..0e85ab4a983 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TrackersInstincts.java +++ b/Mage.Sets/src/mage/sets/darkascension/TrackersInstincts.java @@ -118,7 +118,7 @@ class TrackersInstinctsEffect extends OneShotEffect { } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/darksteel/ChromescaleDrake.java b/Mage.Sets/src/mage/sets/darksteel/ChromescaleDrake.java index 9f06247482a..5ebb37bde09 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ChromescaleDrake.java +++ b/Mage.Sets/src/mage/sets/darksteel/ChromescaleDrake.java @@ -109,8 +109,8 @@ class ChromescaleDrakeEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cardsToHand, Zone.LIBRARY, Zone.HAND, source, game); - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/dissension/BoundDetermined.java b/Mage.Sets/src/mage/sets/dissension/BoundDetermined.java index b46d4946cd1..c199091d4a1 100644 --- a/Mage.Sets/src/mage/sets/dissension/BoundDetermined.java +++ b/Mage.Sets/src/mage/sets/dissension/BoundDetermined.java @@ -125,7 +125,7 @@ class BoundEffect extends OneShotEffect { TargetCardInYourGraveyard targetCard = new TargetCardInYourGraveyard(0, colors, new FilterCard("up to " + colors + " card" + (colors > 1 ? "s" : "") + " from your graveyard")); controller.chooseTarget(outcome, targetCard, source, game); - controller.moveCards(new CardsImpl(targetCard.getTargets()), null, Zone.HAND, source, game); + controller.moveCards(new CardsImpl(targetCard.getTargets()), Zone.HAND, source, game); } } } diff --git a/Mage.Sets/src/mage/sets/dissension/MomirVigSimicVisionary.java b/Mage.Sets/src/mage/sets/dissension/MomirVigSimicVisionary.java index 38d5e605aec..d3a84fbd871 100644 --- a/Mage.Sets/src/mage/sets/dissension/MomirVigSimicVisionary.java +++ b/Mage.Sets/src/mage/sets/dissension/MomirVigSimicVisionary.java @@ -136,7 +136,7 @@ class MomirVigSimicVisionaryEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } } diff --git a/Mage.Sets/src/mage/sets/dissension/RiseFall.java b/Mage.Sets/src/mage/sets/dissension/RiseFall.java index 3df0737e4e4..58db402090f 100644 --- a/Mage.Sets/src/mage/sets/dissension/RiseFall.java +++ b/Mage.Sets/src/mage/sets/dissension/RiseFall.java @@ -108,7 +108,7 @@ class RiseEffect extends OneShotEffect { if (permanent != null) { cardsToHand.add(permanent); } - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java b/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java index f7db36f8b80..f835cf55385 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MirkoVoskMindDrinker.java @@ -119,7 +119,7 @@ class MirkoVoskMindDrinkerEffect extends OneShotEffect { } } player.revealCards("by " + sourceObject.getName() + " from " + player.getName(), cards, game); - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); return true; } } diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/GurmagDrowner.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/GurmagDrowner.java index facf0554825..48c93b2f49b 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/GurmagDrowner.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/GurmagDrowner.java @@ -111,7 +111,7 @@ class GurmagDrownerEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/ProfanerOfTheDead.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/ProfanerOfTheDead.java index 536cc50246f..a08fd37bed8 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/ProfanerOfTheDead.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/ProfanerOfTheDead.java @@ -105,7 +105,7 @@ class ProfanerOfTheDeadReturnEffect extends OneShotEffect { for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { cardsToHand.add(permanent); } - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/EchoingTruth.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/EchoingTruth.java index 48d87e364e2..218e9d73721 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/EchoingTruth.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/EchoingTruth.java @@ -103,7 +103,7 @@ class ReturnToHandAllNamedPermanentsEffect extends OneShotEffect { for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) { cardsToHand.add(perm); } - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } return true; diff --git a/Mage.Sets/src/mage/sets/fatereforged/RenownedWeaponsmith.java b/Mage.Sets/src/mage/sets/fatereforged/RenownedWeaponsmith.java index 4a1a01b88ea..32dc1e76b5c 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/RenownedWeaponsmith.java +++ b/Mage.Sets/src/mage/sets/fatereforged/RenownedWeaponsmith.java @@ -150,7 +150,7 @@ class RenownedWeaponsmithEffect extends OneShotEffect { Cards revealed = new CardsImpl(); revealed.add(card); controller.revealCards(sourceObject.getIdName(), revealed, game); - controller.moveCards(revealed, null, Zone.HAND, source, game); + controller.moveCards(revealed, Zone.HAND, source, game); } } controller.shuffleLibrary(source, game); diff --git a/Mage.Sets/src/mage/sets/fatereforged/SuddenReclamation.java b/Mage.Sets/src/mage/sets/fatereforged/SuddenReclamation.java index c12a2bd1798..f4468150a5c 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/SuddenReclamation.java +++ b/Mage.Sets/src/mage/sets/fatereforged/SuddenReclamation.java @@ -110,7 +110,7 @@ class SuddenReclamationEffect extends OneShotEffect { cardsToHand.add(card); } } - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/fifthedition/Recall.java b/Mage.Sets/src/mage/sets/fifthedition/Recall.java index f1af05b0fa4..194e66d8328 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Recall.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Recall.java @@ -96,7 +96,7 @@ class RecallEffect extends OneShotEffect { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(cardsDiscarded.size(), new FilterCard()); target.setNotTarget(true); target.choose(Outcome.ReturnToHand, controller.getId(), source.getSourceId(), game); - controller.moveCards(new CardsImpl(target.getTargets()), null, Zone.HAND, source, game); + controller.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); } return true; diff --git a/Mage.Sets/src/mage/sets/fifthedition/WindsOfChange.java b/Mage.Sets/src/mage/sets/fifthedition/WindsOfChange.java index 1086263c23f..0a3fb274df7 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WindsOfChange.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WindsOfChange.java @@ -89,7 +89,7 @@ class WindsOfChangeEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { permanentsCount.put(playerId, player.getHand().size()); - player.moveCards(player.getHand(), Zone.HAND, Zone.LIBRARY, source, game); + player.moveCards(player.getHand(), Zone.LIBRARY, source, game); player.shuffleLibrary(source, game); } } diff --git a/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java b/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java index eb65a004706..68c1ed6350f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java @@ -115,7 +115,7 @@ class BalustradeSpyEffect extends OneShotEffect { } if (!cards.isEmpty()) { controller.revealCards(sourceObject.getName(), cards, game); - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); return true; } return true; diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java b/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java index 2fe0f586e95..8781f08619a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorborygmosEnraged.java @@ -121,8 +121,8 @@ class BorborygmosEnragedEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(landCards, Zone.LIBRARY, Zone.HAND, source, game); - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(landCards, Zone.HAND, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java b/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java index b85bd19caa4..cc02f22092c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java @@ -97,7 +97,7 @@ class CoercedConfessionMillEffect extends OneShotEffect { ++foundCreatures; } } - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); if (foundCreatures > 0) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java index 1cde6bde251..5ce7583a7f2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java @@ -116,7 +116,7 @@ class ConsumingAberrationEffect extends OneShotEffect { } } player.revealCards("Consuming Aberrtion", cards, game); - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java index 71b9e9393ee..2a2dd6ce4d0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java @@ -129,7 +129,7 @@ class DimirCharmEffect extends OneShotEffect { card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); cards.remove(card); } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } } } diff --git a/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java b/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java index b679769c81c..ff12970b23b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MindGrind.java @@ -117,7 +117,7 @@ class MindGrindEffect extends OneShotEffect { } } player.revealCards("by " + sourceCard.getName() + " from " + player.getName(), cards, game); - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java b/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java index 3af182f815c..362ade6001a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java @@ -117,7 +117,7 @@ class UndercityInformerEffect extends OneShotEffect { } } player.revealCards("Undercity Informer", cards, game); - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); return true; } } diff --git a/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java b/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java index 5e5525d46e1..19c9e51ce84 100644 --- a/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java +++ b/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java @@ -121,7 +121,7 @@ class DemonicConsultationEffect extends OneShotEffect { controller.moveCards(cardToHand, Zone.HAND, source, game); controller.revealCards(sourceObject.getIdName(), cardsToReaveal, game); cardsToReaveal.remove(cardToHand); - controller.moveCards(cardsToReaveal, null, Zone.EXILED, source, game); + controller.moveCards(cardsToReaveal, Zone.EXILED, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java b/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java index 27469b25766..064e28e7487 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java +++ b/Mage.Sets/src/mage/sets/innistrad/MirrorMadPhantasm.java @@ -108,7 +108,7 @@ class MirrorMadPhantasmEffect extends OneShotEffect { cards.add(card); } player.revealCards("Mirror-Mad Phantasm", cards, game); - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); return true; } } diff --git a/Mage.Sets/src/mage/sets/innistrad/Mulch.java b/Mage.Sets/src/mage/sets/innistrad/Mulch.java index edf5fa2f74e..836bf46cbb7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Mulch.java +++ b/Mage.Sets/src/mage/sets/innistrad/Mulch.java @@ -101,8 +101,8 @@ class MulchEffect extends OneShotEffect { otherCards.add(card); } } - controller.moveCards(landCards, Zone.LIBRARY, Zone.HAND, source, game); - controller.moveCards(otherCards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(landCards, Zone.HAND, source, game); + controller.moveCards(otherCards, Zone.GRAVEYARD, source, game); } return true; diff --git a/Mage.Sets/src/mage/sets/innistrad/TrepanationBlade.java b/Mage.Sets/src/mage/sets/innistrad/TrepanationBlade.java index 690d17eec3c..5694be079cd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TrepanationBlade.java +++ b/Mage.Sets/src/mage/sets/innistrad/TrepanationBlade.java @@ -120,7 +120,7 @@ class TrepanationBladeDiscardEffect extends OneShotEffect { } } } - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); if (!cards.isEmpty()) { player.revealCards(equipment.getName(), cards, game); game.getState().setValue(source.getSourceId().toString() + "_TrepanationBlade", cards.size()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java b/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java index 290ad41bed3..77c0366e205 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java @@ -101,7 +101,7 @@ class HubrisReturnEffect extends OneShotEffect { if (creature != null) { Cards cardsToHand = new CardsImpl(creature.getAttachments()); cardsToHand.add(creature); - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); } } return true; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java b/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java index 3385a47e0da..cca63ec9597 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java @@ -113,7 +113,7 @@ class ScourgeOfFleetsEffect extends OneShotEffect { for (Permanent permanent : game.getBattlefield().getActivePermanents(creatureFilter, source.getControllerId(), source.getSourceId(), game)) { cardsToHand.add(permanent); } - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BitterRevelation.java b/Mage.Sets/src/mage/sets/khansoftarkir/BitterRevelation.java index eea813a1263..5eaad045fb4 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/BitterRevelation.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/BitterRevelation.java @@ -111,8 +111,8 @@ class BitterRevelationEffect extends OneShotEffect { } } } - player.moveCards(cardsToHand, Zone.LIBRARY, Zone.HAND, source, game); - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cardsToHand, Zone.HAND, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java b/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java index 544e4564ac3..180f76c052e 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ScoutTheBorders.java @@ -122,7 +122,7 @@ class ScoutTheBordersEffect extends OneShotEffect { } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java index 91fd0210d33..73cad4c73d4 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiSoothsayer.java @@ -108,7 +108,7 @@ class SultaiSoothsayerEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/VillainousWealth.java b/Mage.Sets/src/mage/sets/khansoftarkir/VillainousWealth.java index 7e9b1319f0f..ada3f95210d 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/VillainousWealth.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/VillainousWealth.java @@ -103,7 +103,7 @@ class VillainousWealthEffect extends OneShotEffect { if (player != null) { Cards cardsToExile = new CardsImpl(); cardsToExile.addAll(player.getLibrary().getTopCards(game, source.getManaCostsToPay().getX())); - controller.moveCards(cardsToExile, null, Zone.EXILED, source, game); + controller.moveCards(cardsToExile, Zone.EXILED, source, game); if (controller.chooseUse(Outcome.PlayForFree, "Cast cards exiled with " + mageObject.getLogName() + " without paying its mana cost?", source, game)) { OuterLoop: while (cardsToExile.count(filter, game) > 0) { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Timetwister.java b/Mage.Sets/src/mage/sets/limitedalpha/Timetwister.java index dcc0eb8c280..22b030ddad3 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Timetwister.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Timetwister.java @@ -84,8 +84,8 @@ class TimetwisterEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - player.moveCards(player.getHand(), Zone.HAND, Zone.LIBRARY, source, game); - player.moveCards(player.getGraveyard(), Zone.GRAVEYARD, Zone.LIBRARY, source, game); + player.moveCards(player.getHand(), Zone.LIBRARY, source, game); + player.moveCards(player.getGraveyard(), Zone.LIBRARY, source, game); player.shuffleLibrary(source, game); } } diff --git a/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java b/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java index 546496984ab..f764227520d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java +++ b/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java @@ -86,8 +86,8 @@ class TimeReversalEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - player.moveCards(player.getHand(), Zone.HAND, Zone.LIBRARY, source, game); - player.moveCards(player.getGraveyard(), Zone.GRAVEYARD, Zone.LIBRARY, source, game); + player.moveCards(player.getHand(), Zone.LIBRARY, source, game); + player.moveCards(player.getGraveyard(), Zone.LIBRARY, source, game); player.shuffleLibrary(source, game); } } diff --git a/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java b/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java index 18fcd214815..fdfbd216747 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java @@ -120,7 +120,7 @@ class SuturedGhoulEffect extends OneShotEffect { } } Cards cardsToExile = new CardsImpl(target.getTargets()); - controller.moveCards(cardsToExile, null, Zone.EXILED, source, game); + controller.moveCards(cardsToExile, Zone.EXILED, source, game); String msg = count == 1 ? "1 card" : count + "cards"; game.informPlayers(permanent.getLogName() + ": " + controller.getLogName() + " exiled " + msg); diff --git a/Mage.Sets/src/mage/sets/magic2014/GlimpseTheFuture.java b/Mage.Sets/src/mage/sets/magic2014/GlimpseTheFuture.java index 53604abaeb9..0a0254fb409 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GlimpseTheFuture.java +++ b/Mage.Sets/src/mage/sets/magic2014/GlimpseTheFuture.java @@ -109,7 +109,7 @@ class GlimpseTheFutureEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/magicorigins/GatherThePack.java b/Mage.Sets/src/mage/sets/magicorigins/GatherThePack.java index 924b1ac7385..b934172d148 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/GatherThePack.java +++ b/Mage.Sets/src/mage/sets/magicorigins/GatherThePack.java @@ -103,12 +103,12 @@ class GatherThePackEffect extends OneShotEffect { Cards cardsToHand = new CardsImpl(target.getTargets()); if (cardsToHand.size() > 0) { cards.removeAll(cardsToHand); - controller.moveCards(cardsToHand, Zone.LIBRARY, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); } } } if (cards.size() > 0) { - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } } return true; diff --git a/Mage.Sets/src/mage/sets/magicorigins/SphinxsTutelage.java b/Mage.Sets/src/mage/sets/magicorigins/SphinxsTutelage.java index d57feb4c445..3702e2683eb 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/SphinxsTutelage.java +++ b/Mage.Sets/src/mage/sets/magicorigins/SphinxsTutelage.java @@ -120,7 +120,7 @@ class SphinxsTutelageEffect extends OneShotEffect { } } } - targetPlayer.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + targetPlayer.moveCards(cards, Zone.GRAVEYARD, source, game); } while (colorShared && targetPlayer.canRespond()); return true; } diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ForgottenLore.java b/Mage.Sets/src/mage/sets/masterseditionii/ForgottenLore.java index 4dad8951946..3d8b9838a2b 100644 --- a/Mage.Sets/src/mage/sets/masterseditionii/ForgottenLore.java +++ b/Mage.Sets/src/mage/sets/masterseditionii/ForgottenLore.java @@ -131,7 +131,7 @@ class ForgottenLoreEffect extends OneShotEffect { if(card != null) { Cards cardsToHand = new CardsImpl(); cardsToHand.add(card); - you.moveCards(cardsToHand, Zone.GRAVEYARD, Zone.HAND, source, game); + you.moveCards(cardsToHand, Zone.HAND, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ThoughtLash.java b/Mage.Sets/src/mage/sets/masterseditionii/ThoughtLash.java index cd7be652931..45b045fd0a7 100644 --- a/Mage.Sets/src/mage/sets/masterseditionii/ThoughtLash.java +++ b/Mage.Sets/src/mage/sets/masterseditionii/ThoughtLash.java @@ -131,7 +131,7 @@ class ThoughtLashExileLibraryEffect extends OneShotEffect { if (controller != null) { Cards cards = new CardsImpl(); cards.addAll(controller.getLibrary().getTopCards(game, controller.getLibrary().size())); - controller.moveCards(cards, Zone.LIBRARY, Zone.EXILED, source, game); + controller.moveCards(cards, Zone.EXILED, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java index 7b19e41816f..e49dd207a36 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java @@ -108,7 +108,7 @@ class SpoilsOfTheVaultEffect extends OneShotEffect { } } controller.revealCards(sourceObject.getIdName(), cardsToReveal, game); - controller.moveCards(cardsToExile, null, Zone.EXILED, source, game); + controller.moveCards(cardsToExile, Zone.EXILED, source, game); controller.loseLife(cardsToExile.size(), game); return true; diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AllSunsDawn.java b/Mage.Sets/src/mage/sets/modernmasters2015/AllSunsDawn.java index 3a3bbbf4690..28b28e6af8d 100644 --- a/Mage.Sets/src/mage/sets/modernmasters2015/AllSunsDawn.java +++ b/Mage.Sets/src/mage/sets/modernmasters2015/AllSunsDawn.java @@ -120,7 +120,7 @@ class AllSunsDawnEffect extends OneShotEffect { cardsToHand.add(card); } } - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java b/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java index ad2893b38ab..71ee27cf4d8 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java @@ -98,7 +98,7 @@ class LifesFinaleEffect extends OneShotEffect { if (player != null && opponent != null) { TargetCardInLibrary target = new TargetCardInLibrary(0, 3, new FilterCreatureCard("creature cards from his library to put in his graveyard")); if (player.searchLibrary(target, game, opponent.getId())) { - player.moveCards(new CardsImpl(target.getTargets()), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(new CardsImpl(target.getTargets()), Zone.GRAVEYARD, source, game); } opponent.shuffleLibrary(source, game); return true; diff --git a/Mage.Sets/src/mage/sets/onslaught/WeirdHarvest.java b/Mage.Sets/src/mage/sets/onslaught/WeirdHarvest.java index f430e4541d9..7fe96967e7b 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WeirdHarvest.java +++ b/Mage.Sets/src/mage/sets/onslaught/WeirdHarvest.java @@ -118,7 +118,7 @@ class WeirdHarvestEffect extends OneShotEffect { if (player.searchLibrary(target, game)) { if (target.getTargets().size() > 0) { Cards cards = new CardsImpl(target.getTargets()); - player.moveCards(cards, null, Zone.HAND, source, game); + player.moveCards(cards, Zone.HAND, source, game); player.revealCards(sourceObject.getIdName() + " (" + player.getName() + ")", cards, game); } } diff --git a/Mage.Sets/src/mage/sets/planarchaos/ShroudedLore.java b/Mage.Sets/src/mage/sets/planarchaos/ShroudedLore.java index 705affbb8bd..12bde406768 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ShroudedLore.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ShroudedLore.java @@ -132,7 +132,7 @@ class ShroudedLoreEffect extends OneShotEffect { if(card != null) { Cards cardsToHand = new CardsImpl(); cardsToHand.add(card); - you.moveCards(cardsToHand, Zone.GRAVEYARD, Zone.HAND, source, game); + you.moveCards(cardsToHand, Zone.HAND, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/Gleancrawler.java b/Mage.Sets/src/mage/sets/prereleaseevents/Gleancrawler.java index 6ae7bbbde66..4ad26bc5b41 100644 --- a/Mage.Sets/src/mage/sets/prereleaseevents/Gleancrawler.java +++ b/Mage.Sets/src/mage/sets/prereleaseevents/Gleancrawler.java @@ -117,7 +117,7 @@ class GleancrawlerEffect extends OneShotEffect { } } } - controller.moveCards(cardsToHand, Zone.GRAVEYARD, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/ravnica/Grozoth.java b/Mage.Sets/src/mage/sets/ravnica/Grozoth.java index f6dd13b3a67..040a36acb83 100644 --- a/Mage.Sets/src/mage/sets/ravnica/Grozoth.java +++ b/Mage.Sets/src/mage/sets/ravnica/Grozoth.java @@ -128,7 +128,7 @@ class GrozothEffect extends SearchEffect { } } player.revealCards(sourceCard.getIdName(), cards, game); - player.moveCards(cards, Zone.LIBRARY, Zone.HAND, source, game); + player.moveCards(cards, Zone.HAND, source, game); } player.shuffleLibrary(source, game); return true; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DestroyTheEvidence.java b/Mage.Sets/src/mage/sets/returntoravnica/DestroyTheEvidence.java index 15dfea14f46..fd47c0782a0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DestroyTheEvidence.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DestroyTheEvidence.java @@ -114,7 +114,7 @@ class DestroyTheEvidenceEffect extends OneShotEffect { } } player.revealCards(sourceObject.getName(), cards, game, true); - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java b/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java index 2564e53eb49..531dce2b461 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GrislySalvage.java @@ -116,7 +116,7 @@ class GrislySalvageEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java b/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java index cabc13af231..0a685745d52 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java @@ -124,7 +124,7 @@ class GuildFeudEffect extends OneShotEffect { } } } - player.moveCards(topThreeCards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(topThreeCards, Zone.GRAVEYARD, source, game); } } // If two creatures are put onto the battlefield this way, those creatures fight each other diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealmsUncharted.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealmsUncharted.java index 37a9c3372a2..46b55407229 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealmsUncharted.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RealmsUncharted.java @@ -128,8 +128,8 @@ class RealmsUnchartedEffect extends OneShotEffect { cards.removeAll(cardsToKeep); } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); - controller.moveCards(cardsToKeep, Zone.LIBRARY, Zone.HAND, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); + controller.moveCards(cardsToKeep, Zone.HAND, source, game); } controller.shuffleLibrary(source, game); return true; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java index 08d10749005..5ea5ce4ebdf 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java @@ -126,7 +126,7 @@ class GenesisWaveEffect extends OneShotEffect { } } controller.moveCards(toBattlefield, Zone.BATTLEFIELD, source, game, false, false, false, null); - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/seventhedition/AncestralMemories.java b/Mage.Sets/src/mage/sets/seventhedition/AncestralMemories.java index 32b515cc39f..8e748fb5a00 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/AncestralMemories.java +++ b/Mage.Sets/src/mage/sets/seventhedition/AncestralMemories.java @@ -112,7 +112,7 @@ class AncestralMemoriesEffect extends OneShotEffect { } } } - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AdviceFromTheFae.java b/Mage.Sets/src/mage/sets/shadowmoor/AdviceFromTheFae.java index 80c568ac4e8..f40fb47f995 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AdviceFromTheFae.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AdviceFromTheFae.java @@ -115,7 +115,7 @@ class AdviceFromTheFaeEffect extends OneShotEffect { TargetCard target = new TargetCard(moreCreatures ? 2 : 1, Zone.LIBRARY, new FilterCard()); if (controller.choose(Outcome.DrawCard, cardsFromLibrary, target, game)) { cardsFromLibrary.removeAll(target.getTargets()); - controller.moveCards(new CardsImpl(target.getTargets()), null, Zone.HAND, source, game); + controller.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); } controller.putCardsOnBottomOfLibrary(cardsFromLibrary, game, source, true); return true; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java index 7f684f62f4d..9b5f4c6fc7b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java @@ -121,7 +121,7 @@ class TwilightShepherdEffect extends OneShotEffect { } } } - controller.moveCards(cardsToHand, Zone.GRAVEYARD, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java index c9743be6bb4..d3aa48d02a2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java @@ -149,7 +149,7 @@ class TidehollowScullerLeaveEffect extends OneShotEffect { int zoneChangeCounter = (sourceObject instanceof PermanentToken) ? source.getSourceObjectZoneChangeCounter() : source.getSourceObjectZoneChangeCounter() - 1; ExileZone exZone = game.getExile().getExileZone(CardUtil.getExileZoneId(game, source.getSourceId(), zoneChangeCounter)); if (exZone != null) { - controller.moveCards(exZone, null, Zone.HAND, source, game); + controller.moveCards(exZone, Zone.HAND, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java b/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java index 3eeb728570b..263463ad0b2 100644 --- a/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java +++ b/Mage.Sets/src/mage/sets/stronghold/HermitDruid.java @@ -120,7 +120,7 @@ class HermitDruidEffect extends OneShotEffect { } while (library.size() > 0 && card != null && !filter.match(card, game)); if (!cards.isEmpty()) { - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); if (card != null) { cards.add(card); } diff --git a/Mage.Sets/src/mage/sets/tempest/Grindstone.java b/Mage.Sets/src/mage/sets/tempest/Grindstone.java index e8332d026cf..dd947828c7d 100644 --- a/Mage.Sets/src/mage/sets/tempest/Grindstone.java +++ b/Mage.Sets/src/mage/sets/tempest/Grindstone.java @@ -115,7 +115,7 @@ class GrindstoneEffect extends OneShotEffect { colorShared = card1.getColor(game).shares(targetPlayer.getLibrary().removeFromTop(game).getColor(game)); } } - targetPlayer.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + targetPlayer.moveCards(cards, Zone.GRAVEYARD, source, game); } while (colorShared && targetPlayer.canRespond()); return true; } diff --git a/Mage.Sets/src/mage/sets/tempest/Intuition.java b/Mage.Sets/src/mage/sets/tempest/Intuition.java index 5702eb8381a..46af1495f5e 100644 --- a/Mage.Sets/src/mage/sets/tempest/Intuition.java +++ b/Mage.Sets/src/mage/sets/tempest/Intuition.java @@ -122,7 +122,7 @@ class IntuitionEffect extends SearchEffect { cards.remove(card); controller.moveCards(card, Zone.HAND, source, game); } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } controller.shuffleLibrary(source, game); return true; diff --git a/Mage.Sets/src/mage/sets/tempest/Lobotomy.java b/Mage.Sets/src/mage/sets/tempest/Lobotomy.java index ea79144455a..104685c501f 100644 --- a/Mage.Sets/src/mage/sets/tempest/Lobotomy.java +++ b/Mage.Sets/src/mage/sets/tempest/Lobotomy.java @@ -154,7 +154,7 @@ class LobotomyEffect extends OneShotEffect { } if (!cardsToExile.isEmpty()) { - controller.moveCards(cardsToExile, null, Zone.EXILED, source, game); + controller.moveCards(cardsToExile, Zone.EXILED, source, game); } targetPlayer.shuffleLibrary(source, game); return true; diff --git a/Mage.Sets/src/mage/sets/tempest/WoodSage.java b/Mage.Sets/src/mage/sets/tempest/WoodSage.java index e820268608a..9cc189ca734 100644 --- a/Mage.Sets/src/mage/sets/tempest/WoodSage.java +++ b/Mage.Sets/src/mage/sets/tempest/WoodSage.java @@ -123,8 +123,8 @@ class WoodSageEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cardsToHand, Zone.LIBRARY, Zone.HAND, source, game); - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/thedark/DanceOfMany.java b/Mage.Sets/src/mage/sets/thedark/DanceOfMany.java index 147f295d9cc..406ad925989 100644 --- a/Mage.Sets/src/mage/sets/thedark/DanceOfMany.java +++ b/Mage.Sets/src/mage/sets/thedark/DanceOfMany.java @@ -163,7 +163,7 @@ class DanceOfManyExileTokenEffect extends OneShotEffect { for (Permanent permanent : tokenPermanents) { cards.add(permanent); } - controller.moveCards(cards, null, Zone.EXILED, source, game); + controller.moveCards(cards, Zone.EXILED, source, game); return true; } } diff --git a/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java b/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java index bd2e5256b6f..f69bde8dc03 100644 --- a/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java +++ b/Mage.Sets/src/mage/sets/theros/CommuneWithTheGods.java @@ -122,7 +122,7 @@ class CommuneWithTheGodsEffect extends OneShotEffect { } } - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java b/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java index 9f02ecd2f03..db36f22d58a 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java +++ b/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java @@ -239,7 +239,7 @@ class GrinningTotemPutIntoGraveyardEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); ExileZone zone = game.getExile().getExileZone(exileZoneId); if (controller != null && zone != null) { - return controller.moveCards(zone, Zone.EXILED, Zone.GRAVEYARD, source, game); + return controller.moveCards(zone, Zone.GRAVEYARD, source, game); } return false; } diff --git a/Mage.Sets/src/mage/sets/torment/MesmericFiend.java b/Mage.Sets/src/mage/sets/torment/MesmericFiend.java index 9654d92bff6..0fc01307b6c 100644 --- a/Mage.Sets/src/mage/sets/torment/MesmericFiend.java +++ b/Mage.Sets/src/mage/sets/torment/MesmericFiend.java @@ -147,7 +147,7 @@ class MesmericFiendLeaveEffect extends OneShotEffect { int zoneChangeCounter = (sourceObject instanceof PermanentToken) ? source.getSourceObjectZoneChangeCounter() : source.getSourceObjectZoneChangeCounter() - 1; ExileZone exZone = game.getExile().getExileZone(CardUtil.getExileZoneId(game, source.getSourceId(), zoneChangeCounter)); if (exZone != null) { - return controller.moveCards(exZone, null, Zone.HAND, source, game); + return controller.moveCards(exZone, Zone.HAND, source, game); } } return false; diff --git a/Mage.Sets/src/mage/sets/urzassaga/NoRestForTheWicked.java b/Mage.Sets/src/mage/sets/urzassaga/NoRestForTheWicked.java index 8d3b3c4a02d..b05c92e0a00 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/NoRestForTheWicked.java +++ b/Mage.Sets/src/mage/sets/urzassaga/NoRestForTheWicked.java @@ -101,7 +101,7 @@ class NoRestForTheWickedEffect extends OneShotEffect { } } } - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/weatherlight/SpinningDarkness.java b/Mage.Sets/src/mage/sets/weatherlight/SpinningDarkness.java index 3adbb45eb8b..94ca45fde91 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/SpinningDarkness.java +++ b/Mage.Sets/src/mage/sets/weatherlight/SpinningDarkness.java @@ -118,7 +118,7 @@ class SpinningDarknessCost extends CostImpl { } i++; } - paid = controller.moveCards(cardsToExile, Zone.GRAVEYARD, Zone.EXILED, ability, game); + paid = controller.moveCards(cardsToExile, Zone.EXILED, ability, game); } } return paid; diff --git a/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java b/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java index 9c0ccd380df..d663b1876cf 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java +++ b/Mage.Sets/src/mage/sets/zendikar/BeastHunt.java @@ -96,8 +96,8 @@ class BeastHuntEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cardsToHand, Zone.LIBRARY, Zone.HAND, source, game); - controller.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); + controller.moveCards(cards, Zone.GRAVEYARD, 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 68f3b51f58a..62e89e3e74f 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 @@ -1882,24 +1882,6 @@ public class TestPlayer implements Player { return computerPlayer.getCommanderId(); } - @Override - @Deprecated - public boolean moveCards(Cards cards, Zone fromZone, Zone toZone, Ability source, Game game) { - return computerPlayer.moveCards(cards, fromZone, toZone, source, game); - } - - @Override - @Deprecated - public boolean moveCards(Card card, Zone fromZone, Zone toZone, Ability source, Game game) { - return computerPlayer.moveCards(card, toZone, source, game); - } - - @Override - @Deprecated - public boolean moveCards(Set cards, Zone toZone, Ability source, Game game) { - return computerPlayer.moveCards(cards, toZone, source, game); - } - @Override public boolean moveCardToHandWithInfo(Card card, UUID sourceId, Game game) { return computerPlayer.moveCardToHandWithInfo(card, sourceId, game); @@ -2156,7 +2138,7 @@ public class TestPlayer implements Player { } @Override - public boolean moveCards(Set cards, Zone fromZone, Zone toZone, Ability source, Game game) { + public boolean moveCards(Set cards, Zone toZone, Ability source, Game game) { return computerPlayer.moveCards(cards, toZone, source, game); } diff --git a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java index 9a601cb185c..dbc17018ca1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java +++ b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java @@ -1093,21 +1093,6 @@ public class PlayerStub implements Player { return null; } - @Override - public boolean moveCards(Cards cards, Zone fromZone, Zone toZone, Ability source, Game game) { - return false; - } - - @Override - public boolean moveCards(Card card, Zone fromZone, Zone toZone, Ability source, Game game) { - return false; - } - - @Override - public boolean moveCards(Set cards, Zone fromZone, Zone toZone, Ability source, Game game) { - return false; - } - @Override public boolean moveCards(Card card, Zone toZone, Ability source, Game game) { return false; diff --git a/Mage/src/main/java/mage/abilities/effects/common/EnvoyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EnvoyEffect.java index d9e584f607e..4ca8bb884eb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EnvoyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EnvoyEffect.java @@ -84,7 +84,7 @@ public class EnvoyEffect extends OneShotEffect { } } cards.removeAll(cardsToHand); - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); controller.putCardsOnBottomOfLibrary(cards, game, source, true); return true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java index 7a6e0a52314..9ca03c05f0d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java @@ -53,7 +53,7 @@ public class ExileCardsFromTopOfLibraryTargetEffect extends OneShotEffect { if (targetPlayer != null) { Cards cards = new CardsImpl(); cards.addAll(targetPlayer.getLibrary().getTopCards(game, amount)); - return targetPlayer.moveCards(cards, null, Zone.EXILED, source, game); + return targetPlayer.moveCards(cards, Zone.EXILED, source, game); } return false; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java index e6c84829921..cb152f0370e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java @@ -171,7 +171,7 @@ public class LookLibraryControllerEffect extends OneShotEffect { } break; case GRAVEYARD: - player.moveCards(cards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(cards, Zone.GRAVEYARD, source, game); break; default: // not supported yet diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandChosenPermanentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandChosenPermanentEffect.java index e0781818931..ccb9e974786 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandChosenPermanentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandChosenPermanentEffect.java @@ -77,7 +77,7 @@ public class ReturnToHandChosenPermanentEffect extends OneShotEffect { if (available > 0) { TargetControlledPermanent target = new TargetControlledPermanent(Math.min(number, available), number, filter, true); if (player.chooseTarget(this.outcome, target, source, game)) { - player.moveCards(new CardsImpl(target.getTargets()), Zone.BATTLEFIELD, Zone.HAND, source, game); + player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); } } return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java index 19e50a63aca..22b744a50c3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java @@ -97,7 +97,7 @@ public class RevealLibraryPutIntoHandEffect extends OneShotEffect { cards.remove(card); } } - controller.moveCards(cardsToHand, null, Zone.HAND, source, game); + controller.moveCards(cardsToHand, Zone.HAND, source, game); controller.putCardsOnBottomOfLibrary(cards, game, source, anyOrder); return true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java index 9a320f3a7eb..563a3d4c47b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java @@ -58,7 +58,7 @@ public class ShuffleIntoLibraryGraveOfSourceOwnerEffect extends OneShotEffect { } Player owner = game.getPlayer(ownerId); if (owner != null) { - owner.moveCards(owner.getGraveyard(), null, Zone.LIBRARY, source, game); + owner.moveCards(owner.getGraveyard(), Zone.LIBRARY, source, game); owner.shuffleLibrary(source, game); return true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java index de5bbdc6c2d..a992a18e792 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java @@ -98,7 +98,7 @@ public class SearchLibraryPutInHandEffect extends SearchEffect { cards.add(card); } } - controller.moveCards(cards, null, Zone.HAND, source, game); + controller.moveCards(cards, Zone.HAND, source, game); if (revealCards) { String name = "Reveal"; Card sourceCard = game.getCard(source.getSourceId()); diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java index 53dadbe70f6..229b7d8bea1 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java @@ -74,7 +74,7 @@ public class SweepEffect extends OneShotEffect { Target target = new TargetPermanent(0, Integer.MAX_VALUE, filter, true); if (controller.chooseTarget(outcome, target, source, game)) { game.getState().setValue(CardUtil.getCardZoneString("sweep", source.getSourceId(), game), target.getTargets().size()); - controller.moveCards(new CardsImpl(target.getTargets()), null, Zone.HAND, source, game); + controller.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); } return true; } diff --git a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java index 8ed7e284468..100c0e74734 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java @@ -85,7 +85,7 @@ class TransmuteEffect extends OneShotEffect { if (target.getTargets().size() > 0) { Cards revealed = new CardsImpl(target.getTargets()); controller.revealCards(sourceObject.getIdName(), revealed, game); - controller.moveCards(revealed, null, Zone.HAND, source, game); + controller.moveCards(revealed, Zone.HAND, source, game); } } controller.shuffleLibrary(source, game); diff --git a/Mage/src/main/java/mage/cards/Card.java b/Mage/src/main/java/mage/cards/Card.java index b5525dc669f..abea174164f 100644 --- a/Mage/src/main/java/mage/cards/Card.java +++ b/Mage/src/main/java/mage/cards/Card.java @@ -141,6 +141,8 @@ public interface Card extends MageObject { boolean putOntoBattlefield(Game game, Zone fromZone, UUID sourceId, UUID controllerId, boolean tapped, boolean facedown, ArrayList appliedEffects); + void setZone(Zone zone, Game game); + List getMana(); void build(); @@ -172,6 +174,4 @@ public interface Card extends MageObject { * returned */ Card getMainCard(); - - void setZone(Zone zone, Game game); } diff --git a/Mage/src/main/java/mage/players/Player.java b/Mage/src/main/java/mage/players/Player.java index 72cdb89893b..f476c8c5a3f 100644 --- a/Mage/src/main/java/mage/players/Player.java +++ b/Mage/src/main/java/mage/players/Player.java @@ -654,27 +654,17 @@ public interface Player extends MageItem, Copyable { * Moves cards from one zone to another * * @param cards - * @param fromZone * @param toZone * @param source * @param game * @return */ - @Deprecated - boolean moveCards(Cards cards, Zone fromZone, Zone toZone, Ability source, Game game); - - @Deprecated - boolean moveCards(Card card, Zone fromZone, Zone toZone, Ability source, Game game); - - @Deprecated - boolean moveCards(Set cards, Zone fromZone, Zone toZone, Ability source, Game game); + boolean moveCards(Cards cards, Zone toZone, Ability source, Game game); boolean moveCards(Card card, Zone toZone, Ability source, Game game); boolean moveCards(Card card, Zone toZone, Ability source, Game game, boolean tapped, boolean faceDown, boolean byOwner, ArrayList appliedEffects); - boolean moveCards(Cards cards, Zone toZone, Ability source, Game game); - boolean moveCards(Set cards, Zone toZone, Ability source, Game game); /** diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 02bb023242b..d921af4bd41 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -3116,55 +3116,6 @@ public abstract class PlayerImpl implements Player, Serializable { return this.commanderId; } - @Override - public boolean moveCards(Cards cards, Zone fromZone, Zone toZone, Ability source, Game game) { - if (cards.isEmpty()) { - return true; - } - Set cardList = new HashSet<>(); - for (UUID cardId : cards) { - fromZone = game.getState().getZone(cardId); - if (Zone.BATTLEFIELD.equals(fromZone)) { - Permanent permanent = game.getPermanent(cardId); - if (permanent != null) { - cardList.add(permanent); - } - } else { - Card card = game.getCard(cardId); - if (card == null) { - Spell spell = game.getState().getStack().getSpell(cardId); - if (spell != null) { - if (!spell.isCopy()) { - card = spell.getCard(); - } else { - // If a spell is returned to its owner's hand, it's removed from the stack and thus will not resolve - game.getStack().remove(spell); - game.informPlayers(spell.getLogName() + " was removed from the stack"); - } - } - } - if (card != null) { - cardList.add(card); - } - } - } - return moveCards(cardList, toZone, source, game); - } - - @Override - public boolean moveCards(Card card, Zone fromZone, Zone toZone, Ability source, Game game) { - Set cardList = new HashSet<>(); - if (card != null) { - cardList.add(card); - } - return moveCards(cardList, toZone, source, game); - } - - @Override - public boolean moveCards(Set cards, Zone fromZone, Zone toZone, Ability source, Game game) { - return moveCards(cards, toZone, source, game); - } - @Override public boolean moveCards(Card card, Zone toZone, Ability source, Game game) { return moveCards(card, toZone, source, game, false, false, false, null);