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

- Fixed "CARDNAME assigns its combat damage as though it weren't blocked." causing a NPE.

Browse Source
This commit is contained in:
Sloth
2013-02-27 18:50:53 +00:00
parent 8fcb03fb3e
commit 0ffe871f98
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -725,7 +725,7 @@ public class Combat {
blockers = this.getBlockers(attacker);
assignedDamage = true;
// If the Attacker is unblocked, or it's a trampler and has 0 blockers, deal damage to defender
if (blockers.size() == 0) {
if (blockers.isEmpty()) {
if (trampler || this.isUnblocked(attacker)) {
this.addDefendingDamage(damageDealt, attacker);
} else {
@@ -735,7 +735,7 @@ public class Combat {
} else {
Map<Card, Integer> map = this.getAttackingPlayer().getController().assignCombatDamage(attacker, blockers, damageDealt, this.getDefenderByAttacker(attacker));
for (Entry<Card, Integer> dt : map.entrySet()) {
if( dt.getKey() == null && trampler) {
if( dt.getKey() == null) {
if (dt.getValue() > 0)
addDefendingDamage(dt.getValue(), attacker);
} else {