- Fixed possible NPE in assignAttackersDamage.

This commit is contained in:
Sloth
2013-06-16 11:24:33 +00:00
parent b7d6f32b89
commit b6418401b3

View File

@@ -641,7 +641,7 @@ public class Combat {
blockers = this.attackerDamageAssignmentOrder.get(attacker);
assignedDamage = true;
// If the Attacker is unblocked, or it's a trampler and has 0 blockers, deal damage to defender
if (blockers.isEmpty()) {
if (blockers == null || blockers.isEmpty()) {
if (trampler || !band.getBlocked()) {
this.addDefendingDamage(damageDealt, attacker);
} // No damage happens if blocked but no blockers left