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

clean up a bunch of R&D code (#13071)

Browse Source 
* clean up a bunch of R&D code

* don't store components

* brug

* speedrun some sloth review
This commit is contained in:
Nemanja
2022-12-19 16:14:02 -05:00
committed by GitHub
parent f78dca8504
commit 0549b22cbc
12 changed files with 159 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,8 @@
using System.Linq;
using Content.Server.Research.Components;
using Content.Shared.Research.Components;
namespace Content.Server.Research;
namespace Content.Server.Research.Systems;
public sealed partial class ResearchSystem
{
@@ -50,8 +51,9 @@ public sealed partial class ResearchSystem
private void OnClientStartup(EntityUid uid, ResearchClientComponent component, ComponentStartup args)
{
if (Servers.Count > 0)
RegisterClientServer(component, Servers[0]);
var allServers = EntityQuery<ResearchServerComponent>(true).ToArray();
if (allServers.Length > 0)
RegisterClientServer(component, allServers[0]);
}
private void OnClientShutdown(EntityUid uid, ResearchClientComponent component, ComponentShutdown args)
@@ -66,22 +68,23 @@ public sealed partial class ResearchSystem
private void UpdateClientInterface(ResearchClientComponent component)
{
var state = new ResearchClientBoundInterfaceState(Servers.Count, GetServerNames(),
var names = GetServerNames();
var state = new ResearchClientBoundInterfaceState(names.Length, names,
GetServerIds(), component.ConnectedToServer ? component.Server!.Id : -1);
_uiSystem.GetUiOrNull(component.Owner, ResearchClientUiKey.Key)?.SetState(state);
_uiSystem.TrySetUiState(component.Owner, ResearchClientUiKey.Key, state);
}
private bool RegisterClientServer(ResearchClientComponent component, ResearchServerComponent? server = null)
{
if (server == null) return false;
return RegisterServerClient(server, component);
return server != null && RegisterServerClient(server, component.Owner, component);
}
private void UnregisterClientServer(ResearchClientComponent component)
{
if (component.Server == null) return;
if (component.Server == null)
return;
UnregisterServerClient(component.Server, component);
UnregisterServerClient(component.Server, component.Owner, component);
}
}