diff --git a/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java b/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java index 890a086a725..748c3d4bb2a 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java @@ -43,6 +43,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.players.Player; +import mage.target.targetpointer.FixedTarget; import mage.watchers.WatcherImpl; /** @@ -95,6 +96,7 @@ class MaelstromNexusTriggeredAbility extends TriggeredAbilityImpl { Card card; Player player = game.getPlayer(source.getControllerId()); ExileZone exile = game.getExile().createZone(source.getSourceId(), player.getName() + " Cascade"); - int sourceCost = game.getCard(source.getSourceId()).getManaCost().convertedManaCost(); + Card stackCard = game.getCard(targetPointer.getFirst(game, source)); + if (stackCard == null) { + return false; + } + int sourceCost = stackCard.getManaCost().convertedManaCost(); do { card = player.getLibrary().removeFromTop(game); if (card == null) { diff --git a/Mage/src/mage/abilities/keyword/CascadeAbility.java b/Mage/src/mage/abilities/keyword/CascadeAbility.java index ac072a0c877..9de7ef91de7 100644 --- a/Mage/src/mage/abilities/keyword/CascadeAbility.java +++ b/Mage/src/mage/abilities/keyword/CascadeAbility.java @@ -93,6 +93,9 @@ public class CascadeAbility extends TriggeredAbilityImpl { } } +// !!! Changes to the cascade effect here have to be copied to the cascadeEffect of Maelstrom Nexus card eventually. +// There is a functional copy of this effect + class CascadeEffect extends OneShotEffect { public CascadeEffect() {