mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 04:37:00 +00:00
[11525] Fixed stacking talent 46951 and ranks triggered spell with glyph 43424 triggered.
This commit is contained in:
parent
d5675ba3bd
commit
dcac3b8fa0
2 changed files with 6 additions and 1 deletions
|
|
@ -2076,6 +2076,11 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
|
|||
(spellInfo_2->SpellIconID == 456 && spellInfo_1->SpellIconID == 2006))
|
||||
return false;
|
||||
|
||||
// Glyph of Revenge (triggered), and Sword and Board (triggered)
|
||||
if ((spellInfo_1->SpellIconID == 856 && spellInfo_2->SpellIconID == 2780) ||
|
||||
(spellInfo_2->SpellIconID == 856 && spellInfo_1->SpellIconID == 2780))
|
||||
return false;
|
||||
|
||||
// Defensive/Berserker/Battle stance aura can not stack (needed for dummy auras)
|
||||
if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x800000)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x800000))) ||
|
||||
((spellInfo_2->SpellFamilyFlags & UI64LIT(0x800000)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x800000))))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue