From a46a4b13d7db761f222be7c0c09a346c9499a724 Mon Sep 17 00:00:00 2001 From: Julian Giebel Date: Mon, 29 May 2023 08:07:59 +0200 Subject: [PATCH] Fix network configurator resolves (#16910) --- .../DeviceNetwork/Systems/NetworkConfiguratorSystem.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs index 5aae1c2722..63b9c11374 100644 --- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs @@ -437,7 +437,7 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem DeviceLinkSourceComponent? sourceComponent = null, DeviceLinkSinkComponent? sinkComponent = null, DeviceNetworkComponent? sourceNetworkComponent = null, DeviceNetworkComponent? sinkNetworkComponent = null) { - if (!Resolve(sourceUid, ref sourceComponent) || !Resolve(sinkUid, ref sinkComponent)) + if (!Resolve(sourceUid, ref sourceComponent, false) || !Resolve(sinkUid, ref sinkComponent, false)) return; var sources = _deviceLinkSystem.GetSourcePorts(sourceUid, sourceComponent); @@ -445,8 +445,8 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem var links = _deviceLinkSystem.GetLinks(sourceUid, sinkUid, sourceComponent); var defaults = _deviceLinkSystem.GetDefaults(sources); - var sourceAddress = Resolve(sourceUid, ref sourceNetworkComponent) ? sourceNetworkComponent.Address : ""; - var sinkAddress = Resolve(sinkUid, ref sinkNetworkComponent) ? sinkNetworkComponent.Address : ""; + var sourceAddress = Resolve(sourceUid, ref sourceNetworkComponent, false) ? sourceNetworkComponent.Address : ""; + var sinkAddress = Resolve(sinkUid, ref sinkNetworkComponent, false) ? sinkNetworkComponent.Address : ""; var state = new DeviceLinkUserInterfaceState(sources, sinks, links, sourceAddress, sinkAddress, defaults); _uiSystem.TrySetUiState(configuratorUid, NetworkConfiguratorUiKey.Link, state);