diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs index 6013b90a3a..d058de9097 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs @@ -38,14 +38,13 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes /// private bool Connectable => !_deleting && Anchored; - private bool Anchored => !Owner.TryGetComponent(out var physics) || physics.Anchored; + private bool Anchored => !Owner.TryGetComponent(out var collidable) || collidable.Anchored; /// /// Prevents a node from being used by other nodes while midway through removal. /// private bool _deleting = false; - #pragma warning disable 649 [Dependency] private readonly INodeGroupFactory _nodeGroupFactory; #pragma warning restore 649 @@ -60,19 +59,19 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes { TryAssignGroupIfNeeded(); CombineGroupWithReachable(); - if (Owner.TryGetComponent(out var physics)) + if (Owner.TryGetComponent(out var collidable)) { AnchorUpdate(); - physics.AnchoredChanged += AnchorUpdate; + collidable.AnchoredChanged += AnchorUpdate; } } public void OnContainerRemove() { _deleting = true; - if (Owner.TryGetComponent(out var physics)) + if (Owner.TryGetComponent(out var collidable)) { - ((IPhysicsComponent) physics).AnchoredChanged -= AnchorUpdate; + collidable.AnchoredChanged -= AnchorUpdate; } NodeGroup.RemoveNode(this); } diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs index 12b9cd4963..c54a753d8a 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs @@ -48,7 +48,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents /// public bool Connectable => Anchored; - private bool Anchored => !Owner.TryGetComponent(out var physics) || physics.Anchored; + private bool Anchored => !Owner.TryGetComponent(out var collidable) || collidable.Anchored; [ViewVariables] public bool NeedsProvider { get; private set; } = true; @@ -89,18 +89,18 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents { TryFindAndSetProvider(); } - if (Owner.TryGetComponent(out var physics)) + if (Owner.TryGetComponent(out var collidable)) { AnchorUpdate(); - ((IPhysicsComponent) physics).AnchoredChanged += AnchorUpdate; + collidable.AnchoredChanged += AnchorUpdate; } } public override void OnRemove() { - if (Owner.TryGetComponent(out var physics)) + if (Owner.TryGetComponent(out var collidable)) { - ((IPhysicsComponent) physics).AnchoredChanged -= AnchorUpdate; + collidable.AnchoredChanged -= AnchorUpdate; } _provider.RemoveReceiver(this); base.OnRemove(); diff --git a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml index f6f74f5642..956bfe3944 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml @@ -18,6 +18,8 @@ - type: Destructible thresholdvalue: 100 - type: SubFloorHide + - type: Physics + Anchored: true - type: entity parent: WireBase