diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-08-12 15:43:24 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-08-12 15:46:02 -0500 |
| commit | 24b1a279858f912da85ef7146aafedb4e997f38c (patch) | |
| tree | 1f932fa87e532397e7f65e0e779e0bbe27cc7fea /src/server/game/Spells/SpellEffects.cpp | |
| parent | a3940f53102ae2bd0260480f4177eed47902c4ff (diff) | |
Core/Entities: Fixed block for Cataclysm
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 909d47c4b92..058a7b5564c 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -383,15 +383,8 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) } case SPELLFAMILY_WARRIOR: { - // Shield Slam - if (m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) - { - uint8 level = m_caster->getLevel(); - uint32 block_value = m_caster->GetShieldBlockValue(uint32(float(level) * 24.5f), uint32(float(level) * 34.5f)); - damage += int32(m_caster->ApplyEffectModifiers(m_spellInfo, effIndex, float(block_value))); - } // Victory Rush - else if (m_spellInfo->SpellFamilyFlags[1] & 0x100) + if (m_spellInfo->SpellFamilyFlags[1] & 0x100) ApplyPctF(damage, m_caster->GetTotalAttackPowerValue(BASE_ATTACK)); // Shockwave else if (m_spellInfo->Id == 46968) @@ -646,14 +639,6 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) damage += count * int32(average * IN_MILLISECONDS) / m_caster->GetAttackTime(BASE_ATTACK); break; } - // Shield of Righteousness - if (m_spellInfo->SpellFamilyFlags[EFFECT_1] & 0x100000) - { - uint8 level = m_caster->getLevel(); - uint32 block_value = m_caster->GetShieldBlockValue(uint32(float(level) * 29.5f), uint32(float(level) * 39.5f)); - damage += CalculatePctN(block_value, m_spellInfo->Effects[EFFECT_1].CalcValue()); - break; - } break; } case SPELLFAMILY_DEATHKNIGHT: |