From ccd9b398517399feb3f28babf389e6de9f02082d Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Thu, 18 Nov 2021 15:21:58 +0100 Subject: Allow rejoin when player left (fixes #1) --- src/game/server/gamecontext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index f54849e9..ea9f3199 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -1195,7 +1195,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) // Switch team on given client and kill/respawn him if(m_pController->CanJoinTeam(pMsg->m_Team, ClientID)) { - if(m_pController->CanChangeTeam(pPlayer, pMsg->m_Team)) + if(m_pController->CanChangeTeam(pPlayer, pMsg->m_Team) || !Server()->ClientIngame(pPlayer->m_CaughtBy)) { pPlayer->m_LastSetTeam = Server()->Tick(); pPlayer->SetTeam(pMsg->m_Team); -- cgit 1.4.1