From 556c81786565a63d6b591a2d9ab18d2bd9edc468 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Sun, 9 Aug 2009 08:23:52 +0400
Subject: [PATCH] [8335] Restore spell 19574 and 34471 addtional effects work
 after [8330].

Also simplify spell 61846 and ranks check in HandleSpellSpecificBoosts.
---
 src/game/SpellAuras.cpp  | 12 ++++--------
 src/shared/revision_nr.h |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 9076a9563..e5580b0d0 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -5544,23 +5544,19 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
         }
         case SPELLFAMILY_HUNTER:
         {
-            if(GetSpellSpecific(m_spellProto->Id) != SPELL_ASPECT)
-                return;
-
-            // Aspect of the Dragonhawk dodge
-            if (GetSpellProto()->SpellFamilyFlags2 & 0x00001000)
-                spellId1 = 61848;
             // The Beast Within and Bestial Wrath - immunity
-            else if (GetId() == 19574 || GetId() == 34471)
+            if (GetId() == 19574 || GetId() == 34471)
             {
                 spellId1 = 24395;
                 spellId2 = 24396;
                 spellId3 = 24397;
                 spellId4 = 26592;
             }
+            // Aspect of the Dragonhawk dodge
+            else if(GetSpellProto()->SpellFamilyFlags2 & 0x00001000)
+                spellId1 = 61848;
             else
                 return;
-
             break;
         }
         case SPELLFAMILY_PALADIN:
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 72011ea42..6503b6e89 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 "8334"
+ #define REVISION_NR "8335"
 #endif // __REVISION_NR_H__