edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed 1 line merge mistake. fixes #45

Browse source
This commit is contained in:
GreYFoX 2011-05-09 18:45:35 +02:00
parent ee97bfcad3
commit 2ab15cc752
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/server/gamecontext.cpp
View file

@ -998,6 +998,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
if(pPlayer->GetTeam()==-1 && pPlayer->m_InfoSaved)
SendChatTarget(ClientID,"Use /pause first then you can kill");
else
{
pPlayer->m_LastSetTeam = Server()->Tick();
if(pPlayer->GetTeam() == TEAM_SPECTATORS || pMsg->m_Team == TEAM_SPECTATORS)