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

Remove Explicit GridId References (#8315)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

27
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;
GridId 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).GridID;
gridId = entMan.GetComponent<TransformComponent>(playerEntity).GridEntityId;
if (gridId == GridId.Invalid)
if (gridId == EntityUid.Invalid)
{
shell.WriteLine("You aren't on a grid to delete gas from.");
return;
@@ -51,7 +51,7 @@ namespace Content.Server.Atmos.Commands
}
case 1:
{
if (!int.TryParse(args[0], out var number))
if (!EntityUid.TryParse(args[0], out var number))
{
// Argument is a gas
if (player == null)
@@ -66,9 +66,9 @@ namespace Content.Server.Atmos.Commands
return;
}
gridId = entMan.GetComponent<TransformComponent>(playerEntity).GridID;
gridId = entMan.GetComponent<TransformComponent>(playerEntity).GridEntityId;
if (gridId == GridId.Invalid)
if (gridId == EntityUid.Invalid)
{
shell.WriteLine("You aren't on a grid to delete gas from.");
return;
@@ -85,27 +85,20 @@ namespace Content.Server.Atmos.Commands
}
// Argument is a grid
gridId = new GridId(number);
if (gridId == GridId.Invalid)
{
shell.WriteLine($"{gridId} is not a valid grid id.");
return;
}
gridId = number;
break;
}
case 2:
{
if (!int.TryParse(args[0], out var first))
if (!EntityUid.TryParse(args[0], out var first))
{
shell.WriteLine($"{args[0]} is not a valid integer for a grid id.");
return;
}
gridId = new GridId(first);
gridId = first;
if (gridId == GridId.Invalid)
if (gridId == EntityUid.Invalid)
{
shell.WriteLine($"{gridId} is not a valid grid id.");
return;