From 4945e6a61ce14bee6a9b093ed5144b6e6218ee08 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:44:19 -0700 Subject: [PATCH] Update FloorTileSystem to not use Component.Owner() (#29930) * Update FloorTileSystem to use EntityUid * missed a variable --------- Co-authored-by: plykiya --- Content.Shared/Tiles/FloorTileSystem.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs index 0d368495f1..97ed908ed3 100644 --- a/Content.Shared/Tiles/FloorTileSystem.cs +++ b/Content.Shared/Tiles/FloorTileSystem.cs @@ -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; } } -- 2.51.2