flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Readability and clarity changes

Browse Source
This commit is contained in:
archshift
2014-07-14 13:46:15 -07:00
parent 554e1c0dd3
commit 061010288a
4 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Entities/Entity.cpp
View File

@@ -311,10 +311,13 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
// IsOnGround() only is false if the player is moving downwards
// TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain)
if (!Player->IsOnGround() && (a_TDI.DamageType == dtAttack || a_TDI.DamageType == dtArrowAttack))
if (!Player->IsOnGround())
{
a_TDI.FinalDamage += 2;
m_World->BroadcastEntityAnimation(*this, 4); // Critical hit
if ((a_TDI.DamageType == dtAttack) || (a_TDI.DamageType == dtArrowAttack))
{
a_TDI.FinalDamage += 2;
m_World->BroadcastEntityAnimation(*this, 4); // Critical hit
}
}
Player->GetStatManager().AddValue(statDamageDealt, (StatValue)floor(a_TDI.FinalDamage * 10 + 0.5));