From 7ab8c79fdfd413deefcc357912f2d44809febced Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Mon, 14 Aug 2023 18:34:07 +0200 Subject: [PATCH] changed player join/leave message --- src/server/Lobby.cpp | 2 -- src/server/Server.cpp | 4 +++- src/server/ServerConnexion.cpp | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/server/Lobby.cpp b/src/server/Lobby.cpp index f8daa21..16b4051 100644 --- a/src/server/Lobby.cpp +++ b/src/server/Lobby.cpp @@ -63,7 +63,6 @@ void Lobby::SendTimeRemaining() { void Lobby::OnPlayerJoin(std::uint8_t playerID) { m_Players.push_back(playerID); - utils::LOG("(Server) Player Joined Lobby !"); if (!m_LobbyOpened) return; @@ -83,7 +82,6 @@ void Lobby::OnPlayerLeave(std::uint8_t playerID) m_Players.erase(it); - utils::LOG("(Server) Player Leaved Lobby !"); if (!m_LobbyOpened) return; diff --git a/src/server/Server.cpp b/src/server/Server.cpp index 95cdca5..06403ce 100644 --- a/src/server/Server.cpp +++ b/src/server/Server.cpp @@ -164,8 +164,10 @@ void Server::BroadcastPacket(const protocol::Packet* packet) { void Server::RemoveConnexion(std::uint8_t connexionID) { auto it = GetPlayers().find(connexionID); - if (it != GetPlayers().end()) + if (it != GetPlayers().end()) { GetPlayers().erase(it); + utils::LOG(utils::format("\t[%s] left !", it->second.GetName().c_str())); + } m_Connections.erase(connexionID); m_Lobby.OnPlayerLeave(connexionID); OnPlayerLeave(connexionID); diff --git a/src/server/ServerConnexion.cpp b/src/server/ServerConnexion.cpp index 68c9e66..4bc5b56 100644 --- a/src/server/ServerConnexion.cpp +++ b/src/server/ServerConnexion.cpp @@ -22,6 +22,7 @@ #include "td/misc/Time.h" #include "td/misc/Random.h" +#include "td/misc/Format.h" #include @@ -96,6 +97,8 @@ void ServerConnexion::HandlePacket(const protocol::PlayerLoginPacket* packet) { if (m_Player->GetName().empty() && !packet->GetPlayerName().empty()) { m_Player->SetName(packet->GetPlayerName()); + utils::LOG(utils::format("\t[%s] joined !", m_Player->GetName().c_str())); + protocol::PlayerJoinPacket joinPacket(m_ID, m_Player->GetName()); m_Server->BroadcastPacket(&joinPacket);