diff --git a/Mage/src/mage/game/combat/CombatGroup.java b/Mage/src/mage/game/combat/CombatGroup.java index 9c30edd7fe8..954ec6c4e47 100644 --- a/Mage/src/mage/game/combat/CombatGroup.java +++ b/Mage/src/mage/game/combat/CombatGroup.java @@ -200,7 +200,9 @@ public class CombatGroup implements Serializable, Copyable { Permanent attacker = game.getPermanent(attackers.get(0)); Player player = game.getPlayer(attacker.getControllerId()); int damage = attacker.getPower().getValue(); - if (attacker != null && canDamage(attacker, first)) { + if (attacker == null) + return; + if (canDamage(attacker, first)) { Map assigned = new HashMap(); for (UUID blockerId: blockerOrder) { Permanent blocker = game.getPermanent(blockerId); @@ -237,6 +239,14 @@ public class CombatGroup implements Serializable, Copyable { blocker.damage(entry.getValue(), attacker.getId(), game, true, true); } } + else { + for (UUID blockerId: blockerOrder) { + Permanent blocker = game.getPermanent(blockerId); + if (canDamage(blocker, first)) { + attacker.damage(blocker.getPower().getValue(), blocker.getId(), game, true, true); + } + } + } } private void defenderDamage(Permanent attacker, int amount, Game game) {