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

* Fixed that attacking creature with deathtouch and trample had to assign more than 1 damage to blocker if only blocked by one (fixes #290).

Browse source
This commit is contained in:
LevelX2 2013-07-20 12:43:07 +02:00
parent 15862b4fc5
commit b1915a1b9a
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

@ -213,7 +213,12 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
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);
}