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

Fix #22933 - Job-specific Uplink items leaking to non-job minds (#23179)

Browse Source 
Fix for 22933 - SharedMindSystem now checks for VisitingMindComponent too.
This commit is contained in:
J. Brown
2024-02-22 11:03:44 +00:00
committed by GitHub
parent c27d0c143c
commit b26e9a9a32
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Mind/SharedMindSystem.cs
View File

@@ -399,7 +399,8 @@ public abstract class SharedMindSystem : EntitySystem
EntityUid uid,
out EntityUid mindId,
[NotNullWhen(true)] out MindComponent? mind,
MindContainerComponent? container = null)
MindContainerComponent? container = null,
VisitingMindComponent? visitingmind = null)
{
mindId = default;
mind = null;
@@ -408,7 +409,14 @@ public abstract class SharedMindSystem : EntitySystem
return false;
if (!container.HasMind)
return false;
{
// The container has no mind. Check for a visiting mind...
if (!Resolve(uid, ref visitingmind, false))
return false;
mindId = visitingmind.MindId ?? default;
return TryComp(mindId, out mind);
}
mindId = container.Mind ?? default;
return TryComp(mindId, out mind);