From 94ca716a80158803d0530f4d3fbe44be5c9b5e63 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Tue, 12 Jun 2012 09:29:29 +0000
Subject: [PATCH] Playing cards with "These Are My People" is optional.

---
 .../lotro/cards/set5/gondor/Card5_041.java    | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_041.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_041.java
index 632c3a3e4..64f257fbf 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_041.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_041.java
@@ -11,7 +11,6 @@ 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.logic.actions.SubAction;
 import com.gempukku.lotro.logic.effects.ChooseArbitraryCardsEffect;
 import com.gempukku.lotro.logic.timing.AbstractSuccessfulEffect;
 import com.gempukku.lotro.logic.timing.Effect;
@@ -44,37 +43,18 @@ public class Card5_041 extends AbstractEvent {
         action.appendCost(
                 new ChooseAndExertCharactersEffect(action, playerId, 1, 1, 2, Filters.aragorn));
 
-        final SubAction subAction = new SubAction(action);
-        subAction.appendEffect(
-                new PlayAnyNumberOfPossessionsOnCharacters(subAction, playerId));
         action.appendEffect(
-                new AbstractSuccessfulEffect() {
-                    @Override
-                    public String getText(LotroGame game) {
-                        return null;
-                    }
-
-                    @Override
-                    public Effect.Type getType() {
-                        return null;
-                    }
-
-                    @Override
-                    public void playEffect(LotroGame game) {
-                        game.getActionsEnvironment().addActionToStack(subAction);
-                    }
-                }
-        );
+                new PlayAnyNumberOfPossessionsOnCharacters(action, playerId));
 
         return action;
     }
 
     private class PlayAnyNumberOfPossessionsOnCharacters extends AbstractSuccessfulEffect {
-        private SubAction _subAction;
+        private PlayEventAction _action;
         private String _playerId;
 
-        private PlayAnyNumberOfPossessionsOnCharacters(SubAction subAction, String playerId) {
-            _subAction = subAction;
+        private PlayAnyNumberOfPossessionsOnCharacters(PlayEventAction action, String playerId) {
+            _action = action;
             _playerId = playerId;
         }
 
@@ -92,7 +72,7 @@ public class Card5_041 extends AbstractEvent {
         public void playEffect(final LotroGame game) {
             final Filter additionalAttachmentFilter = Filters.and(CardType.COMPANION, Signet.ARAGORN);
 
-            _subAction.appendEffect(
+            _action.appendEffect(
                     new ChooseArbitraryCardsEffect(_playerId, "Choose card to play", game.getGameState().getDiscard(_playerId),
                             Filters.and(
                                     CardType.POSSESSION,
@@ -102,7 +82,7 @@ public class Card5_041 extends AbstractEvent {
                             if (selectedCards.size() > 0) {
                                 PhysicalCard selectedCard = selectedCards.iterator().next();
                                 game.getActionsEnvironment().addActionToStack(((AbstractAttachable) selectedCard.getBlueprint()).getPlayCardAction(_playerId, game, selectedCard, additionalAttachmentFilter, 0));
-                                _subAction.appendEffect(new PlayAnyNumberOfPossessionsOnCharacters(_subAction, _playerId));
+                                _action.appendEffect(new PlayAnyNumberOfPossessionsOnCharacters(_action, _playerId));
                             }
                         }
                     });