Merge branch 'fixCombatTest' into 'master'

PickerTest: fix combat

Closes #1121

See merge request core-developers/forge!2036
This commit is contained in:
Michael Kamensky
2019-08-15 06:57:31 +00:00

View File

@@ -317,7 +317,7 @@ public class SpellAbilityPickerTest extends SimulationTestCase {
SpellAbilityPicker picker = new SpellAbilityPicker(game, p); SpellAbilityPicker picker = new SpellAbilityPicker(game, p);
assertNull(picker.chooseSpellAbilityToPlay(null)); assertNull(picker.chooseSpellAbilityToPlay(null));
game.getPhaseHandler().devModeSet(PhaseType.COMBAT_BEGIN, p); game.getPhaseHandler().devAdvanceToPhase(PhaseType.COMBAT_BEGIN);
game.getAction().checkStateEffects(true); game.getAction().checkStateEffects(true);
assertNull(picker.chooseSpellAbilityToPlay(null)); assertNull(picker.chooseSpellAbilityToPlay(null));