josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Damage should be dealt AFTER m_damage has been set. possibly fixes scourge strike damage calculations.

Browse Source
This commit is contained in:
Kandera
2012-05-18 12:31:13 -04:00
parent e897bb59f7
commit 1037f96e4f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+3 -2
View File
@@ -2475,15 +2475,16 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target)
caster->ToPlayer()->CastItemCombatSpell(unitTarget, m_attackType, procVictim, procEx); caster->ToPlayer()->CastItemCombatSpell(unitTarget, m_attackType, procVictim, procEx);
} }
caster->DealSpellDamage(&damageInfo, true);
// Haunt // Haunt
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->SpellFamilyFlags[1] & 0x40000 && m_spellAura && m_spellAura->GetEffect(1)) if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->SpellFamilyFlags[1] & 0x40000 && m_spellAura && m_spellAura->GetEffect(1))
{ {
AuraEffect* aurEff = m_spellAura->GetEffect(1); AuraEffect* aurEff = m_spellAura->GetEffect(1);
aurEff->SetAmount(CalculatePctU(aurEff->GetAmount(), damageInfo.damage)); aurEff->SetAmount(CalculatePctU(aurEff->GetAmount(), damageInfo.damage));
} }
m_damage = damageInfo.damage; m_damage = damageInfo.damage;
caster->DealSpellDamage(&damageInfo, true);
} }
// Passive spell hits/misses or active spells only misses (only triggers) // Passive spell hits/misses or active spells only misses (only triggers)
else else