epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent remote map searches overwriting local or generated state.

Browse Source
This commit is contained in:
Paul Chote
2025-04-29 23:34:41 +01:00
committed by Gustas Kažukauskas
parent 4a4217c3b3
commit e8d710dee4
2 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Game/Map/MapCache.cs
View File

@@ -235,7 +235,7 @@ namespace OpenRA
.ToList();
foreach (var uid in queryUids)
previews[uid].UpdateRemoteSearch(MapStatus.Searching, null, null);
previews[uid].BeginRemoteSearch();
Task.Run(async () =>
{
@@ -251,29 +251,21 @@ namespace OpenRA
try
{
var result = await client.GetStreamAsync(url);
var yaml = MiniYaml.FromStream(result, url, stringPool: stringPool);
foreach (var kv in yaml)
previews[kv.Key].UpdateRemoteSearch(MapStatus.DownloadAvailable, kv.Value, mapDetailsReceived);
foreach (var uid in batchUids)
{
var p = previews[uid];
if (p.Status != MapStatus.DownloadAvailable)
p.UpdateRemoteSearch(MapStatus.Unavailable, null, null);
}
foreach (var kv in MiniYaml.FromStream(result, url, stringPool: stringPool))
previews[kv.Key].CompleteRemoteSearch(kv.Value, mapDetailsReceived);
}
catch (Exception e)
{
Log.Write("debug", "Remote map query failed with error:");
Log.Write("debug", e);
Log.Write("debug", $"URL was: {url}");
}
foreach (var uid in batchUids)
{
var p = previews[uid];
p.UpdateRemoteSearch(MapStatus.Unavailable, null, null);
mapQueryFailed?.Invoke(p);
}
foreach (var uid in batchUids)
{
var p = previews[uid];
if (p.Status == MapStatus.Searching)
p.CompleteRemoteSearch(null, mapQueryFailed);
}
}
}