Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: Implemented new aura script hook OnEnterLeaveCombat

Browse Source
This commit is contained in:
Matan Shukry
2021-03-23 00:21:09 +01:00
committed by Shauren
parent 88f4d30445
commit 2420f4e7a1
8 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -978,6 +978,16 @@ void AuraScript::EffectProcHandler::Call(AuraScript* auraScript, AuraEffect* aur
(auraScript->*_EffectHandlerScript)(aurEff, eventInfo);
}
AuraScript::EnterLeaveCombatHandler::EnterLeaveCombatHandler(AuraEnterLeaveCombatFnType handlerScript)
{
_handlerScript = handlerScript;
}
void AuraScript::EnterLeaveCombatHandler::Call(AuraScript* auraScript, bool isNowInCombat) const
{
(auraScript->*_handlerScript)(isNowInCombat);
}
bool AuraScript::_Load(Aura* aura)
{
m_aura = aura;
@@ -1224,6 +1234,7 @@ Unit* AuraScript::GetTarget() const
case AURA_SCRIPT_HOOK_AFTER_PROC:
case AURA_SCRIPT_HOOK_EFFECT_PROC:
case AURA_SCRIPT_HOOK_EFFECT_AFTER_PROC:
case AURA_SCRIPT_HOOK_ENTER_LEAVE_COMBAT:
return m_auraApplication->GetTarget();
default:
TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u` AuraScript::GetTarget called in a hook in which the call won't have effect!", m_scriptName->c_str(), m_scriptSpellId);