multiAttackerDamage fix

This commit is contained in:
Zzooouhh 2017-11-25 07:20:25 +01:00 committed by GitHub
parent 43f22cc256
commit 92e5d8de0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -330,7 +330,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
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<CombatGroup> {
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<UUID, Integer> entry : assigned.entrySet()) {
Permanent attacker = game.getPermanent(entry.getKey());