From c0bdfdf123294970f02b3e38746cca51fa10a2d0 Mon Sep 17 00:00:00 2001
From: zumorica <zddm@outlook.es>
Date: Thu, 9 Apr 2020 03:01:56 +0200
Subject: [PATCH] Remove CanReturnToBody property from SharedGhostComponent

---
 .../GameObjects/Components/Observer/GhostComponent.cs    | 9 ++-------
 .../GameObjects/Components/Observer/GhostComponent.cs    | 2 +-
 .../Components/Observer/SharedGhostComponent.cs          | 2 --
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs b/Content.Client/GameObjects/Components/Observer/GhostComponent.cs
index 244dd7a5d6..67b81a6345 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs
+++ b/Content.Client/GameObjects/Components/Observer/GhostComponent.cs
@@ -14,14 +14,9 @@ namespace Content.Client.GameObjects.Components.Observer
     public class GhostComponent : SharedGhostComponent
     {
         private GhostGui _gui;
-        private bool _canReturnToBody = true;
 
         [ViewVariables(VVAccess.ReadOnly)]
-        public override bool CanReturnToBody
-        {
-            get => _canReturnToBody;
-            set {}
-        }
+        public bool CanReturnToBody { get; private set; } = true;
 
 #pragma warning disable 649
         [Dependency] private readonly IGameHud _gameHud;
@@ -92,7 +87,7 @@ namespace Content.Client.GameObjects.Components.Observer
 
             if (!(curState is GhostComponentState state)) return;
 
-            _canReturnToBody = state.CanReturnToBody;
+            CanReturnToBody = state.CanReturnToBody;
 
             if (Owner == _playerManager.LocalPlayer.ControlledEntity)
             {
diff --git a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs
index 11eb1d40db..4853900fed 100644
--- a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs
+++ b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs
@@ -18,7 +18,7 @@ namespace Content.Server.GameObjects.Components.Observer
         private bool _canReturnToBody = true;
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public override bool CanReturnToBody
+        public bool CanReturnToBody
         {
             get => _canReturnToBody;
             set
diff --git a/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs b/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs
index f7a302bcba..b838c3b63e 100644
--- a/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs
+++ b/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs
@@ -8,8 +8,6 @@ namespace Content.Shared.GameObjects.Components.Observer
     {
         public override string Name => "Ghost";
         public override uint? NetID => ContentNetIDs.GHOST;
-
-        public virtual bool CanReturnToBody { get; set; } = true;
     }
 
     [Serializable, NetSerializable]