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

Moved VisibilityFlags to EyeComponent (#3716)

Browse Source 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
Acruid
2021-03-27 17:37:19 -07:00
committed by GitHub
parent c8cb23e1fa
commit ac219e099d
4 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components.Markers;
@@ -40,32 +40,40 @@ namespace Content.Server.GameObjects.Components.Observer
}
}
public override void Initialize()
/// <inheritdoc />
protected override void Startup()
{
base.Initialize();
base.Startup();
// Allow this entity to be seen by other ghosts.
Owner.EnsureComponent<VisibilityComponent>().Layer = (int) VisibilityFlags.Ghost;
// Allows this entity to see other ghosts.
Owner.EnsureComponent<EyeComponent>().VisibilityMask |= (uint) VisibilityFlags.Ghost;
_timeOfDeath = _gameTimer.RealTime;
}
public override ComponentState GetComponentState(ICommonSession player) => new GhostComponentState(CanReturnToBody);
public override void HandleMessage(ComponentMessage message, IComponent? component)
/// <inheritdoc />
protected override void Shutdown()
{
base.HandleMessage(message, component);
switch (message)
//Perf: If the entity is deleting itself, no reason to change these back.
if(Owner.LifeStage < EntityLifeStage.Terminating)
{
case PlayerAttachedMsg msg:
msg.NewPlayer.VisibilityMask |= (int) VisibilityFlags.Ghost;
Dirty();
break;
case PlayerDetachedMsg msg:
msg.OldPlayer.VisibilityMask &= ~(int) VisibilityFlags.Ghost;
break;
// Entity can't be seen by ghosts anymore.
if (Owner.TryGetComponent<VisibilityComponent>(out var visComp))
visComp.Layer &= ~(int) VisibilityFlags.Ghost;
// Entity can't see ghosts anymore.
if (Owner.TryGetComponent<EyeComponent>(out var eyeComp))
eyeComp.VisibilityMask &= ~(uint) VisibilityFlags.Ghost;
}
base.Shutdown();
}
public override ComponentState GetComponentState(ICommonSession player) => new GhostComponentState(CanReturnToBody);
public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null!)
{
base.HandleNetworkMessage(message, netChannel, session);