summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2015-05-04 20:31:53 +0200
committerAlexander Harkness <me@bearbin.net>2015-05-04 20:31:53 +0200
commitadba982257c24557c952c07e9b142c32233d055c (patch)
treef9a5fa0402c1376f69a1c9c342221cc39aa7f780 /src/Entities
parentUpgraded ubuntu version. (diff)
parentMerge remote-tracking branch 'origin/master' into fixes (diff)
downloadcuberite-adba982257c24557c952c07e9b142c32233d055c.tar
cuberite-adba982257c24557c952c07e9b142c32233d055c.tar.gz
cuberite-adba982257c24557c952c07e9b142c32233d055c.tar.bz2
cuberite-adba982257c24557c952c07e9b142c32233d055c.tar.lz
cuberite-adba982257c24557c952c07e9b142c32233d055c.tar.xz
cuberite-adba982257c24557c952c07e9b142c32233d055c.tar.zst
cuberite-adba982257c24557c952c07e9b142c32233d055c.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp1
-rw-r--r--src/Entities/Player.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 51cee248e..b87cf51a6 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -247,7 +247,6 @@ void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_R
if (a_Attacker != nullptr)
{
Heading = a_Attacker->GetLookVector() * (a_Attacker->IsSprinting() ? 16 : 11);
- Heading.y = 1.6;
}
TDI.Knockback = Heading * a_KnockbackAmount;
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 8cce4e202..4b8c01dc4 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -122,7 +122,7 @@ public:
double GetEyeHeight(void) const; // tolua_export
Vector3d GetEyePosition(void) const; // tolua_export
virtual bool IsOnGround(void) const override { return m_bTouchGround; }
- inline double GetStance(void) const { return GetPosY() + 1.62; } // tolua_export // TODO: Proper stance when crouching etc.
+ inline double GetStance(void) const { return m_Stance; } // tolua_export
inline cInventory & GetInventory(void) { return m_Inventory; } // tolua_export
inline const cInventory & GetInventory(void) const { return m_Inventory; }