diff --git a/Mage.Sets/src/mage/sets/commander/SzadekLordOfSecrets.java b/Mage.Sets/src/mage/sets/commander/SzadekLordOfSecrets.java index e726058f039..e8616baff45 100644 --- a/Mage.Sets/src/mage/sets/commander/SzadekLordOfSecrets.java +++ b/Mage.Sets/src/mage/sets/commander/SzadekLordOfSecrets.java @@ -101,7 +101,7 @@ class SzadekLordOfSecretsEffect extends ReplacementEffectImpl { if (permanent != null) { permanent.addCounters(CounterType.P1P1.createInstance(damageEvent.getAmount()), game); if (damagedPlayer != null) { - damagedPlayer.moveCards(damagedPlayer.getLibrary().getTopCards(game, damageEvent.getAmount()), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + damagedPlayer.moveCards(damagedPlayer.getLibrary().getTopCards(game, damageEvent.getAmount()), Zone.GRAVEYARD, source, game); } } } diff --git a/Mage.Sets/src/mage/sets/conspiracy/ExtractFromDarkness.java b/Mage.Sets/src/mage/sets/conspiracy/ExtractFromDarkness.java index ec1c37fda95..8ed4db0abdb 100644 --- a/Mage.Sets/src/mage/sets/conspiracy/ExtractFromDarkness.java +++ b/Mage.Sets/src/mage/sets/conspiracy/ExtractFromDarkness.java @@ -83,7 +83,7 @@ class ExtractFromDarknessMillEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - player.moveCards(player.getLibrary().getTopCards(game, 2), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(player.getLibrary().getTopCards(game, 2), Zone.GRAVEYARD, source, game); } } return true; diff --git a/Mage.Sets/src/mage/sets/darkascension/ChillOfForeboding.java b/Mage.Sets/src/mage/sets/darkascension/ChillOfForeboding.java index 876c2a976ff..f47acc86257 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ChillOfForeboding.java +++ b/Mage.Sets/src/mage/sets/darkascension/ChillOfForeboding.java @@ -90,7 +90,7 @@ class ChillOfForebodingEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(sourcePlayer.getId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - player.moveCards(player.getLibrary().getTopCards(game, 5), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(player.getLibrary().getTopCards(game, 5), Zone.GRAVEYARD, source, game); } } return true; diff --git a/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java b/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java index 6b8e1ca96c8..d4594c509ed 100644 --- a/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java +++ b/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java @@ -90,7 +90,7 @@ class IncreasingConfusionEffect extends OneShotEffect { if (spell.getFromZone() == Zone.GRAVEYARD) { amount *= 2; } - player.moveCards(player.getLibrary().getTopCards(game, amount), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(player.getLibrary().getTopCards(game, amount), Zone.GRAVEYARD, source, game); return true; } } diff --git a/Mage.Sets/src/mage/sets/dissension/TrialError.java b/Mage.Sets/src/mage/sets/dissension/TrialError.java index 022c32e6bc5..b4630ce77cf 100644 --- a/Mage.Sets/src/mage/sets/dissension/TrialError.java +++ b/Mage.Sets/src/mage/sets/dissension/TrialError.java @@ -125,7 +125,7 @@ class TrialEffect extends OneShotEffect { } } } - controller.moveCards(toHand, null, Zone.HAND, source, game); + controller.moveCards(toHand, Zone.HAND, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java b/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java index 9e7512c47dc..3f445c6b263 100644 --- a/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java +++ b/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java @@ -96,7 +96,7 @@ class SanityGrindingEffect extends OneShotEffect { Player targetOpponent = game.getPlayer(source.getFirstTarget()); if (targetOpponent != null) { targetOpponent.moveCards(targetOpponent.getLibrary().getTopCards(game, new ChromaSanityGrindingCount(revealed).calculate(game, source, this)), - Zone.LIBRARY, Zone.GRAVEYARD, source, game); + Zone.GRAVEYARD, source, game); } return controller.putCardsOnBottomOfLibrary(revealed, game, source, true); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java index 6e7d45ed3d4..c1e57dbad3b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java @@ -93,7 +93,7 @@ class PsychicStrikeEffect extends OneShotEffect { if (stackObject != null) { Player controller = game.getPlayer(stackObject.getControllerId()); if (controller != null) { - controller.moveCards(controller.getLibrary().getTopCards(game, 2), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(controller.getLibrary().getTopCards(game, 2), Zone.GRAVEYARD, source, game); } } return countered; diff --git a/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java b/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java index 2736968ab2c..8a3b28890a2 100644 --- a/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java +++ b/Mage.Sets/src/mage/sets/iceage/DemonicConsultation.java @@ -102,7 +102,7 @@ class DemonicConsultationEffect extends OneShotEffect { game.informPlayers("Card named: " + name); // Exile the top six cards of your library, - controller.moveCards(controller.getLibrary().getTopCards(game, 6), null, Zone.EXILED, source, game); + controller.moveCards(controller.getLibrary().getTopCards(game, 6), Zone.EXILED, source, game); // then reveal cards from the top of your library until you reveal the named card. Cards cardsToReaveal = new CardsImpl(); diff --git a/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java b/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java index 764bbbdea46..7400d72f084 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java +++ b/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java @@ -93,7 +93,7 @@ class HereticsPunishmentEffect extends OneShotEffect { maxCost = test; } } - controller.moveCards(cardList, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(cardList, Zone.GRAVEYARD, source, game); Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); if (permanent != null) { permanent.damage(maxCost, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java b/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java index 448bfd2d98c..4bc0fd520eb 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java +++ b/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java @@ -137,7 +137,7 @@ class UndeadAlchemistEffect extends ReplacementEffectImpl { public boolean replaceEvent(GameEvent event, Ability source, Game game) { Player player = game.getPlayer(event.getTargetId()); if (player != null) { - return player.moveCards(player.getLibrary().getTopCards(game, event.getAmount()), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + return player.moveCards(player.getLibrary().getTopCards(game, event.getAmount()), Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Countermand.java b/Mage.Sets/src/mage/sets/journeyintonyx/Countermand.java index 9f4f5e009b6..9d5e09c71cd 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Countermand.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Countermand.java @@ -92,7 +92,7 @@ class CountermandEffect extends OneShotEffect { if (stackObject != null) { Player controller = game.getPlayer(stackObject.getControllerId()); if (controller != null) { - controller.moveCards(controller.getLibrary().getTopCards(game, 4), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(controller.getLibrary().getTopCards(game, 4), Zone.GRAVEYARD, source, game); } } return countered; diff --git a/Mage.Sets/src/mage/sets/judgment/BookBurning.java b/Mage.Sets/src/mage/sets/judgment/BookBurning.java index c6ff0c160f7..8f560844fbf 100644 --- a/Mage.Sets/src/mage/sets/judgment/BookBurning.java +++ b/Mage.Sets/src/mage/sets/judgment/BookBurning.java @@ -97,7 +97,7 @@ class BookBurningMillEffect extends OneShotEffect { if (millCards) { Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, 6), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, 6), Zone.GRAVEYARD, source, game); } } return true; diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java b/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java index ae9d55961da..9859e73ec42 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java @@ -102,7 +102,7 @@ class NarsetEnlightenedMasterExileEffect extends OneShotEffect { MageObject sourceObject = game.getObject(source.getSourceId()); if (player != null && sourceObject != null) { Set cards = player.getLibrary().getTopCards(game, 4); - player.moveCards(cards, Zone.LIBRARY, Zone.EXILED, source, game); + player.moveCards(cards, Zone.EXILED, source, game); for (Card card : cards) { if (game.getState().getZone(card.getId()) == Zone.EXILED && !card.getCardType().contains(CardType.CREATURE) diff --git a/Mage.Sets/src/mage/sets/lorwyn/BrokenAmbitions.java b/Mage.Sets/src/mage/sets/lorwyn/BrokenAmbitions.java index cfa6b0f536f..8770da15158 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BrokenAmbitions.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BrokenAmbitions.java @@ -124,7 +124,7 @@ class BrokenAmbitionsEffect extends OneShotEffect { game.getStack().counter(spell.getId(), source.getSourceId(), game); } if (ClashEffect.getInstance().apply(game, source)) { - controller.moveCards(controller.getLibrary().getTopCards(game, 4), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(controller.getLibrary().getTopCards(game, 4), Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java b/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java index 0908b9e2dcc..cf94c1d05be 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java +++ b/Mage.Sets/src/mage/sets/magic2010/WarpWorld.java @@ -113,7 +113,7 @@ class WarpWorldEffect extends OneShotEffect { Integer count = 0; if (set != null) { count = set.size(); - player.moveCards(set, Zone.BATTLEFIELD, Zone.LIBRARY, source, game); + player.moveCards(set, Zone.LIBRARY, source, game); } if (count > 0) { diff --git a/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java b/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java index e303d2ccde0..76004bcfa45 100644 --- a/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java +++ b/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java @@ -107,7 +107,7 @@ class JaceMindseekerEffect extends OneShotEffect { Player targetOpponent = game.getPlayer(targetPointer.getFirst(game, source)); if (targetOpponent != null) { Set allCards = targetOpponent.getLibrary().getTopCards(game, 5); - targetOpponent.moveCards(allCards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + targetOpponent.moveCards(allCards, Zone.GRAVEYARD, source, game); for (Card card : allCards) { if (filter.match(card, game)) { Zone zone = game.getState().getZone(card.getId()); diff --git a/Mage.Sets/src/mage/sets/magicorigins/TalentOfTheTelepath.java b/Mage.Sets/src/mage/sets/magicorigins/TalentOfTheTelepath.java index f23e353f510..0a22395eded 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/TalentOfTheTelepath.java +++ b/Mage.Sets/src/mage/sets/magicorigins/TalentOfTheTelepath.java @@ -141,7 +141,7 @@ class TalentOfTheTelepathEffect extends OneShotEffect { } } - targetOpponent.moveCards(allCards, Zone.LIBRARY, Zone.GRAVEYARD, source, game); + targetOpponent.moveCards(allCards, Zone.GRAVEYARD, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CrumblingSanctuary.java b/Mage.Sets/src/mage/sets/mercadianmasques/CrumblingSanctuary.java index 69087dd02a8..57cfafbc1c6 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CrumblingSanctuary.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CrumblingSanctuary.java @@ -92,7 +92,7 @@ class CrumblingSanctuaryEffect extends PreventionEffectImpl { Player player = game.getPlayer(event.getTargetId()); if(player != null) { preventDamageAction(event, source, game); - player.moveCards(player.getLibrary().getTopCards(game, amount), Zone.LIBRARY, Zone.EXILED, source, game); + player.moveCards(player.getLibrary().getTopCards(game, amount), Zone.EXILED, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java index 2154c98c3e0..10e00be5e0a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java @@ -136,7 +136,7 @@ class ChancellorOfTheSpiresEffect extends OneShotEffect { for (UUID opponentId : game.getOpponents(source.getControllerId())) { Player opponent = game.getPlayer(opponentId); if (opponent != null) { - opponent.moveCards(opponent.getLibrary().getTopCards(game, 7), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + opponent.moveCards(opponent.getLibrary().getTopCards(game, 7), Zone.GRAVEYARD, source, game); } } return true; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java b/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java index 6fc8128a350..7708baf7e4d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java @@ -131,7 +131,7 @@ class MindcrankEffect extends OneShotEffect { if (amount == null) { amount = 0; } - targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, amount), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, amount), Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java b/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java index 8a25adbaa50..5db7135f24c 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java @@ -90,7 +90,7 @@ class PsychicSpiralEffect extends OneShotEffect { if (cardsInGraveyard > 0) { Player targetPlayer = game.getPlayer(source.getFirstTarget()); if (targetPlayer != null) { - targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, cardsInGraveyard), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, cardsInGraveyard), Zone.GRAVEYARD, source, game); } } return true; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java index 60cf32f6cfe..37d7cddc2b9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java @@ -89,7 +89,7 @@ class KeeningStoneEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { - player.moveCards(player.getLibrary().getTopCards(game, player.getGraveyard().size()), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(player.getLibrary().getTopCards(game, player.getGraveyard().size()), Zone.GRAVEYARD, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java index 673758910b8..f0f772ff372 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java @@ -106,7 +106,7 @@ class CloudhoofKirinEffect extends OneShotEffect { } } if (targetPlayer != null) { - return targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, spell.getConvertedManaCost()), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + return targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, spell.getConvertedManaCost()), Zone.GRAVEYARD, source, game); } } return false; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java index 51a04054f99..5819d908429 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java @@ -86,7 +86,7 @@ class GrindclockEffect extends OneShotEffect { int amount = game.getPermanent(source.getSourceId()).getCounters().getCount(CounterType.CHARGE); Player targetPlayer = game.getPlayer(source.getFirstTarget()); if (targetPlayer != null) { - targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, amount), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + targetPlayer.moveCards(targetPlayer.getLibrary().getTopCards(game, amount), Zone.GRAVEYARD, source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/HarnessTheStorm.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/HarnessTheStorm.java index 503a8a488d4..af27241646d 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/HarnessTheStorm.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/HarnessTheStorm.java @@ -27,8 +27,10 @@ */ package mage.sets.shadowsoverinnistrad; +import java.util.LinkedHashMap; import java.util.UUID; import mage.abilities.Ability; +import mage.abilities.ActivatedAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -133,7 +135,10 @@ class HarnessTheStormEffect extends OneShotEffect { Card card = controller.getGraveyard().get(getTargetPointer().getFirst(game, source), game); if (card != null) { if (controller.chooseUse(outcome, "Cast " + card.getIdName() + " from your graveyard?", source, game)) { - controller.cast(card.getSpellAbility(), game, false); + //LinkedHashMap useableAbilities = controller.getUseableActivatedAbilities(object, zone, game); + //if (useableAbilities != null && useableAbilities.size() > 0) { + //controller.activateAbility(useableAbilities, card, game); + //} } } return true; diff --git a/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java b/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java index 1aa12cadfd7..29b1013c6a6 100644 --- a/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java +++ b/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java @@ -102,7 +102,7 @@ class AltarOfDementiaEffect extends OneShotEffect { } } if (amount > 0) { - player.moveCards(player.getLibrary().getTopCards(game, amount), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(player.getLibrary().getTopCards(game, amount), Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/tenthedition/Traumatize.java b/Mage.Sets/src/mage/sets/tenthedition/Traumatize.java index e4a78743236..06947ac5fad 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/Traumatize.java +++ b/Mage.Sets/src/mage/sets/tenthedition/Traumatize.java @@ -80,7 +80,7 @@ class TraumatizeEffect extends OneShotEffect { Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { int amount = player.getLibrary().size() / 2; - return player.moveCards(player.getLibrary().getTopCards(game, amount), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + return player.moveCards(player.getLibrary().getTopCards(game, amount), Zone.GRAVEYARD, source, game); } return false; } diff --git a/Mage.Sets/src/mage/sets/torment/CephalidVandal.java b/Mage.Sets/src/mage/sets/torment/CephalidVandal.java index 6aa724c6288..58ead923f01 100644 --- a/Mage.Sets/src/mage/sets/torment/CephalidVandal.java +++ b/Mage.Sets/src/mage/sets/torment/CephalidVandal.java @@ -98,7 +98,7 @@ class CephalidVandalEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null && controller != null) { int amount = permanent.getCounters().getCount(CounterType.SHRED); - controller.moveCards(controller.getLibrary().getTopCards(game, amount), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + controller.moveCards(controller.getLibrary().getTopCards(game, amount), Zone.GRAVEYARD, source, game); } return true; } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Whetstone.java b/Mage.Sets/src/mage/sets/urzassaga/Whetstone.java index e3e2cc72d3d..9d57fda2e42 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Whetstone.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Whetstone.java @@ -82,7 +82,7 @@ class WhetstoneEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - player.moveCards(player.getLibrary().getTopCards(game, 2), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(player.getLibrary().getTopCards(game, 2), 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 0a48edc89ce..77171586c40 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 @@ -1864,8 +1864,8 @@ public class TestPlayer implements Player { @Override @Deprecated - public boolean moveCards(Set cards, Zone fromZone, Zone toZone, Ability source, Game game) { - return computerPlayer.moveCards(cards, fromZone, toZone, source, game); + public boolean moveCards(Set cards, Zone toZone, Ability source, Game game) { + return computerPlayer.moveCards(cards, toZone, source, game); } @Override @@ -2124,7 +2124,7 @@ public class TestPlayer implements Player { } @Override - public boolean moveCards(Set cards, Zone toZone, Ability source, Game game) { + public boolean moveCards(Set cards, Zone fromZone, Zone toZone, Ability source, Game game) { return computerPlayer.moveCards(cards, toZone, source, game); } diff --git a/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java index 31cc6b2422e..6da0f046e92 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java @@ -59,7 +59,7 @@ public class PutTopCardOfYourLibraryToGraveyardCost extends CostImpl { Player player = game.getPlayer(controllerId); if (player != null && player.getLibrary().size() >= numberOfCards) { paid = true; - player.moveCards(player.getLibrary().getTopCards(game, numberOfCards), Zone.LIBRARY, Zone.GRAVEYARD, ability, game); + player.moveCards(player.getLibrary().getTopCards(game, numberOfCards), Zone.GRAVEYARD, ability, game); } return paid; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java index 2efd33a0420..8caeff03b84 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java @@ -74,7 +74,7 @@ public class PutLibraryIntoGraveTargetEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { - player.moveCards(player.getLibrary().getTopCards(game, amount.calculate(game, source, this)), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + player.moveCards(player.getLibrary().getTopCards(game, amount.calculate(game, source, this)), Zone.GRAVEYARD, source, game); return true; } return false; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveControllerEffect.java index 655f8e14dbe..26796d81562 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveControllerEffect.java @@ -65,7 +65,7 @@ public class PutTopCardOfLibraryIntoGraveControllerEffect extends OneShotEffect public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - return controller.moveCards(controller.getLibrary().getTopCards(game, numberCards), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + return controller.moveCards(controller.getLibrary().getTopCards(game, numberCards), Zone.GRAVEYARD, source, game); } return false; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java index 9ec478115c1..2d2948ad150 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java @@ -68,7 +68,7 @@ public class PutTopCardOfLibraryIntoGraveTargetEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { - return player.moveCards(player.getLibrary().getTopCards(game, numberCards.calculate(game, source, this)), Zone.LIBRARY, Zone.GRAVEYARD, source, game); + return player.moveCards(player.getLibrary().getTopCards(game, numberCards.calculate(game, source, this)), Zone.GRAVEYARD, source, game); } return false; } diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 71bce77c5c7..2a5afe4ecbe 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -3102,7 +3102,7 @@ public abstract class PlayerImpl implements Player, Serializable { } } } - return moveCards(cardList, fromZone, toZone, source, game); + return moveCards(cardList, toZone, source, game); } @Override @@ -3111,12 +3111,12 @@ public abstract class PlayerImpl implements Player, Serializable { if (card != null) { cardList.add(card); } - return moveCards(cardList, fromZone, toZone, source, game); + 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, false, false, false, null); + public boolean moveCards(Set cards, Zone toZone, Ability source, Game game) { + return moveCards(cards, toZone, source, game); } @Override @@ -3139,7 +3139,7 @@ public abstract class PlayerImpl implements Player, Serializable { } @Override - public boolean moveCards(Set cards, Zone toZone, Ability source, Game game) { + public boolean moveCards(Set cards, Zone fromZone, Zone toZone, Ability source, Game game) { return moveCards(cards, toZone, source, game, false, false, false, null); }