mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Fix #18035: Favourited servers don't get their online status updated

Browse Source 
From fetching flow, list will always have favourited servers but no code to update those entries, only append.
This code updates those favourited servers in the list with new data from internet by matching address.
This will fix list having 2 duplicate servers too. (one favourited and one not)
This commit is contained in:
Meehoi
2022-09-24 03:51:05 +07:00
committed by GitHub
parent 7af999e2dd
commit d6ca1a3da9
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/openrct2/network/ServerList.cpp
View File

@@ -150,6 +150,33 @@ void ServerList::AddRange(const std::vector<ServerListEntry>& entries)
Sort();
}
void ServerList::AddOrUpdateRange(const std::vector<ServerListEntry>& entries)
{
for (auto& existsEntry : _serverEntries)
{
auto match = std::find_if(
entries.begin(), entries.end(), [&](const ServerListEntry& entry) { return existsEntry.Address == entry.Address; });
if (match != entries.end())
{
// Keep favourites
auto fav = existsEntry.Favourite;
existsEntry = *match;
existsEntry.Favourite = fav;
}
}
std::vector<ServerListEntry> newServers;
std::copy_if(entries.begin(), entries.end(), std::back_inserter(newServers), [this](const ServerListEntry& entry) {
return std::find_if(
_serverEntries.begin(), _serverEntries.end(),
[&](const ServerListEntry& existsEntry) { return existsEntry.Address == entry.Address; })
== _serverEntries.end();
});
AddRange(newServers);
}
void ServerList::Clear() noexcept
{
_serverEntries.clear();