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

Remove CanReturnToBody property from SharedGhostComponent

Browse Source
This commit is contained in:
zumorica
2020-04-09 03:01:56 +02:00
parent 612790840c
commit c0bdfdf123
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/GameObjects/Components/Observer/GhostComponent.cs
View File

@@ -14,14 +14,9 @@ namespace Content.Client.GameObjects.Components.Observer
public class GhostComponent : SharedGhostComponent public class GhostComponent : SharedGhostComponent
{ {
private GhostGui _gui; private GhostGui _gui;
private bool _canReturnToBody = true;
[ViewVariables(VVAccess.ReadOnly)] [ViewVariables(VVAccess.ReadOnly)]
public override bool CanReturnToBody public bool CanReturnToBody { get; private set; } = true;
{
get => _canReturnToBody;
set {}
}
#pragma warning disable 649 #pragma warning disable 649
[Dependency] private readonly IGameHud _gameHud; [Dependency] private readonly IGameHud _gameHud;
@@ -92,7 +87,7 @@ namespace Content.Client.GameObjects.Components.Observer
if (!(curState is GhostComponentState state)) return; if (!(curState is GhostComponentState state)) return;
_canReturnToBody = state.CanReturnToBody; CanReturnToBody = state.CanReturnToBody;
if (Owner == _playerManager.LocalPlayer.ControlledEntity) if (Owner == _playerManager.LocalPlayer.ControlledEntity)
{ {

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

@@ -18,7 +18,7 @@ namespace Content.Server.GameObjects.Components.Observer
private bool _canReturnToBody = true; private bool _canReturnToBody = true;
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public override bool CanReturnToBody public bool CanReturnToBody
{ {
get => _canReturnToBody; get => _canReturnToBody;
set set

2
Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs
View File

@@ -8,8 +8,6 @@ namespace Content.Shared.GameObjects.Components.Observer
{ {
public override string Name => "Ghost"; public override string Name => "Ghost";
public override uint? NetID => ContentNetIDs.GHOST; public override uint? NetID => ContentNetIDs.GHOST;
public virtual bool CanReturnToBody { get; set; } = true;
} }
[Serializable, NetSerializable] [Serializable, NetSerializable]