Fix various damage related bugs (client-side)

E.g. spawning or teleporting into lava to become invinsible
minetest · Mar 17, 2015 · c552d29 · c552d29
1 parent 34c5a5b
commit c552d29
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/environment.cpp b/src/environment.cpp
@@ -2563,16 +2563,10 @@ void ClientEnvironment::damageLocalPlayer(u8 damage, bool handle_hp)
 	LocalPlayer *lplayer = getLocalPlayer();
 	assert(lplayer);
 
-	if(handle_hp) {
-		// Don't damage a dead player
-		if (lplayer->isDead()) 
-			return;
-
-		if(lplayer->hp > damage)
-			lplayer->hp -= damage;
-		else
-			lplayer->hp = 0;
-	}
+	if (handle_hp && lplayer->hp > damage)
+		lplayer->hp -= damage;
+	else
+		lplayer->hp = 0;
 
 	ClientEnvEvent event;
 	event.type = CEE_PLAYER_DAMAGE;