From 92e5d8de0aa16978bfc72694a25e031e185e5829 Mon Sep 17 00:00:00 2001 From: Zzooouhh Date: Sat, 25 Nov 2017 07:20:25 +0100 Subject: [PATCH] multiAttackerDamage fix --- Mage/src/main/java/mage/game/combat/CombatGroup.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/combat/CombatGroup.java b/Mage/src/main/java/mage/game/combat/CombatGroup.java index f64863280fa..5b98721b08b 100644 --- a/Mage/src/main/java/mage/game/combat/CombatGroup.java +++ b/Mage/src/main/java/mage/game/combat/CombatGroup.java @@ -330,7 +330,7 @@ public class CombatGroup implements Serializable, Copyable { if (damage > 0 && hasTrample(attacker) && excessDamageToDefender) { defenderDamage(attacker, damage, game); } else if (!blockerOrder.isEmpty()) { - // Assign the damge left to first blocker + // Assign the damage left to first blocker assigned.put(blockerOrder.get(0), assigned.get(blockerOrder.get(0)) + damage); } } @@ -413,6 +413,10 @@ public class CombatGroup implements Serializable, Copyable { damage -= damageAssigned; } } + if (damage > 0) { + // Assign the damage left to first attacker + assigned.put(attackerOrder.get(0), assigned.get(attackerOrder.get(0)) + damage); + } for (Map.Entry entry : assigned.entrySet()) { Permanent attacker = game.getPermanent(entry.getKey());