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

fix crash on devicenet address adding (#11457)

Browse Source
This commit is contained in:
Flipp Syder
2022-09-24 02:51:02 -07:00
committed by GitHub
parent b7206b9053
commit 07fe950c91
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,9 @@ public sealed class DeviceListSystem : SharedDeviceListSystem
/// <summary> /// <summary>
/// Gets the given device list as a dictionary /// Gets the given device list as a dictionary
/// </summary> /// </summary>
/// <remarks>
/// If any entity in the device list is pre-map init, it will show the entity UID of the device instead.
/// </remarks>
public Dictionary<string, EntityUid> GetDeviceList(EntityUid uid, DeviceListComponent? deviceList = null) public Dictionary<string, EntityUid> GetDeviceList(EntityUid uid, DeviceListComponent? deviceList = null)
{ {
if (!Resolve(uid, ref deviceList)) if (!Resolve(uid, ref deviceList))
@@ -37,7 +40,11 @@ public sealed class DeviceListSystem : SharedDeviceListSystem
if (!TryComp(deviceUid, out DeviceNetworkComponent? deviceNet)) if (!TryComp(deviceUid, out DeviceNetworkComponent? deviceNet))
continue; continue;
devices.Add(deviceNet.Address, deviceUid); var address = MetaData(deviceUid).EntityLifeStage == EntityLifeStage.MapInitialized
? deviceNet.Address
: $"UID: {deviceUid.ToString()}";
devices.Add(address, deviceUid);
} }