diff --git a/Entity.cpp b/Entity.cpp
index 82ad6c39e3e3c900e4f60ce0efdb9c5c1a8f1726..707a854abd32bf5bd5ff951d28d4262d6ccbd90e 100644
--- a/Entity.cpp
+++ b/Entity.cpp
@@ -62,7 +62,10 @@ bool Entity::step(Position const &PlayerPos, FloatSeconds const & Frametime, Lev
 
 int Entity::takeDamage(Color color)
 {
-	hitpoints = std::max((hitpoints - 1), 0);
+	if(hitpoints == 0) {
+		return hitpoints;
+	}
+	hitpoints--;
 	hittime = HIT_TIME;
 	hitcolor = color;
 	return hitpoints;