From b2672bdd3b5b3f4ee5705f6e7749a825fdd9a136 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Tue, 29 Aug 2023 12:34:23 -0700 Subject: [PATCH] Fix sporadic test fail unable to resolve mind component when terminating (#19640) --- Content.Server/Mind/Components/VisitingMindComponent.cs | 3 --- Content.Server/Mind/MindSystem.cs | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Content.Server/Mind/Components/VisitingMindComponent.cs b/Content.Server/Mind/Components/VisitingMindComponent.cs index d21a64959d..ce5ba673ec 100644 --- a/Content.Server/Mind/Components/VisitingMindComponent.cs +++ b/Content.Server/Mind/Components/VisitingMindComponent.cs @@ -5,9 +5,6 @@ namespace Content.Server.Mind.Components { [ViewVariables] public EntityUid? MindId; - - [ViewVariables] - public MindComponent? Mind; } public sealed class MindUnvisitedMessage : EntityEventArgs diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs index f486e0f9e1..f170d337f9 100644 --- a/Content.Server/Mind/MindSystem.cs +++ b/Content.Server/Mind/MindSystem.cs @@ -104,7 +104,7 @@ public sealed class MindSystem : EntitySystem private void OnVisitingTerminating(EntityUid uid, VisitingMindComponent component, ref EntityTerminatingEvent args) { if (component.MindId != null) - UnVisit(component.MindId.Value, component.Mind); + UnVisit(component.MindId.Value); } private void OnMindContainerTerminating(EntityUid uid, MindContainerComponent component, ref EntityTerminatingEvent args) @@ -278,7 +278,6 @@ public sealed class MindSystem : EntitySystem // EnsureComp instead of AddComp to deal with deferred deletions. var comp = EnsureComp(entity); comp.MindId = mindId; - comp.Mind = mind; Log.Info($"Session {mind.Session?.Name} visiting entity {entity}."); } @@ -334,7 +333,7 @@ public sealed class MindSystem : EntitySystem if (TryComp(oldVisitingEnt, out VisitingMindComponent? visitComp)) { - visitComp.Mind = null; + visitComp.MindId = null; RemCompDeferred(oldVisitingEnt, visitComp); }