From f32a922c1155c28dee8b6c8c87b028128f7ce652 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 27 Mar 2023 00:15:23 +1100
Subject: [PATCH] Fix firevisuals layer spam (#14871)

---
 .../Atmos/EntitySystems/FireVisualizerSystem.cs          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs b/Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs
index 6f0dba4bd7..d2b9bc2316 100644
--- a/Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs
@@ -27,8 +27,13 @@ public sealed class FireVisualizerSystem : VisualizerSystem<FireVisualsComponent
             component.LightEntity = null;
         }
 
-        if (TryComp<SpriteComponent>(uid, out var sprite))
-            sprite.RemoveLayer(FireVisualLayers.Fire);
+        // Need LayerMapTryGet because Init fails if there's no existing sprite / appearancecomp
+        // which means in some setups (most frequently no AppearanceComp) the layer never exists.
+        if (TryComp<SpriteComponent>(uid, out var sprite) &&
+            sprite.LayerMapTryGet(FireVisualLayers.Fire, out var layer))
+        {
+            sprite.RemoveLayer(layer);
+        }
     }
 
     private void OnComponentInit(EntityUid uid, FireVisualsComponent component, ComponentInit args)
-- 
2.51.2