From 288a1ec02cd2b3c26b261936a2a883345bd1e064 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 12 Oct 2015 23:10:16 +0200
Subject: [PATCH] * Oath of Lieges - Fixed target handling (fixes #1312).

---
 .../src/mage/sets/exodus/OathOfLieges.java    |  22 ++--
 .../cards/enchantments/OathOfLiegesTest.java  | 124 ++++++++++++++++++
 .../java/org/mage/test/player/TestPlayer.java |  29 +++-
 Mage/src/mage/game/GameImpl.java              |   2 +-
 4 files changed, 163 insertions(+), 14 deletions(-)
 create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java

diff --git a/Mage.Sets/src/mage/sets/exodus/OathOfLieges.java b/Mage.Sets/src/mage/sets/exodus/OathOfLieges.java
index b7a8d637588..f11e6b7823e 100644
--- a/Mage.Sets/src/mage/sets/exodus/OathOfLieges.java
+++ b/Mage.Sets/src/mage/sets/exodus/OathOfLieges.java
@@ -31,7 +31,7 @@ import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.Effect;
-import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
+import mage.abilities.effects.common.search.SearchLibraryPutInPlayTargetPlayerEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Outcome;
@@ -46,14 +46,16 @@ import mage.game.Game;
 import mage.players.Player;
 import mage.target.TargetPlayer;
 import mage.target.common.TargetCardInLibrary;
+import mage.target.targetpointer.FixedTarget;
 
 /**
  *
  * @author emerald000
  */
 public class OathOfLieges extends CardImpl {
-    
-    private static final FilterPlayer filter = new FilterPlayer();
+
+    private static final FilterPlayer filter = new FilterPlayer("player who controls more lands than you do and is his your opponent");
+
     static {
         filter.add(new OathOfLiegesPredicate());
     }
@@ -62,9 +64,8 @@ public class OathOfLieges extends CardImpl {
         super(ownerId, 11, "Oath of Lieges", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}");
         this.expansionSetCode = "EXO";
 
-
         // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is his or her opponent. The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library.
-        Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), false, Outcome.PutLandInPlay);
+        Effect effect = new SearchLibraryPutInPlayTargetPlayerEffect(new TargetCardInLibrary(new FilterBasicLandCard()), false, Outcome.PutLandInPlay);
         effect.setText("that player chooses target player who controls more lands than he or she does and is his or her opponent. The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library");
         Ability ability = new BeginningOfUpkeepTriggeredAbility(effect, TargetController.ANY, true);
         ability.addTarget(new TargetPlayer(1, 1, false, filter));
@@ -74,16 +75,21 @@ public class OathOfLieges extends CardImpl {
     public OathOfLieges(final OathOfLieges card) {
         super(card);
     }
-    
+
     @Override
     public void adjustTargets(Ability ability, Game game) {
         if (ability instanceof BeginningOfUpkeepTriggeredAbility) {
             Player activePlayer = game.getPlayer(game.getActivePlayerId());
             if (activePlayer != null) {
-                ability.setControllerId(activePlayer.getId());
                 ability.getTargets().clear();
                 TargetPlayer target = new TargetPlayer(1, 1, false, filter);
+                target.setTargetController(activePlayer.getId());
                 ability.getTargets().add(target);
+                for (Effect effect : ability.getEffects()) {
+                    if (effect instanceof SearchLibraryPutInPlayTargetPlayerEffect) {
+                        effect.setTargetPointer(new FixedTarget(activePlayer.getId()));
+                    }
+                }
             }
         }
     }
@@ -119,4 +125,4 @@ class OathOfLiegesPredicate implements ObjectSourcePlayerPredicate<ObjectSourceP
     public String toString() {
         return "player who controls more lands than he or she does and is his or her opponent";
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java
new file mode 100644
index 00000000000..2ad4dc07a44
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java
@@ -0,0 +1,124 @@
+/*
+ *  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.enchantments;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class OathOfLiegesTest extends CardTestPlayerBase {
+
+    @Test
+    public void testSearchLandOwner() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is his or her opponent.
+        // The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library.
+        addCard(Zone.HAND, playerA, "Oath of Lieges", 1); // {1}{W}
+        addCard(Zone.LIBRARY, playerA, "Plains", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Plains", 3);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Oath of Lieges");
+        addTarget(playerA, playerB);
+        addTarget(playerA, "Plains");
+
+        setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
+        execute();
+
+        assertPermanentCount(playerA, "Oath of Lieges", 1);
+        assertPermanentCount(playerA, "Plains", 3);
+
+    }
+
+    @Test
+    public void testSearchLandOpponent() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is his or her opponent.
+        // The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library.
+        addCard(Zone.HAND, playerA, "Oath of Lieges", 1); // {1}{W}
+
+        addCard(Zone.BATTLEFIELD, playerB, "Plains", 1);
+        addCard(Zone.LIBRARY, playerB, "Plains", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Oath of Lieges");
+        addTarget(playerB, playerA);
+        addTarget(playerB, "Plains");
+
+        setStopAt(2, PhaseStep.PRECOMBAT_MAIN);
+        execute();
+
+        assertPermanentCount(playerA, "Oath of Lieges", 1);
+        assertPermanentCount(playerB, "Plains", 2);
+    }
+
+    @Test
+    public void testSearchLandOwnerCopy() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is his or her opponent.
+        // The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library.
+        addCard(Zone.HAND, playerA, "Oath of Lieges", 1); // {1}{W}
+        addCard(Zone.LIBRARY, playerA, "Plains", 3);
+        addCard(Zone.HAND, playerA, "Plains", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Island", 3);
+        addCard(Zone.HAND, playerB, "Copy Enchantment", 1); // {2}{U}
+        addCard(Zone.LIBRARY, playerB, "Plains", 3);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Oath of Lieges");
+
+        castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Copy Enchantment");
+        setChoice(playerB, "Oath of Lieges");
+
+        // turn 3
+        addTarget(playerA, playerB);
+        addTarget(playerA, "Plains"); // 3rd land
+        addTarget(playerA, "Plains"); // second trigger will fail because target player has no longer more lands than controller
+
+        playLand(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Plains"); // 4th land
+
+        // turn 4
+        addTarget(playerB, playerA);
+        addTarget(playerB, "Plains");
+        addTarget(playerB, "Plains"); // second trigger will fail because target player has no longer more lands than controller
+
+        setStopAt(4, PhaseStep.PRECOMBAT_MAIN);
+        execute();
+
+        assertPermanentCount(playerB, "Oath of Lieges", 1);
+        assertPermanentCount(playerA, "Oath of Lieges", 1);
+
+        assertPermanentCount(playerB, "Plains", 1);
+        assertPermanentCount(playerA, "Plains", 4);
+
+    }
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index fe231aa0a37..55ebad8d17f 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -813,6 +813,30 @@ public class TestPlayer implements Player {
         return computerPlayer.chooseTarget(outcome, target, source, game);
     }
 
+    @Override
+    public boolean chooseTarget(Outcome outcome, Cards cards, TargetCard target, Ability source, Game game) {
+        if (!targets.isEmpty()) {
+            for (String targetDefinition : targets) {
+                String[] targetList = targetDefinition.split("\\^");
+                boolean targetFound = false;
+                for (String targetName : targetList) {
+                    for (Card card : cards.getCards(game)) {
+                        if (card.getName().equals(targetName)) {
+                            target.add(card.getId(), game);
+                            targetFound = true;
+                            break;
+                        }
+                    }
+                }
+                if (targetFound) {
+                    targets.remove(targetDefinition);
+                    return true;
+                }
+            }
+        }
+        return computerPlayer.chooseTarget(outcome, cards, target, source, game);
+    }
+
     @Override
     public TriggeredAbility chooseTriggeredAbility(List<TriggeredAbility> abilities, Game game) {
         if (!choices.isEmpty()) {
@@ -1891,11 +1915,6 @@ public class TestPlayer implements Player {
         return computerPlayer.choose(outcome, cards, target, game);
     }
 
-    @Override
-    public boolean chooseTarget(Outcome outcome, Cards cards, TargetCard target, Ability source, Game game) {
-        return computerPlayer.chooseTarget(outcome, cards, target, source, game);
-    }
-
     @Override
     public boolean chooseTargetAmount(Outcome outcome, TargetAmount target, Ability source, Game game) {
         return computerPlayer.chooseTargetAmount(outcome, target, source, game);
diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java
index 27abfa58db1..f67b6387437 100644
--- a/Mage/src/mage/game/GameImpl.java
+++ b/Mage/src/mage/game/GameImpl.java
@@ -1467,7 +1467,7 @@ public abstract class GameImpl implements Game, Serializable {
         } else {
             TriggeredAbility newAbility = ability.copy();
             newAbility.newId();
-            // Too early, becuase no targets set yet !!!!!!!!!!!
+            // Too early, because no targets set yet !!!!!!!!!!!
             for (Effect effect : newAbility.getEffects()) {
                 effect.getTargetPointer().init(this, newAbility);
             }