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

Fixed null pointer dereference in Veilstone Amulet

Browse source
This commit is contained in:
Duncan Townsend 2015-01-21 22:16:31 -05:00
parent 25ec2a95d0
commit f08ec6f2aa
No known key found for this signature in database
GPG key ID: C00ECDF315F7A593
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Mage.Sets/src/mage/sets/futuresight/VeilstoneAmulet.java
View file

@ -35,7 +35,7 @@ import mage.constants.CardType;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.filter.FilterSpell;
import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl;
import mage.constants.Duration;
import mage.constants.Outcome;
@ -55,7 +55,10 @@ public class VeilstoneAmulet extends CardImpl {
this.expansionSetCode = "FUT";
// Whenever you cast a spell, creatures you control can't be the targets of spells or abilities your opponents control this turn.
this.addAbility(new SpellCastControllerTriggeredAbility(new VeilstoneAmuletEffect(), false));
this.addAbility(new SpellCastControllerTriggeredAbility(new VeilstoneAmuletEffect(),
new FilterSpell(),
false,
"Whenever you cast a spell, creatures you control can't be the targets of spells or abilities your opponents control this turn."));
}
public VeilstoneAmulet(final VeilstoneAmulet card) {
@ -95,15 +98,15 @@ class VeilstoneAmuletEffect extends ContinuousRuleModifiyingEffectImpl {
public boolean applies(GameEvent event, Ability ability, Game game) {
if (event.getType() == EventType.TARGET) {
Permanent permanent = game.getPermanent(event.getTargetId());
UUID permanentController = permanent.getControllerId();
UUID abilityController = ability.getControllerId();
UUID sourceController = event.getPlayerId();
if (permanent != null &&
permanent.getCardType().contains(CardType.CREATURE) &&
permanentController.equals(abilityController) &&
game.getPlayer(abilityController).hasOpponent(sourceController, game)) {
return true;
if (permanent != null) {
UUID permanentController = permanent.getControllerId();
UUID abilityController = ability.getControllerId();
UUID sourceController = event.getPlayerId();
if (permanent.getCardType().contains(CardType.CREATURE) &&
permanentController.equals(abilityController) &&
game.getPlayer(abilityController).hasOpponent(sourceController, game)) {
return true;
}
}
}
return false;