mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 22:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11525] Fixed stacking talent 46951 and ranks triggered spell with glyph 43424 triggered.

Browse source
This commit is contained in:
VladimirMangos 2011-05-23 07:06:08 +04:00
parent d5675ba3bd
commit dcac3b8fa0
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/game/SpellMgr.cpp
View file

@ -2076,6 +2076,11 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
(spellInfo_2->SpellIconID == 456 && spellInfo_1->SpellIconID == 2006)) (spellInfo_2->SpellIconID == 456 && spellInfo_1->SpellIconID == 2006))
return false; 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) // Defensive/Berserker/Battle stance aura can not stack (needed for dummy auras)
if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x800000)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x800000))) || if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x800000)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x800000))) ||
((spellInfo_2->SpellFamilyFlags & UI64LIT(0x800000)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x800000)))) ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x800000)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x800000))))

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11524" #define REVISION_NR "11525"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__