From f166bebe8c70f2a21d0996eee54c55feb4e58b0a Mon Sep 17 00:00:00 2001 From: Zzooouhh Date: Thu, 28 Dec 2017 16:49:51 +0100 Subject: [PATCH] Fixed lethal damage potentially dipping into negative values Example: in multiple multi-blocker creatures blocking the same creatures (if one of them assigns more than lethal to the first creature in its attackerOrder) --- Mage/src/main/java/mage/game/combat/CombatGroup.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/game/combat/CombatGroup.java b/Mage/src/main/java/mage/game/combat/CombatGroup.java index 7ad9391ceac..7c5594343c9 100644 --- a/Mage/src/main/java/mage/game/combat/CombatGroup.java +++ b/Mage/src/main/java/mage/game/combat/CombatGroup.java @@ -311,7 +311,7 @@ public class CombatGroup implements Serializable, Copyable { 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) { if (!oldRuleDamage) { @@ -483,7 +483,7 @@ public class CombatGroup implements Serializable, Copyable { if (blocker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) { lethalDamage = 1; } else { - lethalDamage = attacker.getToughness().getValue() - attacker.getDamage(); + lethalDamage = Math.max(attacker.getToughness().getValue() - attacker.getDamage(), 0); } if (lethalDamage >= damage) { assigned.put(attackerId, damage);