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

Hotfix round restart loops (#16292)

Browse Source 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
metalgearsloth
2023-05-11 11:00:39 +10:00
committed by GitHub
parent 90d13d79ac
commit 20748cc542
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameTicking/GameTicker.RoundFlow.cs
View File

@@ -254,7 +254,7 @@ namespace Content.Server.GameTicking
return;
}
_sawmill.Warning($"Exception caught while trying to start the round! Restarting round...");
_sawmill.Error($"Exception caught while trying to start the round! Restarting round...");
_runtimeLog.LogException(e, nameof(GameTicker));
_startingRound = false;
RestartRound();

16
Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
View File

@@ -1,4 +1,5 @@
using System.Runtime.InteropServices;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using Content.Server.Database;
@@ -350,6 +351,19 @@ public sealed class PlayTimeTrackingManager
return GetPlayTimeForTracker(id, PlayTimeTrackingShared.TrackerOverall);
}
public bool TryGetTrackerTimes(IPlayerSession id, [NotNullWhen(true)] out Dictionary<string, TimeSpan>? time)
{
time = null;
if (!_playTimeData.TryGetValue(id, out var data) || !data.Initialized)
{
return false;
}
time = data.TrackerTimes;
return true;
}
public Dictionary<string, TimeSpan> GetTrackerTimes(IPlayerSession id)
{
if (!_playTimeData.TryGetValue(id, out var data) || !data.Initialized)

7
Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
View File

@@ -201,7 +201,12 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
return;
var player = _playerManager.GetSessionByUserId(userId);
var playTimes = _tracking.GetTrackerTimes(player);
if (!_tracking.TryGetTrackerTimes(player, out var playTimes))
{
// Sorry mate but your playtimes haven't loaded.
Logger.ErrorS("playtime", $"Playtimes weren't ready yet for {player} on roundstart!");
playTimes ??= new Dictionary<string, TimeSpan>();
}
for (var i = 0; i < jobs.Count; i++)
{