Merge remote-tracking branch 'origin/master' into 4.3.4
This commit is contained in:
commit
15086e92f1
5 files changed
+36
-17
No files matched your search
@@ -9948,9 +9948,12 @@ uint32 Unit::SpellCriticalDamageBonus(SpellInfo const* spellProto, uint32 damage
|
||||
|
||||
crit_bonus -= damage;
|
||||
|
||||
// adds additional damage to crit_bonus (from talents)
|
||||
if (Player* modOwner = GetSpellModOwner())
|
||||
modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);
|
||||
if (damage > uint32(crit_bonus))
|
||||
{
|
||||
// adds additional damage to critBonus (from talents)
|
||||
if (Player* modOwner = GetSpellModOwner())
|
||||
modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);
|
||||
}
|
||||
|
||||
crit_bonus += damage;
|
||||
|
||||
|
||||
Reference in new issue
Block a user