Additional fixes for #6771 (modal spells resolve order)

This commit is contained in:
Oleg Agafonov 2020-07-03 01:46:05 +04:00
parent 6dccaee9a4
commit da4a44445b
8 changed files with 120 additions and 64 deletions

View file

@ -3537,8 +3537,8 @@ public abstract class PlayerImpl implements Player, Serializable {
// TODO: Support modal spells with more than one selectable mode
for (Mode mode : option.getModes().values()) {
Ability newOption = option.copy();
newOption.getModes().getSelectedModes().clear();
newOption.getModes().getSelectedModes().add(mode.getId());
newOption.getModes().clearSelectedModes();
newOption.getModes().addSelectedMode(mode.getId());
newOption.getModes().setActiveMode(mode);
if (!newOption.getTargets().getUnchosen().isEmpty()) {
if (!newOption.getManaCosts().getVariableCosts().isEmpty()) {