github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix this.spellAbility NPE

Browse source
This commit is contained in:
Noah Gleason 2018-06-23 20:45:21 -04:00
parent 9a1ce53c9e
commit d9c7daaf52
No known key found for this signature in database
GPG key ID: EC030EC6B0650A40
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Mage.Sets/src/mage/cards/p/Prophecy.java
View file

@ -17,6 +17,7 @@ import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.players.Player; import mage.players.Player;
import mage.target.common.TargetOpponent;
/** /**
* *
@ -29,7 +30,8 @@ public final class Prophecy extends CardImpl {
// Reveal the top card of target opponent's library. If it's a land, you gain 1 life. Then that player shuffles his or her library. // Reveal the top card of target opponent's library. If it's a land, you gain 1 life. Then that player shuffles his or her library.
this.spellAbility.addEffect(new ProphecyEffect()); this.getSpellAbility().addEffect(new ProphecyEffect());
this.getSpellAbility().addTarget(new TargetOpponent());
// Draw a card at the beginning of the next turn's upkeep. // Draw a card at the beginning of the next turn's upkeep.
this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false)); this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false));
@ -64,8 +66,9 @@ class ProphecyEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player targetPlayer = game.getPlayer(source.getFirstTarget()); Player targetPlayer = game.getPlayer(source.getFirstTarget());
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = game.getObject(source.getSourceId()); MageObject sourceObject = game.getObject(source.getSourceId());
if (sourceObject == null || targetPlayer == null) { if (sourceObject == null || targetPlayer == null || controller == null) {
return false; return false;
} }
if (targetPlayer.getLibrary().hasCards()) { if (targetPlayer.getLibrary().hasCards()) {
@ -75,9 +78,9 @@ class ProphecyEffect extends OneShotEffect {
return false; return false;
} }
cards.add(card); cards.add(card);
targetPlayer.revealCards(sourceObject.getName(), cards, game); targetPlayer.revealCards(sourceObject.getIdName(), cards, game);
if (card.isLand()) { if (card.isLand()) {
targetPlayer.gainLife(1, game, source.getSourceId()); controller.gainLife(1, game, source.getSourceId());
} }
targetPlayer.shuffleLibrary(source, game); targetPlayer.shuffleLibrary(source, game);
} }