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

Nullable grid Uid (#8798)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-20 12:14:35 +12:00
committed by GitHub
parent ef41cd5aa8
commit fa4c6f63f8
82 changed files with 318 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Atmos/Commands/DeleteGasCommand.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Server.Atmos.Commands
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
EntityUid gridId;
EntityUid? gridId;
Gas? gas = null;
var entMan = IoCManager.Resolve<IEntityManager>();
@@ -39,9 +39,9 @@ namespace Content.Server.Atmos.Commands
return;
}
gridId = entMan.GetComponent<TransformComponent>(playerEntity).GridEntityId;
gridId = entMan.GetComponent<TransformComponent>(playerEntity).GridUid;
if (gridId == EntityUid.Invalid)
if (gridId == null)
{
shell.WriteLine("You aren't on a grid to delete gas from.");
return;
@@ -66,9 +66,9 @@ namespace Content.Server.Atmos.Commands
return;
}
gridId = entMan.GetComponent<TransformComponent>(playerEntity).GridEntityId;
gridId = entMan.GetComponent<TransformComponent>(playerEntity).GridUid;
if (gridId == EntityUid.Invalid)
if (gridId == null)
{
shell.WriteLine("You aren't on a grid to delete gas from.");
return;
@@ -98,7 +98,7 @@ namespace Content.Server.Atmos.Commands
gridId = first;
if (gridId == EntityUid.Invalid)
if (gridId.Value.IsValid())
{
shell.WriteLine($"{gridId} is not a valid grid id.");
return;
@@ -134,7 +134,7 @@ namespace Content.Server.Atmos.Commands
if (gas == null)
{
foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId.Value, true))
{
if (tile.Immutable) continue;
@@ -146,7 +146,7 @@ namespace Content.Server.Atmos.Commands
}
else
{
foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId.Value, true))
{
if (tile.Immutable) continue;