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

Refactor mind and ghost deletion code (#3680)

Browse Source 
* Refactor mind and ghost deletion code

* Refactor to use EventBus and clean up deletes

* Fix mind eject when being deleted

* Refactor entity manager calls to use IEntity.EntityManager
This commit is contained in:
ShadowCommander
2021-03-31 14:17:22 -07:00
committed by GitHub
parent 4005fbe133
commit 951b0f425a
11 changed files with 86 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/GameObjects/Components/Observer/GhostComponent.cs
View File

@@ -72,6 +72,26 @@ namespace Content.Server.GameObjects.Components.Observer
base.Shutdown();
}
public override void OnAdd()
{
base.OnAdd();
if (Owner.TryGetComponent<MindComponent>(out var mind))
{
mind.GhostOnShutdown = false;
}
}
public override void OnRemove()
{
base.OnRemove();
if (Owner.TryGetComponent<MindComponent>(out var mind))
{
mind.GhostOnShutdown = true;
}
}
public override ComponentState GetComponentState(ICommonSession player) => new GhostComponentState(CanReturnToBody);
public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null!)
@@ -92,13 +112,12 @@ namespace Content.Server.GameObjects.Components.Observer
{
var o = actor.playerSession.ContentData()!.Mind;
o?.UnVisit();
Owner.Delete();
}
break;
}
case ReturnToCloneComponentMessage _:
if (Owner.TryGetComponent(out VisitingMindComponent? mind))
if (Owner.TryGetComponent(out VisitingMindComponent? mind) && mind.Mind != null)
{
Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new GhostReturnMessage(mind.Mind));
}