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

15
Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs
View File

@@ -8,6 +8,8 @@ namespace Content.Server.Administration.Commands
[AdminCommand(AdminFlags.Admin)]
public sealed class RemoveEntityStorageCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "rmstorage";
public string Description => "Removes a given entity from it's containing storage, if any.";
public string Help => "Usage: rmstorage <uid>";
@@ -20,22 +22,23 @@ namespace Content.Server.Administration.Commands
return;
}
if (!EntityUid.TryParse(args[0], out var entityUid))
if (!NetEntity.TryParse(args[0], out var entityNet) || !_entManager.TryGetEntity(entityNet, out var entityUid))
{
shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
return;
}
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!_entManager.EntitySysManager.TryGetEntitySystem<EntityStorageSystem>(out var entstorage))
return;
if (!entityManager.EntitySysManager.TryGetEntitySystem<EntityStorageSystem>(out var entstorage)) return;
if (!entityManager.TryGetComponent<TransformComponent>(entityUid, out var transform)) return;
if (!_entManager.TryGetComponent<TransformComponent>(entityUid, out var transform))
return;
var parent = transform.ParentUid;
if (entityManager.TryGetComponent<EntityStorageComponent>(parent, out var storage))
if (_entManager.TryGetComponent<EntityStorageComponent>(parent, out var storage))
{
entstorage.Remove(entityUid, storage.Owner, storage);
entstorage.Remove(entityUid.Value, storage.Owner, storage);
}
else
{