github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Mindsparker - Fixed that the ability did not trigger for the correct card types and colors.

Browse source
This commit is contained in:
LevelX2 2013-07-24 19:02:50 +02:00
parent 235d314104
commit 14bf4c8d33
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/magic2014/Mindsparker.java
View file

@ -76,7 +76,7 @@ public class Mindsparker extends CardImpl<Mindsparker> {
this.addAbility(FirstStrikeAbility.getInstance());
// Whenever an opponent casts a white or blue instant or sorcery spell, Mindsparker deals 2 damage to that player.
this.addAbility(new OpponentCastsSpellTriggeredAbility(Zone.BATTLEFIELD, new MindsparkerEffect(), filter, false));
this.addAbility(new OpponentCastsSpellTriggeredAbility(Zone.BATTLEFIELD, new MindsparkerEffect(), filter, false, true));
}
@ -115,4 +115,4 @@ class MindsparkerEffect extends OneShotEffect<MindsparkerEffect> {
}
return false;
}
}
}

20
Mage/src/mage/abilities/common/OpponentCastsSpellTriggeredAbility.java
View file

@ -27,9 +27,9 @@
*/
package mage.abilities.common;
import mage.constants.Zone;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -55,8 +55,7 @@ public class OpponentCastsSpellTriggeredAbility extends TriggeredAbilityImpl<Opp
}
public OpponentCastsSpellTriggeredAbility(Zone zone, Effect effect, FilterCard filter, boolean optional) {
super(zone, effect, optional);
this.filter = filter;
this(zone, effect, filter, optional, false);
}
public OpponentCastsSpellTriggeredAbility(Zone zone, Effect effect, FilterCard filter, boolean optional, boolean setTargetPointerPlayer) {
@ -67,7 +66,7 @@ public class OpponentCastsSpellTriggeredAbility extends TriggeredAbilityImpl<Opp
public OpponentCastsSpellTriggeredAbility(final OpponentCastsSpellTriggeredAbility ability) {
super(ability);
filter = ability.filter;
this.filter = ability.filter;
this.setTargetPointerPlayer = ability.setTargetPointerPlayer;
}
@ -75,12 +74,13 @@ public class OpponentCastsSpellTriggeredAbility extends TriggeredAbilityImpl<Opp
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.SPELL_CAST && game.getOpponents(controllerId).contains(event.getPlayerId())) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && filter.match(spell, game) && !setTargetPointerPlayer) {
this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getTargetId()));
return true;
} else {
this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getPlayerId()));
return true;
if (spell != null && filter.match(spell, game)) {
if (setTargetPointerPlayer) {
for (Effect effect: this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
}
}
return false;