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

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,9 @@ namespace Content.Server.Atmos.Commands
[AdminCommand(AdminFlags.Debug)]
public sealed class DeleteGasCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
public string Command => "deletegas";
public string Description => "Removes all gases from a grid, or just of one type if specified.";
public string Help => $"Usage: {Command} <GridId> <Gas> / {Command} <GridId> / {Command} <Gas> / {Command}";
@@ -21,8 +24,6 @@ namespace Content.Server.Atmos.Commands
EntityUid? gridId;
Gas? gas = null;
var entMan = IoCManager.Resolve<IEntityManager>();
switch (args.Length)
{
case 0:
@@ -39,7 +40,7 @@ namespace Content.Server.Atmos.Commands
return;
}
gridId = entMan.GetComponent<TransformComponent>(playerEntity).GridUid;
gridId = _entManager.GetComponent<TransformComponent>(playerEntity).GridUid;
if (gridId == null)
{
@@ -51,7 +52,7 @@ namespace Content.Server.Atmos.Commands
}
case 1:
{
if (!EntityUid.TryParse(args[0], out var number))
if (!NetEntity.TryParse(args[0], out var numberEnt) || !_entManager.TryGetEntity(numberEnt, out var number))
{
// Argument is a gas
if (player == null)
@@ -66,7 +67,7 @@ namespace Content.Server.Atmos.Commands
return;
}
gridId = entMan.GetComponent<TransformComponent>(playerEntity).GridUid;
gridId = _entManager.GetComponent<TransformComponent>(playerEntity).GridUid;
if (gridId == null)
{
@@ -90,7 +91,7 @@ namespace Content.Server.Atmos.Commands
}
case 2:
{
if (!EntityUid.TryParse(args[0], out var first))
if (!NetEntity.TryParse(args[0], out var firstNet) || !_entManager.TryGetEntity(firstNet, out var first))
{
shell.WriteLine($"{args[0]} is not a valid integer for a grid id.");
return;
@@ -119,15 +120,13 @@ namespace Content.Server.Atmos.Commands
return;
}
var mapManager = IoCManager.Resolve<IMapManager>();
if (!mapManager.TryGetGrid(gridId, out _))
if (!_mapManager.TryGetGrid(gridId, out _))
{
shell.WriteLine($"No grid exists with id {gridId}");
return;
}
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var atmosphereSystem = _entManager.System<AtmosphereSystem>();
var tiles = 0;
var moles = 0f;
@@ -136,7 +135,8 @@ namespace Content.Server.Atmos.Commands
{
foreach (var tile in atmosphereSystem.GetAllMixtures(gridId.Value, true))
{
if (tile.Immutable) continue;
if (tile.Immutable)
continue;
tiles++;
moles += tile.TotalMoles;
@@ -148,7 +148,8 @@ namespace Content.Server.Atmos.Commands
{
foreach (var tile in atmosphereSystem.GetAllMixtures(gridId.Value, true))
{
if (tile.Immutable) continue;
if (tile.Immutable)
continue;
tiles++;
moles += tile.TotalMoles;