From b26e9a9a325070323fe9475275ceaf4ed079cb76 Mon Sep 17 00:00:00 2001 From: "J. Brown" Date: Thu, 22 Feb 2024 11:03:44 +0000 Subject: [PATCH] Fix #22933 - Job-specific Uplink items leaking to non-job minds (#23179) Fix for 22933 - SharedMindSystem now checks for VisitingMindComponent too. --- Content.Shared/Mind/SharedMindSystem.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs index 25e644c901..1d6d052f9a 100644 --- a/Content.Shared/Mind/SharedMindSystem.cs +++ b/Content.Shared/Mind/SharedMindSystem.cs @@ -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); -- 2.51.2