mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 01:37:00 +00:00
Merge branch 'master' into 310
Conflicts: src/game/Unit.cpp
This commit is contained in:
commit
3ad6044f72
11 changed files with 16 additions and 16 deletions
|
|
@ -2400,7 +2400,7 @@ void Spell::EffectPowerBurn(uint32 i)
|
|||
{
|
||||
uint32 maxdamage = m_caster->GetMaxPower(powertype) * damage * 2 / 100;
|
||||
damage = unitTarget->GetMaxPower(powertype) * damage / 100;
|
||||
if(damage > maxdamage) damage = maxdamage;
|
||||
if(damage > maxdamage) damage = maxdamage;
|
||||
}
|
||||
|
||||
int32 curPower = int32(unitTarget->GetPower(powertype));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue