Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

*More logical to cause the damage -after- the fall, not before, lol.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-26 12:28:48 -07:00
parent ff9a2f6ba1
commit 59586af421
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/Player.cpp
View File

@@ -4461,15 +4461,16 @@ bool Player::FallGround(uint8 FallMode)
if ((z_diff = fabs(ground_Z - z)) < 0.1f)
return false;
GetMotionMaster()->MoveFall(ground_Z, EVENT_FALL_GROUND);
// Below formula for falling damage is from Player::HandleFall
if(FallMode == 2 && z_diff >= 14.57f)
{
uint32 damage = std::min(GetMaxHealth(), (uint32)((0.018f*z_diff-0.2426f)*GetMaxHealth()*sWorld.getRate(RATE_DAMAGE_FALL)));
if(damage > 0) EnvironmentalDamage(DAMAGE_FALL, damage);
}
GetMotionMaster()->MoveFall(ground_Z, EVENT_FALL_GROUND);
if(FallMode == 0) Unit::setDeathState(DEAD_FALLING);
else if(FallMode == 0)
Unit::setDeathState(DEAD_FALLING);
return true;
}