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

Fixed that a planeswalker that left the battlefield was not correctly removed from combat.

Browse source
This commit is contained in:
LevelX2 2016-02-25 21:41:38 +01:00
parent ff298938c1
commit 9f35637e6d
4 changed files with 68 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1091,10 +1091,8 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
if (!oneCanBeAttacked) {
return false;
}
} else {
if (!canAttackCheckRestrictionEffects(defenderId, game)) {
return false;
}
} else if (!canAttackCheckRestrictionEffects(defenderId, game)) {
return false;
}
return !abilities.containsKey(DefenderAbility.getInstance().getId())
@ -1223,6 +1221,10 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
public boolean removeFromCombat(Game game, boolean withInfo) {
if (this.isAttacking() || this.blocking > 0) {
return game.getCombat().removeFromCombat(objectId, game, withInfo);
} else if (getCardType().contains(CardType.PLANESWALKER)) {
if (game.getCombat().getDefenders().contains(getId())) {
game.getCombat().removePlaneswalkerFromCombat(objectId, game, withInfo);
}
}
return false;
}