]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix explosion grid alignment for static grids (#40193)
authorLeon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Sun, 21 Sep 2025 02:52:23 +0000 (14:52 +1200)
committerGitHub <noreply@github.com>
Sun, 21 Sep 2025 02:52:23 +0000 (14:52 +1200)
Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs

index 61e0ff50b78fe20d4f172424f066550f8de1f90c..cee694886baea10750de2d7d4ccf680a45358e6c 100644 (file)
@@ -275,7 +275,7 @@ public sealed partial class ExplosionSystem
         radius = Math.Min(radius, MaxIterations / 4);
 
         EntityUid? referenceGrid = null;
-        float mass = 0;
+        var mass = float.MinValue;
 
         // First attempt to find a grid that is relatively close to the explosion's center. Instead of looking in a
         // diameter x diameter sized box, use a smaller box with radius sized sides:
@@ -285,7 +285,7 @@ public sealed partial class ExplosionSystem
         _mapManager.FindGridsIntersecting(epicenter.MapId, box, ref _grids);
         foreach (var grid in _grids)
         {
-            if (TryComp(grid.Owner, out PhysicsComponent? physics) && physics.Mass > mass)
+            if (TryComp(grid.Owner, out PhysicsComponent? physics) && physics.FixturesMass > mass)
             {
                 mass = physics.Mass;
                 referenceGrid = grid.Owner;
@@ -315,7 +315,7 @@ public sealed partial class ExplosionSystem
         {
             if (TryComp(grid.Owner, out PhysicsComponent? physics) && physics.Mass > mass)
             {
-                mass = physics.Mass;
+                mass = physics.FixturesMass;
                 referenceGrid = grid.Owner;
             }
         }