From d1c6cc72cce7e02dcaca7797b463d071d67d27db Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 5 May 2020 17:05:11 +0200
Subject: [PATCH] Server: Improve some log messages (#9820)

---
 src/network/serverpackethandler.cpp | 16 +++++++---------
 src/server/player_sao.cpp           |  6 +++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 5136eb0ec..adaa9a965 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -111,8 +111,6 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
 
 	if (depl_serial_v == SER_FMT_VER_INVALID) {
 		actionstream << "Server: A mismatched client tried to connect from " <<
-			addr_s << std::endl;
-		infostream << "Server: Cannot negotiate serialization version with " <<
 			addr_s << " client_max=" << (int)client_max << std::endl;
 		DenyAccess(peer_id, SERVER_ACCESSDENIED_WRONG_VERSION);
 		return;
@@ -902,8 +900,8 @@ bool Server::checkInteractDistance(RemotePlayer *player, const f32 d, const std:
 		actionstream << "Player " << player->getName()
 				<< " tried to access " << what
 				<< " from too far: "
-				<< "d=" << d <<", max_d=" << max_d
-				<< ". ignoring." << std::endl;
+				<< "d=" << d << ", max_d=" << max_d
+				<< "; ignoring." << std::endl;
 		// Call callbacks
 		m_script->on_cheat(player->getPlayerSAO(), "interacted_too_far");
 		return false;
@@ -956,7 +954,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 	}
 
 	if (playersao->isDead()) {
-		actionstream << "Server: NoCheat: " << player->getName()
+		actionstream << "Server: " << player->getName()
 				<< " tried to interact while dead; ignoring." << std::endl;
 		if (pointed.type == POINTEDTHING_NODE) {
 			// Re-send block to revert change on client-side
@@ -1145,7 +1143,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 				playersao->noCheatDigEnd();
 				// If player didn't start digging this, ignore dig
 				if (nocheat_p != p_under) {
-					infostream << "Server: NoCheat: " << player->getName()
+					infostream << "Server: " << player->getName()
 							<< " started digging "
 							<< PP(nocheat_p) << " and completed digging "
 							<< PP(p_under) << "; not digging." << std::endl;
@@ -1169,9 +1167,9 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 				}
 				// If can't dig, ignore dig
 				if (!params.diggable) {
-					infostream << "Server: NoCheat: " << player->getName()
+					infostream << "Server: " << player->getName()
 							<< " completed digging " << PP(p_under)
-							<< ", which is not diggable with tool. not digging."
+							<< ", which is not diggable with tool; not digging."
 							<< std::endl;
 					is_valid_dig = false;
 					// Call callbacks
@@ -1195,7 +1193,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 				}
 				// Dig not possible
 				else {
-					infostream << "Server: NoCheat: " << player->getName()
+					infostream << "Server: " << player->getName()
 							<< " completed digging " << PP(p_under)
 							<< "too fast; not digging." << std::endl;
 					is_valid_dig = false;
diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp
index 58fcea5fe..a4d0f4ce7 100644
--- a/src/server/player_sao.cpp
+++ b/src/server/player_sao.cpp
@@ -656,9 +656,9 @@ bool PlayerSAO::checkMovementCheat()
 		float lag_pool_max = m_env->getMaxLagEstimate() * 2.0;
 		lag_pool_max = MYMAX(lag_pool_max, LAG_POOL_MIN);
 		if (m_time_from_last_teleport > lag_pool_max) {
-			actionstream << "Player " << m_player->getName()
-					<< " moved too fast; resetting position"
-					<< std::endl;
+			actionstream << "Server: " << m_player->getName()
+					<< " moved too fast: V=" << d_vert << ", H=" << d_horiz
+					<< "; resetting position." << std::endl;
 			cheated = true;
 		}
 		setBasePosition(m_last_good_position);