summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-24 16:02:35 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-24 16:02:35 +0100
commit89f87f66a5b64619cacf86461c1a0f26563e34c5 (patch)
treeca8bdb26fb612ff63dab28eb777153123d56255c /src
parentImproved player fall particle positions (diff)
downloadcuberite-89f87f66a5b64619cacf86461c1a0f26563e34c5.tar
cuberite-89f87f66a5b64619cacf86461c1a0f26563e34c5.tar.gz
cuberite-89f87f66a5b64619cacf86461c1a0f26563e34c5.tar.bz2
cuberite-89f87f66a5b64619cacf86461c1a0f26563e34c5.tar.lz
cuberite-89f87f66a5b64619cacf86461c1a0f26563e34c5.tar.xz
cuberite-89f87f66a5b64619cacf86461c1a0f26563e34c5.tar.zst
cuberite-89f87f66a5b64619cacf86461c1a0f26563e34c5.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index d82a89ab2..8a74c9da4 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -246,7 +246,7 @@ void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_R
{
Heading = a_Attacker->GetLookVector() * (a_Attacker->IsSprinting() ? 10 : 8);
}
- Heading.y += 3;
+ Heading.y = 2;
TDI.Knockback = Heading * a_KnockbackAmount;
DoTakeDamage(TDI);
@@ -307,7 +307,7 @@ void cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
// IsOnGround() only is false if the player is moving downwards
if (!((cPlayer *)a_TDI.Attacker)->IsOnGround()) // TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain)
{
- a_TDI.FinalDamage + 2;
+ a_TDI.FinalDamage += 2;
m_World->BroadcastEntityAnimation(*this, 4); // Critical hit
}
}
@@ -321,7 +321,7 @@ void cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
m_Health = 0;
}
- AddSpeed(a_TDI.Knockback * 3);
+ AddSpeed(a_TDI.Knockback * 2);
m_World->BroadcastEntityStatus(*this, ENTITY_STATUS_HURT);