aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2008-11-28 15:47:18 -0600
committermegamage <none@none>2008-11-28 15:47:18 -0600
commit615e0f777353d01421bcd54d5b91da90ecb49a18 (patch)
treef3cb08a6a79c9f70bb1d995a3dd991e0f93faf57 /src
parent6107faa8940e5ff08bc382a2ed02cdb09e822aa6 (diff)
*Do not let mark of the wild stack (different ranks, different effects).
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/SpellMgr.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index fa0fbaa9e8a..3ef75606803 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -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]