From d513fc88201ed09b59beb73c015849286bba0eb6 Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <marcin.sciesinski>
Date: Fri, 15 Jan 2021 15:54:19 -0800
Subject: [PATCH] Cleaning up

---
 .../appender/resolver/CardResolver.java       | 30 ++++++-------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/CardResolver.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/CardResolver.java
index 01e0fae91..70917ac52 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/CardResolver.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/CardResolver.java
@@ -277,15 +277,12 @@ public class CardResolver {
                 public boolean isPlayableInFull(ActionContext actionContext) {
                     int min = countSource.getMinimum(actionContext);
 
-                    Filterable filterable = Filters.any;
-                    if (choiceFilter != null)
-                        filterable = choiceFilter.getFilterable(actionContext);
                     Filterable additionalFilterable = Filters.any;
                     if (playabilityFilter != null)
                         additionalFilterable = playabilityFilter.getFilterable(actionContext);
 
                     Set<PhysicalCard> self = Collections.singleton(actionContext.getSource());
-                    return Filters.filter(self, actionContext.getGame(), Filters.zone(Zone.DISCARD), filterable, additionalFilterable).size() >= min;
+                    return Filters.filter(self, actionContext.getGame(), Filters.zone(Zone.DISCARD), additionalFilterable).size() >= min;
                 }
 
                 @Override
@@ -311,14 +308,11 @@ public class CardResolver {
                     int min = countSource.getMinimum(null);
                     String choicePlayerId = playerSource.getPlayer(actionContext);
                     final Collection<? extends PhysicalCard> cardsFromMemory = actionContext.getCardsFromMemory(sourceMemory);
-                    Filterable filterable = Filters.any;
-                    if (choiceFilter != null)
-                        filterable = choiceFilter.getFilterable(actionContext);
                     Filterable additionalFilterable = Filters.any;
                     if (playabilityFilter != null)
                         additionalFilterable = playabilityFilter.getFilterable(actionContext);
                     final LotroGame game = actionContext.getGame();
-                    return Filters.filter(game.getGameState().getDiscard(choicePlayerId), game, Filters.in(cardsFromMemory), filterable, additionalFilterable).size() >= min;
+                    return Filters.filter(game.getGameState().getDiscard(choicePlayerId), game, Filters.in(cardsFromMemory), additionalFilterable).size() >= min;
                 }
 
                 @Override
@@ -336,6 +330,11 @@ public class CardResolver {
             final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);
             final PlayerSource playerSource = PlayerResolver.resolvePlayer(choicePlayer, environment);
             return new DelayedAppender() {
+                @Override
+                public boolean isPlayableInFull(ActionContext actionContext) {
+                    return true;
+                }
+
                 @Override
                 protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
                     return new UnrespondableEffect() {
@@ -346,18 +345,10 @@ public class CardResolver {
                             Filterable filterable = Filters.any;
                             if (choiceFilter != null)
                                 filterable = choiceFilter.getFilterable(actionContext);
-                            Filterable additionalFilterable = Filters.any;
-                            if (playabilityFilter != null)
-                                additionalFilterable = playabilityFilter.getFilterable(actionContext);
-                            actionContext.setCardMemory(memory, Filters.filter(game.getGameState().getDiscard(choicePlayerId), game, filter, filterable, additionalFilterable));
+                            actionContext.setCardMemory(memory, Filters.filter(game.getGameState().getDiscard(choicePlayerId), game, filter, filterable));
                         }
                     };
                 }
-
-                @Override
-                public boolean isPlayableInFull(ActionContext actionContext) {
-                    return true;
-                }
             };
         } else if (type.startsWith("choose(") && type.endsWith(")")) {
             final String filter = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
@@ -369,14 +360,11 @@ public class CardResolver {
                     int min = countSource.getMinimum(actionContext);
                     final Filterable filter = filterableSource.getFilterable(actionContext);
                     String choicePlayerId = playerSource.getPlayer(actionContext);
-                    Filterable filterable = Filters.any;
-                    if (choiceFilter != null)
-                        filterable = choiceFilter.getFilterable(actionContext);
                     Filterable additionalFilterable = Filters.any;
                     if (playabilityFilter != null)
                         additionalFilterable = playabilityFilter.getFilterable(actionContext);
                     final LotroGame game = actionContext.getGame();
-                    return Filters.filter(game.getGameState().getDiscard(choicePlayerId), game, filter, filterable, additionalFilterable).size() >= min;
+                    return Filters.filter(game.getGameState().getDiscard(choicePlayerId), game, filter, additionalFilterable).size() >= min;
                 }
 
                 @Override