Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

20
Content.Server/Construction/Commands/TileReplaceCommand.cs
View File

@@ -9,6 +9,10 @@ namespace Content.Server.Construction.Commands;
[AdminCommand(AdminFlags.Mapping)]
sealed class TileReplaceCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDef = default!;
// ReSharper disable once StringLiteralTypo
public string Command => "tilereplace";
public string Description => "Replaces one tile with another.";
@@ -17,7 +21,6 @@ sealed class TileReplaceCommand : IConsoleCommand
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
var entityManager = IoCManager.Resolve<IEntityManager>();
EntityUid? gridId;
string tileIdA;
string tileIdB;
@@ -31,12 +34,13 @@ sealed class TileReplaceCommand : IConsoleCommand
return;
}
gridId = entityManager.GetComponent<TransformComponent>(playerEntity).GridUid;
gridId = _entManager.GetComponent<TransformComponent>(playerEntity).GridUid;
tileIdA = args[0];
tileIdB = args[1];
break;
case 3:
if (!EntityUid.TryParse(args[0], out var id))
if (!NetEntity.TryParse(args[0], out var idNet) ||
!_entManager.TryGetEntity(idNet, out var id))
{
shell.WriteLine($"{args[0]} is not a valid entity.");
return;
@@ -51,18 +55,16 @@ sealed class TileReplaceCommand : IConsoleCommand
return;
}
var tileDefinitionManager = IoCManager.Resolve<ITileDefinitionManager>();
var tileA = tileDefinitionManager[tileIdA];
var tileB = tileDefinitionManager[tileIdB];
var tileA = _tileDef[tileIdA];
var tileB = _tileDef[tileIdB];
var mapManager = IoCManager.Resolve<IMapManager>();
if (!mapManager.TryGetGrid(gridId, out var grid))
if (!_mapManager.TryGetGrid(gridId, out var grid))
{
shell.WriteLine($"No grid exists with id {gridId}");
return;
}
if (!entityManager.EntityExists(grid.Owner))
if (!_entManager.EntityExists(grid.Owner))
{
shell.WriteLine($"Grid {gridId} doesn't have an associated grid entity.");
return;