From 28047bb55a3a56e4b9798226a38c9a60b6e3f9c0 Mon Sep 17 00:00:00 2001 From: Sol Date: Sat, 27 Apr 2013 01:41:38 +0000 Subject: [PATCH] - If activating player hasn't been set in when trying to grab it, use the controller instead. --- .../java/forge/card/spellability/AbilityActivated.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/card/spellability/AbilityActivated.java b/src/main/java/forge/card/spellability/AbilityActivated.java index 82d5fb67c12..9a8f91ef504 100644 --- a/src/main/java/forge/card/spellability/AbilityActivated.java +++ b/src/main/java/forge/card/spellability/AbilityActivated.java @@ -25,6 +25,7 @@ import forge.card.cost.CostPayment; import forge.card.staticability.StaticAbility; import forge.game.GameState; import forge.game.GlobalRuleChange; +import forge.game.player.Player; import forge.game.zone.ZoneType; /** @@ -79,7 +80,12 @@ public abstract class AbilityActivated extends SpellAbility implements java.io.S /** {@inheritDoc} */ @Override public boolean canPlay() { - final GameState game = getActivatingPlayer().getGame(); + Player player = getActivatingPlayer(); + if (player == null) { + player = this.getSourceCard().getController(); + } + + final GameState game = player.getGame(); if (game.getStack().isSplitSecondOnStack() && !this.isManaAbility()) { return false; }