2 files changed, 31 insertions, 16 deletions

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 6969501a3..42b207c48 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -927,12 +927,13 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 		float fallspeed;
 		if (IsBlockWater(BlockIn))
 		{
-			fallspeed = m_Gravity * a_Dt / 3;  // Fall 3x slower in water.
+			fallspeed = m_Gravity * a_Dt / 3;  // Fall 3x slower in water
+			ApplyFriction(NextSpeed, 0.7, a_Dt);
 		}
 		else if (BlockIn == E_BLOCK_COBWEB)
 		{
 			NextSpeed.y *= 0.05;  // Reduce overall falling speed
-			fallspeed = 0;  // No falling.
+			fallspeed = 0;  // No falling
 		}
 		else
 		{
@@ -943,20 +944,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 	}
 	else
 	{
-		// Friction on ground
-		if (NextSpeed.SqrLength() > 0.0004f)
-		{
-			NextSpeed.x *= 0.7f / (1 + a_Dt);
-			if (fabs(NextSpeed.x) < 0.05)
-			{
-				NextSpeed.x = 0;
-			}
-			NextSpeed.z *= 0.7f / (1 + a_Dt);
-			if (fabs(NextSpeed.z) < 0.05)
-			{
-				NextSpeed.z = 0;
-			}
-		}
+		ApplyFriction(NextSpeed, 0.7, a_Dt);
 	}
 
 	// Adjust X and Z speed for COBWEB temporary. This speed modification should be handled inside block handlers since we
@@ -1062,6 +1050,27 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 
 
 
+void cEntity::ApplyFriction(Vector3d & a_Speed, double a_SlowdownMultiplier, float a_Dt)
+{
+	if (a_Speed.SqrLength() > 0.0004f)
+	{
+		a_Speed.x *= a_SlowdownMultiplier / (1 + a_Dt);
+		if (fabs(a_Speed.x) < 0.05)
+		{
+			a_Speed.x = 0;
+		}
+		a_Speed.z *= a_SlowdownMultiplier / (1 + a_Dt);
+		if (fabs(a_Speed.z) < 0.05)
+		{
+			a_Speed.z = 0;
+		}
+	}
+}
+
+
+
+
+
 void cEntity::TickBurning(cChunk & a_Chunk)
 {
 	// Remember the current burning state:
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index b9c280b6b..6bc070dcc 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -535,6 +535,12 @@ protected:
 	
 	virtual void Destroyed(void) {}  // Called after the entity has been destroyed
 
+	/** Applies friction to an entity
+	@param a_Speed The speed vector to apply changes to
+	@param a_SlowdownMultiplier The factor to reduce the speed by
+	*/
+	static void ApplyFriction(Vector3d & a_Speed, double a_SlowdownMultiplier, float a_Dt);
+
 	/** Called in each tick to handle air-related processing i.e. drowning */
 	virtual void HandleAir(void);