aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellAuras.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-04-25 13:58:26 +0200
committerQAston <none@none>2009-04-25 13:58:26 +0200
commite23ec703fedf828f37be5bd3a37b4db4359c8d9d (patch)
treeb14ea9a63ec9904b905cdf56bb395bd56c1bb8a6 /src/game/SpellAuras.cpp
parentfdc94c91fade8a88b30a478abe7244529e519e0c (diff)
*Trigger offhand hit for Whirlwind
*Allow to cast conflagrate if target is affected by shadowflame --HG-- branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
-rw-r--r--src/game/SpellAuras.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index d476f7dcd91..bba2dee3973 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1013,8 +1013,9 @@ void Aura::_AddAura()
if (IsSealSpell(m_spellProto))
SetAuraState(AURA_STATE_JUDGEMENT);
- // Conflagrate aura state on Immolate
- if (m_spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellProto->SpellFamilyFlags[0] & 4)
+ // Conflagrate aura state on Immolate or Shadowflame
+ if (m_spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && (m_spellProto->SpellFamilyFlags[0] & 4
+ || m_spellProto->SpellFamilyFlags[2] & 2))
SetAuraState(AURA_STATE_IMMOLATE);
// Faerie Fire (druid versions)