From b1915a1b9a6a41c42aca4a46edce8a93bb2459d0 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 20 Jul 2013 12:43:07 +0200 Subject: [PATCH] * Fixed that attacking creature with deathtouch and trample had to assign more than 1 damage to blocker if only blocked by one (fixes #290). --- 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 ad617d158e..5acb5f60cd 100644 --- a/Mage/src/mage/game/combat/CombatGroup.java +++ b/Mage/src/mage/game/combat/CombatGroup.java @@ -213,7 +213,12 @@ public class CombatGroup implements Serializable, Copyable { if (blocked && canDamage(attacker, first)) { int damage = attacker.getPower().getValue(); if (hasTrample(attacker)) { - 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) { blocker.markDamage(damage, attacker.getId(), game, true, true); }