From 895c84b8b0f995edcd6ea40db8940fe926b38e3a Mon Sep 17 00:00:00 2001
From: MrLama <MrLama@getmangos.com>
Date: Mon, 7 Dec 2009 22:12:50 +0300
Subject: [PATCH] [8942] Spells 20911 and 25899 stats bonus.

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

Also stacking rule to prevent log spam.
---
 src/game/SpellAuras.cpp  | 12 ++++++++++++
 src/game/SpellMgr.cpp    |  9 +++++++++
 src/shared/revision_nr.h |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 0e67c1cf5..785ea9ec5 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2732,6 +2732,18 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
         case SPELLFAMILY_HUNTER:
             break;
         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;
         case SPELLFAMILY_SHAMAN:
         {
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 75bf86ccf..15b16d51c 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -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)
                         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;
                 }
             }
@@ -1640,8 +1644,13 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
                 // Concentration Aura and Improved Concentration Aura and Aura Mastery
                 if ((spellInfo_1->SpellIconID == 1487) && (spellInfo_2->SpellIconID == 1487))
                     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)
             if( spellInfo_2->Id == 11129 && spellInfo_1->SpellIconID == 33 && spellInfo_1->SpellVisual[0] == 321 )
                 return false;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 6cb0bafe8..f8d4f3052 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 "8941"
+ #define REVISION_NR "8942"
 #endif // __REVISION_NR_H__