Update: hopefully fixed respawn timers for real this time

Partmedia · Mar 31, 2024 · a276fbe · a276fbe
1 parent 03f5243
commit a276fbe
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/Content.Server/Ghost/Components/GhostComponent.cs b/Content.Server/Ghost/Components/GhostComponent.cs
@@ -11,6 +11,8 @@ public sealed class GhostComponent : SharedGhostComponent
     {
         public TimeSpan TimeOfDeath { get; set; } = TimeSpan.Zero;
 
+        public float TimeSinceDeath = 0f;
+
         [DataField("respawnTime")]
         public float RespawnTime = 600f;
 

diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
@@ -73,11 +73,22 @@ public override void Update(float frameTime)
         {
             foreach (var ghost in EntityManager.EntityQuery<GhostComponent, SharedGhostComponent>(true))
             {
-                var elapsedSinceDeath = _gameTiming.CurTime - ghost.Item1.TimeOfDeath;
-                var timeRemaining = ghost.Item1.RespawnTime - (float)elapsedSinceDeath.TotalSeconds;
 
-                if (!EntityManager.TryGetComponent(ghost.Item1.Owner, out ActorComponent? actor))
+                var timeRemaining = 0f;
+
+                if (EntityManager.TryGetComponent(ghost.Item1.Owner, out ActorComponent? actor))
+                {
+                    var playerData = actor.PlayerSession.ContentData();
+                    if (playerData is not null && playerData.Mind is not null)
+                    {
+                        playerData.Mind.TimeSinceGhost += frameTime;
+                        timeRemaining = ghost.Item1.RespawnTime - playerData.Mind.TimeSinceGhost;
+                    }
+                }
+                else
+                {
                     SetCanGhostRespawn(ghost.Item2, false, 0);
+                }
 
                 var autoClonerAvailable = false;
 
@@ -258,6 +269,8 @@ private void OnGhostRespawnRequest(GhostRespawnRequest msg, EntitySessionEventAr
                         break;
                 }
             }
+
+            mind.TimeSinceGhost = 0f;
         }
 
         private void OnGhostWarpToTargetRequest(GhostWarpToTargetRequestEvent msg, EntitySessionEventArgs args)

diff --git a/Content.Server/Mind/Components/MindComponent.cs b/Content.Server/Mind/Components/MindComponent.cs
@@ -32,6 +32,7 @@ public sealed class MindComponent : Component
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("ghostOnShutdown")]
         public bool GhostOnShutdown { get; set; } = true;
+
     }
 
     public sealed class MindRemovedMessage : EntityEventArgs

diff --git a/Content.Server/Mind/Mind.cs b/Content.Server/Mind/Mind.cs
@@ -91,6 +91,9 @@ public Mind(NetUserId userId)
         [ViewVariables]
         public TimeSpan? TimeOfDeath { get; set; } = null;
 
+        [ViewVariables]
+        public float TimeSinceGhost = 0f;
+
         /// <summary>
         ///     The component currently owned by this mind.
         ///     Can be null.