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

Only delete ghosts on return to body or unghost

Browse Source
This commit is contained in:
zumorica
2020-04-17 19:19:37 +02:00
parent 01e8e4784b
commit 02ccc6dc45
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Administration/AGhost.cs
View File

@@ -1,10 +1,12 @@
using Content.Server.GameObjects.Components.Observer; using System.Timers;
using Content.Server.GameObjects.Components.Observer;
using Content.Server.Players; using Content.Server.Players;
using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Timer = Robust.Shared.Timers.Timer;
namespace Content.Server.Administration namespace Content.Server.Administration
{ {
@@ -27,7 +29,7 @@ namespace Content.Server.Administration
{ {
var visiting = mind.VisitingEntity; var visiting = mind.VisitingEntity;
mind.UnVisit(); mind.UnVisit();
visiting.Delete(); Timer.Spawn(100, visiting.Delete);
} }
else else
{ {

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

@@ -50,6 +50,7 @@ namespace Content.Server.GameObjects.Components.Observer
if (netChannel == null || netChannel == actor.playerSession.ConnectedClient) if (netChannel == null || netChannel == actor.playerSession.ConnectedClient)
{ {
actor.playerSession.ContentData().Mind.UnVisit(); actor.playerSession.ContentData().Mind.UnVisit();
Timer.Spawn(100, Owner.Delete);
} }
break; break;
case PlayerAttachedMsg msg: case PlayerAttachedMsg msg:
@@ -58,7 +59,6 @@ namespace Content.Server.GameObjects.Components.Observer
break; break;
case PlayerDetachedMsg msg: case PlayerDetachedMsg msg:
msg.OldPlayer.VisibilityMask &= ~(int)VisibilityFlags.Ghost; msg.OldPlayer.VisibilityMask &= ~(int)VisibilityFlags.Ghost;
Timer.Spawn(100, Owner.Delete);
break; break;
default: default:
break; break;

2
Content.Server/Observer/Ghost.cs
View File

@@ -10,6 +10,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Timers;
namespace Content.Server.Observer namespace Content.Server.Observer
{ {
@@ -37,6 +38,7 @@ namespace Content.Server.Observer
if (mind.VisitingEntity != null) if (mind.VisitingEntity != null)
{ {
mind.UnVisit(); mind.UnVisit();
Timer.Spawn(100, mind.VisitingEntity.Delete);
} }
var position = player.AttachedEntity?.Transform.GridPosition ?? IoCManager.Resolve<IGameTicker>().GetObserverSpawnPoint(); var position = player.AttachedEntity?.Transform.GridPosition ?? IoCManager.Resolve<IGameTicker>().GetObserverSpawnPoint();