1 files changed, 7 insertions, 1 deletions

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index d568e068d..6e3db5194 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1764,6 +1764,12 @@ void cPlayer::HandleFood(void)
 {
 	// Ref.: http://www.minecraftwiki.net/wiki/Hunger
 	
+	if (IsGameModeCreative())
+	{
+		// Hunger is disabled for Creative
+		return;
+	}
+	
 	// Remember the food level before processing, for later comparison
 	int LastFoodLevel = m_FoodLevel;
 	
@@ -1781,7 +1787,7 @@ void cPlayer::HandleFood(void)
 				Heal(1);
 				m_FoodExhaustionLevel += 3;
 			}
-			else if (m_FoodLevel <= 0)
+			else if (m_FoodLevel <= 0 && m_Health > 1)
 			{
 				// Damage from starving
 				TakeDamage(dtStarving, NULL, 1, 1, 0);