sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Unit): prevent self-immunity in IsImmunedToSpell (#25984)

Browse Source 
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
sogladev
2026-05-28 08:17:39 +02:00
committed by GitHub
parent 74b798c8b5
commit 1cccafbe0c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+6
View File
@@ -954,6 +954,9 @@ bool Unit::IsImmunedToSpell(SpellInfo const* spellInfo, uint32 effectMask, Unit
for (auto const& [immunitySchoolMask, immunityAuraId] : schoolList) for (auto const& [immunitySchoolMask, immunityAuraId] : schoolList)
{ {
SpellInfo const* immuneSpellInfo = sSpellMgr->GetSpellInfo(immunityAuraId); SpellInfo const* immuneSpellInfo = sSpellMgr->GetSpellInfo(immunityAuraId);
if (immunityAuraId == spellInfo->Id)
continue;
if ((immunitySchoolMask & schoolMask) != schoolMask) if ((immunitySchoolMask & schoolMask) != schoolMask)
continue; continue;
@@ -10087,6 +10090,9 @@ bool Unit::IsImmunedToSpell(SpellInfo const* spellInfo, Spell const* spell)
SpellImmuneContainer const& schoolList = m_spellImmune[IMMUNITY_SCHOOL]; SpellImmuneContainer const& schoolList = m_spellImmune[IMMUNITY_SCHOOL];
for (auto itr = schoolList.begin(); itr != schoolList.end(); ++itr) for (auto itr = schoolList.begin(); itr != schoolList.end(); ++itr)
{ {
if (itr->second == spellInfo->Id)
continue;
SpellInfo const* immuneSpellInfo = sSpellMgr->GetSpellInfo(itr->second); SpellInfo const* immuneSpellInfo = sSpellMgr->GetSpellInfo(itr->second);
if (!(itr->first & spellSchoolMask)) if (!(itr->first & spellSchoolMask))
continue; continue;