Fix damage flash when damage disabled

kwolekr · kwolekr · commit 1a1774a10517 · 2015-07-10T15:58:57.000-04:00
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
@@ -1151,7 +1151,7 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
 				<< std::endl;
 
 		playersao->setHP(playersao->getHP() - damage);
-		SendPlayerHPOrDie(playersao->getPeerID(), playersao->getHP() == 0);
+		SendPlayerHPOrDie(playersao);
 	}
 }
 
@@ -1510,14 +1510,12 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 			// If the object is a player and its HP changed
 			if (src_original_hp != pointed_object->getHP() &&
 					pointed_object->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-				SendPlayerHPOrDie(((PlayerSAO*)pointed_object)->getPeerID(),
-						pointed_object->getHP() == 0);
+				SendPlayerHPOrDie((PlayerSAO *)pointed_object);
 			}
 
 			// If the puncher is a player and its HP changed
-			if (dst_origin_hp != playersao->getHP()) {
-				SendPlayerHPOrDie(playersao->getPeerID(), playersao->getHP() == 0);
-			}
+			if (dst_origin_hp != playersao->getHP())
+				SendPlayerHPOrDie(playersao);
 		}
 
 	} // action == 0
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
@@ -222,15 +222,13 @@ int ObjectRef::l_punch(lua_State *L)
 	// If the punched is a player, and its HP changed
 	if (src_original_hp != co->getHP() &&
 			co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-		getServer(L)->SendPlayerHPOrDie(((PlayerSAO*)co)->getPeerID(),
-				co->getHP() == 0);
+		getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co);
 	}
 
 	// If the puncher is a player, and its HP changed
 	if (dst_origin_hp != puncher->getHP() &&
 			puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-		getServer(L)->SendPlayerHPOrDie(((PlayerSAO*)puncher)->getPeerID(),
-				puncher->getHP() == 0);
+		getServer(L)->SendPlayerHPOrDie((PlayerSAO *)puncher);
 	}
 	return 0;
 }
@@ -265,9 +263,9 @@ int ObjectRef::l_set_hp(lua_State *L)
 			<<" hp="<<hp<<std::endl;*/
 	// Do it
 	co->setHP(hp);
-	if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-		getServer(L)->SendPlayerHPOrDie(((PlayerSAO*)co)->getPeerID(), co->getHP() == 0);
-	}
+	if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
+		getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co);
+
 	// Return
 	return 0;
 }
diff --git a/src/server.cpp b/src/server.cpp
@@ -1108,7 +1108,7 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
 	SendInventory(playersao);
 
 	// Send HP
-	SendPlayerHPOrDie(peer_id, playersao->getHP() == 0);
+	SendPlayerHPOrDie(playersao);
 
 	// Send Breath
 	SendPlayerBreath(peer_id);
@@ -1487,6 +1487,20 @@ void Server::SendMovement(u16 peer_id)
 	Send(&pkt);
 }
 
+void Server::SendPlayerHPOrDie(PlayerSAO *playersao)
+{
+	if (!g_settings->getBool("enable_damage"))
+		return;
+
+	u16 peer_id   = playersao->getPeerID();
+	bool is_alive = playersao->getHP() > 0;
+
+	if (is_alive)
+		SendPlayerHP(peer_id);
+	else
+		DiePlayer(peer_id);
+}
+
 void Server::SendHP(u16 peer_id, u8 hp)
 {
 	DSTACK(__FUNCTION_NAME);
diff --git a/src/server.h b/src/server.h
@@ -374,7 +374,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 			u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch,
 			std::string* vers_string);
 
-	void SendPlayerHPOrDie(u16 peer_id, bool die) { die ? DiePlayer(peer_id) : SendPlayerHP(peer_id); }
+	void SendPlayerHPOrDie(PlayerSAO *player);
 	void SendPlayerBreath(u16 peer_id);
 	void SendInventory(PlayerSAO* playerSAO);
 	void SendMovePlayer(u16 peer_id);

Original file line number	Diff line number	Diff line change
`@@ -1151,7 +1151,7 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)`
`1151`	`1151`	`<< std::endl;`
`1152`	`1152`
`1153`	`1153`	`playersao->setHP(playersao->getHP() - damage);`
`1154`		`- SendPlayerHPOrDie(playersao->getPeerID(), playersao->getHP() == 0);`
	`1154`	`+ SendPlayerHPOrDie(playersao);`
`1155`	`1155`	`}`
`1156`	`1156`	`}`
`1157`	`1157`
`@@ -1510,14 +1510,12 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)`
`1510`	`1510`	`// If the object is a player and its HP changed`
`1511`	`1511`	`if (src_original_hp != pointed_object->getHP() &&`
`1512`	`1512`	`pointed_object->getType() == ACTIVEOBJECT_TYPE_PLAYER) {`
`1513`		`- SendPlayerHPOrDie(((PlayerSAO*)pointed_object)->getPeerID(),`
`1514`		`- pointed_object->getHP() == 0);`
	`1513`	`+ SendPlayerHPOrDie((PlayerSAO *)pointed_object);`
`1515`	`1514`	`}`
`1516`	`1515`
`1517`	`1516`	`// If the puncher is a player and its HP changed`
`1518`		`- if (dst_origin_hp != playersao->getHP()) {`
`1519`		`- SendPlayerHPOrDie(playersao->getPeerID(), playersao->getHP() == 0);`
`1520`		`- }`
	`1517`	`+ if (dst_origin_hp != playersao->getHP())`
	`1518`	`+ SendPlayerHPOrDie(playersao);`
`1521`	`1519`	`}`
`1522`	`1520`
`1523`	`1521`	`} // action == 0`