diff options
| author | kandera <kanderadev@gmail.com> | 2012-06-20 09:25:17 -0700 |
|---|---|---|
| committer | kandera <kanderadev@gmail.com> | 2012-06-20 09:25:17 -0700 |
| commit | 2049a92fd3abb78e7f1e1209ef153687255f78ce (patch) | |
| tree | 81fe5f9e385457f0d06fef71158c7b034efc3669 /src/server/game/Spells/SpellEffects.cpp | |
| parent | 66c9973d44faededc8597bb1a3af9d657577c1f5 (diff) | |
| parent | ef4d9dd4ae188aeabe19388f0cad7543dae3c907 (diff) | |
Merge pull request #6869 from Vincent-Michael/bloodthirst
Core/Spells: Fix Bloodthirst heal
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index b4a1ba19a08..84c1401bb5b 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -365,11 +365,8 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) } case SPELLFAMILY_WARRIOR: { - // Bloodthirst - if (m_spellInfo->SpellFamilyFlags[1] & 0x400) - ApplyPctF(damage, m_caster->GetTotalAttackPowerValue(BASE_ATTACK)); // Shield Slam - else if (m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) + 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)); |