diff --git a/Content.Server/Power/Components/CableComponent.cs b/Content.Server/Power/Components/CableComponent.cs
index 63899735b5..5da4af25ca 100644
--- a/Content.Server/Power/Components/CableComponent.cs
+++ b/Content.Server/Power/Components/CableComponent.cs
@@ -1,10 +1,8 @@
using Content.Server.Power.EntitySystems;
using Content.Shared.Power;
using Content.Shared.Tools;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using System.Diagnostics.Tracing;
using Content.Shared.Tools.Systems;
+using Robust.Shared.Prototypes;
namespace Content.Server.Power.Components;
@@ -28,10 +26,10 @@ public sealed partial class CableComponent : Component
/// Checked by to determine if there is
/// already a cable of a type on a tile.
///
- [DataField("cableType")]
+ [DataField]
public CableType CableType = CableType.HighVoltage;
- [DataField("cuttingDelay")]
+ [DataField]
public float CuttingDelay = 1f;
}
@@ -41,18 +39,17 @@ public sealed partial class CableComponent : Component
[ByRefEvent]
public readonly struct CableAnchorStateChangedEvent
{
- public readonly TransformComponent Transform;
- public EntityUid Entity => Transform.Owner;
- public bool Anchored => Transform.Anchored;
+ public readonly Entity Cable;
+ public bool Anchored => Cable.Comp.Anchored;
///
/// If true, the entity is being detached to null-space
///
public readonly bool Detaching;
- public CableAnchorStateChangedEvent(TransformComponent transform, bool detaching = false)
+ public CableAnchorStateChangedEvent(Entity cable, bool detaching = false)
{
+ Cable = cable;
Detaching = detaching;
- Transform = transform;
}
}
diff --git a/Content.Server/Power/EntitySystems/CableSystem.cs b/Content.Server/Power/EntitySystems/CableSystem.cs
index 1afbc8287f..0449bcd5f8 100644
--- a/Content.Server/Power/EntitySystems/CableSystem.cs
+++ b/Content.Server/Power/EntitySystems/CableSystem.cs
@@ -47,7 +47,7 @@ public sealed partial class CableSystem : EntitySystem
return;
var xform = Transform(uid);
- var ev = new CableAnchorStateChangedEvent(xform);
+ var ev = new CableAnchorStateChangedEvent((uid, xform));
RaiseLocalEvent(uid, ref ev);
if (_electrocutionSystem.TryDoElectrifiedAct(uid, args.User))
@@ -61,7 +61,7 @@ public sealed partial class CableSystem : EntitySystem
private void OnAnchorChanged(EntityUid uid, CableComponent cable, ref AnchorStateChangedEvent args)
{
- var ev = new CableAnchorStateChangedEvent(args.Transform, args.Detaching);
+ var ev = new CableAnchorStateChangedEvent((uid, args.Transform), args.Detaching);
RaiseLocalEvent(uid, ref ev);
if (args.Anchored)
diff --git a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
index 0ccb440d87..76d3e24aad 100644
--- a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
@@ -152,7 +152,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
public void OnCableAnchorStateChanged(EntityUid uid, CableComponent component, CableAnchorStateChangedEvent args)
{
- var xform = args.Transform;
+ var xform = args.Cable.Comp;
if (xform.GridUid == null || !TryComp(xform.GridUid, out var grid))
return;