From 7ba81173bd5e2feb91bdeacaf13f356631e4ea71 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Fri, 23 May 2025 11:56:10 -0400 Subject: [PATCH] Cleanup warnings in `SmokeOnTriggerSystem` (#37754) Cleanup 2 warnings in SmokeOnTriggerSystem --- .../Explosion/EntitySystems/SmokeOnTriggerSystem.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs index 3d3c5d8563..31b4746ec2 100644 --- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs +++ b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs @@ -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(ent, out var smoke)) { -- 2.51.2