diff options
| author | megamage <none@none> | 2009-01-17 17:54:11 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-17 17:54:11 -0600 |
| commit | 02c060be05b27dcd2d5d662027bae7fd91c3abfc (patch) | |
| tree | 1e3bddc4c459f48445cf45ff7e5253bd08cbe450 /src/game/SpellMgr.cpp | |
| parent | 2cf1a3be1b310feafc43781ab9178f0c1f35d352 (diff) | |
*Update to Mangos 7100.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 79942a2d38e..2b5787bad90 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1273,6 +1273,11 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool if(spellInfo_1->SpellFamilyName != spellInfo_2->SpellFamilyName) return false; + // TODO: Is this needed? + // Allow stack passive and not passive spells + if ((spellInfo_1->Attributes & SPELL_ATTR_PASSIVE)!=(spellInfo_2->Attributes & SPELL_ATTR_PASSIVE)) + return false; + // generic spells if(!spellInfo_1->SpellFamilyName) { |