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

Merge #2423

Browse source 
2423: Only SendChat to clients that exist. Initialize m_Sixup anyway r=def- a=Learath2

#2421 

Co-authored-by: Learath <learath2@gmail.com>
This commit is contained in:
bors[bot] 2020-06-30 16:25:47 +00:00 committed by GitHub
parent b96544f8ac 8d8f1d7208
commit 5a41318cbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/server/server.cpp
View file

@ -484,6 +484,7 @@ int CServer::Init()
m_aClients[i].m_ShowIps = false;
m_aClients[i].m_AuthKey = -1;
m_aClients[i].m_Latency = 0;
m_aClients[i].m_Sixup = false;
}
m_CurrentGameTick = 0;

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

@ -405,10 +405,12 @@ void CGameContext::SendChat(int ChatterClientID, int Team, const char *pText, in
// send to the clients
for(int i = 0; i < MAX_CLIENTS; i++)
{
if(!m_apPlayers[i])
continue;
bool Send = (Server()->IsSixup(i) && (Flags & CHAT_SIXUP)) ||
(!Server()->IsSixup(i) && (Flags & CHAT_SIX));
if(m_apPlayers[i] != 0 && !m_apPlayers[i]->m_DND && Send)
if(!m_apPlayers[i]->m_DND && Send)
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, i);
}
}