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

14
Content.Server/Administration/Commands/AddEntityStorageCommand.cs
View File

@@ -8,6 +8,8 @@ namespace Content.Server.Administration.Commands
[AdminCommand(AdminFlags.Admin)]
public sealed class AddEntityStorageCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "addstorage";
public string Description => "Adds a given entity to a containing storage.";
public string Help => "Usage: addstorage <entity uid> <storage uid>";
@@ -20,24 +22,22 @@ namespace Content.Server.Administration.Commands
return;
}
if (!EntityUid.TryParse(args[0], out var entityUid))
if (!NetEntity.TryParse(args[0], out var entityUidNet) || !_entManager.TryGetEntity(entityUidNet, out var entityUid))
{
shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
return;
}
if (!EntityUid.TryParse(args[1], out var storageUid))
if (!NetEntity.TryParse(args[1], out var storageUidNet) || !_entManager.TryGetEntity(storageUidNet, out var storageUid))
{
shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
return;
}
var entityManager = IoCManager.Resolve<IEntityManager>();
if (entityManager.HasComponent<EntityStorageComponent>(storageUid) &&
entityManager.EntitySysManager.TryGetEntitySystem<EntityStorageSystem>(out var storageSys))
if (_entManager.HasComponent<EntityStorageComponent>(storageUid) &&
_entManager.EntitySysManager.TryGetEntitySystem<EntityStorageSystem>(out var storageSys))
{
storageSys.Insert(entityUid, storageUid);
storageSys.Insert(entityUid.Value, storageUid.Value);
}
else
{