juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix research server test fail (#37562)

Browse Source
This commit is contained in:
Nemanja
2025-05-18 16:04:19 -04:00
committed by GitHub
parent 95924cafd5
commit 964fa22b54
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Research/Systems/ResearchSystem.Server.cs
View File

@@ -63,7 +63,7 @@ public sealed partial class ResearchSystem
public void RegisterClient(EntityUid client, EntityUid server, ResearchClientComponent? clientComponent = null,
ResearchServerComponent? serverComponent = null, bool dirtyServer = true)
{
if (!Resolve(client, ref clientComponent) || !Resolve(server, ref serverComponent))
if (!Resolve(client, ref clientComponent, false) || !Resolve(server, ref serverComponent, false))
return;
if (serverComponent.Clients.Contains(client))
@@ -73,7 +73,7 @@ public sealed partial class ResearchSystem
clientComponent.Server = server;
SyncClientWithServer(client, clientComponent: clientComponent);
if (dirtyServer)
if (dirtyServer && !TerminatingOrDeleted(server))
Dirty(server, serverComponent);
var ev = new ResearchRegistrationChangedEvent(server);
@@ -108,14 +108,14 @@ public sealed partial class ResearchSystem
public void UnregisterClient(EntityUid client, EntityUid server, ResearchClientComponent? clientComponent = null,
ResearchServerComponent? serverComponent = null, bool dirtyServer = true)
{
if (!Resolve(client, ref clientComponent) || !Resolve(server, ref serverComponent))
if (!Resolve(client, ref clientComponent, false) || !Resolve(server, ref serverComponent, false))
return;
serverComponent.Clients.Remove(client);
clientComponent.Server = null;
SyncClientWithServer(client, clientComponent: clientComponent);
if (dirtyServer)
if (dirtyServer && !TerminatingOrDeleted(server))
{
Dirty(server, serverComponent);
}