summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-27 19:56:54 +0200
committermadmaxoft <github@xoft.cz>2013-08-27 19:56:54 +0200
commitf260e9211fcba6f65fd131a34a75d288a10d5ebe (patch)
treed5608458e9e336b6c8df590cf89d0b4b074cf009
parentDebug logging for arrows improved (diff)
downloadcuberite-f260e9211fcba6f65fd131a34a75d288a10d5ebe.tar
cuberite-f260e9211fcba6f65fd131a34a75d288a10d5ebe.tar.gz
cuberite-f260e9211fcba6f65fd131a34a75d288a10d5ebe.tar.bz2
cuberite-f260e9211fcba6f65fd131a34a75d288a10d5ebe.tar.lz
cuberite-f260e9211fcba6f65fd131a34a75d288a10d5ebe.tar.xz
cuberite-f260e9211fcba6f65fd131a34a75d288a10d5ebe.tar.zst
cuberite-f260e9211fcba6f65fd131a34a75d288a10d5ebe.zip
-rw-r--r--source/Entities/Entity.cpp2
-rw-r--r--source/Entities/Entity.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/Entities/Entity.cpp b/source/Entities/Entity.cpp
index 608f5a73b..b936d8d73 100644
--- a/source/Entities/Entity.cpp
+++ b/source/Entities/Entity.cpp
@@ -529,7 +529,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
float fallspeed;
if (IsBlockWater(BlockIn))
{
- fallspeed = -3.0f * a_Dt; // Fall slower in water.
+ fallspeed = m_Gravity * a_Dt / 3; // Fall 3x slower in water.
}
else if (BlockIn == E_BLOCK_COBWEB)
{
diff --git a/source/Entities/Entity.h b/source/Entities/Entity.h
index dde3eb8c6..f407cd2c1 100644
--- a/source/Entities/Entity.h
+++ b/source/Entities/Entity.h
@@ -163,7 +163,7 @@ public:
void SetPosY (double a_PosY);
void SetPosZ (double a_PosZ);
void SetPosition(double a_PosX, double a_PosY, double a_PosZ);
- void SetPosition(const Vector3d & a_Pos) { SetPosition(a_Pos.x,a_Pos.y,a_Pos.z);}
+ void SetPosition(const Vector3d & a_Pos) { SetPosition(a_Pos.x, a_Pos.y, a_Pos.z); }
void SetRot (const Vector3f & a_Rot);
void SetRotation(double a_Rotation);
void SetPitch (double a_Pitch);