diff options
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 617a39f770a..f398f224286 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1345,28 +1345,11 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons break; } - // more generic checks - if (spellInfo_1->SpellIconID == spellInfo_2->SpellIconID && - spellInfo_1->SpellIconID != 0 && spellInfo_2->SpellIconID != 0) - { - bool isModifier = false; - for (int i = 0; i < 3; i++) - { - if (spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_ADD_FLAT_MODIFIER || - spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_ADD_PCT_MODIFIER || - spellInfo_2->EffectApplyAuraName[i] == SPELL_AURA_ADD_FLAT_MODIFIER || - spellInfo_2->EffectApplyAuraName[i] == SPELL_AURA_ADD_PCT_MODIFIER ) - isModifier = true; - } - - if (!isModifier) - return true; - } - if (IsRankSpellDueToSpell(spellInfo_1, spellId_2)) return true; - if (spellInfo_1->SpellFamilyName == 0 || spellInfo_2->SpellFamilyName == 0) + if (spellInfo_1->SpellIconID != spellInfo_2->SpellIconID || + !spellInfo_1->SpellIconID) return false; if (spellInfo_1->SpellFamilyName != spellInfo_2->SpellFamilyName) |