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

Fix device networking, again (#23035)

Browse Source
This commit is contained in:
Leon Friedrich
2023-12-26 23:39:04 -05:00
committed by GitHub
parent 6e07bc70f8
commit af42cf82b7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
View File

@@ -92,7 +92,8 @@ public sealed class DeviceListSystem : SharedDeviceListSystem
//Don't filter anything if the device list is empty //Don't filter anything if the device list is empty
if (component.Devices.Count == 0) if (component.Devices.Count == 0)
{ {
if (component.IsAllowList) args.Cancel(); if (component.IsAllowList)
args.Cancel();
return; return;
} }
@@ -100,7 +101,8 @@ public sealed class DeviceListSystem : SharedDeviceListSystem
foreach (var recipient in args.Recipients) foreach (var recipient in args.Recipients)
{ {
if (component.Devices.Contains(recipient.Owner) == component.IsAllowList) filteredRecipients.Add(recipient); if (component.Devices.Contains(recipient.Owner) == component.IsAllowList)
filteredRecipients.Add(recipient);
} }
args.ModifiedRecipients = filteredRecipients; args.ModifiedRecipients = filteredRecipients;
@@ -162,7 +164,7 @@ public sealed class DeviceListSystem : SharedDeviceListSystem
var old = device.Devices.ToList(); var old = device.Devices.ToList();
device.Devices.ExceptWith(toRemove); device.Devices.ExceptWith(toRemove);
RaiseLocalEvent(uid, new DeviceListUpdateEvent(old, device.Devices.ToList())); RaiseLocalEvent(uid, new DeviceListUpdateEvent(old, device.Devices.ToList()));
Dirty(device); Dirty(uid, device);
toRemove.Clear(); toRemove.Clear();
} }
} }

3
Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
View File

@@ -532,12 +532,13 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem
/// </summary> /// </summary>
private void OnUiClosed(EntityUid uid, NetworkConfiguratorComponent component, BoundUIClosedEvent args) private void OnUiClosed(EntityUid uid, NetworkConfiguratorComponent component, BoundUIClosedEvent args)
{ {
component.ActiveDeviceList = null;
if (TryComp(component.ActiveDeviceList, out DeviceListComponent? list)) if (TryComp(component.ActiveDeviceList, out DeviceListComponent? list))
{ {
list.Configurators.Remove(uid); list.Configurators.Remove(uid);
} }
component.ActiveDeviceList = null;
if (args.UiKey is NetworkConfiguratorUiKey.Link) if (args.UiKey is NetworkConfiguratorUiKey.Link)
{ {
component.ActiveDeviceLink = null; component.ActiveDeviceLink = null;