Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 03:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[svn] Fix a bug that shaman's shield can stack.

Browse Source 
Fix: MovementInform without behavior change for waypoint movement. Patch provided by DragonHunter.
Update gruul lair script. Patch provided by Blaymoira.

--HG--
branch : trunk
This commit is contained in:
megamage
2008-10-22 09:41:31 -05:00
parent 1b0baa51b5
commit 2a742e78b9
6 changed files with 265 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/SpellMgr.cpp
View File

@@ -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 ||