Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: Allow accessing removed spell HitAura in scripts

Browse Source
This commit is contained in:
Shauren
2025-05-30 00:19:32 +02:00
parent 63cad8f182
commit cc0e892d8d
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -623,17 +623,14 @@ bool SpellScript::IsHitCrit() const
}
if (Unit* hitUnit = GetHitUnit())
{
auto itr = std::find_if(m_spell->m_UniqueTargetInfo.begin(), m_spell->m_UniqueTargetInfo.end(), [hitUnit](Spell::TargetInfo const& targetInfo)
{
return targetInfo.TargetGUID == hitUnit->GetGUID();
});
auto itr = std::ranges::find(m_spell->m_UniqueTargetInfo, hitUnit->GetGUID(), &Spell::TargetInfo::TargetGUID);
ASSERT(itr != m_spell->m_UniqueTargetInfo.end());
return itr->IsCrit;
}
return false;
}
Aura* SpellScript::GetHitAura(bool dynObjAura /*= false*/) const
Aura* SpellScript::GetHitAura(bool dynObjAura /*= false*/, bool withRemoved /*= false*/) const
{
if (!IsInTargetHook())
{
@@ -645,7 +642,7 @@ Aura* SpellScript::GetHitAura(bool dynObjAura /*= false*/) const
if (dynObjAura)
aura = m_spell->_dynObjAura;
if (!aura || aura->IsRemoved())
if (!aura || (aura->IsRemoved() && !withRemoved))
return nullptr;
return aura;

2
src/server/game/Spells/SpellScript.h
View File

@@ -1044,7 +1044,7 @@ public:
bool IsHitCrit() const;
Spell* GetSpell() const { return m_spell; }
// returns current spell hit target aura
Aura* GetHitAura(bool dynObjAura = false) const;
Aura* GetHitAura(bool dynObjAura = false, bool withRemoved = false) const;
// prevents applying aura on current spell hit target
void PreventHitAura();