From 121e55f1d74d684d1d6e3d93c9a69e06f1206d08 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 27 Nov 2015 20:21:48 +0100 Subject: [PATCH] * Fixed a problem with calculation of playable lands. --- Mage/src/mage/abilities/PlayLandAbility.java | 2 +- Mage/src/mage/players/PlayerImpl.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Mage/src/mage/abilities/PlayLandAbility.java b/Mage/src/mage/abilities/PlayLandAbility.java index ed7689ef71..602cb8f6f4 100644 --- a/Mage/src/mage/abilities/PlayLandAbility.java +++ b/Mage/src/mage/abilities/PlayLandAbility.java @@ -56,7 +56,7 @@ public class PlayLandAbility extends ActivatedAbilityImpl { return false; } //20091005 - 114.2a - return game.getPlayer(playerId).canPlayLand(); + return game.getActivePlayerId().equals(playerId) && game.getPlayer(playerId).canPlayLand(); } @Override diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index 8d2553044b..3cf0240b47 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -1057,12 +1057,7 @@ public abstract class PlayerImpl implements Player, Serializable { if (!playLandAbility.canActivate(this.playerId, game)) { return false; } - if (ignoreTiming) { - if (!game.getActivePlayerId().equals(playerId)) { - // Also if a land can be played during the resolution of another spell, it has to be the turn of the player playing the land - return false; - } - } else if (!game.canPlaySorcery(playerId)) { + if (!ignoreTiming && !game.canPlaySorcery(playerId)) { return false; } //20091005 - 305.1