Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions 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 
Port From (https://github.com/TrinityCore/TrinityCore/commit/f3548d45d0a74203ef6f5c7282c31ba794ddf7a1)
This commit is contained in:
hondacrx
2021-08-28 17:03:47 -04:00
parent 5ff5fb7d3f
commit 091272755c
8 changed files with 467 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Scripting/SpellScript.cs
+17 -7
View File
@@ -724,18 +724,22 @@ namespace Game.Scripting
void PreventHitHeal() { SetHitHeal(0); }
public Spell GetSpell() { return m_spell; }
// returns current spell hit target aura
public Aura GetHitAura()
public Aura GetHitAura(bool dynObjAura = false)
{
if (!IsInTargetHook())
{
Log.outError(LogFilter.Scripts, "Script: `{0}` Spell: `{1}`: function SpellScript.GetHitAura was called, but function has no effect in current hook!", m_scriptName, m_scriptSpellId);
return null;
}
if (m_spell.m_spellAura == null)
Aura aura = m_spell.spellAura;
if (dynObjAura)
aura = m_spell.dynObjAura;
if (aura == null || aura.IsRemoved())
return null;
if (m_spell.m_spellAura.IsRemoved())
return null;
return m_spell.m_spellAura;
return aura;
}
// prevents applying aura on current spell hit target
public void PreventHitAura()
@@ -745,8 +749,14 @@ namespace Game.Scripting
Log.outError(LogFilter.Scripts, "Script: `{0}` Spell: `{1}`: function SpellScript.PreventHitAura was called, but function has no effect in current hook!", m_scriptName, m_scriptSpellId);
return;
}
if (m_spell.m_spellAura != null)
m_spell.m_spellAura.Remove();
UnitAura unitAura = m_spell.spellAura;
if (unitAura != null)
unitAura.Remove();
DynObjAura dynAura = m_spell.dynObjAura;
if (dynAura != null)
dynAura.Remove();
}
// prevents effect execution on current spell hit target