about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDennis Felsing <dennis.felsing@sap.com>2021-11-18 15:21:58 +0100
committerDennis Felsing <dennis.felsing@sap.com>2021-11-18 15:21:58 +0100
commitccd9b398517399feb3f28babf389e6de9f02082d (patch)
tree5e57d8679e3bc45a9363d32a7ca908b13e3d16f1
parente52a203238bc60e03d207f7df385356089272ef2 (diff)
downloadzcatch-ccd9b398517399feb3f28babf389e6de9f02082d.tar.gz
zcatch-ccd9b398517399feb3f28babf389e6de9f02082d.zip
Allow rejoin when player left (fixes #1)
-rw-r--r--src/game/server/gamecontext.cpp2
1 files changed, 1 insertions, 1 deletions
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);