aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/Spell.cpp
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-10-04 23:35:50 -0300
committerariel- <ariel-@users.noreply.github.com>2016-10-04 23:35:50 -0300
commitd9e4c8e04f9d0ece910642d1e695441deb4e8610 (patch)
tree6618d2d578e797dca8c0af4059b7929519c7cd91 /src/server/game/Spells/Spell.cpp
parent51493a63e25429c99760e76be145666ae5616eec (diff)
Core/Spells: add Target Processing (SMSG_SPELLLOGEXECUTE) to LAUNCH_TARGET phase.
Move EffectInterruptCast to LAUNCH_TARGET Phase. Closes #3718 Closes #6042
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
-rw-r--r--src/server/game/Spells/Spell.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index b37a44d6e70..9bf2184f0c3 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -6880,9 +6880,11 @@ void Spell::HandleLaunchPhase()
for (Unit::AuraEffectList::const_iterator j = Auras.begin(); j != Auras.end(); ++j)
{
if ((*j)->IsAffectedOnSpell(m_spellInfo))
- usesAmmo=false;
+ usesAmmo = false;
}
+ PrepareTargetProcessing();
+
for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
{
TargetInfo& target = *ihit;
@@ -6916,8 +6918,11 @@ void Spell::HandleLaunchPhase()
break;
}
}
+
DoAllEffectOnLaunchTarget(target, multiplier);
}
+
+ FinishTargetProcessing();
}
void Spell::DoAllEffectOnLaunchTarget(TargetInfo& targetInfo, float* multiplier)