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

Merge branch 'bug-fixes' into 'master'

Browse Source 
fix NPE when there is nothing to choose from

See merge request core-developers/forge!952
This commit is contained in:
Michael Kamensky
2018-09-27 04:37:43 +00:00
parent fc8142db8b 32ab0aadb0
commit 9bbd1da0ba
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -892,9 +892,11 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
do { do {
selectedCards = decider.getController().chooseCardsForZoneChange(destination, origin, sa, fetchList, delayedReveal, selectPrompt, decider); selectedCards = decider.getController().chooseCardsForZoneChange(destination, origin, sa, fetchList, delayedReveal, selectPrompt, decider);
} while (selectedCards != null && selectedCards.size() > changeNum); } while (selectedCards != null && selectedCards.size() > changeNum);
if (selectedCards != null) {
for (Card card : selectedCards) { for (Card card : selectedCards) {
chosenCards.add(card); chosenCards.add(card);
}; }
}
// maybe prompt the user if they selected fewer than the maximum possible? // maybe prompt the user if they selected fewer than the maximum possible?
} else { } else {
// one at a time // one at a time