From 35f1a63c4e7455bf68f99d96239270c1b4642d44 Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Fri, 17 Jun 2011 10:21:23 -0400 Subject: [PATCH] fixed issue 68 --- Mage/src/mage/game/combat/CombatGroup.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Mage/src/mage/game/combat/CombatGroup.java b/Mage/src/mage/game/combat/CombatGroup.java index 8dabe4baae6..9c30edd7fe8 100644 --- a/Mage/src/mage/game/combat/CombatGroup.java +++ b/Mage/src/mage/game/combat/CombatGroup.java @@ -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 { Map assigned = new HashMap(); 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);