Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Auras: Fixed iterator invalidation crash with procs using SPELL_ATTR0_PROC_FAILURE_BURNS_CHARGE attribute

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/15451ce699540c7d175f4a24d257778dedb0e3d7)
This commit is contained in:
hondacrx
2023-04-21 18:32:54 -04:00
parent cffa1fe172
commit b7a8a88a76
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Spells.cs
+1 -1
View File
@@ -1544,7 +1544,7 @@ namespace Game.Entities
if (procEntry != null) if (procEntry != null)
{ {
aurApp.GetBase().PrepareProcChargeDrop(procEntry, eventInfo); aurApp.GetBase().PrepareProcChargeDrop(procEntry, eventInfo);
aurApp.GetBase().ConsumeProcCharges(procEntry); aurasTriggeringProc.Add(Tuple.Create(0u, aurApp));
} }
} }
Source/Game/Spells/Auras/Aura.cs
+13 -10
View File
@@ -1884,20 +1884,23 @@ namespace Game.Spells
public void TriggerProcOnEvent(uint procEffectMask, AuraApplication aurApp, ProcEventInfo eventInfo) public void TriggerProcOnEvent(uint procEffectMask, AuraApplication aurApp, ProcEventInfo eventInfo)
{ {
bool prevented = CallScriptProcHandlers(aurApp, eventInfo); if (procEffectMask != 0)
if (!prevented)
{ {
for (byte i = 0; i < SpellConst.MaxEffects; ++i) bool prevented = CallScriptProcHandlers(aurApp, eventInfo);
if (!prevented)
{ {
if (!Convert.ToBoolean(procEffectMask & (1 << i))) for (byte i = 0; i < SpellConst.MaxEffects; ++i)
continue; {
if (!Convert.ToBoolean(procEffectMask & (1 << i)))
continue;
// OnEffectProc / AfterEffectProc hooks handled in AuraEffect.HandleProc() // OnEffectProc / AfterEffectProc hooks handled in AuraEffect.HandleProc()
if (aurApp.HasEffect(i)) if (aurApp.HasEffect(i))
GetEffect(i).HandleProc(aurApp, eventInfo); GetEffect(i).HandleProc(aurApp, eventInfo);
}
CallScriptAfterProcHandlers(aurApp, eventInfo);
} }
CallScriptAfterProcHandlers(aurApp, eventInfo);
} }
ConsumeProcCharges(Global.SpellMgr.GetSpellProcEntry(GetSpellInfo())); ConsumeProcCharges(Global.SpellMgr.GetSpellProcEntry(GetSpellInfo()));