diff options
| author | megamage <none@none> | 2008-10-22 09:41:31 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2008-10-22 09:41:31 -0500 |
| commit | 2a742e78b91c8747088c28259a0aa1a46fc57ed5 (patch) | |
| tree | 8cc3b5767222df3a6a98dda62575709da12a3c49 /src/game/SpellMgr.cpp | |
| parent | 1b0baa51b59df113f3fc2200fc76ddc1f6a91ada (diff) | |
[svn] Fix a bug that shaman's shield can stack.
Fix: MovementInform without behavior change for waypoint movement. Patch provided by DragonHunter.
Update gruul lair script. Patch provided by Blaymoira.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 0188f0140cc..c56c1b7ac28 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1040,6 +1040,9 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons { if(spellInfo_1->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags) return true; + if(spellInfo_1->SpellFamilyName == SPELLFAMILY_SHAMAN) + if(IsElementalShield(spellInfo_1) && IsElementalShield(spellInfo_2)) + return true; //Corruption & Seed of corruption if(spellInfo_1->SpellFamilyName == SPELLFAMILY_WARLOCK) if( spellInfo_1->SpellIconID == 313 && spellInfo_2->SpellIconID == 1932 || |