*Do not let mark of the wild stack (different ranks, different effects).

--HG-- branch : trunk
2008-11-28 15:47:18 -06:00
parent 6107faa894
commit 615e0f7773
1 changed files with 3 additions and 0 deletions
@@ -1212,6 +1212,9 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool
    //    && spellInfo_1->SpellIconID == spellInfo_2->SpellIconID)
    //    return true; // maybe change this to IsRankSpellDueToSpell?

+    if(spellInfo_1->SpellFamilyName && IsRankSpellDueToSpell(spellInfo_1, spellId_2))
+        return true;
+
    //if spells have exactly the same effect they cannot stack
    for(uint32 i = 0; i < 3; ++i)
        if(spellInfo_1->Effect[i] != spellInfo_2->Effect[i]