ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/Spells): Port SPELL_ATTR3_INSTANT_TARGET_PROCS cascade proc suppression from TrinityCore (#24936)

Browse source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
Co-authored-by: QAston <126822+QAston@users.noreply.github.com>
This commit is contained in:
blinkysc 2026-03-02 06:34:59 -06:00 • committed by GitHub
parent ed78bfe5a6
commit dd6f32d54d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 279 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/server/game/Entities/Unit/Unit.cpp
View file

@ -13058,11 +13058,28 @@ void Unit::TriggerAurasProcOnEvent(std::list<AuraApplication*>* myProcAuras, std
void Unit::TriggerAurasProcOnEvent(ProcEventInfo& eventInfo, AuraApplicationProcContainer& aurasTriggeringProc)
{
Spell const* triggeringSpell = eventInfo.GetProcSpell();
bool const disableProcs = triggeringSpell && triggeringSpell->IsProcDisabled();
if (disableProcs)
SetCantProc(true);
for (auto const& [procEffectMask, aurApp] : aurasTriggeringProc)
{
if (!aurApp->GetRemoveMode())
aurApp->GetBase()->TriggerProcOnEvent(procEffectMask, aurApp, eventInfo);
if (aurApp->GetRemoveMode())
continue;
SpellInfo const* spellInfo = aurApp->GetBase()->GetSpellInfo();
if (spellInfo->HasAttribute(SPELL_ATTR3_INSTANT_TARGET_PROCS))
SetCantProc(true);
aurApp->GetBase()->TriggerProcOnEvent(procEffectMask, aurApp, eventInfo);
if (spellInfo->HasAttribute(SPELL_ATTR3_INSTANT_TARGET_PROCS))
SetCantProc(false);
}
if (disableProcs)
SetCantProc(false);
}
Player* Unit::GetSpellModOwner() const