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

Remove some obsolete AppearanceComponent method usages (#13726)

Browse Source
This commit is contained in:
Visne
2023-02-02 17:34:53 +01:00
committed by GitHub
parent 23b90de34d
commit 5a5a3afbb1
111 changed files with 428 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
View File

@@ -1,6 +1,7 @@
using Content.Server.Explosion.Components;
using Content.Shared.Physics;
using Content.Shared.Trigger;
using Robust.Server.GameObjects;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Physics.Events;
@@ -10,6 +11,8 @@ namespace Content.Server.Explosion.EntitySystems;
public sealed partial class TriggerSystem
{
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
/// <summary>
/// Anything that has stuff touching it (to check speed) or is on cooldown.
/// </summary>
@@ -86,9 +89,9 @@ public sealed partial class TriggerSystem
private void SetProximityAppearance(EntityUid uid, TriggerOnProximityComponent component)
{
if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
{
appearanceComponent.SetData(ProximityTriggerVisualState.State, component.Enabled ? ProximityTriggerVisuals.Inactive : ProximityTriggerVisuals.Off);
_appearance.SetData(uid, ProximityTriggerVisualState.State, component.Enabled ? ProximityTriggerVisuals.Inactive : ProximityTriggerVisuals.Off, appearance);
}
}
@@ -107,9 +110,9 @@ public sealed partial class TriggerSystem
component.Accumulator += component.Cooldown;
}
if (EntityManager.TryGetComponent(component.Owner, out AppearanceComponent? appearanceComponent))
if (EntityManager.TryGetComponent(component.Owner, out AppearanceComponent? appearance))
{
appearanceComponent.SetData(ProximityTriggerVisualState.State, ProximityTriggerVisuals.Active);
_appearance.SetData(appearance.Owner, ProximityTriggerVisualState.State, ProximityTriggerVisuals.Active, appearance);
}
Trigger(component.Owner);