From c68ae831b64c06809f54e1691ec040491a0d3733 Mon Sep 17 00:00:00 2001 From: krullgor Date: Thu, 26 Mar 2015 12:08:41 +0000 Subject: [PATCH] [Core] Fix Improved Shield Block Talent Its additional charge was removed by a Dummy Effect (ZERO Only) (c2642) --- src/game/Object/SpellMgr.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/game/Object/SpellMgr.cpp b/src/game/Object/SpellMgr.cpp index 6fad1b8d..810412da 100644 --- a/src/game/Object/SpellMgr.cpp +++ b/src/game/Object/SpellMgr.cpp @@ -2111,6 +2111,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons } 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) if (spellInfo_1->SpellIconID == 276 && spellInfo_2->Id == 71) { return false; }