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 #1088

Browse source 
1088: Only count distinct client IP addresses for minimum player vote count r=heinrich5991 a=heinrich5991
This commit is contained in:
bors[bot] 2018-03-20 10:21:49 +00:00
parent 5a5b3970cb 08e2c843a1
commit 1e15b97543
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1419,12 +1419,36 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
if(g_Config.m_SvVoteKickMin)
{
int PlayerNum = 0;
char aaAddresses[MAX_CLIENTS][NETADDR_MAXSTRSIZE] = {{0}};
for(int i = 0; i < MAX_CLIENTS; i++)
{
if(m_apPlayers[i])
{
Server()->GetClientAddr(i, aaAddresses[i], NETADDR_MAXSTRSIZE);
}
}
int NumPlayers = 0;
for(int i = 0; i < MAX_CLIENTS; ++i)
{
if(m_apPlayers[i] && m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS)
++PlayerNum;
{
NumPlayers++;
for(int j = 0; j < i; j++)
{
if(PlayerNum < g_Config.m_SvVoteKickMin)
if(m_apPlayers[j] && m_apPlayers[j]->GetTeam() != TEAM_SPECTATORS)
{
if(str_comp(aaAddresses[i], aaAddresses[j]) == 0)
{
NumPlayers--;
break;
}
}
}
}
}
if(NumPlayers < g_Config.m_SvVoteKickMin)
{
str_format(aChatmsg, sizeof(aChatmsg), "Kick voting requires %d players on the server", g_Config.m_SvVoteKickMin);
SendChatTarget(ClientID, aChatmsg);