From b426e64c39d47b70a92fe029c0af7bbf85ea9d30 Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 1 Jan 2018 17:17:49 -0300 Subject: Core/Entities: fix crash - m_currentSpells and spell would be different in case cancelation of a channeled spell would remove the aura, and aura scripted to cast another channeled spell on remove - In the above situation, we would lose reference of currentSpell and remove reference from wrong one, this was fixed by clearing the pointer before spell cancelation. Closes #20172 (cherry picked from commit 5e284d4b3826cd345193298688c1d2bc5b3c8f72) --- src/server/game/Spells/Spell.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/server/game/Spells/Spell.cpp') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 83720573430..97cd6f64d20 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3372,13 +3372,15 @@ void Spell::_cast(bool skipCheck) CallScriptAfterCastHandlers(); - if (const std::vector *spell_triggered = sSpellMgr->GetSpellLinked(m_spellInfo->Id)) + if (std::vector const* spell_triggered = sSpellMgr->GetSpellLinked(m_spellInfo->Id)) { - for (std::vector::const_iterator i = spell_triggered->begin(); i != spell_triggered->end(); ++i) - if (*i < 0) - m_caster->RemoveAurasDueToSpell(-(*i)); + for (int32 id : *spell_triggered) + { + if (id < 0) + m_caster->RemoveAurasDueToSpell(-id); else - m_caster->CastSpell(m_targets.GetUnitTarget() ? m_targets.GetUnitTarget() : m_caster, *i, true); + m_caster->CastSpell(m_targets.GetUnitTarget() ? m_targets.GetUnitTarget() : m_caster, id, true); + } } if (modOwner) -- cgit v1.2.3