Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Mind ecs" (#14881)

Browse Source
This commit is contained in:
Leon Friedrich
2023-03-27 10:24:00 +13:00
committed by GitHub
parent c6c8fa2075
commit 4d71b1b81e
85 changed files with 684 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Mind/Commands/MakeSentientCommand.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.Mind.Commands
public static void MakeSentient(EntityUid uid, IEntityManager entityManager, bool allowMovement = true, bool allowSpeech = true)
{
entityManager.EnsureComponent<MindContainerComponent>(uid);
entityManager.EnsureComponent<MindComponent>(uid);
if (allowMovement)
{
entityManager.EnsureComponent<InputMoverComponent>(uid);

2
Content.Server/Mind/Commands/MindInfoCommand.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.Mind.Commands
}
var builder = new StringBuilder();
builder.AppendFormat("player: {0}, mob: {1}\nroles: ", mind.UserId, mind.OwnedEntity);
builder.AppendFormat("player: {0}, mob: {1}\nroles: ", mind.UserId, mind.OwnedComponent?.Owner);
foreach (var role in mind.AllRoles)
{
builder.AppendFormat("{0} ", role.Name);

2
Content.Server/Mind/Commands/RenameCommand.cs
View File

@@ -48,7 +48,7 @@ public sealed class RenameCommand : IConsoleCommand
var entSysMan = IoCManager.Resolve<IEntitySystemManager>();
if (entMan.TryGetComponent(entityUid, out MindContainerComponent? mind) && mind.Mind != null)
if (entMan.TryGetComponent(entityUid, out MindComponent? mind) && mind.Mind != null)
{
// Mind
mind.Mind.CharacterName = name;