diff options
| -rw-r--r-- | src/game/SpellEffects.cpp | 14 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 022850c2451..04a93469e9b 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2001,19 +2001,7 @@ void Spell::EffectDummy(uint32 i) // Death strike if (m_spellInfo->SpellFamilyFlags[0] & 0x00000010) { - uint32 count = 0; - Unit::AuraMap const& auras = unitTarget->GetAuras(); - for (Unit::AuraMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) - { - if(itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE && - itr->second->GetCasterGUID() == m_caster->GetGUID()) - { - ++count; - // max. 15% - if(count == 3) - break; - } - } + uint32 count = unitTarget->GetDiseasesByCaster(m_caster->GetGUID()); int32 bp = count * m_caster->GetMaxHealth() * m_spellInfo->DmgMultiplier[0] / 100; // Improved Death Strike if (AuraEffect const * aurEff = m_caster->GetAuraEffect(SPELL_AURA_ADD_PCT_MODIFIER, SPELLFAMILY_DEATHKNIGHT, 2751, 0)) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 4348f60df31..1e121dedb04 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4353,7 +4353,7 @@ uint32 Unit::GetDiseasesByCaster(uint64 casterGUID, bool remove) static const AuraType diseaseAuraTypes[] = { SPELL_AURA_PERIODIC_DAMAGE, // Frost Fever and Blood Plague - SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT, // Crypt Fever and Ebon Plague + SPELL_AURA_LINKED, // Crypt Fever and Ebon Plague SPELL_AURA_NONE }; |