diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java
new file mode 100644
index 0000000000..6e1970210e
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.abilities.activated;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class LightningStormTest extends CardTestPlayerBase {
+
+ /**
+ * So, this just happened to me. My opponent cast Lightning Storm and while
+ * it was on the stack I couldn't use the ability despite having land in
+ * hand which isn't something I've had an issue with before.
+ *
+ * My opponent had a Leyline of Sanctity in play, so perhaps that was
+ * causing the issue somehow? Does anyone want to try and replicate it?
+ *
+ */
+ @Test
+ public void ActivateByBothPlayersTest() {
+ addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
+ // Lightning Storm deals X damage to target creature or player, where X is 3 plus the number of charge counters on it.
+ // Discard a land card: Put two charge counters on Lightning Storm. You may choose a new target for it. Any player may activate this ability but only if Lightning Storm is on the stack.
+ addCard(Zone.HAND, playerA, "Lightning Storm"); // {1}{R}{R}
+
+ addCard(Zone.HAND, playerA, "Mountain");
+ addCard(Zone.HAND, playerB, "Mountain");
+
+ castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Storm", playerB);
+ activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Discard");
+ setChoice(playerB, "playerA");
+ activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Discard");
+ setChoice(playerA, "playerB");
+
+ setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
+
+ execute();
+
+ assertGraveyardCount(playerA, "Lightning Storm", 1);
+ assertGraveyardCount(playerB, "Mountain", 1);
+ assertGraveyardCount(playerA, "Mountain", 1);
+
+ assertLife(playerA, 20);
+ assertLife(playerB, 13);
+ }
+
+}
diff --git a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java
index ffdc3d4e01..13724366e7 100644
--- a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java
+++ b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java
@@ -191,7 +191,7 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa
//20091005 - 602.5d/602.5e
if (timing == TimingRule.INSTANT || game.canPlaySorcery(playerId)
|| game.getContinuousEffects().asThough(sourceId, AsThoughEffectType.ACTIVATE_AS_INSTANT, this, controllerId, game)) {
- if (costs.canPay(this, sourceId, controllerId, game) && canChooseTarget(game)) {
+ if (costs.canPay(this, sourceId, playerId, game) && canChooseTarget(game)) {
this.activatorId = playerId;
return true;
}
diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index 51d6b13b97..97d6dd9a2c 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -1184,18 +1184,23 @@ public abstract class PlayerImpl implements Player, Serializable {
return false;
}
- if (ability.getAbilityType().equals(AbilityType.SPECIAL_ACTION)) {
- result = specialAction((SpecialAction) ability.copy(), game);
- } else if (ability.getAbilityType().equals(AbilityType.MANA)) {
- result = playManaAbility((ManaAbility) ability.copy(), game);
- } else if (ability.getAbilityType().equals(AbilityType.SPELL)) {
- if (ability instanceof FlashbackAbility) {
+ switch (ability.getAbilityType()) {
+ case SPECIAL_ACTION:
+ result = specialAction((SpecialAction) ability.copy(), game);
+ break;
+ case MANA:
+ result = playManaAbility((ManaAbility) ability.copy(), game);
+ break;
+ case SPELL:
+ if (ability instanceof FlashbackAbility) {
+ result = playAbility(ability.copy(), game);
+ } else {
+ result = cast((SpellAbility) ability, game, false);
+ }
+ break;
+ default:
result = playAbility(ability.copy(), game);
- } else {
- result = cast((SpellAbility) ability, game, false);
- }
- } else {
- result = playAbility(ability.copy(), game);
+ break;
}
}
@@ -2398,7 +2403,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
if (canBeCastRegularly) {
ManaOptions abilityOptions = copy.getManaCostsToPay().getOptions();
- if (abilityOptions.size() == 0) {
+ if (abilityOptions.isEmpty()) {
return true;
} else {
if (available == null) {
@@ -2639,6 +2644,16 @@ public abstract class PlayerImpl implements Player, Serializable {
}
}
}
+ // activated abilities from stack objects
+ for (StackObject stackObject : game.getState().getStack()) {
+ for (ActivatedAbility ability : stackObject.getAbilities().getActivatedAbilities(Zone.STACK)) {
+ if (ability instanceof ActivatedAbility
+ && canPlay(ability, availableMana, game.getObject(ability.getSourceId()), game)) {
+ playableActivated.put(ability.toString(), ability);
+ }
+
+ }
+ }
// activated abilities from objects in the command zone (emblems or commanders)
for (CommandObject commandObject : game.getState().getCommand()) {
for (ActivatedAbility ability : commandObject.getAbilities().getActivatedAbilities(Zone.COMMAND)) {