external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix loop of selecting same card when optional

Browse Source
This commit is contained in:
tool4EvEr
2021-05-13 13:55:19 +02:00
parent 9d4e02c2d4
commit 3681dba5fb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
View File

@@ -180,8 +180,7 @@ public class PlayEffect extends SpellAbilityEffect {
activator.addController(controlledByTimeStamp, controlledByPlayer);
}
final CardCollection saidNoTo = new CardCollection();
while (tgtCards.size() > saidNoTo.size() && saidNoTo.size() < amount && amount > 0) {
while (!tgtCards.isEmpty() && amount > 0) {
activator.getController().tempShowCards(showCards);
Card tgtCard = controller.getController().chooseSingleEntityForEffect(tgtCards, sa, Localizer.getInstance().getMessage("lblSelectCardToPlay"), null);
activator.getController().endTempShowCards();
@@ -207,7 +206,7 @@ public class PlayEffect extends SpellAbilityEffect {
if (wasFaceDown) {
tgtCard.turnFaceDownNoUpdate();
}
saidNoTo.add(tgtCard);
tgtCards.remove(tgtCard);
continue;
}
@@ -241,7 +240,7 @@ public class PlayEffect extends SpellAbilityEffect {
source.addRemembered(tgtCard);
}
} else {
saidNoTo.add(tgtCard);
tgtCards.remove(tgtCard);
}
continue;
}