Merge origin/master

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/InfectTest.java

@@ -37,21 +37,23 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  *
  * @author LevelX2
  */
-
 public class InfectTest extends CardTestPlayerBase {
 
     /**
-
+     *
-        702.89. Infect
+     * 702.89. Infect 702.89a Infect is a static ability. 702.89b Damage dealt
-            702.89a Infect is a static ability.
+     * to a player by a source with infect doesn’t cause that player to lose
-            702.89b Damage dealt to a player by a source with infect doesn’t cause that player to lose life. Rather, it causes the player to get that many poison counters. See rule 119.3.
+     * life. Rather, it causes the player to get that many poison counters. See
-            702.89c Damage dealt to a creature by a source with infect isn’t marked on that creature. Rather, it causes that many -1/-1 counters to be put on that creature. See rule 119.3.
+     * rule 119.3. 702.89c Damage dealt to a creature by a source with infect
-            702.89d If a permanent leaves the battlefield before an effect causes it to deal damage, its last known information is used to determine whether it had infect.
+     * isn’t marked on that creature. Rather, it causes that many -1/-1 counters
-            702.89e The infect rules function no matter what zone an object with infect deals damage from.
+     * to be put on that creature. See rule 119.3. 702.89d If a permanent leaves
-            702.89f Multiple instances of infect on the same object are redundant.
+     * the battlefield before an effect causes it to deal damage, its last known
-
+     * information is used to determine whether it had infect. 702.89e The
+     * infect rules function no matter what zone an object with infect deals
+     * damage from. 702.89f Multiple instances of infect on the same object are
+     * redundant.
+     *
      */
-
     @Test
     public void testNormalUse() {
         addCard(Zone.BATTLEFIELD, playerB, "Tine Shrike"); // 2/1 Infect
@@ -68,7 +70,6 @@ public class InfectTest extends CardTestPlayerBase {
 
     }
 
-
     @Test
     public void testLoseInfectUse() {
         // Creatures your opponents control lose infect.
@@ -89,17 +90,23 @@ public class InfectTest extends CardTestPlayerBase {
     }
 
     /**
-     * Inkmoth Nexus has no effect it he attacks becaus it has infect but there are no counters added
+     * Inkmoth Nexus has no effect it he attacks becaus it has infect but there
+     * are no counters added
      * http://www.mtgsalvation.com/forums/magic-fundamentals/magic-rulings/magic-rulings-archives/296553-melira-sylvok-outcast-vs-inkmoth-nexus
      */
     @Test
     public void testInkmothNexusLoseInfect() {
         // Creatures your opponents control lose infect.
+        // Creatures you control can't have -1/-1 counters placed on them.
         addCard(Zone.BATTLEFIELD, playerA, "Melira, Sylvok Outcast");
+        // Put a -1/-1 counter on target creature. When that creature dies this turn, its controller gets a poison counter.
+        addCard(Zone.HAND, playerA, "Virulent Wound"); // Instant {B}
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
 
         addCard(Zone.BATTLEFIELD, playerB, "Plains", 1);
         addCard(Zone.BATTLEFIELD, playerB, "Inkmoth Nexus");
 
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Virulent Wound", "Melira, Sylvok Outcast");
         // {1}: Inkmoth Nexus becomes a 1/1 Blinkmoth artifact creature with flying and infect until end of turn. It's still a land.
         // (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
         activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{1}: {this} becomes");
@@ -108,6 +115,8 @@ public class InfectTest extends CardTestPlayerBase {
         setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
         execute();
 
+        assertGraveyardCount(playerA, "Virulent Wound", 1);
+        assertPowerToughness(playerA, "Melira, Sylvok Outcast", 2, 2);
         assertTapped("Plains", true);
         assertTapped("Inkmoth Nexus", true);
         assertCounterCount(playerA, CounterType.POISON, 0);

Mage/src/mage/cards/CardImpl.java

@@ -366,7 +366,7 @@ 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
+                        if (stackObject == null && (this instanceof SplitCard)) { // handle if half of 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());

Mage/src/mage/cards/SplitCard.java

@@ -60,16 +60,32 @@ public abstract class SplitCard extends CardImpl {
 
     public SplitCard(SplitCard card) {
         super(card);
-        this.leftHalfCard = card.leftHalfCard.copy();
+        this.leftHalfCard = card.getLeftHalfCard().copy();
+        ((SplitCardHalf) leftHalfCard).setParentCard(this);
         this.rightHalfCard = card.rightHalfCard.copy();
+        ((SplitCardHalf) rightHalfCard).setParentCard(this);
     }
 
-    public Card getLeftHalfCard() {
+    public SplitCardHalf getLeftHalfCard() {
-        return leftHalfCard;
+        return (SplitCardHalf) leftHalfCard;
     }
 
-    public Card getRightHalfCard() {
+    public SplitCardHalf getRightHalfCard() {
-        return rightHalfCard;
+        return (SplitCardHalf) rightHalfCard;
+    }
+
+    @Override
+    public void assignNewId() {
+        super.assignNewId();
+        leftHalfCard.assignNewId();
+        rightHalfCard.assignNewId();
+    }
+
+    @Override
+    public void setCopy(boolean isCopy) {
+        super.setCopy(isCopy);
+        leftHalfCard.setCopy(isCopy);
+        rightHalfCard.setCopy(isCopy);
     }
 
     @Override

Mage/src/mage/cards/SplitCardHalf.java

@@ -12,5 +12,7 @@ package mage.cards;
 public interface SplitCardHalf extends Card {
 
     @Override
-    Card copy();
+    SplitCardHalf copy();
+
+    void setParentCard(SplitCard card);
 }

Mage/src/mage/cards/SplitCardHalfImpl.java

@@ -62,7 +62,7 @@ public class SplitCardHalfImpl extends CardImpl implements SplitCardHalf {
     }
 
     @Override
-    public Card getMainCard() {
+    public SplitCard getMainCard() {
         return splitCardParent;
     }
 
@@ -74,8 +74,13 @@ public class SplitCardHalfImpl extends CardImpl implements SplitCardHalf {
     }
 
     @Override
-    public SplitCardHalfImpl copy() {
+    public SplitCardHalf copy() {
         return new SplitCardHalfImpl(this);
     }
 
+    @Override
+    public void setParentCard(SplitCard card) {
+        this.splitCardParent = card;
+    }
+
 }

Mage/src/mage/game/Exile.java

@@ -100,7 +100,7 @@ public class Exile implements Serializable, Copyable<Exile> {
     }
 
     public List<Card> getAllCards(Game game) {
-        List<Card> cards = new ArrayList<Card>();
+        List<Card> cards = new ArrayList<>();
         for (ExileZone exile : exileZones.values()) {
             cards.addAll(exile.getCards(game));
         }

Mage/src/mage/game/GameImpl.java

@@ -67,6 +67,7 @@ import mage.cards.Card;
 import mage.cards.Cards;
 import mage.cards.CardsImpl;
 import mage.cards.SplitCard;
+import mage.cards.SplitCardHalf;
 import mage.cards.decks.Deck;
 import mage.choices.Choice;
 import mage.constants.CardType;
@@ -1525,6 +1526,9 @@ public abstract class GameImpl implements Game, Serializable {
         Iterator<Card> copiedCards = this.getState().getCopiedCards().iterator();
         while (copiedCards.hasNext()) {
             Card card = copiedCards.next();
+            if (card instanceof SplitCardHalf) {
+                continue; // only the main card is moves, not the halves
+            }
             Zone zone = state.getZone(card.getId());
             if (zone != Zone.BATTLEFIELD && zone != Zone.STACK) {
                 switch (zone) {