diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-07 06:24:53 -0700 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-07 06:24:53 -0700 |
| commit | e34124f6bf772278fc346cf89e79ce8e3ccab8b7 (patch) | |
| tree | aa05340f2ec0858e5b20b57299f084f2a4a6626f | |
| parent | 6ca7a7b78d2e08d9eae4b38d18ef7303c19acd82 (diff) | |
| parent | 727369a159f9dd1a44ad65d9a1af241dcbe02c1b (diff) | |
Merge pull request #7685 from Tuxity/dotsCanCrit434
[434] DoTs can now crit
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 10ea10fab11..746a0ac238f 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1155,18 +1155,7 @@ void AuraEffect::UpdatePeriodic(Unit* caster) bool AuraEffect::IsPeriodicTickCrit(Unit* target, Unit const* caster) const { ASSERT(caster); - Unit::AuraEffectList const& mPeriodicCritAuras= caster->GetAuraEffectsByType(SPELL_AURA_ABILITY_PERIODIC_CRIT); - for (Unit::AuraEffectList::const_iterator itr = mPeriodicCritAuras.begin(); itr != mPeriodicCritAuras.end(); ++itr) - { - if ((*itr)->IsAffectingSpell(m_spellInfo) && caster->isSpellCrit(target, m_spellInfo, m_spellInfo->GetSchoolMask())) - return true; - } - - // Rupture - since 3.3.3 can crit - if (m_spellInfo->SpellIconID == 500 && m_spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE) - return caster->isSpellCrit(target, m_spellInfo, m_spellInfo->GetSchoolMask()); - - return false; + return caster->isSpellCrit(target, m_spellInfo, m_spellInfo->GetSchoolMask()); } bool AuraEffect::IsAffectingSpell(SpellInfo const* spell) const |