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 #8000 from Robyt3/Serverbrowser-Has-Finishes-Fix

Browse source 
Add `has_finishes` attribute to community info
This commit is contained in:
heinrich5991 2024-02-20 19:54:07 +00:00 committed by GitHub
parent 99c982e3e0 386b00f18d
commit 9858d4e3c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/client/serverbrowser.cpp
View file

@ -1438,6 +1438,7 @@ void CServerBrowser::LoadDDNetServers()
const json_value &IconSha256 = Icon["sha256"];
const json_value &IconUrl = Icon["url"];
const json_value &Name = Community["name"];
const json_value HasFinishes = Community["has_finishes"];
const json_value *pFinishes = &Icon["finishes"];
const json_value *pServers = &Icon["servers"];
if(pFinishes->type == json_none)
@ -1464,6 +1465,7 @@ void CServerBrowser::LoadDDNetServers()
IconSha256.type != json_string ||
IconUrl.type != json_string ||
Name.type != json_string ||
HasFinishes.type != json_boolean ||
(pFinishes->type != json_array && pFinishes->type != json_none) ||
pServers->type != json_array)
{
@ -1482,8 +1484,8 @@ void CServerBrowser::LoadDDNetServers()
log_error("serverbrowser", "invalid community servers (CommunityId=%s)", NewCommunity.Id());
continue;
}
NewCommunity.m_HasFinishes = pFinishes->type == json_array;
if(NewCommunity.m_HasFinishes && !ParseCommunityFinishes(&NewCommunity, *pFinishes))
NewCommunity.m_HasFinishes = HasFinishes;
if(NewCommunity.m_HasFinishes && pFinishes->type == json_array && !ParseCommunityFinishes(&NewCommunity, *pFinishes))
{
log_error("serverbrowser", "invalid community finishes (CommunityId=%s)", NewCommunity.Id());
continue;