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

fix(Core/Spells): Fix SetSpellModTakingSpell assert from re-entrant calls (#24863)

Browse source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc 2026-02-24 19:38:11 -06:00 • committed by GitHub
parent fca1ee550d
commit e17df40a57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/server/game/Entities/Player/Player.cpp
View file

@ -10027,10 +10027,10 @@ bool Player::HasSpellModApplied(SpellModifier* mod, Spell* spell)
void Player::SetSpellModTakingSpell(Spell* spell, bool apply)
{
if (apply && m_spellModTakingSpell)
ASSERT(m_spellModTakingSpell == nullptr);
else if (!apply)
ASSERT(m_spellModTakingSpell && m_spellModTakingSpell == spell);
if (apply && m_spellModTakingSpell && m_spellModTakingSpell != spell)
return;
else if (!apply && m_spellModTakingSpell != spell)
return;
m_spellModTakingSpell = apply ? spell : nullptr;
}