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

Delete ghost when player is detached (#12221)

Browse Source
This commit is contained in:
Jacob Tong
2022-10-27 07:09:35 -07:00
committed by GitHub
parent 0e9213f523
commit 52382aa7a6
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Ghost/GhostSystem.cs
View File

@@ -46,6 +46,7 @@ namespace Content.Server.Ghost
SubscribeLocalEvent<GhostComponent, MindRemovedMessage>(OnMindRemovedMessage); SubscribeLocalEvent<GhostComponent, MindRemovedMessage>(OnMindRemovedMessage);
SubscribeLocalEvent<GhostComponent, MindUnvisitedMessage>(OnMindUnvisitedMessage); SubscribeLocalEvent<GhostComponent, MindUnvisitedMessage>(OnMindUnvisitedMessage);
SubscribeLocalEvent<GhostComponent, PlayerDetachedEvent>(OnPlayerDetached);
SubscribeLocalEvent<GhostOnMoveComponent, MoveInputEvent>(OnRelayMoveInput); SubscribeLocalEvent<GhostOnMoveComponent, MoveInputEvent>(OnRelayMoveInput);
@@ -58,6 +59,7 @@ namespace Content.Server.Ghost
SubscribeLocalEvent<RoundEndTextAppendEvent>(_ => MakeVisible(true)); SubscribeLocalEvent<RoundEndTextAppendEvent>(_ => MakeVisible(true));
} }
private void OnActionPerform(EntityUid uid, GhostComponent component, BooActionEvent args) private void OnActionPerform(EntityUid uid, GhostComponent component, BooActionEvent args)
{ {
if (args.Handled) if (args.Handled)
@@ -160,6 +162,11 @@ namespace Content.Server.Ghost
DeleteEntity(uid); DeleteEntity(uid);
} }
private void OnPlayerDetached(EntityUid uid, GhostComponent component, PlayerDetachedEvent args)
{
QueueDel(uid);
}
private void OnGhostWarpsRequest(GhostWarpsRequestEvent msg, EntitySessionEventArgs args) private void OnGhostWarpsRequest(GhostWarpsRequestEvent msg, EntitySessionEventArgs args)
{ {
if (args.SenderSession.AttachedEntity is not {Valid: true} entity || if (args.SenderSession.AttachedEntity is not {Valid: true} entity ||