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

[8942] Spells 20911 and 25899 stats bonus.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>

Also stacking rule to prevent log spam.
This commit is contained in:
MrLama 2009-12-07 22:12:50 +03:00 • committed by VladimirMangos
parent 65f1d6ba14
commit 895c84b8b0
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/SpellAuras.cpp
View file

@ -2732,6 +2732,18 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
case SPELLFAMILY_HUNTER: case SPELLFAMILY_HUNTER:
break; break;
case SPELLFAMILY_PALADIN: case SPELLFAMILY_PALADIN:
switch(GetId())
{
case 20911: // Blessing of Sanctuary
case 25899: // Greater Blessing of Sanctuary
{
if (apply)
m_target->CastSpell(m_target, 67480, true, NULL, this);
else
m_target->RemoveAurasDueToSpell(67480);
return;
}
}
break; break;
case SPELLFAMILY_SHAMAN: case SPELLFAMILY_SHAMAN:
{ {

9
src/game/SpellMgr.cpp
View file

@ -1412,6 +1412,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
if( spellId_1 == 35081 && spellInfo_2->SpellIconID==561 && spellInfo_2->SpellVisual[0]==7992) if( spellId_1 == 35081 && spellInfo_2->SpellIconID==561 && spellInfo_2->SpellVisual[0]==7992)
return false; return false;
// Blessing of Sanctuary (multi-family check, some from 16 spell icon spells)
if (spellInfo_1->Id == 67480 && spellInfo_2->Id == 20911)
return false;
break; break;
} }
} }
@ -1640,8 +1644,13 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
// Concentration Aura and Improved Concentration Aura and Aura Mastery // Concentration Aura and Improved Concentration Aura and Aura Mastery
if ((spellInfo_1->SpellIconID == 1487) && (spellInfo_2->SpellIconID == 1487)) if ((spellInfo_1->SpellIconID == 1487) && (spellInfo_2->SpellIconID == 1487))
return false; return false;
} }
// Blessing of Sanctuary (multi-family check, some from 16 spell icon spells)
if (spellInfo_2->Id == 67480 && spellInfo_1->Id == 20911)
return false;
// Combustion and Fire Protection Aura (multi-family check) // Combustion and Fire Protection Aura (multi-family check)
if( spellInfo_2->Id == 11129 && spellInfo_1->SpellIconID == 33 && spellInfo_1->SpellVisual[0] == 321 ) if( spellInfo_2->Id == 11129 && spellInfo_1->SpellIconID == 33 && spellInfo_1->SpellVisual[0] == 321 )
return false; return false;

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 "8941" #define REVISION_NR "8942"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__