]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cleanup warnings in `SmokeOnTriggerSystem` (#37754)
authorTayrtahn <tayrtahn@gmail.com>
Fri, 23 May 2025 15:56:10 +0000 (11:56 -0400)
committerGitHub <noreply@github.com>
Fri, 23 May 2025 15:56:10 +0000 (17:56 +0200)
Cleanup 2 warnings in SmokeOnTriggerSystem

Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs

index 3d3c5d85630c02aa7a0556f75b19e1a7648422e1..31b4746ec21c1f5b11a93b51a9c36b6059f8e20e 100644 (file)
@@ -16,6 +16,7 @@ namespace Content.Server.Explosion.EntitySystems;
 public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
 {
     [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly SmokeSystem _smoke = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly SpreaderSystem _spreader = default!;
@@ -31,8 +32,8 @@ public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
     {
         var xform = Transform(uid);
         var mapCoords = _transform.GetMapCoordinates(uid, xform);
-        if (!_mapMan.TryFindGridAt(mapCoords, out _, out var grid) ||
-            !grid.TryGetTileRef(xform.Coordinates, out var tileRef) ||
+        if (!_mapMan.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
+            !_map.TryGetTileRef(gridUid, grid, xform.Coordinates, out var tileRef) ||
             tileRef.Tile.IsEmpty)
         {
             return;
@@ -41,7 +42,7 @@ public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
         if (_spreader.RequiresFloorToSpread(comp.SmokePrototype.ToString()) && tileRef.Tile.IsSpace())
             return;
 
-        var coords = grid.MapToGrid(mapCoords);
+        var coords = _map.MapToGrid(gridUid, mapCoords);
         var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid());
         if (!TryComp<SmokeComponent>(ent, out var smoke))
         {