araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-20 23:11:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: rework part 3: spells only handle at most one UnitAura and one DynObjAura during its lifetime

Browse Source 
Closes #15088

(cherry picked from commit e8d5aa56cc)
This commit is contained in:
ariel-
2018-01-27 03:45:40 -03:00
committed by Shauren
parent 52ae3c89d1
commit f3548d45d0
17 changed files with 591 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellScript.cpp
+14 -7
View File
@@ -21,6 +21,7 @@
#include "ScriptMgr.h"
#include "SpellAuras.h"
#include "SpellMgr.h"
#include "Unit.h"
#include <sstream>
#include <string>
@@ -648,18 +649,22 @@ void SpellScript::SetHitHeal(int32 heal)
m_spell->m_healing = heal;
}
Aura* SpellScript::GetHitAura() const
Aura* SpellScript::GetHitAura(bool dynObjAura /*= false*/) const
{
if (!IsInTargetHook())
{
TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::GetHitAura was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId);
return nullptr;
}
if (!m_spell->m_spellAura)
Aura* aura = m_spell->_spellAura;
if (dynObjAura)
aura = m_spell->_dynObjAura;
if (!aura || aura->IsRemoved())
return nullptr;
if (m_spell->m_spellAura->IsRemoved())
return nullptr;
return m_spell->m_spellAura;
return aura;
}
void SpellScript::PreventHitAura()
@@ -669,8 +674,10 @@ void SpellScript::PreventHitAura()
TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::PreventHitAura was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId);
return;
}
if (m_spell->m_spellAura)
m_spell->m_spellAura->Remove();
if (UnitAura* aura = m_spell->_spellAura)
aura->Remove();
if (DynObjAura* aura = m_spell->_dynObjAura)
aura->Remove();
}
void SpellScript::PreventHitEffect(SpellEffIndex effIndex)