diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java index 7635403f1..7b7911f95 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java @@ -34,10 +34,6 @@ public class PlayPermanentAction implements CostToEffectAction { private Effect _discardCardEffect; private boolean _cardDiscarded; - public PlayPermanentAction(PhysicalCard card, Zone zone) { - this(card, zone, 0); - } - public PlayPermanentAction(PhysicalCard card, Zone zone, int twilightModifier) { _source = card; diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardsEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardsEffect.java index aaa84af26..af264e789 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardsEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseActiveCardsEffect.java @@ -32,14 +32,19 @@ public abstract class ChooseActiveCardsEffect extends UnrespondableEffect { @Override public void playEffect(LotroGame game) { - game.getUserFeedback().sendAwaitingDecision(_playerId, - new CardsSelectionDecision(1, _choiceText, Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), _filters), _minimum, _maximum) { - @Override - public void decisionMade(String result) throws DecisionResultInvalidException { - List selectedCards = getSelectedCardsByResponse(result); - cardsSelected(selectedCards); - } - }); + List matchingCards = Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), _filters); + if (matchingCards.size() == _minimum) { + cardsSelected(matchingCards); + } else { + game.getUserFeedback().sendAwaitingDecision(_playerId, + new CardsSelectionDecision(1, _choiceText, matchingCards, _minimum, _maximum) { + @Override + public void decisionMade(String result) throws DecisionResultInvalidException { + List selectedCards = getSelectedCardsByResponse(result); + cardsSelected(selectedCards); + } + }); + } } protected abstract void cardsSelected(List cards);