From eceae8dc9905ee703f92c5acee659788ad8bb95c Mon Sep 17 00:00:00 2001 From: DiSlord Date: Sun, 25 Jan 2009 21:54:39 +0300 Subject: [PATCH] [7181] Fix mana regen on priest 47585 use Signed-off-by: DiSlord --- src/game/Spell.cpp | 2 ++ src/game/SpellMgr.cpp | 4 ++++ src/shared/revision_nr.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 4cd470d1c..37d28db7d 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2214,6 +2214,8 @@ void Spell::cast(bool skipCheck) if (m_spellInfo->Mechanic == MECHANIC_SHIELD && m_spellInfo->SpellIconID == 566) // Power Word: Shield m_preCastSpell = 6788; // Weakened Soul + if (m_spellInfo->Id == 47585) // Dispersion (transform) + m_preCastSpell = 60069; // Dispersion (mana regen) break; } case SPELLFAMILY_PALADIN: diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index e7253a7cc..b62a2c8b6 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1262,6 +1262,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons if( (spellInfo_1->SpellFamilyFlags & 0x200000) && (spellInfo_2->SpellFamilyFlags & 0x8000) || (spellInfo_2->SpellFamilyFlags & 0x200000) && (spellInfo_1->SpellFamilyFlags & 0x8000) ) return false; + // Dispersion + if( (spellInfo_1->Id == 47585 && spellInfo_2->Id == 60069) || + (spellInfo_2->Id == 47585 && spellInfo_1->Id == 60069) ) + return false; } break; case SPELLFAMILY_DRUID: diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b07f4e7e0..7b4700b6e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7180" + #define REVISION_NR "7181" #endif // __REVISION_NR_H__