From 23b90de34df903305c9679f167edca4e0a9b9ace Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 3 Feb 2023 00:48:53 +1300
Subject: [PATCH] Fix cross-map explosion overlay bug. (#13855)

---
 Content.Client/Explosion/ExplosionOverlay.cs          | 3 +++
 Content.Client/Explosion/ExplosionVisualsComponent.cs | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index 6eae8c07d0..ad66e23803 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -35,6 +35,9 @@ public sealed class ExplosionOverlay : Overlay
 
         foreach (var (comp, appearance) in _entMan.EntityQuery<ExplosionVisualsComponent, AppearanceComponent>(true))
         {
+            if (comp.Epicenter.MapId != args.MapId)
+                continue;
+
             if (!appearance.TryGetData(ExplosionAppearanceData.Progress, out int index))
                 continue;
 
diff --git a/Content.Client/Explosion/ExplosionVisualsComponent.cs b/Content.Client/Explosion/ExplosionVisualsComponent.cs
index 953934b975..a925b3d300 100644
--- a/Content.Client/Explosion/ExplosionVisualsComponent.cs
+++ b/Content.Client/Explosion/ExplosionVisualsComponent.cs
@@ -7,12 +7,14 @@ namespace Content.Client.Explosion;
 [ComponentReference(typeof(SharedExplosionVisualsComponent))]
 public sealed class ExplosionVisualsComponent : SharedExplosionVisualsComponent
 {
-    public EntityUid LightEntity;
     /// <summary>
-    ///     How long have we been drawing this explosion, starting from the time the explosion was fully drawn.
+    ///     Uid of the client-side point light entity for this explosion.
     /// </summary>
-    public float Lifetime;
+    public EntityUid LightEntity;
 
+    /// <summary>
+    ///     How intense an explosion needs to be at a given tile in order to progress to the next fire-intensity RSI state. See also <see cref="FireFrames"/>
+    /// </summary>
     public float IntensityPerState;
 
     /// <summary>