diff options
| author | jackpoz <giacomopoz@gmail.com> | 2016-01-09 16:51:39 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2016-01-09 16:51:39 +0100 |
| commit | b39216eed31f587b1bcef88e69a714214304e896 (patch) | |
| tree | 6d044dcf5bb39c24c59cb14f5071ba7b4e011222 /src | |
| parent | b1d0855624d1c83850fc36f5242437d7f7c1336b (diff) | |
| parent | f810db72a93e0ef6bee7be121c39440781ec916b (diff) | |
Merge pull request #16186 from ariel-/spellmodcharges
Core/Spells: Fix redundant mod charge drop and spell crit calc
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index c677187e3d4..aed7c0db043 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2359,7 +2359,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) // Do healing and triggers if (m_healing > 0) { - bool crit = caster->IsSpellCrit(unitTarget, m_spellInfo, m_spellSchoolMask); + bool crit = target->crit; uint32 addhealth = m_healing; if (crit) { @@ -2384,7 +2384,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) SpellNonMeleeDamage damageInfo(caster, unitTarget, m_spellInfo->Id, m_spellSchoolMask); // Add bonuses and fill damageInfo struct - caster->CalculateSpellDamageTaken(&damageInfo, m_damage, m_spellInfo, m_attackType, target->crit); + caster->CalculateSpellDamageTaken(&damageInfo, m_damage, m_spellInfo, m_attackType, target->crit); caster->DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); // Send log damage message to client |