Merge branch 'master' into 'master'

Revert a change in GameSimulator to make it work and prevent tests from failing

See merge request core-developers/forge!447
This commit is contained in:
Michael Kamensky
2018-04-20 20:03:10 +00:00

View File

@@ -153,11 +153,7 @@ public class GameSimulator {
SpellAbility sa;
if (origSa instanceof SpellAbilityPicker.PlayLandAbility) {
Card hostCard = (Card) copier.find(origSa.getHostCard());
origSa.setHostCard(hostCard);
origSa.setActivatingPlayer(aiPlayer);
if (origSa.canPlay()) {
origSa.resolve();
} else {
if (!aiPlayer.playLand(hostCard, false)) {
System.err.println("Simulation: Couldn't play land! " + origSa);
}
sa = origSa;