From 6d2f95c591ed4240c57b7a8128892ed90e1c91eb Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 13 Jun 2015 19:57:08 +0200
Subject: [PATCH] * Fixed that countering the half of a split spell did not
 work correctly.

---
 .../counterspell/CounterspellTest.java        | 80 +++++++++++++++++++
 Mage/src/mage/cards/CardImpl.java             |  6 ++
 2 files changed, 86 insertions(+)
 create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java

diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java
new file mode 100644
index 00000000000..1481997f5af
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java
@@ -0,0 +1,80 @@
+/*
+ *  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.oneshot.counterspell;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class CounterspellTest extends CardTestPlayerBase {
+
+    /**
+        It looks like Boom//Bust can't be countered (although it says it's countered in the log).
+
+        Code: Select all
+            13:10: Benno casts Boom [8ce] targeting Mountain [4c8] Island [80c]
+            13:10: Benno casts Counterspell [2b7] targeting Boom [8ce]
+            13:10: Benno puts Boom [8ce] from stack into his or her graveyard
+            13:10: Boom is countered by Counterspell [2b7]
+            13:10: Benno puts Counterspell [2b7] from stack into his or her graveyard
+            13:10: Mountain [4c8] was destroyed
+            13:10: Island [80c] was destroyed
+     */
+    
+    @Test
+    public void testCounterSplitSpell() {
+        // Boom - Sorcery   {1}{R}
+        // Destroy target land you control and target land you don't control.        
+        addCard(Zone.HAND, playerA, "Boom // Bust");
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2);
+        
+        addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
+        addCard(Zone.HAND, playerB, "Counterspell");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Boom", "Mountain^Island");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Counterspell", "Boom");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerA, "Boom // Bust", 1);
+        assertGraveyardCount(playerB, "Counterspell", 1);
+        
+        assertPermanentCount(playerA, "Mountain", 2);
+        assertPermanentCount(playerB, "Island", 2);
+        
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+    }
+}
diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java
index b656ae3bf29..8f9f4ee18a6 100644
--- a/Mage/src/mage/cards/CardImpl.java
+++ b/Mage/src/mage/cards/CardImpl.java
@@ -359,6 +359,12 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
                         break;
                     case STACK:
                         StackObject stackObject = game.getStack().getSpell(getId());
+                        if (stackObject == null && (this instanceof SplitCard)) { // handle if half od Split cast is on the stack
+                            stackObject = game.getStack().getSpell(((SplitCard)this).getLeftHalfCard().getId());
+                            if (stackObject == null) {
+                                stackObject = game.getStack().getSpell(((SplitCard)this).getRightHalfCard().getId());
+                            }
+                        }
                         if (stackObject != null) {
                             game.getStack().remove(stackObject);
                         }