Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes overlays not clearing when using the ghost command (#1669)

Browse Source 
* fixes overlays not clearing when ghosting

* fix gonflicts???

* actually fixes gonflicts

Co-authored-by: ancientpower <ancientpowerer@gmail.com>
This commit is contained in:
ancientpower
2020-08-14 08:13:32 -05:00
committed by GitHub
parent 47c32a1c6f
commit 9ffc134f75
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ using Content.Server.GameObjects.Components.Observer;
using Content.Server.Interfaces.GameTicking; using Content.Server.Interfaces.GameTicking;
using Content.Server.Players; using Content.Server.Players;
using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Damage;
using Content.Shared.GameObjects.Components.Mobs;
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;
@@ -67,7 +68,12 @@ namespace Content.Server.Observer
var ghostComponent = ghost.GetComponent<GhostComponent>(); var ghostComponent = ghost.GetComponent<GhostComponent>();
ghostComponent.CanReturnToBody = canReturn; ghostComponent.CanReturnToBody = canReturn;
if(canReturn) if (player.AttachedEntity.TryGetComponent(out ServerOverlayEffectsComponent overlayComponent))
{
overlayComponent?.RemoveOverlay(SharedOverlayID.CircleMaskOverlay);
}
if (canReturn)
mind.Visit(ghost); mind.Visit(ghost);
else else
mind.TransferTo(ghost); mind.TransferTo(ghost);