3 files changed, 44 insertions, 5 deletions

diff --git a/source/Entities/Entity.cpp b/source/Entities/Entity.cpp
index 1a593b3d1..cb6799d33 100644
--- a/source/Entities/Entity.cpp
+++ b/source/Entities/Entity.cpp
@@ -55,6 +55,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
 	, m_TicksSinceLastBurnDamage(0)
 	, m_TicksSinceLastLavaDamage(0)
 	, m_TicksSinceLastFireDamage(0)
+	, m_TicksSinceLastVoidDamage(0)
 	, m_TicksLeftBurning(0)
 	, m_WaterSpeed(0, 0, 0)
 	, m_Width(a_Width)
@@ -505,6 +506,11 @@ void cEntity::Tick(float a_Dt, cChunk & a_Chunk)
 	{
 		TickBurning(a_Chunk);
 	}
+	if ((a_Chunk.IsValid())  && (GetPosY() < -46))
+	{
+		TickInVoid(a_Chunk);
+	}
+	else { m_TicksSinceLastVoidDamage = 0; }
 }
 
 
@@ -524,8 +530,15 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 	if ((BlockY >= cChunkDef::Height) || (BlockY < 0))
 	{
 		// Outside of the world
-		// TODO: Current speed should still be added to the entity position
-		// Otherwise TNT explosions in the void will still effect the bottommost layers of the world
+
+		cChunk * NextChunk = a_Chunk.GetNeighborChunk(BlockX, BlockZ);
+		// See if we can commit our changes. If not, we will discard them.
+		if (NextChunk != NULL)
+		{
+			SetSpeed(NextSpeed);
+			NextPos += (NextSpeed * a_Dt);
+			SetPosition(NextPos);
+		}
 		return;
 	}
 	
@@ -829,6 +842,23 @@ void cEntity::TickBurning(cChunk & a_Chunk)
 
 
 
+void cEntity::TickInVoid(cChunk & a_Chunk)
+{
+	if (m_TicksSinceLastVoidDamage == 20)
+	{
+		TakeDamage(dtInVoid, NULL, 2, 0);
+		m_TicksSinceLastVoidDamage = 0;
+	}
+	else
+	{
+		m_TicksSinceLastVoidDamage++;
+	}
+}
+
+
+
+
+
 /// Called when the entity starts burning
 void cEntity::OnStartedBurning(void)
 {
diff --git a/source/Entities/Entity.h b/source/Entities/Entity.h
index 48d2e7602..a2c99d2a0 100644
--- a/source/Entities/Entity.h
+++ b/source/Entities/Entity.h
@@ -267,6 +267,9 @@ public:
 	
 	/// Updates the state related to this entity being on fire
 	virtual void TickBurning(cChunk & a_Chunk);
+	
+	/// Handles when the entity is in the void
+	virtual void TickInVoid(cChunk & a_Chunk);
 
 	/// Called when the entity starts burning
 	virtual void OnStartedBurning(void);
@@ -389,6 +392,9 @@ protected:
 	
 	/// Time, in ticks, until the entity extinguishes its fire
 	int m_TicksLeftBurning;
+	
+	/// Time, in ticks, since the last damage dealt by the void. Reset to zero when moving out of the void.
+	int m_TicksSinceLastVoidDamage;
 
 	virtual void Destroyed(void) {} // Called after the entity has been destroyed
 
diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp
index 22f1b8967..751920759 100644
--- a/source/Entities/Player.cpp
+++ b/source/Entities/Player.cpp
@@ -610,10 +610,13 @@ void cPlayer::SetSprint(bool a_IsSprinting)
 
 void cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
 {
-	if (m_GameMode == eGameMode_Creative)
+	if (a_TDI.DamageType != dtInVoid)
 	{
-		// No damage / health in creative mode
-		return;
+		if (IsGameModeCreative())
+		{
+			// No damage / health in creative mode
+			return;
+		}
 	}
 	
 	super::DoTakeDamage(a_TDI);