From 8bc014b42d283376d4bb196543081ce91d9c0242 Mon Sep 17 00:00:00 2001 From: adrycasillo Date: Sat, 6 Jun 2009 09:14:04 +0200 Subject: [PATCH] *Do not allow Divine Spirit and Prayer of Divine spirit to stack. --HG-- branch : trunk --- src/game/SpellMgr.cpp | 9 +++++++++ src/game/SpellMgr.h | 1 + 2 files changed, 10 insertions(+) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index bed5ffc4d8..f356a2ea1a 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -390,6 +390,14 @@ SpellSpecific GetSpellSpecific(uint32 spellId) break; } + case SPELLFAMILY_PRIEST: + { + // Divine Spirit and Prayer of Spirit + if (spellInfo->SpellFamilyFlags[0] & 0x20) + return SPELL_PRIEST_DIVINE_SPIRIT; + + break; + } case SPELLFAMILY_WARRIOR: { if (spellInfo->SpellFamilyFlags[1] & 0x000080 || spellInfo->SpellFamilyFlags[0] & 0x10000LL) @@ -520,6 +528,7 @@ bool IsSingleFromSpellSpecificPerTarget(uint32 spellSpec1,uint32 spellSpec2) case SPELL_SCROLL: case SPELL_WARRIOR_ENRAGE: case SPELL_MAGE_ARCANE_BRILLANCE: + case SPELL_PRIEST_DIVINE_SPIRIT: return spellSpec1==spellSpec2; case SPELL_BATTLE_ELIXIR: return spellSpec2==SPELL_BATTLE_ELIXIR diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index fcb3bea829..053a5d0e17 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -141,6 +141,7 @@ enum SpellSpecific SPELL_SCROLL = 23, SPELL_MAGE_ARCANE_BRILLANCE = 24, SPELL_WARRIOR_ENRAGE = 25, + SPELL_PRIEST_DIVINE_SPIRIT = 26, }; #define SPELL_LINKED_MAX_SPELLS 200000