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

Fix pipe net null error (#9508)

Browse Source
This commit is contained in:
Leon Friedrich
2022-07-07 15:36:07 +12:00
committed by GitHub
parent 731e9cbd9f
commit d9c247b310
6 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/Power/NodeGroups/PowerNet.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.Power.NodeGroups
[UsedImplicitly]
public sealed class PowerNet : BaseNetConnectorNodeGroup<IPowerNet>, IPowerNet
{
private readonly PowerNetSystem _powerNetSystem = EntitySystem.Get<PowerNetSystem>();
private PowerNetSystem? _powerNetSystem;
[ViewVariables] public readonly List<PowerSupplierComponent> Suppliers = new();
[ViewVariables] public readonly List<PowerConsumerComponent> Consumers = new();
@@ -37,10 +37,11 @@ namespace Content.Server.Power.NodeGroups
[ViewVariables]
public PowerState.Network NetworkNode { get; } = new();
public override void Initialize(Node sourceNode, IEntityManager? entMan = null)
public override void Initialize(Node sourceNode, IEntityManager entMan)
{
base.Initialize(sourceNode, entMan);
_powerNetSystem = entMan.EntitySysManager.GetEntitySystem<PowerNetSystem>();
_powerNetSystem.InitPowerNet(this);
}
@@ -48,7 +49,7 @@ namespace Content.Server.Power.NodeGroups
{
base.AfterRemake(newGroups);
_powerNetSystem.DestroyPowerNet(this);
_powerNetSystem?.DestroyPowerNet(this);
}
protected override void SetNetConnectorNet(IBaseNetConnectorComponent<IPowerNet> netConnectorComponent)
@@ -60,28 +61,28 @@ namespace Content.Server.Power.NodeGroups
{
supplier.NetworkSupply.LinkedNetwork = default;
Suppliers.Add(supplier);
_powerNetSystem.QueueReconnectPowerNet(this);
_powerNetSystem?.QueueReconnectPowerNet(this);
}
public void RemoveSupplier(PowerSupplierComponent supplier)
{
supplier.NetworkSupply.LinkedNetwork = default;
Suppliers.Remove(supplier);
_powerNetSystem.QueueReconnectPowerNet(this);
_powerNetSystem?.QueueReconnectPowerNet(this);
}
public void AddConsumer(PowerConsumerComponent consumer)
{
consumer.NetworkLoad.LinkedNetwork = default;
Consumers.Add(consumer);
_powerNetSystem.QueueReconnectPowerNet(this);
_powerNetSystem?.QueueReconnectPowerNet(this);
}
public void RemoveConsumer(PowerConsumerComponent consumer)
{
consumer.NetworkLoad.LinkedNetwork = default;
Consumers.Remove(consumer);
_powerNetSystem.QueueReconnectPowerNet(this);
_powerNetSystem?.QueueReconnectPowerNet(this);
}
public void AddDischarger(BatteryDischargerComponent discharger)
@@ -89,7 +90,7 @@ namespace Content.Server.Power.NodeGroups
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(discharger.Owner);
battery.NetworkBattery.LinkedNetworkCharging = default;
Dischargers.Add(discharger);
_powerNetSystem.QueueReconnectPowerNet(this);
_powerNetSystem?.QueueReconnectPowerNet(this);
}
public void RemoveDischarger(BatteryDischargerComponent discharger)
@@ -99,7 +100,7 @@ namespace Content.Server.Power.NodeGroups
battery.NetworkBattery.LinkedNetworkCharging = default;
Dischargers.Remove(discharger);
_powerNetSystem.QueueReconnectPowerNet(this);
_powerNetSystem?.QueueReconnectPowerNet(this);
}
public void AddCharger(BatteryChargerComponent charger)
@@ -107,7 +108,7 @@ namespace Content.Server.Power.NodeGroups
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(charger.Owner);
battery.NetworkBattery.LinkedNetworkCharging = default;
Chargers.Add(charger);
_powerNetSystem.QueueReconnectPowerNet(this);
_powerNetSystem?.QueueReconnectPowerNet(this);
}
public void RemoveCharger(BatteryChargerComponent charger)
@@ -117,11 +118,14 @@ namespace Content.Server.Power.NodeGroups
battery.NetworkBattery.LinkedNetworkCharging = default;
Chargers.Remove(charger);
_powerNetSystem.QueueReconnectPowerNet(this);
_powerNetSystem?.QueueReconnectPowerNet(this);
}
public override string? GetDebugData()
{
if (_powerNetSystem == null)
return null;
// This is just recycling the multi-tool examine.
var ps = _powerNetSystem.GetNetworkStatistics(NetworkNode);