ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If 0 cards are choosable from Arbitrary collection, it no longer causes the client to show a possibility of choice.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-10-26 15:46:06 +00:00
parent 26c5732e67
commit a9352d05a5
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseArbitraryCardsEffect.java
View File

@@ -10,6 +10,7 @@ import com.gempukku.lotro.logic.timing.AbstractEffect;
import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.Effect;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
public abstract class ChooseArbitraryCardsEffect extends AbstractEffect { public abstract class ChooseArbitraryCardsEffect extends AbstractEffect {
@@ -55,10 +56,13 @@ public abstract class ChooseArbitraryCardsEffect extends AbstractEffect {
boolean success = possibleCards.size() >= _minimum; boolean success = possibleCards.size() >= _minimum;
int minimum = _minimum; int minimum = _minimum;
if (possibleCards.size() < minimum) if (possibleCards.size() < minimum)
minimum = possibleCards.size(); minimum = possibleCards.size();
if (possibleCards.size() == minimum) { if (_maximum == 0) {
cardsSelected(game, Collections.<PhysicalCard>emptySet());
} else if (possibleCards.size() == minimum) {
cardsSelected(game, possibleCards); cardsSelected(game, possibleCards);
} else { } else {
game.getUserFeedback().sendAwaitingDecision(_playerId, game.getUserFeedback().sendAwaitingDecision(_playerId,

7
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseCardsFromDiscardEffect.java
View File

@@ -11,6 +11,7 @@ import com.gempukku.lotro.logic.timing.AbstractEffect;
import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.Effect;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
public abstract class ChooseCardsFromDiscardEffect extends AbstractEffect { public abstract class ChooseCardsFromDiscardEffect extends AbstractEffect {
@@ -50,9 +51,11 @@ public abstract class ChooseCardsFromDiscardEffect extends AbstractEffect {
int minimum = Math.min(_minimum, cards.size()); int minimum = Math.min(_minimum, cards.size());
if (cards.size() == minimum) if (_maximum == 0) {
cardsSelected(game, Collections.<PhysicalCard>emptySet());
} else if (cards.size() == minimum) {
cardsSelected(game, cards); cardsSelected(game, cards);
else { } else {
game.getUserFeedback().sendAwaitingDecision(_playerId, game.getUserFeedback().sendAwaitingDecision(_playerId,
new ArbitraryCardsSelectionDecision(1, "Choose card from discard", new LinkedList<PhysicalCard>(cards), minimum, _maximum) { new ArbitraryCardsSelectionDecision(1, "Choose card from discard", new LinkedList<PhysicalCard>(cards), minimum, _maximum) {
@Override @Override