Fix cross-map explosion overlay bug. (#13855)

diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index 6eae8c07d004fec0f694ab3098a17b6bd9db6a06..ad66e2380349857e0d629c80283da9c23d8f1352 100644 (file)
--- 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 953934b975f36ff7be23efb5182a01ac7fa3382f..a925b3d3007db02da8d857f61ea66f7a63bc4d84 100644 (file)
--- 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>