Merge pull request #241 from FireNameFN/RespawnVisual

Fix respawn button visual bug

Content.Server/Corvax/Respawn/RespawnSystem.cs

@@ -5,7 +5,7 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Robust.Server.Player;
-using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Corvax.Respawn;
@@ -15,13 +15,15 @@ public sealed class RespawnSystem : EntitySystem
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    private readonly Dictionary<NetUserId, TimeSpan> _respawnResetTimes = [];
+    private readonly Dictionary<ICommonSession, TimeSpan> _respawnResetTimes = [];
 
     public override void Initialize()
     {
         SubscribeLocalEvent<MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<MindContainerComponent, MindRemovedMessage>(OnMindRemoved);
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
+
+        _player.PlayerStatusChanged += OnPlayerStatusChanged;
     }
 
     private void OnMobStateChanged(MobStateChangedEvent e)
@@ -32,7 +34,7 @@ private void OnMobStateChanged(MobStateChangedEvent e)
         if (!_player.TryGetSessionByEntity(e.Target, out var session))
             return;
 
-        ResetRespawnTime(e.Target, session.UserId);
+        ResetRespawnTime(e.Target, session);
     }
 
     private void OnMindRemoved(EntityUid entity, MindContainerComponent component, MindRemovedMessage e)
@@ -43,36 +45,39 @@ private void OnMindRemoved(EntityUid entity, MindContainerComponent component, M
         if (TryComp<MobStateComponent>(entity, out var state) && state.CurrentState == MobState.Dead)
             return;
 
-        ResetRespawnTime(entity, e.Mind.Comp.UserId.Value);
+        ResetRespawnTime(entity, _player.GetSessionById(e.Mind.Comp.UserId.Value));
     }
 
     private void OnRoundRestartCleanup(RoundRestartCleanupEvent e)
     {
-        foreach (var player in _respawnResetTimes.Keys)
-            SendRespawnResetTime(player, null);
-
         _respawnResetTimes.Clear();
     }
 
-    private void ResetRespawnTime(EntityUid entity, NetUserId player)
+    private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
+    {
+        if (e.NewStatus == Robust.Shared.Enums.SessionStatus.Connected)
+            SendRespawnResetTime(e.Session, GetRespawnResetTime(e.Session));
+    }
+
+    private void ResetRespawnTime(EntityUid entity, ICommonSession session)
     {
         if (!HasComp<RespawnResetComponent>(entity))
             return;
 
-        ref var respawnTime = ref CollectionsMarshal.GetValueRefOrAddDefault(_respawnResetTimes, player, out _);
+        ref var respawnTime = ref CollectionsMarshal.GetValueRefOrAddDefault(_respawnResetTimes, session, out _);
 
         respawnTime = _timing.CurTime;
 
-        SendRespawnResetTime(player, _timing.CurTime);
+        SendRespawnResetTime(session, _timing.CurTime);
     }
 
-    private void SendRespawnResetTime(NetUserId player, TimeSpan? time)
+    private void SendRespawnResetTime(ICommonSession session, TimeSpan? time)
     {
-        RaiseNetworkEvent(new RespawnResetEvent(time), _player.GetSessionById(player));
+        RaiseNetworkEvent(new RespawnResetEvent(time), session);
     }
 
-    public TimeSpan? GetRespawnResetTime(NetUserId user)
+    public TimeSpan? GetRespawnResetTime(ICommonSession session)
     {
-        return _respawnResetTimes.TryGetValue(user, out var time) ? time : null;
+        return _respawnResetTimes.TryGetValue(session, out var time) ? time : null;
     }
 }

Content.Server/_NF/Commands/GhostRespawnCommand.cs

@@ -60,7 +60,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        var respawnResetTime = _entity.GetEntitySystem<RespawnSystem>().GetRespawnResetTime(shell.Player.UserId);
+        var respawnResetTime = _entity.GetEntitySystem<RespawnSystem>().GetRespawnResetTime(shell.Player);
 
         if (respawnResetTime is not null)
         {