Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Inline TryGetComponent completely, for real

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Power/NodeGroups/ApcNet.cs
View File

@@ -7,6 +7,7 @@ using Content.Server.Power.EntitySystems;
using Content.Server.Power.Pow3r;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
@@ -66,7 +67,7 @@ namespace Content.Server.Power.NodeGroups
public void AddApc(ApcComponent apc)
{
if (apc.Owner.TryGetComponent(out PowerNetworkBatteryComponent? netBattery))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(apc.Owner.Uid, out PowerNetworkBatteryComponent? netBattery))
netBattery.NetworkBattery.LinkedNetworkDischarging = default;
QueueNetworkReconnect();
@@ -75,7 +76,7 @@ namespace Content.Server.Power.NodeGroups
public void RemoveApc(ApcComponent apc)
{
if (apc.Owner.TryGetComponent(out PowerNetworkBatteryComponent? netBattery))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(apc.Owner.Uid, out PowerNetworkBatteryComponent? netBattery))
netBattery.NetworkBattery.LinkedNetworkDischarging = default;
QueueNetworkReconnect();

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

@@ -100,7 +100,7 @@ namespace Content.Server.Power.NodeGroups
public void RemoveDischarger(BatteryDischargerComponent discharger)
{
// Can be missing if the entity is being deleted, not a big deal.
if (discharger.Owner.TryGetComponent(out PowerNetworkBatteryComponent? battery))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(discharger.Owner.Uid, out PowerNetworkBatteryComponent? battery))
battery.NetworkBattery.LinkedNetworkCharging = default;
Dischargers.Remove(discharger);
@@ -118,7 +118,7 @@ namespace Content.Server.Power.NodeGroups
public void RemoveCharger(BatteryChargerComponent charger)
{
// Can be missing if the entity is being deleted, not a big deal.
if (charger.Owner.TryGetComponent(out PowerNetworkBatteryComponent? battery))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(charger.Owner.Uid, out PowerNetworkBatteryComponent? battery))
battery.NetworkBattery.LinkedNetworkCharging = default;
Chargers.Remove(charger);