From c75361bd66d1025d84104db6555338e228910ddb Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Thu, 4 Nov 2021 10:02:04 +0100 Subject: [PATCH] fix: team selection --- src/game/server/ServerConnexion.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/server/ServerConnexion.cpp b/src/game/server/ServerConnexion.cpp index 1a00f21..df2178b 100644 --- a/src/game/server/ServerConnexion.cpp +++ b/src/game/server/ServerConnexion.cpp @@ -97,8 +97,7 @@ void ServerConnexion::HandlePacket(protocol::SelectTeamPacket* packet) { if (m_Server->getGame().getGameState() != game::GameState::Lobby) return; if ((std::int8_t)packet->getSelectedTeam() >= -1 || (std::int8_t)packet->getSelectedTeam() <= 1) { - //m_Player->setTeamColor(packet->getSelectedTeam()); - if (m_Player->getTeamColor() == game::TeamColor::None) { //join a team + if (m_Player->getTeamColor() == game::TeamColor::None) { // join a team m_Server->getGame().getTeam(packet->getSelectedTeam()).addPlayer(m_Player); } else if (packet->getSelectedTeam() == game::TeamColor::None) { // leave a team m_Server->getGame().getTeam(m_Player->getTeamColor()).removePlayer(m_Player); @@ -107,6 +106,7 @@ void ServerConnexion::HandlePacket(protocol::SelectTeamPacket* packet) { m_Server->getGame().getTeam(m_Player->getTeamColor()).removePlayer(m_Player); m_Server->getGame().getTeam(packet->getSelectedTeam()).addPlayer(m_Player); } + m_Player->setTeamColor(packet->getSelectedTeam()); protocol::UpdatePlayerTeamPacket updateTeamPacket(m_ID, packet->getSelectedTeam()); m_Server->broadcastPacket(&updateTeamPacket); }