]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Update FloorTileSystem to not use Component.Owner() (#29930)
authorPlykiya <58439124+Plykiya@users.noreply.github.com>
Thu, 11 Jul 2024 22:44:19 +0000 (15:44 -0700)
committerGitHub <noreply@github.com>
Thu, 11 Jul 2024 22:44:19 +0000 (00:44 +0200)
* Update FloorTileSystem to use EntityUid

* missed a variable

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
Content.Shared/Tiles/FloorTileSystem.cs

index 0d368495f1822dd4f553c859c3f7b46bea46d94c..97ed908ed3af4a288bf0b4f6dae5275933a29d78 100644 (file)
@@ -124,7 +124,7 @@ public sealed class FloorTileSystem : EntitySystem
 
             if (mapGrid != null)
             {
-                var gridUid = mapGrid.Owner;
+                var gridUid = location.EntityId;
 
                 if (!CanPlaceTile(gridUid, mapGrid, out var reason))
                 {
@@ -154,12 +154,11 @@ public sealed class FloorTileSystem : EntitySystem
                 if (_netManager.IsClient)
                     return;
 
-                mapGrid = _mapManager.CreateGrid(locationMap.MapId);
-                var gridUid = mapGrid.Owner;
-                var gridXform = Transform(gridUid);
+                var grid = _mapManager.CreateGridEntity(locationMap.MapId);
+                var gridXform = Transform(grid);
                 _transform.SetWorldPosition(gridXform, locationMap.Position);
-                location = new EntityCoordinates(gridUid, Vector2.Zero);
-                PlaceAt(args.User, gridUid, mapGrid, location, _tileDefinitionManager[component.OutputTiles[0]].TileId, component.PlaceTileSound, mapGrid.TileSize / 2f);
+                location = new EntityCoordinates(grid, Vector2.Zero);
+                PlaceAt(args.User, grid, grid.Comp, location, _tileDefinitionManager[component.OutputTiles[0]].TileId, component.PlaceTileSound, grid.Comp.TileSize / 2f);
                 return;
             }
         }