github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed Issue 67

Browse source
This commit is contained in:
BetaSteward 2011-05-08 23:34:54 -04:00
parent 337eb9926e
commit bf070098f7
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/game/permanent/PermanentImpl.java
View file

@ -436,7 +436,7 @@ public abstract class PermanentImpl<T extends PermanentImpl<T>> extends CardImpl
Permanent source = game.getPermanent(sourceId);
if (source != null && source.getAbilities().containsKey(LifelinkAbility.getInstance().getId())) {
Player player = game.getPlayer(source.getControllerId());
player.gainLife(damageDone, game);
player.gainLife(damageAmount, game);
}
if (source != null && source.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) {
deathtouched = true;

7
Mage/src/mage/players/PlayerImpl.java
View file

@ -642,14 +642,9 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
}
if (source != null && source.getAbilities().containsKey(LifelinkAbility.getInstance().getId())) {
Player player = game.getPlayer(source.getControllerId());
player.gainLife(actualDamage, game);
player.gainLife(damage, game);
}
game.fireEvent(new DamagedPlayerEvent(playerId, sourceId, playerId, actualDamage, combatDamage));
// game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DAMAGED_PLAYER, playerId, sourceId, playerId, actualDamage));
// if (combatDamage)
// game.fireEvent(GameEvent.getEvent(GameEvent.EventType.COMBAT_DAMAGED_PLAYER, playerId, sourceId, playerId, actualDamage));
// else
// game.fireEvent(GameEvent.getEvent(GameEvent.EventType.NONCOMBAT_DAMAGED_PLAYER, playerId, sourceId, playerId, actualDamage));
return actualDamage;
}
}