From e967c3951322f26cbd25ded5c489bdcbbccd2e62 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sun, 15 Oct 2017 20:07:08 -0400 Subject: [PATCH] fixed Mana Maze not allowing colorless spells to be cast (fixes #4112) --- Mage.Sets/src/mage/cards/m/ManaMaze.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/cards/m/ManaMaze.java b/Mage.Sets/src/mage/cards/m/ManaMaze.java index 97303002237..02038f0e618 100644 --- a/Mage.Sets/src/mage/cards/m/ManaMaze.java +++ b/Mage.Sets/src/mage/cards/m/ManaMaze.java @@ -53,11 +53,10 @@ import mage.watchers.Watcher; public class ManaMaze extends CardImpl { public ManaMaze(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); // Players can't cast spells that share a color with the spell most recently cast this turn. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaMazeEffect()), new LastSpellCastWatcher()); - } public ManaMaze(final ManaMaze card) { @@ -91,9 +90,8 @@ class ManaMazeEffect extends ContinuousRuleModifyingEffectImpl { Card card = game.getCard(event.getSourceId()); if (card != null) { LastSpellCastWatcher watcher = (LastSpellCastWatcher) game.getState().getWatchers().get(LastSpellCastWatcher.class.getSimpleName()); - if (watcher != null - && watcher.lastSpellCast != null) { - return card.getColor(game).contains(watcher.lastSpellCast.getColor(game)); + if (watcher != null && watcher.lastSpellCast != null) { + return !card.getColor(game).intersection(watcher.lastSpellCast.getColor(game)).isColorless(); } } return false;