External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging'

Browse source
This commit is contained in:
rkfg 2016-03-07 01:35:20 +03:00
commit 95d5bd852e
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/PlayLandAbility.java
View file

@ -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

5
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -1064,10 +1064,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