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

Fix player sent to nullspace when ghost is deleted

Browse Source
This commit is contained in:
ShadowCommander
2021-04-18 01:54:36 -07:00
parent 5e42812c27
commit 64491bc986
2 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,26 +72,6 @@ namespace Content.Server.GameObjects.Components.Observer
base.Shutdown(); 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 ComponentState GetComponentState(ICommonSession player) => new GhostComponentState(CanReturnToBody);
public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null!) public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null!)

18
Content.Server/GameObjects/EntitySystems/GhostSystem.cs
View File

@@ -26,24 +26,24 @@ namespace Content.Server.GameObjects.EntitySystems
private void OnMindRemovedMessage(EntityUid uid, GhostComponent component, MindRemovedMessage args) private void OnMindRemovedMessage(EntityUid uid, GhostComponent component, MindRemovedMessage args)
{ {
if (!EntityManager.TryGetEntity(uid, out var entity)) DeleteEntity(uid);
return;
DeleteEntity(entity);
} }
private void OnMindUnvisitedMessage(EntityUid uid, GhostComponent component, MindUnvisitedMessage args) private void OnMindUnvisitedMessage(EntityUid uid, GhostComponent component, MindUnvisitedMessage args)
{ {
if (!EntityManager.TryGetEntity(uid, out var entity)) DeleteEntity(uid);
return;
DeleteEntity(entity);
} }
private void DeleteEntity(IEntity? entity) private void DeleteEntity(EntityUid uid)
{ {
if (entity?.Deleted == true) if (!EntityManager.TryGetEntity(uid, out var entity)
|| entity.Deleted == true
|| entity.LifeStage == EntityLifeStage.Terminating)
return; return;
entity?.Delete(); if (entity.TryGetComponent<MindComponent>(out var mind))
mind.GhostOnShutdown = false;
entity.Delete();
} }
} }
} }