Fix ResearchSystem.Client UpdateClientInterface preconditions. (s…

…pace-wizards#25743) * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. Fixes a paradox where selecting a research server requires a research server to already be selected. This would softlock the research client until it is reconstructed. * style: Discards the discard operator Co-authored-by: Nemanja <[email protected]> --------- Co-authored-by: Nemanja <[email protected]>
SS14-Classic · Mar 2, 2024 · aaf5d0d · aaf5d0d
1 parent a5200cc
commit aaf5d0d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Content.Server/Research/Systems/ResearchSystem.Client.cs b/Content.Server/Research/Systems/ResearchSystem.Client.cs
@@ -82,12 +82,11 @@ private void UpdateClientInterface(EntityUid uid, ResearchClientComponent? compo
         if (!Resolve(uid, ref component, false))
             return;
 
-        if (!TryGetClientServer(uid, out _, out var serverComponent, component))
-            return;
+        TryGetClientServer(uid, out _, out var serverComponent, component);
 
         var names = GetServerNames();
         var state = new ResearchClientBoundInterfaceState(names.Length, names,
-            GetServerIds(), component.ConnectedToServer ? serverComponent.Id : -1);
+            GetServerIds(), serverComponent?.Id ?? -1);
 
         _uiSystem.TrySetUiState(uid, ResearchClientUiKey.Key, state);
     }