From 28d816b21faad50aa5bdf6d32e5882074c82b6ec Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 23 May 2015 18:59:41 +0200
Subject: [PATCH] * Endrek Sahr, Master Breeder - Fixed Thrull creating ability
 that did not work when the triggering spell was countered.

---
 .../EndrekSahrMasterBreeder.java              |  4 ++
 .../EndrekSahrMasterBreederTest.java          | 72 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/EndrekSahrMasterBreederTest.java

diff --git a/Mage.Sets/src/mage/sets/commander2013/EndrekSahrMasterBreeder.java b/Mage.Sets/src/mage/sets/commander2013/EndrekSahrMasterBreeder.java
index 30166e0aeee..9396551ffe3 100644
--- a/Mage.Sets/src/mage/sets/commander2013/EndrekSahrMasterBreeder.java
+++ b/Mage.Sets/src/mage/sets/commander2013/EndrekSahrMasterBreeder.java
@@ -48,6 +48,7 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.token.Token;
 import mage.game.stack.Spell;
+import mage.target.targetpointer.FixedTarget;
 
 /**
  *
@@ -136,6 +137,9 @@ class EndrekSahrMasterBreederEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source));
+        if (spell == null) {
+            spell = (Spell) game.getLastKnownInformation(((FixedTarget)getTargetPointer()).getTarget(), Zone.STACK);
+        }            
         if (spell != null) {
             int cmc = spell.getConvertedManaCost();
             if (cmc > 0) {
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/EndrekSahrMasterBreederTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/EndrekSahrMasterBreederTest.java
new file mode 100644
index 00000000000..01fdf896f50
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/EndrekSahrMasterBreederTest.java
@@ -0,0 +1,72 @@
+/*
+ *  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 EndrekSahrMasterBreederTest extends CardTestPlayerBase {
+
+    /**
+     * Test that tokens are created also if the spell that triggers Endreks ability is countered
+     *
+     */
+    @Test
+    public void testTokenAlsoIfCountered() {
+        // Whenever you cast a creature spell, put X 1/1 black Thrull creature tokens onto the battlefield, where X is that spell's converted mana cost.
+        addCard(Zone.BATTLEFIELD, playerA, "Endrek Sahr, Master Breeder", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        addCard(Zone.HAND, playerA, "Silvercoat Lion", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
+        addCard(Zone.HAND, playerB, "Counterspell", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Counterspell", "Silvercoat Lion", "Silvercoat Lion");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+
+        assertGraveyardCount(playerA, "Silvercoat Lion", 1);
+        assertGraveyardCount(playerB, "Counterspell", 1);
+        
+        assertPermanentCount(playerA, "Thrull", 2);        
+
+    }
+
+}
\ No newline at end of file