mirror of
https://github.com/araxiaonline/TrinityCore2.git
synced 2026-06-18 13:59:39 -04:00
Fix Critical Block
--HG-- branch : trunk
This commit is contained in:
+2
-2
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user