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

Misc mind tweaks and fixes (#20614)

Browse Source
This commit is contained in:
Leon Friedrich
2023-10-07 12:00:48 +11:00
committed by GitHub
parent ec452aa4a3
commit 427cae2d25
6 changed files with 98 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/Mind/MindSystem.cs
View File

@@ -31,6 +31,25 @@ public sealed class MindSystem : SharedMindSystem
base.Initialize();
SubscribeLocalEvent<MindContainerComponent, EntityTerminatingEvent>(OnMindContainerTerminating);
SubscribeLocalEvent<MindComponent, ComponentShutdown>(OnMindShutdown);
}
private void OnMindShutdown(EntityUid uid, MindComponent mind, ComponentShutdown args)
{
if (mind.UserId is {} user)
{
UserMinds.Remove(user);
if (_players.GetPlayerData(user).ContentData() is { } oldData)
oldData.Mind = null;
mind.UserId = null;
}
if (!TryComp(mind.OwnedEntity, out MetaDataComponent? meta) || meta.EntityLifeStage >= EntityLifeStage.Terminating)
return;
RaiseLocalEvent(mind.OwnedEntity.Value, new MindRemovedMessage(uid, mind), true);
mind.OwnedEntity = null;
mind.OwnedComponent = null;
}
private void OnMindContainerTerminating(EntityUid uid, MindContainerComponent component, ref EntityTerminatingEvent args)
@@ -195,11 +214,11 @@ public sealed class MindSystem : SharedMindSystem
public override void TransferTo(EntityUid mindId, EntityUid? entity, bool ghostCheckOverride = false, bool createGhost = true,
MindComponent? mind = null)
{
base.TransferTo(mindId, entity, ghostCheckOverride, createGhost, mind);
if (!Resolve(mindId, ref mind))
if (mind == null && !Resolve(mindId, ref mind))
return;
base.TransferTo(mindId, entity, ghostCheckOverride, createGhost, mind);
if (entity == mind.OwnedEntity)
return;