From 66040f0c1f664df81fc79845b22d79f4e700eabe Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Mon, 7 Mar 2016 01:07:08 +0300
Subject: [PATCH] Move canPlaySorcery() to ActivatedAbility.canActivate().
---
Mage/src/main/java/mage/abilities/PlayLandAbility.java | 2 +-
Mage/src/main/java/mage/players/PlayerImpl.java | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Mage/src/main/java/mage/abilities/PlayLandAbility.java b/Mage/src/main/java/mage/abilities/PlayLandAbility.java
index 602cb8f6f4..31fd0702bc 100644
--- a/Mage/src/main/java/mage/abilities/PlayLandAbility.java
+++ b/Mage/src/main/java/mage/abilities/PlayLandAbility.java
@@ -56,7 +56,7 @@ public class PlayLandAbility extends ActivatedAbilityImpl {
return false;
}
//20091005 - 114.2a
- return game.getActivePlayerId().equals(playerId) && game.getPlayer(playerId).canPlayLand();
+ return game.getActivePlayerId().equals(playerId) && game.getPlayer(playerId).canPlayLand() && game.canPlaySorcery(playerId);
}
@Override
diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index 508831c718..d7e4328fdb 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -1065,10 +1065,7 @@ public abstract class PlayerImpl implements Player, Serializable {
return false;
}
//20091005 - 114.2a
- if (!playLandAbility.canActivate(this.playerId, game)) {
- return false;
- }
- if (!ignoreTiming && !game.canPlaySorcery(playerId)) {
+ if (!ignoreTiming && !playLandAbility.canActivate(this.playerId, game)) {
return false;
}
//20091005 - 305.1
@@ -2725,7 +2722,7 @@ public abstract class PlayerImpl implements Player, Serializable {
if (game.getContinuousEffects().preventedByRuleModification(GameEvent.getEvent(GameEvent.EventType.PLAY_LAND, ability.getSourceId(), ability.getSourceId(), playerId), ability, game, true)) {
break;
}
- if (canPlay((ActivatedAbility) ability, available, card, game) && game.canPlaySorcery(playerId)) {
+ if (canPlay((ActivatedAbility) ability, available, card, game)) {
playable.add(card.getId());
break Abilities;
}