diff --git a/Mage.Sets/src/mage/cards/m/MaelstromNexus.java b/Mage.Sets/src/mage/cards/m/MaelstromNexus.java index 2c8609419d..4542b9e861 100644 --- a/Mage.Sets/src/mage/cards/m/MaelstromNexus.java +++ b/Mage.Sets/src/mage/cards/m/MaelstromNexus.java @@ -46,7 +46,6 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.watchers.common.FirstSpellCastThisTurnWatcher; - /** * * @author jeffwadsworth @@ -54,7 +53,7 @@ import mage.watchers.common.FirstSpellCastThisTurnWatcher; public class MaelstromNexus extends CardImpl { public MaelstromNexus(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}{U}{B}{R}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}{U}{B}{R}{G}"); // The first spell you cast each turn has cascade. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaelstromNexusGainCascadeFirstSpellEffect()), new FirstSpellCastThisTurnWatcher()); @@ -72,7 +71,7 @@ public class MaelstromNexus extends CardImpl { class MaelstromNexusGainCascadeFirstSpellEffect extends ContinuousEffectImpl { - private Ability cascadeAbility = new CascadeAbility(); + private final Ability cascadeAbility = new CascadeAbility(); public MaelstromNexusGainCascadeFirstSpellEffect() { super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); @@ -106,4 +105,4 @@ class MaelstromNexusGainCascadeFirstSpellEffect extends ContinuousEffectImpl { } return false; } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java index 9fc4586732..145bd9abf0 100644 --- a/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java @@ -12,7 +12,8 @@ import mage.watchers.Watcher; /** * @author jeffwadsworth -**/ +* + */ public class FirstSpellCastThisTurnWatcher extends Watcher { private final Map playerFirstSpellCast = new HashMap<>(); @@ -24,6 +25,8 @@ public class FirstSpellCastThisTurnWatcher extends Watcher { public FirstSpellCastThisTurnWatcher(final FirstSpellCastThisTurnWatcher watcher) { super(watcher); + playerFirstSpellCast.putAll(watcher.playerFirstSpellCast); + playerFirstCastSpell.putAll(watcher.playerFirstSpellCast); } @Override @@ -61,4 +64,4 @@ public class FirstSpellCastThisTurnWatcher extends Watcher { return playerFirstSpellCast.get(playerId); } } -} \ No newline at end of file +}