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

Unrestrict device net ids (#8332)

Browse Source
This commit is contained in:
wrexbe
2022-05-22 07:36:21 -07:00
committed by GitHub
parent a1b2a9c142
commit 6fa431cfce
3 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
View File

@@ -21,20 +21,13 @@ namespace Content.Server.DeviceNetwork.Systems
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
private readonly DeviceNet[] _networks = new DeviceNet[4]; // Number of ConnectionType enum values
private readonly Dictionary<int, DeviceNet> _networks = new(4);
private readonly Queue<DeviceNetworkPacketEvent> _packets = new();
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<DeviceNetworkComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<DeviceNetworkComponent, ComponentShutdown>(OnNetworkShutdown);
InitNetwork(ConnectionType.Private);
InitNetwork(ConnectionType.Wired);
InitNetwork(ConnectionType.Wireless);
InitNetwork(ConnectionType.Apc);
}
public override void Update(float frameTime)
@@ -66,10 +59,6 @@ namespace Content.Server.DeviceNetwork.Systems
if (frequency != null)
_packets.Enqueue(new DeviceNetworkPacketEvent(device.DeviceNetId, address, frequency.Value, device.Address, uid, data));
}
private void InitNetwork(ConnectionType connectionType) =>
_networks[(int) connectionType] = new(connectionType, _random);
/// <summary>
/// Automatically attempt to connect some devices when a map starts.
/// </summary>
@@ -93,8 +82,14 @@ namespace Content.Server.DeviceNetwork.Systems
ConnectDevice(uid, device);
}
private DeviceNet GetNetwork(ConnectionType connectionType) =>
_networks[(int) connectionType];
private DeviceNet GetNetwork(int netId)
{
if (_networks.TryGetValue(netId, out var deviceNet))
return deviceNet;
var newDeviceNet = new DeviceNet(netId, _random);
_networks[netId] = newDeviceNet;
return newDeviceNet;
}
/// <summary>
/// Automatically disconnect when an entity with a DeviceNetworkComponent shuts down.
@@ -191,7 +186,7 @@ namespace Content.Server.DeviceNetwork.Systems
/// <summary>
/// Try to find a device on a network using its address.
/// </summary>
private bool TryGetDevice(ConnectionType netId, string address, [NotNullWhen(true)] out DeviceNetworkComponent? device) =>
private bool TryGetDevice(int netId, string address, [NotNullWhen(true)] out DeviceNetworkComponent? device) =>
GetNetwork(netId).Devices.TryGetValue(address, out device);
private void SendPacket(DeviceNetworkPacketEvent packet)
@@ -289,9 +284,9 @@ namespace Content.Server.DeviceNetwork.Systems
public sealed class DeviceNetworkPacketEvent : EntityEventArgs
{
/// <summary>
/// The type of network that this packet is being sent on.
/// The id of the network that this packet is being sent on.
/// </summary>
public ConnectionType NetId;
public int NetId;
/// <summary>
/// The frequency the packet is sent on.
@@ -318,7 +313,7 @@ namespace Content.Server.DeviceNetwork.Systems
/// </summary>
public readonly NetworkPayload Data;
public DeviceNetworkPacketEvent(ConnectionType netId, string? address, uint frequency, string senderAddress, EntityUid sender, NetworkPayload data)
public DeviceNetworkPacketEvent(int netId, string? address, uint frequency, string senderAddress, EntityUid sender, NetworkPayload data)
{
NetId = netId;
Address = address;