aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel.silva305@gmail.com>2016-01-04 19:01:02 -0300
committerariel- <ariel.silva305@gmail.com>2016-01-04 19:01:02 -0300
commitf810db72a93e0ef6bee7be121c39440781ec916b (patch)
tree2491982443275c56add2e935f67ae1d4fd672ef4 /src
parent8a0bbc386982612077e6f83f1816b02be757e371 (diff)
Fix redundant calculation of spell critical chance, fix spellmods being dropped twice.
Closes #7315
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/Spell.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index cb573f4ec3d..0cfcf05c4b5 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