Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2018-01-02 23:48:27 +01:00
commit 02f6ce7639
67 changed files with 3282 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/game/permanent/PermanentImpl.java
View file

@ -965,7 +965,9 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
public boolean canBeTargetedBy(MageObject source, UUID sourceControllerId, Game game) {
if (source != null) {
if (abilities.containsKey(ShroudAbility.getInstance().getId())) {
return false;
if (!game.getContinuousEffects().asThough(this.getId(), AsThoughEffectType.SHROUD, sourceControllerId, game)) {
return false;
}
}
if (abilities.containsKey(HexproofAbility.getInstance().getId())) {
if (game.getPlayer(this.getControllerId()).hasOpponent(sourceControllerId, game)