Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: fix logic error causing near teleports to drop combat for players

Browse Source 
Closes #21362

(cherry picked from commit 65709e1c30)
This commit is contained in:
ariel-
2018-02-05 14:43:11 -03:00
committed by Shauren
parent f9b14ca795
commit 8c379e920c
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Spells/SpellScript.cpp
View File

@@ -436,6 +436,22 @@ bool SpellScript::IsInTargetHook() const
}
return false;
}
bool SpellScript::IsInModifiableHook() const
{
// after hit hook executed after damage/healing is already done
// modifying it at this point has no effect
switch (m_currentScriptState)
{
case SPELL_SCRIPT_HOOK_EFFECT_LAUNCH_TARGET:
case SPELL_SCRIPT_HOOK_EFFECT_HIT_TARGET:
case SPELL_SCRIPT_HOOK_BEFORE_HIT:
case SPELL_SCRIPT_HOOK_HIT:
return true;
}
return false;
}
bool SpellScript::IsInHitPhase() const
{
return (m_currentScriptState >= HOOK_SPELL_HIT_START && m_currentScriptState < HOOK_SPELL_HIT_END);
@@ -603,7 +619,7 @@ int32 SpellScript::GetHitDamage() const
void SpellScript::SetHitDamage(int32 damage)
{
if (!IsInTargetHook())
if (!IsInModifiableHook())
{
TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::SetHitDamage was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId);
return;
@@ -623,7 +639,7 @@ int32 SpellScript::GetHitHeal() const
void SpellScript::SetHitHeal(int32 heal)
{
if (!IsInTargetHook())
if (!IsInModifiableHook())
{
TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::SetHitHeal was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId);
return;