diff --git a/Mage/src/mage/game/combat/Combat.java b/Mage/src/mage/game/combat/Combat.java index 7cc9706d1f7..76b57344b73 100644 --- a/Mage/src/mage/game/combat/Combat.java +++ b/Mage/src/mage/game/combat/Combat.java @@ -416,6 +416,8 @@ public class Combat implements Serializable, Copyable { if (group.blockers.contains(blockerId)) { group.blockers.remove(blockerId); group.blockerOrder.remove(blockerId); + if (group.blockers.isEmpty()) + group.blocked = false; } } Permanent creature = game.getPermanent(blockerId); diff --git a/Mage/src/mage/game/combat/CombatGroup.java b/Mage/src/mage/game/combat/CombatGroup.java index cf201837267..c511cd8697b 100644 --- a/Mage/src/mage/game/combat/CombatGroup.java +++ b/Mage/src/mage/game/combat/CombatGroup.java @@ -484,12 +484,14 @@ public class CombatGroup implements Serializable, Copyable { return defenderIsPlaneswalker; } - void remove(UUID creatureId) { + public void remove(UUID creatureId) { if (attackers.contains(creatureId)) { attackers.remove(creatureId); } if (blockers.contains(creatureId)) { blockers.remove(creatureId); + if (blockers.isEmpty()) + blocked = false; //20100423 - 509.2a if (blockerOrder.contains(creatureId)) blockerOrder.remove(creatureId);