Merge pull request #7435 from zorix/PR1

Core/Spells: Check for Bane spells should be before check curse because Bane have dispel type Curse

1 files changed, 4 insertions, 4 deletions

diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index df22b10e533..d71de9e94e0 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -1950,14 +1950,14 @@ SpellSpecificType SpellInfo::GetSpellSpecific() const
         }
         case SPELLFAMILY_WARLOCK:
         {
-            // only warlock curses have this
-            if (Dispel == DISPEL_CURSE)
-                return SPELL_SPECIFIC_CURSE;
-
             // Warlock (Bane of Doom | Bane of Agony | Bane of Havoc)
             if (Id == 603 || Id ==  980 || Id == 80240)
                 return SPELL_SPECIFIC_BANE;
 
+            // only warlock curses have this
+            if (Dispel == DISPEL_CURSE)
+                return SPELL_SPECIFIC_CURSE;
+
             // Warlock (Demon Armor | Demon Skin | Fel Armor)
             if (SpellFamilyFlags[1] & 0x20000020 || SpellFamilyFlags[2] & 0x00000010)
                 return SPELL_SPECIFIC_WARLOCK_ARMOR;