cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix device networking, again (#23035)

This commit is contained in:
Leon Friedrich 2023-12-26 23:39:04 -05:00 committed by GitHub
parent 6e07bc70f8
commit af42cf82b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats 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
if (component.Devices.Count == 0)
{
if (component.IsAllowList) args.Cancel();
if (component.IsAllowList)
args.Cancel();
return;
}
@ -100,7 +101,8 @@ public sealed class DeviceListSystem : SharedDeviceListSystem
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;
@ -162,7 +164,7 @@ public sealed class DeviceListSystem : SharedDeviceListSystem
var old = device.Devices.ToList();
device.Devices.ExceptWith(toRemove);
RaiseLocalEvent(uid, new DeviceListUpdateEvent(old, device.Devices.ToList()));
Dirty(device);
Dirty(uid, device);
toRemove.Clear();
}
}

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

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