From 571dac8c3e84572a9cd579b46bc75803d154fea2 Mon Sep 17 00:00:00 2001
From: haiwwkes <49613070+rhailrake@users.noreply.github.com>
Date: Thu, 3 Apr 2025 15:38:40 +0500
Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=BB=D0=B5=D1=82=D0=BE=D0=B2=20=D1=81=D0=B5=D1=80=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=B3=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BE=D1=81=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=B7=D0=B0?=
 =?UTF-8?q?=20=D0=BA=D0=B8=D0=BA"=20(#1636)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Content.Server/GameTicking/GameTicker.Player.cs            | 7 +------
 .../Players/PlayTimeTracking/PlayTimeTrackingManager.cs    | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index 2bb96f3905..f2635c6a9a 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -65,8 +65,6 @@ namespace Content.Server.GameTicking
                     // Sunrise-Queue-Start
                     if (!IoCManager.Instance!.TryResolveType<IServerJoinQueueManager>(out _))
                         Timer.Spawn(0, () => _playerManager.JoinGame(args.Session));
-                    else
-                        _userDb.ClientConnected(session);
                     // Sunrise-Queue-End
 
                     var record = await _db.GetPlayerRecordByUserId(args.Session.UserId);
@@ -109,10 +107,7 @@ namespace Content.Server.GameTicking
 
                 case SessionStatus.InGame:
                 {
-                    // Sunrise-Queue-Start
-                    if (!IoCManager.Instance!.TryResolveType<IServerJoinQueueManager>(out _))
-                        _userDb.ClientConnected(session);
-                    // Sunrise-Queue-End
+                    _userDb.ClientConnected(session);
 
                     if (mind == null)
                     {
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index a245f5cb2f..bdc9b1597b 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -406,7 +406,7 @@ public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager, IPostInjec
 
     public Dictionary<string, TimeSpan> GetTrackerTimes(ICommonSession id)
     {
-        if (!_playTimeData.TryGetValue(id.UserId, out var data) || !data.Initialized) // Sunrise-Edit
+        if (!_playTimeData.TryGetValue(id.UserId, out var data) || !data.Initialized)
             throw new InvalidOperationException("Play time info is not yet loaded for this player!");
 
         return data.TrackerTimes;