From dedbeab86be045269f52f5649710d353d90ea5e7 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 29 Mar 2015 22:45:24 +0200 Subject: [PATCH] * Minor formatting. --- Mage.Sets/src/mage/sets/commander/RikuOfTwoReflections.java | 5 +---- .../common/SpellCastControllerTriggeredAbility.java | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/sets/commander/RikuOfTwoReflections.java b/Mage.Sets/src/mage/sets/commander/RikuOfTwoReflections.java index 9f38b964529..ec60a7d42e9 100644 --- a/Mage.Sets/src/mage/sets/commander/RikuOfTwoReflections.java +++ b/Mage.Sets/src/mage/sets/commander/RikuOfTwoReflections.java @@ -49,9 +49,9 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import mage.game.permanent.token.EmptyToken; import mage.game.stack.Spell; import mage.players.Player; -import mage.game.permanent.token.EmptyToken; import mage.util.CardUtil; /** @@ -78,9 +78,6 @@ public class RikuOfTwoReflections extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setRed(true); - this.color.setBlue(true); - this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java b/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java index 8dd05c58a48..471bda4c7ec 100644 --- a/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java @@ -76,7 +76,7 @@ public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl { public SpellCastControllerTriggeredAbility(final SpellCastControllerTriggeredAbility ability) { super(ability); - filter = ability.filter; + this.filter = ability.filter; this.rememberSource = ability.rememberSource; this.rule = ability.rule; } @@ -90,7 +90,7 @@ public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { if (event.getPlayerId().equals(this.getControllerId())) { Spell spell = game.getStack().getSpell(event.getTargetId()); - if (spell != null && filter.match(spell, game)) { + if (spell != null && filter.match(spell, getControllerId(), game)) { if (rememberSource) { this.getEffects().get(0).setTargetPointer(new FixedTarget(spell.getId())); }