mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8953] Apply spell mutiplier to final damage for health calculation in Spell::EffectHealthLeech.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Quriq14 2009-12-09 00:26:59 +03:00 • committed by VladimirMangos
parent 4ca8b0defc
commit 8d519d7219
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/game/SpellEffects.cpp
View file

@ -2776,21 +2776,21 @@ void Spell::EffectHealthLeech(uint32 i)
sLog.outDebug("HealthLeech :%i", damage); sLog.outDebug("HealthLeech :%i", damage);
uint32 curHealth = unitTarget->GetHealth();
damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damage );
if (curHealth < damage)
damage = curHealth;
float multiplier = m_spellInfo->EffectMultipleValue[i]; float multiplier = m_spellInfo->EffectMultipleValue[i];
if (Player *modOwner = m_caster->GetSpellModOwner()) if (Player *modOwner = m_caster->GetSpellModOwner())
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, multiplier); modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);
int32 new_damage = int32(damage*multiplier); uint32 heal = uint32(damage*multiplier);
uint32 curHealth = unitTarget->GetHealth();
new_damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, new_damage );
if (curHealth < new_damage)
new_damage = curHealth;
if (m_caster->isAlive()) if (m_caster->isAlive())
{ {
new_damage = m_caster->SpellHealingBonus(m_caster, m_spellInfo, new_damage, HEAL); heal = m_caster->SpellHealingBonus(m_caster, m_spellInfo, heal, HEAL);
m_caster->DealHeal(m_caster, uint32(new_damage), m_spellInfo); m_caster->DealHeal(m_caster, heal, m_spellInfo);
} }
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8952" #define REVISION_NR "8953"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__