diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseArbitraryCardsEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseArbitraryCardsEffect.java index 2c2c1e5cc..f59863947 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseArbitraryCardsEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseArbitraryCardsEffect.java @@ -10,6 +10,7 @@ import com.gempukku.lotro.logic.timing.AbstractEffect; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collection; +import java.util.Collections; import java.util.List; public abstract class ChooseArbitraryCardsEffect extends AbstractEffect { @@ -55,10 +56,13 @@ public abstract class ChooseArbitraryCardsEffect extends AbstractEffect { boolean success = possibleCards.size() >= _minimum; int minimum = _minimum; + if (possibleCards.size() < minimum) minimum = possibleCards.size(); - if (possibleCards.size() == minimum) { + if (_maximum == 0) { + cardsSelected(game, Collections.emptySet()); + } else if (possibleCards.size() == minimum) { cardsSelected(game, possibleCards); } else { game.getUserFeedback().sendAwaitingDecision(_playerId, diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseCardsFromDiscardEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseCardsFromDiscardEffect.java index 044d3fa95..14f0765a9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseCardsFromDiscardEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseCardsFromDiscardEffect.java @@ -11,6 +11,7 @@ import com.gempukku.lotro.logic.timing.AbstractEffect; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; public abstract class ChooseCardsFromDiscardEffect extends AbstractEffect { @@ -50,9 +51,11 @@ public abstract class ChooseCardsFromDiscardEffect extends AbstractEffect { int minimum = Math.min(_minimum, cards.size()); - if (cards.size() == minimum) + if (_maximum == 0) { + cardsSelected(game, Collections.emptySet()); + } else if (cards.size() == minimum) { cardsSelected(game, cards); - else { + } else { game.getUserFeedback().sendAwaitingDecision(_playerId, new ArbitraryCardsSelectionDecision(1, "Choose card from discard", new LinkedList(cards), minimum, _maximum) { @Override