Merge pull request #159 from tigerw/bugfix

Multiple fixes and features
2013-09-11 12:19:39 -07:00
parent 3abfd46f55 3a1def2c90
commit 85804d085d
5 changed files with 107 additions and 5 deletions
--- 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);