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

Merge pull request #7968 from Robyt3/Server-Mod-Message-Fix

Browse source 
Make it less likely that antibot message is sent from random tees
This commit is contained in:
Dennis Felsing 2024-02-11 21:58:01 +00:00 committed by GitHub
parent 2d9a0c8b7a be98c17738
commit c85be52409
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/server.h
View file

@ -55,6 +55,7 @@ public:
virtual const char *ClientName(int ClientID) const = 0;
virtual const char *ClientClan(int ClientID) const = 0;
virtual int ClientCountry(int ClientID) const = 0;
virtual bool ClientEmpty(int ClientID) const = 0;
virtual bool ClientIngame(int ClientID) const = 0;
virtual bool ClientAuthed(int ClientID) const = 0;
virtual bool GetClientInfo(int ClientID, CClientInfo *pInfo) const = 0;

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

@ -646,6 +646,11 @@ int CServer::ClientCountry(int ClientID) const
return -1;
}
bool CServer::ClientEmpty(int ClientID) const
{
return ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY;
}
bool CServer::ClientIngame(int ClientID) const
{
return ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME;

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

@ -298,6 +298,7 @@ public:
const char *ClientName(int ClientID) const override;
const char *ClientClan(int ClientID) const override;
int ClientCountry(int ClientID) const override;
bool ClientEmpty(int ClientID) const override;
bool ClientIngame(int ClientID) const override;
bool ClientAuthed(int ClientID) const override;
int Port() const override;

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

@ -1521,7 +1521,7 @@ void CGameContext::OnClientEnter(int ClientID)
int Empty = -1;
for(int i = 0; i < MAX_CLIENTS; i++)
{
if(!Server()->ClientIngame(i))
if(Server()->ClientEmpty(i))
{
Empty = i;
break;