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

Browse source 
1697: Don't check dnsbl when alone r=def- a=Learath2

Should help relieve some of the issues reported on discord.

Co-authored-by: Learath <learath2@gmail.com>
This commit is contained in:
bors[bot] 2019-05-02 05:29:06 +00:00
parent b86c457c91 57f58cc9c7
commit 0b7ca35414
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -679,10 +679,20 @@ void CGameContext::OnTick()
if(m_VoteUpdate)
{
// count votes
char aaBuf[MAX_CLIENTS][NETADDR_MAXSTRSIZE] = {{0}};
char aaBuf[MAX_CLIENTS][NETADDR_MAXSTRSIZE] = {{0}}, *pIP = NULL;
bool SinglePlayer = true;
for(int i = 0; i < MAX_CLIENTS; i++)
{
if(m_apPlayers[i])
{
Server()->GetClientAddr(i, aaBuf[i], NETADDR_MAXSTRSIZE);
if(!pIP)
pIP = aaBuf[i];
else if(SinglePlayer && str_comp(pIP, aaBuf[i]))
SinglePlayer = false;
}
}
bool aVoteChecked[MAX_CLIENTS] = {0};
int64 Now = Server()->Tick();
for(int i = 0; i < MAX_CLIENTS; i++)
@ -711,7 +721,7 @@ void CGameContext::OnTick()
continue;
// don't count votes by blacklisted clients
if(g_Config.m_SvDnsblVote && !m_pServer->DnsblWhite(i))
if(g_Config.m_SvDnsblVote && !m_pServer->DnsblWhite(i) && !SinglePlayer)
continue;
int ActVote = m_apPlayers[i]->m_Vote;