Skip to content

Commit

Permalink
Update FloorTileSystem to not use Component.Owner() (space-wizards#29930
Browse files Browse the repository at this point in the history
)

* Update FloorTileSystem to use EntityUid

* missed a variable

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
  • Loading branch information
Plykiya and plykiya authored Jul 11, 2024
1 parent e3bb277 commit 4945e6a
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions Content.Shared/Tiles/FloorTileSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ private void OnAfterInteract(EntityUid uid, FloorTileComponent component, AfterI

if (mapGrid != null)
{
var gridUid = mapGrid.Owner;
var gridUid = location.EntityId;

if (!CanPlaceTile(gridUid, mapGrid, out var reason))
{
Expand Down Expand Up @@ -154,12 +154,11 @@ private void OnAfterInteract(EntityUid uid, FloorTileComponent component, AfterI
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;
}
}
Expand Down

0 comments on commit 4945e6a

Please sign in to comment.