github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

updated discard effect to prevent unnecessary choosing from an empty hand (fixes #7064)

Browse source
This commit is contained in:
Evan Kranzler 2020-09-11 22:34:16 -04:00
parent 91b9e123ab
commit c6e4a309fe
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java
View file

@ -89,9 +89,14 @@ public class DiscardEachPlayerEffect extends OneShotEffect {
}
int numberOfCardsToDiscard = Math.min(toDiscard, player.getHand().size());
Cards cards = new CardsImpl();
Target target = new TargetDiscard(numberOfCardsToDiscard, numberOfCardsToDiscard, StaticFilters.FILTER_CARD, playerId);
player.chooseTarget(outcome, target, source, game);
cards.addAll(target.getTargets());
if (numberOfCardsToDiscard > 0) {
Target target = new TargetDiscard(
numberOfCardsToDiscard, numberOfCardsToDiscard,
StaticFilters.FILTER_CARD, playerId
);
player.chooseTarget(outcome, target, source, game);
cards.addAll(target.getTargets());
}
cardsToDiscard.put(playerId, cards);
}
if (randomDiscard) {