From e60a0cbafda6406f2803718f2fe5721a6e9c6f0a Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Tue, 31 Jan 2012 17:52:52 +0000
Subject: [PATCH] - "Sword of Minas Morgul" now correctly discards the
 possession born by a character skirmishing the Nazgul.

---
 .../lotro/cards/set1/wraith/Card1_225.java     | 18 +++---------------
 .../src/main/webapp/includes/changeLog.html    |  3 +++
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java
index 12bec1ece..9219c760d 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java
@@ -3,15 +3,13 @@ package com.gempukku.lotro.cards.set1.wraith;
 import com.gempukku.lotro.cards.AbstractAttachable;
 import com.gempukku.lotro.cards.PlayConditions;
 import com.gempukku.lotro.cards.effects.ExertCharactersEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
 import com.gempukku.lotro.common.*;
 import com.gempukku.lotro.filters.Filter;
 import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
 import com.gempukku.lotro.game.state.LotroGame;
-import com.gempukku.lotro.game.state.Skirmish;
 import com.gempukku.lotro.logic.actions.ActivateCardAction;
-import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
-import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect;
 import com.gempukku.lotro.logic.modifiers.KeywordModifier;
 import com.gempukku.lotro.logic.modifiers.Modifier;
 import com.gempukku.lotro.logic.modifiers.StrengthModifier;
@@ -55,18 +53,8 @@ public class Card1_225 extends AbstractAttachable {
                 && PlayConditions.canExert(self, game, self.getAttachedTo())) {
             final ActivateCardAction action = new ActivateCardAction(self);
             action.appendCost(new ExertCharactersEffect(self, self.getAttachedTo()));
-            Skirmish skirmish = game.getGameState().getSkirmish();
-            if (skirmish != null
-                    && skirmish.getShadowCharacters().contains(self.getAttachedTo())) {
-                action.appendEffect(
-                        new ChooseActiveCardEffect(self, playerId, "Choose possession borne by character he is skirmishing", CardType.POSSESSION, Filters.hasAttached(skirmish.getFellowshipCharacter())) {
-                            @Override
-                            protected void cardSelected(LotroGame game, PhysicalCard possession) {
-                                action.appendEffect(
-                                        new DiscardCardsFromPlayEffect(self, possession));
-                            }
-                        });
-            }
+            action.appendEffect(
+                    new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.POSSESSION, Filters.attachedTo(Filters.character, Filters.inSkirmishAgainst(self))));
             return Collections.singletonList(action);
         }
         return null;
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index c12b7c5c1..5067d00fb 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -1,4 +1,7 @@
 <pre style="font-size:80%">
+<b>31 Jan. 2012</b>
+- "Sword of Minas Morgul" now correctly discards the possession born by a character skirmishing the Nazgul.
+
 <b>29 Jan. 2012</b>
 - "Whip of Many Thongs" now discards only Free People cards from hand.
 - "The One Rings" should now correctly add burdens instead of wounds if The One Ring is on.