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

Fix sporadic test fail unable to resolve mind component when terminating (#19640)

Browse Source
This commit is contained in:
DrSmugleaf
2023-08-29 12:34:23 -07:00
committed by GitHub
parent 90c10c4675
commit b2672bdd3b
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Mind/Components/VisitingMindComponent.cs
View File

@@ -5,9 +5,6 @@ namespace Content.Server.Mind.Components
{ {
[ViewVariables] [ViewVariables]
public EntityUid? MindId; public EntityUid? MindId;
[ViewVariables]
public MindComponent? Mind;
} }
public sealed class MindUnvisitedMessage : EntityEventArgs public sealed class MindUnvisitedMessage : EntityEventArgs

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

@@ -104,7 +104,7 @@ public sealed class MindSystem : EntitySystem
private void OnVisitingTerminating(EntityUid uid, VisitingMindComponent component, ref EntityTerminatingEvent args) private void OnVisitingTerminating(EntityUid uid, VisitingMindComponent component, ref EntityTerminatingEvent args)
{ {
if (component.MindId != null) if (component.MindId != null)
UnVisit(component.MindId.Value, component.Mind); UnVisit(component.MindId.Value);
} }
private void OnMindContainerTerminating(EntityUid uid, MindContainerComponent component, ref EntityTerminatingEvent args) 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. // EnsureComp instead of AddComp to deal with deferred deletions.
var comp = EnsureComp<VisitingMindComponent>(entity); var comp = EnsureComp<VisitingMindComponent>(entity);
comp.MindId = mindId; comp.MindId = mindId;
comp.Mind = mind;
Log.Info($"Session {mind.Session?.Name} visiting entity {entity}."); Log.Info($"Session {mind.Session?.Name} visiting entity {entity}.");
} }
@@ -334,7 +333,7 @@ public sealed class MindSystem : EntitySystem
if (TryComp(oldVisitingEnt, out VisitingMindComponent? visitComp)) if (TryComp(oldVisitingEnt, out VisitingMindComponent? visitComp))
{ {
visitComp.Mind = null; visitComp.MindId = null;
RemCompDeferred(oldVisitingEnt, visitComp); RemCompDeferred(oldVisitingEnt, visitComp);
} }