external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed possible NPE in assignAttackersDamage.

Browse Source
This commit is contained in:
Sloth
2013-06-16 11:24:33 +00:00
parent b7d6f32b89
commit b6418401b3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/game/phase/Combat.java
View File

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