aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
authorChaplain <aionthefirst@gmail.com>2012-05-10 19:39:29 +0300
committerChaplain <aionthefirst@gmail.com>2012-05-10 20:42:07 +0300
commit469ba0b0e797c64040d0b4a3fbe371d8d5baa0b6 (patch)
tree3083b91aa1a349166b9e6f018e5e520ad0686e6a /src/server/game/Entities
parent9d5c59939f0ebb5e7a078ebac67b9cc0029fb7d9 (diff)
Clean up for 58f63509cd4
*restore const methods in spellauraeffects *fix typo in Unit::CalculateMeleeDamage thx bytewarrior *minor speed up in SpellInfo::GetMaxTicks() thx Warpten *deleted duble ';;' thx bytewarrior *speed up in SpellInfo::GetMaxTicks() thx goes to Vincent-Michael
Diffstat (limited to 'src/server/game/Entities')
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index a04e2ac0e48..f4f41ff6b5f 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -1151,7 +1151,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam
damage += CalculateDamage(damageInfo->attackType, false, true);
// Add melee damage bonus
damage = MeleeDamageBonusDone(damageInfo->target, damage, damageInfo->attackType);
- damage = MeleeDamageBonusTaken(damage, damageInfo->attackType);
+ damage = damageInfo->target->MeleeDamageBonusTaken(damage, damageInfo->attackType);
// Calculate armor reduction
if (IsDamageReducedByArmor((SpellSchoolMask)(damageInfo->damageSchoolMask)))