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

Merge branch 'etali' into 'master'

Browse Source 
PlayEffect: Fix loop of selecting same card when optional

Closes #1835

See merge request core-developers/forge!4697
This commit is contained in:
Michael Kamensky
2021-05-16 03:47:07 +00:00
parent f996c90653 3681dba5fb
commit a1e7ecbecc
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); activator.addController(controlledByTimeStamp, controlledByPlayer);
} }
final CardCollection saidNoTo = new CardCollection(); while (!tgtCards.isEmpty() && amount > 0) {
while (tgtCards.size() > saidNoTo.size() && saidNoTo.size() < amount && amount > 0) {
activator.getController().tempShowCards(showCards); activator.getController().tempShowCards(showCards);
Card tgtCard = controller.getController().chooseSingleEntityForEffect(tgtCards, sa, Localizer.getInstance().getMessage("lblSelectCardToPlay"), null); Card tgtCard = controller.getController().chooseSingleEntityForEffect(tgtCards, sa, Localizer.getInstance().getMessage("lblSelectCardToPlay"), null);
activator.getController().endTempShowCards(); activator.getController().endTempShowCards();
@@ -207,7 +206,7 @@ public class PlayEffect extends SpellAbilityEffect {
if (wasFaceDown) { if (wasFaceDown) {
tgtCard.turnFaceDownNoUpdate(); tgtCard.turnFaceDownNoUpdate();
} }
saidNoTo.add(tgtCard); tgtCards.remove(tgtCard);
continue; continue;
} }
@@ -241,7 +240,7 @@ public class PlayEffect extends SpellAbilityEffect {
source.addRemembered(tgtCard); source.addRemembered(tgtCard);
} }
} else { } else {
saidNoTo.add(tgtCard); tgtCards.remove(tgtCard);
} }
continue; continue;
} }