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/network/serverpackethandler.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/network')

diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 7e9495d16..c81d15d5b 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -799,7 +799,7 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
 		return;
 	}
 
-	if (g_settings->getBool("enable_damage")) {
+	if (!playersao->isImmortal()) {
 		if (playersao->isDead()) {
 			verbosestream << "Server::ProcessData(): Info: "
 				"Ignoring damage as player " << player->getName()
@@ -1156,10 +1156,6 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 			if (pointed_object->isGone())
 				return;
 
-			actionstream<<player->getName()<<" punches object "
-					<<pointed.object_id<<": "
-					<<pointed_object->getDescription()<<std::endl;
-
 			ItemStack punchitem = playersao->getWieldedItemOrHand();
 			ToolCapabilities toolcap =
 					punchitem.getToolCapabilities(m_itemdef);
-- 
cgit v1.2.3