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 ee476602d..84005db45 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 @@ -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.Set; public abstract class ChooseActiveCardsEffect extends AbstractEffect { @@ -73,7 +74,9 @@ public abstract class ChooseActiveCardsEffect extends AbstractEffect { if (matchingCards.size() < minimum) minimum = matchingCards.size(); - if (_shortcut && matchingCards.size() == minimum) { + if (_shortcut && maximum == 0) { + cardsSelected(game, Collections.emptySet()); + } if (_shortcut && matchingCards.size() == minimum) { if (_source != null && matchingCards.size() > 0) game.getGameState().cardAffectsCard(_playerId, _source, matchingCards); cardsSelected(game, matchingCards); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAndDiscardCardsFromHandEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAndDiscardCardsFromHandEffect.java index 58afd02e2..3d299f019 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAndDiscardCardsFromHandEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAndDiscardCardsFromHandEffect.java @@ -14,6 +14,7 @@ import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collection; +import java.util.Collections; import java.util.Set; public class ChooseAndDiscardCardsFromHandEffect extends AbstractSubActionEffect { @@ -79,7 +80,9 @@ public class ChooseAndDiscardCardsFromHandEffect extends AbstractSubActionEffect int maximum = Math.min(_maximum.evaluateExpression(game.getGameState(), game.getModifiersQuerying(), null), hand.size()); int minimum = _minimum.evaluateExpression(game.getGameState(), game.getModifiersQuerying(), null); - if (hand.size() <= minimum) { + if (maximum == 0) { + cardsBeingDiscardedCallback(Collections.emptySet()); + } else if (hand.size() <= minimum) { SubAction subAction = new SubAction(_action); subAction.appendEffect(new DiscardCardsFromHandEffect(_action.getActionSource(), _playerId, hand, _forced)); processSubAction(game, subAction); 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 5869cc17e..01f3848fa 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 @@
+13 Dec. 2012
+- If an effect calls for selecting a variable number of cards, and the number is 0, game should no longer stop working.
+
 12 Dec. 2012
 - "Strength of Spirit" no longer cancels an effect if the exertion was a cost.
 - "Orc Insurgent" now allows a choice of number of FP cultures over 2 you wish to spot.