diff options
| author | QAston <none@none> | 2009-04-25 18:53:29 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-25 18:53:29 +0200 |
| commit | a00563a1278f0bc6f816750b3c92d0117eac913e (patch) | |
| tree | 883cf925a8f07affd11bcdf794ea4bfa7c2a8ea5 /src/game/SpellEffects.cpp | |
| parent | f89cd6318daba66d9761c1cdbf012210ca31f918 (diff) | |
*Fix deadly brew.
*Some changes in flag SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 6e619b0e36c..e1fcae5f1a0 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -338,14 +338,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) switch(m_spellInfo->Id) // better way to check unknown { - case 35354: //Hand of Death - { - if(unitTarget && unitTarget->HasAura(38528)) //Protection of Elune - { - damage = 0; - } - break; - } // percent from health with min case 25599: // Thundercrash { @@ -451,7 +443,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) Unit::AuraEffectList const &mPeriodic = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); for(Unit::AuraEffectList::const_iterator i = mPeriodic.begin(); i != mPeriodic.end(); ++i) { - if( (*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK && ((*i)->GetSpellProto()->SpellFamilyFlags[0] & 4) && + if( (*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK && ((*i)->GetSpellProto()->SpellFamilyFlags[0] & 4 || (*i)->GetSpellProto()->SpellFamilyFlags[2] & 2) && (*i)->GetCasterGUID()==m_caster->GetGUID() ) { unitTarget->RemoveAurasDueToSpell((*i)->GetId(), m_caster->GetGUID()); |