From a687efa6dfb97927d94db4d2f05970cde9d4181f Mon Sep 17 00:00:00 2001
From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Sun, 9 Jun 2019 11:25:41 +0200
Subject: Damage: Play no damage sound when immortal (#8350)

Add isImmortal server-side for proper enable_damage handling
Rework log messages
---
 src/server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index 7167a6686..f3c13bad1 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1426,7 +1426,7 @@ void Server::SendMovement(session_t peer_id)
 
 void Server::SendPlayerHPOrDie(PlayerSAO *playersao, const PlayerHPChangeReason &reason)
 {
-	if (!g_settings->getBool("enable_damage"))
+	if (playersao->isImmortal())
 		return;
 
 	session_t peer_id   = playersao->getPeerID();
-- 
cgit v1.2.3