Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7435 from zorix/PR1

Browse Source 
Core/Spells: Check for Bane spells should be before check curse because Bane have dispel type Curse
This commit is contained in:
Nay
2012-08-18 07:14:02 -07:00
parent 346be644ca 819d79075e
commit ee3a229adf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Spells/SpellInfo.cpp
View File

@@ -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;