From d3089e3f039d0e23d7f12089962c391851c43720 Mon Sep 17 00:00:00 2001 From: Duddino <47313600+Duddino@users.noreply.github.com> Date: Tue, 12 Jul 2022 02:30:03 +0200 Subject: [PATCH] Fixed PDA not spawning with the correct light (#9623) * Fixed PDA not spawning with the correct light * Fixed indentation * Forgot I had to use camelCase --- Content.Client/PDA/PDAVisualizer.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Client/PDA/PDAVisualizer.cs b/Content.Client/PDA/PDAVisualizer.cs index 4e6f4d83e3..67288a029b 100644 --- a/Content.Client/PDA/PDAVisualizer.cs +++ b/Content.Client/PDA/PDAVisualizer.cs @@ -28,7 +28,8 @@ namespace Content.Client.PDA public override void InitializeEntity(EntityUid entity) { base.InitializeEntity(entity); - var sprite = IoCManager.Resolve().GetComponent(entity); + var entityManager = IoCManager.Resolve(); + var sprite = entityManager.GetComponent(entity); if (_state != null) { @@ -39,25 +40,24 @@ namespace Content.Client.PDA sprite.LayerSetShader(PDAVisualLayers.Flashlight, "unshaded"); sprite.LayerMapSet(PDAVisualLayers.IDLight, sprite.AddLayerState("id_overlay")); sprite.LayerSetShader(PDAVisualLayers.IDLight, "unshaded"); - } + var appearance = entityManager.GetComponent(entity); + sprite.LayerSetVisible(PDAVisualLayers.IDLight, appearance.IdSlot.StartingItem != null); + } public override void OnChangeData(AppearanceComponent component) { base.OnChangeData(component); - var sprite = IoCManager.Resolve().GetComponent(component.Owner); sprite.LayerSetVisible(PDAVisualLayers.Flashlight, false); if (component.TryGetData(UnpoweredFlashlightVisuals.LightOn, out bool isFlashlightOn)) { sprite.LayerSetVisible(PDAVisualLayers.Flashlight, isFlashlightOn); } - if (component.TryGetData(PDAVisuals.IDCardInserted, out bool isCardInserted)) { sprite.LayerSetVisible(PDAVisualLayers.IDLight, isCardInserted); } - } } }