Damage: Play no damage sound when immortal (#8350)

Add isImmortal server-side for proper enable_damage handling
Rework log messages

src/content_sao.cpp

@@ -633,17 +633,15 @@ int LuaEntitySAO::punch(v3f dir,
 		return 0;
 	}
 
-	ItemStack *punchitem = NULL;
+	FATAL_ERROR_IF(!puncher, "Punch action called without SAO");
-	ItemStack punchitem_static;
+
-	if (puncher) {
+	s32 old_hp = getHP();
-		punchitem_static = puncher->getWieldedItem();
+	const ItemStack &punchitem = puncher->getWieldedItem();
-		punchitem = &punchitem_static;
-	}
 
 	PunchDamageResult result = getPunchDamage(
 			m_armor_groups,
 			toolcap,
-			punchitem,
+			&punchitem,
 			time_from_last_punch);
 
 	bool damage_handled = m_env->getScriptIface()->luaentity_Punch(m_id, puncher,
@@ -654,14 +652,6 @@ int LuaEntitySAO::punch(v3f dir,
 			setHP((s32)getHP() - result.damage,
 				PlayerHPChangeReason(PlayerHPChangeReason::SET_HP));
 
-			if (result.damage > 0) {
-				std::string punchername = puncher ? puncher->getDescription() : "nil";
-
-				actionstream << getDescription() << " punched by "
-						<< punchername << ", damage " << result.damage
-						<< " hp, health now " << getHP() << " hp" << std::endl;
-			}
-
 			std::string str = gob_cmd_punched(getHP());
 			// create message and add to list
 			ActiveObjectMessage aom(getId(), true, str);
@@ -676,6 +666,12 @@ int LuaEntitySAO::punch(v3f dir,
 		m_env->getScriptIface()->luaentity_on_death(m_id, puncher);
 	}
 
+	actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
+			", hp=" << puncher->getHP() << ") punched " <<
+			getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
+			"), damage=" << (old_hp - (s32)getHP()) <<
+			(damage_handled ? " (handled by Lua)" : "") << std::endl;
+
 	return result.wear;
 }
 
@@ -893,6 +889,9 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t p
 	m_breath = m_prop.breath_max;
 	// Disable zoom in survival mode using a value of 0
 	m_prop.zoom_fov = g_settings->getBool("creative_mode") ? 15.0f : 0.0f;
+
+	if (!g_settings->getBool("enable_damage"))
+		m_armor_groups["immortal"] = 1;
 }
 
 PlayerSAO::~PlayerSAO()
@@ -995,7 +994,7 @@ void PlayerSAO::getStaticData(std::string * result) const
 
 void PlayerSAO::step(float dtime, bool send_recommended)
 {
-	if (m_drowning_interval.step(dtime, 2.0f)) {
+	if (!isImmortal() && m_drowning_interval.step(dtime, 2.0f)) {
 		// Get nose/mouth position, approximate with eye position
 		v3s16 p = floatToInt(getEyePosition(), BS);
 		MapNode n = m_env->getMap().getNodeNoEx(p);
@@ -1025,7 +1024,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 			setBreath(m_breath + 1);
 	}
 
-	if (m_node_hurt_interval.step(dtime, 1.0f)) {
+	if (!isImmortal() && m_node_hurt_interval.step(dtime, 1.0f)) {
 		u32 damage_per_second = 0;
 		std::string nodename;
 		// Lowest and highest damage points are 0.1 within collisionbox
@@ -1284,6 +1283,8 @@ int PlayerSAO::punch(v3f dir,
 	if (!toolcap)
 		return 0;
 
+	FATAL_ERROR_IF(!puncher, "Punch action called without SAO");
+
 	// No effect if PvP disabled
 	if (!g_settings->getBool("enable_pvp")) {
 		if (puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
@@ -1295,14 +1296,10 @@ int PlayerSAO::punch(v3f dir,
 		}
 	}
 
+	s32 old_hp = getHP();
 	HitParams hitparams = getHitParams(m_armor_groups, toolcap,
 			time_from_last_punch);
 
-	std::string punchername = "nil";
-
-	if (puncher != 0)
-		punchername = puncher->getDescription();
-
 	PlayerSAO *playersao = m_player->getPlayerSAO();
 
 	bool damage_handled = m_env->getScriptIface()->on_punchplayer(playersao,
@@ -1321,15 +1318,11 @@ int PlayerSAO::punch(v3f dir,
 		}
 	}
 
-
+	actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
-	actionstream << "Player " << m_player->getName() << " punched by "
+		", hp=" << puncher->getHP() << ") punched " <<
-			<< punchername;
+		getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
-	if (!damage_handled) {
+		"), damage=" << (old_hp - (s32)getHP()) <<
-		actionstream << ", damage " << hitparams.hp << " HP";
+		(damage_handled ? " (handled by Lua)" : "") << std::endl;
-	} else {
-		actionstream << ", damage handled by lua";
-	}
-	actionstream << std::endl;
 
 	return hitparams.wear;
 }
@@ -1348,7 +1341,7 @@ void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason)
 		hp = rangelim(oldhp + hp_change, 0, m_prop.hp_max);
 	}
 
-	if (hp < oldhp && !g_settings->getBool("enable_damage"))
+	if (hp < oldhp && isImmortal())
 		return;
 
 	m_hp = hp;

src/content_sao.h

@@ -45,6 +45,8 @@ public:
 
 	inline bool isAttached() const
 	{ return getParent(); }
+	inline bool isImmortal() const
+	{ return itemgroup_get(m_armor_groups, "immortal"); }
 
 	void setArmorGroups(const ItemGroupList &armor_groups);
 	const ItemGroupList &getArmorGroups();

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);

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();