server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Core] Fix Improved Shield Block Talent Its additional charge was removed by a Dummy Effect (ZERO Only) (c2642)

Browse Source
This commit is contained in:
krullgor 2015-03-26 12:08:41 +00:00 committed by Antz
parent c9d7879cd9
commit c68ae831b6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Object/SpellMgr.cpp
View File

@ -2111,6 +2111,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
} }
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
{ {
// Defensive State Dummy and Shield Block
if (spellInfo_1->Id == 5302 && spellInfo_2->Id == 2565)
{ return false; }
// Scroll of Protection and Defensive Stance (multi-family check) // Scroll of Protection and Defensive Stance (multi-family check)
if (spellInfo_1->SpellIconID == 276 && spellInfo_2->Id == 71) if (spellInfo_1->SpellIconID == 276 && spellInfo_2->Id == 71)
{ return false; } { return false; }