diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java index dbaa36402d..145b6d71ed 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java @@ -31,4 +31,12 @@ public class DamageDistributionTest extends CardTestBase { assertLife(playerB, 4); } + @Test + public void testDoubleStrikeUnblocked() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Warren Instigator"); + setLife(playerB, 4); + execute(); + assertLife(playerB, 2); + } + } diff --git a/Mage/src/mage/game/combat/CombatGroup.java b/Mage/src/mage/game/combat/CombatGroup.java index bc2dd6c1d9..9c050ef327 100644 --- a/Mage/src/mage/game/combat/CombatGroup.java +++ b/Mage/src/mage/game/combat/CombatGroup.java @@ -28,12 +28,9 @@ package mage.game.combat; -import java.io.Serializable; -import java.util.*; import mage.Constants.Outcome; import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.abilities.keyword.DeathtouchAbility; - import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.TrampleAbility; @@ -43,6 +40,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.Copyable; +import java.io.Serializable; +import java.util.*; + /** * * @author BetaSteward_at_googlemail.com @@ -480,8 +480,13 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> { } if (blockers.contains(creatureId)) { blockers.remove(creatureId); + + // ayratn: Issue 375 + /* if (blockers.isEmpty()) blocked = false; + */ + //20100423 - 509.2a if (blockerOrder.contains(creatureId)) blockerOrder.remove(creatureId);