aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authorthenecromancer <none@none>2010-04-21 18:56:13 +0200
committerthenecromancer <none@none>2010-04-21 18:56:13 +0200
commit3ea6bc08db3ab2bc0aade37205fd25763a82b7f5 (patch)
tree563f37091de5f41c43d4b0cc6b98fb20546460db /src/game/Unit.cpp
parent4a698f5dd25525eff7a985cc58462a013488317f (diff)
Fix Critical Block
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 901d67b0276..fd39d86849d 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -1095,7 +1095,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 dama
{
damageInfo->blocked = uint32(pVictim->GetShieldBlockValue());
//double blocked amount if block is critical
- if (isBlockCritical())
+ if (pVictim->isBlockCritical())
damageInfo->blocked+=damageInfo->blocked;
if (damage < damageInfo->blocked)
damageInfo->blocked = damage;
@@ -1321,7 +1321,7 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
damageInfo->procEx |= PROC_EX_BLOCK;
damageInfo->blocked_amount = damageInfo->target->GetShieldBlockValue();
//double blocked amount if block is critical
- if (isBlockCritical())
+ if (damageInfo->target->isBlockCritical())
damageInfo->blocked_amount+=damageInfo->blocked_amount;
if (damageInfo->blocked_amount >= damageInfo->damage)
{