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

Fix GravityGridTest (#23348)

Browse Source
This commit is contained in:
Leon Friedrich
2024-01-02 01:24:01 -05:00
committed by GitHub
parent 719b44f1ce
commit 383271c8fa
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.IntegrationTests/Tests/GravityGridTest.cs
View File

@@ -1,11 +1,10 @@
using Content.Server.Gravity; using Content.Server.Gravity;
using Content.Server.Power.Components; using Content.Server.Power.Components;
using Content.Shared.Coordinates;
using Content.Shared.Gravity; using Content.Shared.Gravity;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests namespace Content.IntegrationTests.Tests
{ {
@@ -38,6 +37,7 @@ namespace Content.IntegrationTests.Tests
EntityUid generator = default; EntityUid generator = default;
var entityMan = server.ResolveDependency<IEntityManager>(); var entityMan = server.ResolveDependency<IEntityManager>();
var mapMan = server.ResolveDependency<IMapManager>(); var mapMan = server.ResolveDependency<IMapManager>();
var mapSys = entityMan.System<SharedMapSystem>();
MapGridComponent grid1 = null; MapGridComponent grid1 = null;
MapGridComponent grid2 = null; MapGridComponent grid2 = null;
@@ -53,7 +53,10 @@ namespace Content.IntegrationTests.Tests
grid1Entity = grid1.Owner; grid1Entity = grid1.Owner;
grid2Entity = grid2.Owner; grid2Entity = grid2.Owner;
generator = entityMan.SpawnEntity("GridGravityGeneratorDummy", grid2.ToCoordinates()); mapSys.SetTile(grid1Entity, grid1, Vector2i.Zero, new Tile(1));
mapSys.SetTile(grid2Entity, grid2, Vector2i.Zero, new Tile(1));
generator = entityMan.SpawnEntity("GridGravityGeneratorDummy", new EntityCoordinates(grid1Entity, 0.5f, 0.5f));
Assert.Multiple(() => Assert.Multiple(() =>
{ {
Assert.That(entityMan.HasComponent<GravityGeneratorComponent>(generator)); Assert.That(entityMan.HasComponent<GravityGeneratorComponent>(generator));

2
Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
View File

@@ -21,11 +21,13 @@ namespace Content.Shared.Coordinates
return new EntityCoordinates(id, x, y); return new EntityCoordinates(id, x, y);
} }
[Obsolete]
public static EntityCoordinates ToCoordinates(this MapGridComponent grid, float x, float y) public static EntityCoordinates ToCoordinates(this MapGridComponent grid, float x, float y)
{ {
return ToCoordinates(grid.Owner, x, y); return ToCoordinates(grid.Owner, x, y);
} }
[Obsolete]
public static EntityCoordinates ToCoordinates(this MapGridComponent grid) public static EntityCoordinates ToCoordinates(this MapGridComponent grid)
{ {
return ToCoordinates(grid.Owner, Vector2.Zero); return ToCoordinates(grid.Owner, Vector2.Zero);