Remove Explicit GridId References (#8315)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions

View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.Threading.Tasks;
using Content.Server.Fluids.Components;
@@ -55,13 +55,13 @@ public sealed class FluidSpill : ContentIntegrationTest
var spillSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SpillableSystem>();
var gameTiming = server.ResolveDependency<IGameTiming>();
MapId mapId;
GridId gridId = default;
EntityUid gridId = default;
await server.WaitPost(() =>
{
mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
gridId = grid.Index;
gridId = grid.GridEntityId;
for (var x = 0; x < 3; x++)
{
@@ -118,7 +118,7 @@ public sealed class FluidSpill : ContentIntegrationTest
var spillSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SpillableSystem>();
var gameTiming = server.ResolveDependency<IGameTiming>();
MapId mapId;
GridId gridId = default;
EntityUid gridId = default;
await server.WaitPost(() =>
{
@@ -133,7 +133,7 @@ public sealed class FluidSpill : ContentIntegrationTest
}
}
gridId = grid.Index;
gridId = grid.GridEntityId;
});
await server.WaitAssertion(() =>