From 6098c4549cada758437a97ac4ef27988d1244b97 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sun, 19 Mar 2017 04:11:55 -0300 Subject: Core/Spell: add assert checks on SpellMgr::CheckSpellGroupStackRules Ref #19319 (cherry picked from commit 36bb4cabae01c591cf6151bae2f65a1f578ed9f3) --- src/server/game/Spells/SpellMgr.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index af6d589217d..a336ff2ab63 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -369,10 +369,14 @@ bool SpellMgr::AddSameEffectStackRuleSpellGroups(SpellInfo const* spellInfo, int SpellGroupStackRule SpellMgr::CheckSpellGroupStackRules(SpellInfo const* spellInfo1, SpellInfo const* spellInfo2) const { + ASSERT(spellInfo1); + ASSERT(spellInfo2); + uint32 spellid_1 = spellInfo1->GetFirstRankSpell()->Id; uint32 spellid_2 = spellInfo2->GetFirstRankSpell()->Id; if (spellid_1 == spellid_2) return SPELL_GROUP_STACK_RULE_DEFAULT; + // find SpellGroups which are common for both spells SpellSpellGroupMapBounds spellGroup1 = GetSpellSpellGroupMapBounds(spellid_1); std::set groups; -- cgit v1.2.3