From 2a742e78b91c8747088c28259a0aa1a46fc57ed5 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 22 Oct 2008 09:41:31 -0500 Subject: [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 --- src/game/SpellMgr.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/game/SpellMgr.cpp') 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 || -- cgit v1.2.3