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

6
Content.Server/Shuttles/Commands/DockCommand.cs
View File

@@ -22,13 +22,13 @@ public sealed class DockCommand : IConsoleCommand
return;
}
if (!EntityUid.TryParse(args[0], out var airlock1))
if (!NetEntity.TryParse(args[0], out var airlock1Net) || !_entManager.TryGetEntity(airlock1Net, out var airlock1))
{
shell.WriteError(Loc.GetString("cmd-dock-invalid", ("entity", args[0])));
return;
}
if (!EntityUid.TryParse(args[1], out var airlock2))
if (!NetEntity.TryParse(args[1], out var airlock2Net) || !_entManager.TryGetEntity(airlock2Net, out var airlock2))
{
shell.WriteError(Loc.GetString("cmd-dock-invalid", ("entity", args[1])));
return;
@@ -47,7 +47,7 @@ public sealed class DockCommand : IConsoleCommand
}
var dockSystem = _entManager.System<DockingSystem>();
dockSystem.Dock(airlock1, dock1, airlock2, dock2);
dockSystem.Dock(airlock1.Value, dock1, airlock2.Value, dock2);
if (dock1.DockedWith == airlock2)
{