From 70df7c8e91cd2b58b005f69e8868444e7bc62c6b Mon Sep 17 00:00:00 2001
From: pasdVn <pasdVn3@gmx.de>
Date: Wed, 9 Sep 2009 10:32:44 +0200
Subject: [PATCH] [8484] Fix priest spell 47585

* Move precast spell and add one more to Aura boosts for proper remove at cancel.
* Check in ispositivespell as positive to allow cancel in client.

(cherry picked from commit 6566ec2bbd3654921446b6522e9800ef835ffffe)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
---
 src/game/Spell.cpp       | 1 -
 src/game/SpellAuras.cpp  | 8 ++++++++
 src/game/SpellMgr.cpp    | 9 +++++++--
 src/shared/revision_nr.h | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 8d63d569d..23e9fa7db 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2419,7 +2419,6 @@ void Spell::cast(bool skipCheck)
 
             switch(m_spellInfo->Id)
             {
-                case 47585: AddPrecastSpell(60069); break;  // Dispersion (transform)
                 case 15237: AddTriggeredSpell(23455); break;// Holy Nova, rank 1
                 case 15430: AddTriggeredSpell(23458); break;// Holy Nova, rank 2
                 case 15431: AddTriggeredSpell(23459); break;// Holy Nova, rank 3
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 1d0aa0593..5beb39353 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -5691,6 +5691,14 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
             }
             break;
         }
+        case SPELLFAMILY_PRIEST:
+            // Dispersion mana reg and immunity
+            if (GetSpellProto()->Id == 47585)
+            {
+                spellId1 = 60069;
+                spellId2 = 63230;
+            }
+            break;
         case SPELLFAMILY_ROGUE:
             // Sprint (skip non player casted spells by category)
             if (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000040) && GetSpellProto()->Category == 44)
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 1d6c4d764..29272ee01 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -477,8 +477,13 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex)
                         return false;
                     break;
                 case SPELL_AURA_MOD_PACIFY_SILENCE:
-                    if(spellproto->Id == 24740)             // Wisp Costume
-                        return true;
+                    switch(spellproto->Id)
+                    {
+                        case 24740:                         // Wisp Costume
+                        case 47585:                         // Dispersion
+                            return true;
+                        default: break;
+                    }
                     return false;
                 case SPELL_AURA_MOD_ROOT:
                 case SPELL_AURA_MOD_SILENCE:
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 6e1ff2f21..9e0f8d2c2 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 "8483"
+ #define REVISION_NR "8484"
 #endif // __REVISION_NR_H__