tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ResearchSystem threading exception (#40917)

Browse Source 
* Fix ResearchSystem threading exception

* Update Content.Server/Research/Systems/ResearchSystem.Client.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
Leon Friedrich
2025-10-16 01:53:34 +13:00
committed by GitHub
parent 704521d8df
commit 68f9d748a2
2 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Research/Systems/ResearchSystem.Client.cs
View File

@@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.Power.EntitySystems;
using Content.Shared.Research.Components;
using Robust.Shared.Utility;
namespace Content.Server.Research.Systems;
@@ -62,10 +63,8 @@ public sealed partial class ResearchSystem
private void OnClientMapInit(EntityUid uid, ResearchClientComponent component, MapInitEvent args)
{
var allServers = GetServers(uid).ToList();
if (allServers.Count > 0)
RegisterClient(uid, allServers[0], component, allServers[0]);
if (GetServers(uid).FirstOrNull() is { } server)
RegisterClient(uid, server, component, server);
}
private void OnClientShutdown(EntityUid uid, ResearchClientComponent component, ComponentShutdown args)
@@ -85,10 +84,8 @@ public sealed partial class ResearchSystem
if (ent.Comp.Server is not null)
return;
var allServers = GetServers(ent).ToList();
if (allServers.Count > 0)
RegisterClient(ent, allServers[0], ent, allServers[0]);
if (GetServers(ent).FirstOrNull() is { } server)
RegisterClient(ent, server, ent, server);
}
else
{