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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-12-28 16:56:13 +01:00
commit 80f71027d6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/game/combat/CombatGroup.java
View file

@ -256,7 +256,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
if (attacker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) {
lethalDamage = 1;
} else {
lethalDamage = blocker.getToughness().getValue() - blocker.getDamage();
lethalDamage = Math.max(blocker.getToughness().getValue() - blocker.getDamage(), 0);
}
if (lethalDamage >= damage) {
blocker.markDamage(damage, attacker.getId(), game, true, true);