]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cleanup warnings in `CableSystem.Placer` (#36868)
authorTayrtahn <tayrtahn@gmail.com>
Wed, 23 Apr 2025 22:14:50 +0000 (18:14 -0400)
committerGitHub <noreply@github.com>
Wed, 23 Apr 2025 22:14:50 +0000 (18:14 -0400)
* Fix warnings in CableSystem.Placer

* Formatting

Content.Server/Power/EntitySystems/CableSystem.Placer.cs

index a5cf54fae0c871c5c32bb073a939801ab61d3d90..5d9105a3fc71a67e9ce0920da6aac621439bd273 100644 (file)
@@ -28,17 +28,18 @@ public sealed partial class CableSystem
         if (component.CablePrototypeId == null)
             return;
 
-        if(!TryComp<MapGridComponent>(_transform.GetGrid(args.ClickLocation), out var grid))
+        if (!TryComp<MapGridComponent>(_transform.GetGrid(args.ClickLocation), out var grid))
             return;
 
         var gridUid = _transform.GetGrid(args.ClickLocation)!.Value;
-        var snapPos = grid.TileIndicesFor(args.ClickLocation);
-        var tileDef = (ContentTileDefinition) _tileManager[_map.GetTileRef(gridUid, grid,snapPos).Tile.TypeId];
+        var snapPos = _map.TileIndicesFor((gridUid, grid), args.ClickLocation);
+        var tileDef = (ContentTileDefinition)_tileManager[_map.GetTileRef(gridUid, grid, snapPos).Tile.TypeId];
 
         if (!tileDef.IsSubFloor || !tileDef.Sturdy)
             return;
 
-        foreach (var anchored in grid.GetAnchoredEntities(snapPos))
+
+        foreach (var anchored in _map.GetAnchoredEntities((gridUid, grid), snapPos))
         {
             if (TryComp<CableComponent>(anchored, out var wire) && wire.CableType == component.BlockingCableType)
                 return;
@@ -47,7 +48,7 @@ public sealed partial class CableSystem
         if (TryComp<StackComponent>(placer, out var stack) && !_stack.Use(placer, 1, stack))
             return;
 
-        var newCable = EntityManager.SpawnEntity(component.CablePrototypeId, grid.GridTileToLocal(snapPos));
+        var newCable = EntityManager.SpawnEntity(component.CablePrototypeId, _map.GridTileToLocal(gridUid, grid, snapPos));
         _adminLogger.Add(LogType.Construction, LogImpact.Low,
             $"{ToPrettyString(args.User):player} placed {ToPrettyString(newCable):cable} at {Transform(newCable).Coordinates}");
         args.Handled = true;