Disconnect remote player

unibuc-cs · Jan 29, 2025 · cb3b7c7 · cb3b7c7
1 parent a9b22fe
commit cb3b7c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/DeadZone/source/Client/Client.cpp b/DeadZone/source/Client/Client.cpp
@@ -513,14 +513,12 @@ void Client::sendCloseRangeDamage(const double damage, const double shortRangeAt
 
 void Client::sendDisconnect()
 {
-	nlohmann::json jsonData;
-	jsonData["disconnect"] = true;
-
-	bool failure = true;
-	while (failure)
+	if (succesfullyConnected)
 	{
-		this->sendMessage(jsonData.dump(), failure, this->lastTimeSentPing);
-	}
+		nlohmann::json jsonData;
+		jsonData["disconnect"] = true;
 
-	enet_host_flush(this->client);
+		this->sendMessageUnsafe(jsonData.dump(), this->lastTimeSentPing);
+		enet_host_flush(this->client);
+	}
 }
diff --git a/DeadZone/source/Server/Server.cpp b/DeadZone/source/Server/Server.cpp
@@ -558,7 +558,7 @@ void Server::sendNumFinishedWaves(int number)
 
 void Server::disconnectPlayer(const std::string& clientKey)
 {
-	enet_peer_disconnect(connectedClients[clientKey].peer, 0);
+	// enet_peer_disconnect(connectedClients[clientKey].peer, 0);
 	connectedClients.erase(clientKey);
 
 	// Broadcast