From 0ffe871f98a2c0d4a3905560d3e28b5dacaca93c Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Wed, 27 Feb 2013 18:50:53 +0000
Subject: [PATCH] - Fixed "CARDNAME assigns its combat damage as though it
 weren't blocked." causing a NPE.

---
 src/main/java/forge/game/phase/Combat.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/game/phase/Combat.java b/src/main/java/forge/game/phase/Combat.java
index e0c025faf3b..e593c54be6b 100644
--- a/src/main/java/forge/game/phase/Combat.java
+++ b/src/main/java/forge/game/phase/Combat.java
@@ -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 {