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

Make research clients grid-local (#36821)

Browse Source 
* Limit RD servers to the station grid

* the sluth
This commit is contained in:
Nemanja
2025-05-18 00:04:27 -04:00
committed by GitHub
parent ffc65ea474
commit 4bced26086
2 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.Power.EntitySystems;
using Content.Shared.Research.Components;
@@ -12,6 +13,7 @@ public sealed partial class ResearchSystem
SubscribeLocalEvent<ResearchClientComponent, ComponentShutdown>(OnClientShutdown);
SubscribeLocalEvent<ResearchClientComponent, BoundUIOpenedEvent>(OnClientUIOpen);
SubscribeLocalEvent<ResearchClientComponent, ConsoleServerSelectionMessage>(OnConsoleSelect);
SubscribeLocalEvent<ResearchClientComponent, AnchorStateChangedEvent>(OnClientAnchorStateChanged);
SubscribeLocalEvent<ResearchClientComponent, ResearchClientSyncMessage>(OnClientSyncMessage);
SubscribeLocalEvent<ResearchClientComponent, ResearchClientServerSelectedMessage>(OnClientSelected);
@@ -23,7 +25,11 @@ public sealed partial class ResearchSystem
private void OnClientSelected(EntityUid uid, ResearchClientComponent component, ResearchClientServerSelectedMessage args)
{
if (!TryGetServerById(args.ServerId, out var serveruid, out var serverComponent))
if (!TryGetServerById(uid, args.ServerId, out var serveruid, out var serverComponent))
return;
// Validate that we can access this server.
if (!GetServers(uid).Contains((serveruid.Value, serverComponent)))
return;
UnregisterClient(uid, component);
@@ -56,12 +62,7 @@ public sealed partial class ResearchSystem
private void OnClientMapInit(EntityUid uid, ResearchClientComponent component, MapInitEvent args)
{
var allServers = new List<Entity<ResearchServerComponent>>();
var query = AllEntityQuery<ResearchServerComponent>();
while (query.MoveNext(out var serverUid, out var serverComp))
{
allServers.Add((serverUid, serverComp));
}
var allServers = GetServers(uid).ToList();
if (allServers.Count > 0)
RegisterClient(uid, allServers[0], component, allServers[0]);
@@ -77,6 +78,24 @@ public sealed partial class ResearchSystem
UpdateClientInterface(uid, component);
}
private void OnClientAnchorStateChanged(Entity<ResearchClientComponent> ent, ref AnchorStateChangedEvent args)
{
if (args.Anchored)
{
if (ent.Comp.Server is not null)
return;
var allServers = GetServers(ent).ToList();
if (allServers.Count > 0)
RegisterClient(ent, allServers[0], ent, allServers[0]);
}
else
{
UnregisterClient(ent, ent.Comp);
}
}
private void UpdateClientInterface(EntityUid uid, ResearchClientComponent? component = null)
{
if (!Resolve(uid, ref component, false))
@@ -84,9 +103,12 @@ public sealed partial class ResearchSystem
TryGetClientServer(uid, out _, out var serverComponent, component);
var names = GetServerNames();
var state = new ResearchClientBoundInterfaceState(names.Length, names,
GetServerIds(), serverComponent?.Id ?? -1);
var names = GetServerNames(uid);
var state = new ResearchClientBoundInterfaceState(
names.Length,
names,
GetServerIds(uid),
serverComponent?.Id ?? -1);
_uiSystem.SetUiState(uid, ResearchClientUiKey.Key, state);
}