From 31bc96d16ad340d8c7d2d45a31fc273480759c64 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 26 Sep 2016 23:04:07 +0200 Subject: [PATCH] * Astral Slide - Some clean up. --- Mage.Sets/src/mage/sets/onslaught/AstralSlide.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java index 6514c819f3..1b624dfc26 100644 --- a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java +++ b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java @@ -84,20 +84,19 @@ class AstralSlideEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - MageObject sourceObject = game.getObject(source.getSourceId()); + MageObject sourceObject = source.getSourceObject(game); if (controller != null && sourceObject != null) { - Permanent permanent = game.getPermanent(source.getFirstTarget()); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { UUID exileId = UUID.randomUUID(); - if (controller.moveCardToExileWithInfo(permanent, exileId, sourceObject.getIdName(), source.getSourceId(), game, Zone.BATTLEFIELD, true)) { + if (controller.moveCardsToExile(permanent, source, game, true, exileId, sourceObject.getIdName())) { //create delayed triggered ability AtTheBeginOfNextEndStepDelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnFromExileEffect(exileId, Zone.BATTLEFIELD, false)); game.addDelayedTriggeredAbility(delayedAbility, source); - return true; } } + return true; } - return false; }