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

Refactor minds to be entities with components, make roles components (#19591)

Browse Source 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
DrSmugleaf
2023-08-28 16:53:24 -07:00
committed by GitHub
parent e0ee397af7
commit 15c0211fb2
119 changed files with 1445 additions and 1289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/Mind/Toolshed/MindCommand.cs
View File

@@ -1,7 +1,4 @@
using Content.Server.Mind.Components;
using Content.Server.Players;
using Robust.Server.Player;
using Robust.Shared.Players;
using Robust.Server.Player;
using Robust.Shared.Toolshed;
using Robust.Shared.Toolshed.Errors;
using Robust.Shared.Toolshed.Syntax;
@@ -17,20 +14,17 @@ public sealed class MindCommand : ToolshedCommand
private MindSystem? _mind;
[CommandImplementation("get")]
public Mind? Get([PipedArgument] IPlayerSession session)
public MindComponent? Get([PipedArgument] IPlayerSession session)
{
return session.ContentData()?.Mind;
_mind ??= GetSys<MindSystem>();
return _mind.TryGetMind(session, out _, out var mind) ? mind : null;
}
[CommandImplementation("get")]
public Mind? Get([PipedArgument] EntityUid ent)
public MindComponent? Get([PipedArgument] EntityUid ent)
{
if (!TryComp<MindContainerComponent>(ent, out var container))
{
return null;
}
return container.Mind;
_mind ??= GetSys<MindSystem>();
return _mind.TryGetMind(ent, out _, out var mind) ? mind : null;
}
[CommandImplementation("control")]
@@ -48,15 +42,13 @@ public sealed class MindCommand : ToolshedCommand
return target;
}
var mind = player.ContentData()?.Mind;
if (mind is null)
if (!_mind.TryGetMind(player, out var mindId, out var mind))
{
ctx.ReportError(new SessionHasNoEntityError(player));
return target;
}
_mind.TransferTo(mind, target);
_mind.TransferTo(mindId, target, mind: mind);
return target;
}
}