github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 11:08:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed issue 68

Browse source
This commit is contained in:
BetaSteward 2011-06-17 10:21:23 -04:00
parent 51067b6e64
commit 35f1a63c4e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ package mage.game.combat;
import java.io.Serializable;
import java.util.*;
import mage.abilities.keyword.DeathtouchAbility;
import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.FirstStrikeAbility;
@ -203,7 +204,11 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
Map<UUID, Integer> assigned = new HashMap<UUID, Integer>();
for (UUID blockerId: blockerOrder) {
Permanent blocker = game.getPermanent(blockerId);
int lethalDamage = blocker.getToughness().getValue() - blocker.getDamage();
int lethalDamage;
if (attacker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId()))
lethalDamage = 1;
else
lethalDamage = blocker.getToughness().getValue() - blocker.getDamage();
if (lethalDamage >= damage) {
// Issue#73
//blocker.damage(damage, attacker.getId(), game, true, true);