diff options
| author | megamage <none@none> | 2009-03-13 14:44:55 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-13 14:44:55 -0600 |
| commit | f0ad9ee2329acc892dd29b31908894557dd6768b (patch) | |
| tree | 5ec45cd95a4ce8df002fa2c76ac72dc945df32e1 /src | |
| parent | 146b2560aa8a7d0fc8a90ec3af70d1a8e01e514d (diff) | |
| parent | be90383b1337a630eb1417a4555890df6b7c92e5 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellAuras.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 99adb488eb1..4b868812b16 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -4013,9 +4013,10 @@ void Aura::HandleAuraModResistance(bool apply, bool Real) } // Faerie Fire (druid versions) - if( m_spellProto->SpellIconID == 109 && + if( (m_spellProto->SpellIconID == 109 && m_spellProto->SpellFamilyName == SPELLFAMILY_DRUID && - m_spellProto->SpellFamilyFlags & 0x0000000000000400LL ) + m_spellProto->SpellFamilyFlags & 0x0000000000000400LL) + || m_spellProto->Id == 35325) { m_target->ModifyAuraState(AURA_STATE_FAERIE_FIRE,apply); } |