From 213f8e707174f811361e5734a9b2de9cd9aeea54 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 14 Jul 2014 23:15:37 +0200
Subject: [PATCH] * Liliana's Careess - Fixed target handling of opponent.
---
.../src/mage/sets/magic2011/LilianasCaress.java | 16 ++++++++++------
.../cards/abilities/keywords/PersistTest.java | 3 +++
Utils/release/getting_implemented_cards.txt | 2 ++
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java
index f26a431548..eaa28d347b 100644
--- a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java
+++ b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java
@@ -29,16 +29,17 @@
package mage.sets.magic2011;
import java.util.UUID;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.LoseLifeTargetEffect;
+import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
-import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.effects.common.LoseLifeTargetEffect;
-import mage.cards.CardImpl;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
-import mage.target.TargetPlayer;
+import mage.target.targetpointer.FixedTarget;
/**
*
@@ -50,6 +51,8 @@ public class LilianasCaress extends CardImpl {
super(ownerId, 103, "Liliana's Caress", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}");
this.expansionSetCode = "M11";
this.color.setBlack(true);
+
+ // Whenever an opponent discards a card, that player loses 2 life.
this.addAbility(new LilianasCaressAbility());
}
@@ -82,8 +85,9 @@ class LilianasCaressAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.DISCARDED_CARD && game.getOpponents(controllerId).contains(event.getPlayerId())) {
- this.addTarget(new TargetPlayer());
- getTargets().get(0).add(event.getPlayerId(), game);
+ for (Effect effect :this.getEffects()) {
+ effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
+ }
return true;
}
return false;
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java
index 3686aea2c9..7d96541cfe 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java
@@ -92,6 +92,9 @@ public class PersistTest extends CardTestPlayerBase {
/**
+ * see here for more information
+ * http://www.slightlymagic.net/forum/viewtopic.php?f=116&t=14516
+ *
* Tests Safehold Elite with persist returns to battlefield with -1/-1 counter
* Murder Investigation puts 2 tokens onto battlefield because enchanted Safehold Elite
* was 2/2
diff --git a/Utils/release/getting_implemented_cards.txt b/Utils/release/getting_implemented_cards.txt
index 4b604cb06a..6b446c296a 100644
--- a/Utils/release/getting_implemented_cards.txt
+++ b/Utils/release/getting_implemented_cards.txt
@@ -39,6 +39,8 @@ since 1.3.0-2014-06-15
git log 6c8b818d890e9e0ce4bc5e3128249bb9e62c0b23..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
since 1.3.0-2014-06-28
git log 1129858a6c5c0dae5d1e29ea931804c1165b8c38..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
+since 1.3.0-2014-07-11
+git log 458255cd0627af90c2ebeab4c410a16d55a36f41..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
3. Copy added_cards.txt to trunk\Utils folder