Merge branch 'crash' into 'master'

Fix crash when all choices invalid

See merge request core-developers/forge!6078
This commit is contained in:
Michael Kamensky
2022-01-24 11:28:00 +00:00

View File

@@ -72,7 +72,7 @@ public class ChooseGenericEffect extends SpellAbilityEffect {
if (sa.hasParam("AtRandom")) {
random = true;
Aggregates.random(abilities, amount, chosenSAs);
} else {
} else if (!abilities.isEmpty()) {
chosenSAs = p.getController().chooseSpellAbilitiesForEffect(abilities, sa, prompt, amount, ImmutableMap.of());
}