github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Issue 375.

Browse source
This commit is contained in:
magenoxx 2011-12-12 14:46:49 +04:00
parent 9fe16d3518
commit 065f1c3190
2 changed files with 16 additions and 3 deletions
Mage.Tests/src/test/java/org/mage/test/combat
DamageDistributionTest.java
Mage/src/mage/game/combat
CombatGroup.java

8
Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java
View file

@ -31,4 +31,12 @@ public class DamageDistributionTest extends CardTestBase {
assertLife(playerB, 4); assertLife(playerB, 4);
} }
@Test
public void testDoubleStrikeUnblocked() {
addCard(Constants.Zone.BATTLEFIELD, playerA, "Warren Instigator");
setLife(playerB, 4);
execute();
assertLife(playerB, 2);
}
} }

11
Mage/src/mage/game/combat/CombatGroup.java
View file

@ -28,12 +28,9 @@
package mage.game.combat; package mage.game.combat;
import java.io.Serializable;
import java.util.*;
import mage.Constants.Outcome; import mage.Constants.Outcome;
import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.abilities.common.DamageAsThoughNotBlockedAbility;
import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.DeathtouchAbility;
import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.TrampleAbility;
@ -43,6 +40,9 @@ import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
import mage.util.Copyable; import mage.util.Copyable;
import java.io.Serializable;
import java.util.*;
/** /**
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
@ -480,8 +480,13 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
} }
if (blockers.contains(creatureId)) { if (blockers.contains(creatureId)) {
blockers.remove(creatureId); blockers.remove(creatureId);
// ayratn: Issue 375
/*
if (blockers.isEmpty()) if (blockers.isEmpty())
blocked = false; blocked = false;
*/
//20100423 - 509.2a //20100423 - 509.2a
if (blockerOrder.contains(creatureId)) if (blockerOrder.contains(creatureId))
blockerOrder.remove(creatureId); blockerOrder.remove(creatureId);