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

Merge branch 'master' into 'master'

Browse Source 
Fix NPE in CostPartWithList (will need further rework / generalization later)

See merge request core-developers/forge!3033
This commit is contained in:
Michael Kamensky
2020-07-26 16:43:40 +00:00
parent 47e683b855 55a10bccb7
commit f2b4f0fd7b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/cost/CostPartWithList.java
View File

@@ -132,8 +132,8 @@ public abstract class CostPartWithList extends CostPart {
} }
cardList.addAll(doListPayment(ability, targetCards)); cardList.addAll(doListPayment(ability, targetCards));
} else { } else {
if (targetCards.isEmpty()) { if (targetCards.isEmpty() && this instanceof CostFlipCoin) {
doPayment(ability, null); // e.g. CostFlipCoin doPayment(ability, null); // TODO: generalize for other cost types if necessary
} else { } else {
for (Card c : targetCards) { for (Card c : targetCards) {
executePayment(ability, c); executePayment(ability, c);