tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Content mapmanager query changes (#16894)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-28 23:22:44 +10:00
committed by GitHub
parent 16bf85f6e0
commit cd487b66e4
29 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
View File

@@ -493,7 +493,7 @@ public abstract partial class InteractionTest
var pos = (coords ?? TargetCoords).ToMap(SEntMan, Transform);
await Server.WaitPost(() =>
{
if (MapMan.TryFindGridAt(pos, out var grid))
if (MapMan.TryFindGridAt(pos, out _, out var grid))
tile = grid.GetTileRef(coords ?? TargetCoords).Tile;
});
@@ -663,7 +663,7 @@ public abstract partial class InteractionTest
await Server.WaitPost(() =>
{
if (grid != null || MapMan.TryFindGridAt(pos, out grid))
if (grid != null || MapMan.TryFindGridAt(pos, out var gridUid, out grid))
{
grid.SetTile(coords ?? TargetCoords, tile);
return;
@@ -673,11 +673,12 @@ public abstract partial class InteractionTest
return;
grid = MapMan.CreateGrid(MapData.MapId);
var gridXform = SEntMan.GetComponent<TransformComponent>(grid.Owner);
gridUid = grid.Owner;
var gridXform = SEntMan.GetComponent<TransformComponent>(gridUid);
Transform.SetWorldPosition(gridXform, pos.Position);
grid.SetTile(coords ?? TargetCoords, tile);
if (!MapMan.TryFindGridAt(pos, out grid))
if (!MapMan.TryFindGridAt(pos, out _, out grid))
Assert.Fail("Failed to create grid?");
});
await AssertTile(proto, coords);