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

Fixed minor problem of Volrath's Laboratory. Added combat flag to LIFE_LOST event.

Browse source
This commit is contained in:
LevelX2 2016-09-28 08:00:32 +02:00
parent 9676f24752
commit 9cf9d69c55
134 changed files with 163 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1699,7 +1699,7 @@ public abstract class PlayerImpl implements Player, Serializable {
if (life > this.life) {
gainLife(life - this.life, game);
} else if (life < this.life) {
loseLife(this.life - life, game);
loseLife(this.life - life, game, false);
}
}
@ -1730,17 +1730,17 @@ public abstract class PlayerImpl implements Player, Serializable {
}
@Override
public int loseLife(int amount, Game game) {
public int loseLife(int amount, Game game, boolean atCombat) {
if (!canLoseLife) {
return 0;
}
GameEvent event = new GameEvent(GameEvent.EventType.LOSE_LIFE, playerId, playerId, playerId, amount, false);
GameEvent event = new GameEvent(GameEvent.EventType.LOSE_LIFE, playerId, playerId, playerId, amount, atCombat);
if (!game.replaceEvent(event)) {
this.life -= event.getAmount();
if (!game.isSimulation()) {
game.informPlayers(this.getLogName() + " loses " + event.getAmount() + " life");
}
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.LOST_LIFE, playerId, playerId, playerId, amount));
game.fireEvent(new GameEvent(GameEvent.EventType.LOST_LIFE, playerId, playerId, playerId, amount, atCombat));
return amount;
}
return 0;
@ -1820,7 +1820,7 @@ public abstract class PlayerImpl implements Player, Serializable {
} else {
GameEvent damageToLifeLossEvent = new GameEvent(EventType.DAMAGE_CAUSES_LIFE_LOSS, playerId, sourceId, playerId, actualDamage, combatDamage);
if (!game.replaceEvent(damageToLifeLossEvent)) {
this.loseLife(damageToLifeLossEvent.getAmount(), game);
this.loseLife(damageToLifeLossEvent.getAmount(), game, combatDamage);
}
}
if (sourceAbilities != null && sourceAbilities.containsKey(LifelinkAbility.getInstance().getId())) {