Skip to content

Add min value for RESULT_SCREEN_TIME and cleaned up session over logic #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thisguyStan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add min value for RESULT_SCREEN_TIME and cleaned up session over logic #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3b45cb
Add min value for RESULT_SCREEN_TIME and cleaned up session over logic
thisguyStan Dec 28, 2025
a57634d
Undo log change
thisguyStan Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AssettoServer/Server/Configuration/ACServerConfigurationValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public ACServerConfigurationValidator()
server.RuleFor(s => s.KickQuorum).InclusiveBetween((ushort)0, (ushort)90);
server.RuleFor(s => s.VotingQuorum).InclusiveBetween((ushort)0, (ushort)100);
server.RuleFor(s => s.QualifyMaxWait).GreaterThanOrEqualTo((ushort)100);
server.RuleFor(s => s.ResultScreenTime).GreaterThanOrEqualTo(1);

server.RuleForEach(s => s.Weathers).ChildRules(weather =>
{
Expand Down
2 changes: 1 addition & 1 deletion AssettoServer/Server/Configuration/Kunos/ServerConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class ServerConfiguration
[IniField("SERVER", "RACE_PIT_WINDOW_END")] public short PitWindowEnd { get; init; }
[IniField("SERVER", "STABILITY_ALLOWED")] public bool StabilityAllowed { get; init; }
[IniField("SERVER", "RACE_OVER_TIME")] public int RaceOverTime { get; init; }
[IniField("SERVER", "RESULT_SCREEN_TIME")] public int ResultScreenTime { get; init; }
[IniField("SERVER", "RESULT_SCREEN_TIME")] public int ResultScreenTime { get; init; } = 1;
[IniField("SERVER", "TYRE_WEAR_RATE", Percent = true)] public float TyreConsumptionRate { get; init; }
[IniField("SERVER", "MAX_CONTACTS_PER_KM", IgnoreParsingErrors = true)] public byte MaxContactsPerKm { get; init; }
[IniField("SERVER", "LEGAL_TYRES")] public string LegalTyres { get; init; } = "";
Expand Down
43 changes: 17 additions & 26 deletions AssettoServer/Server/SessionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,39 +266,30 @@ private bool IsSessionOver()
return CurrentSession.TimeLeftMilliseconds == 0;
}

if (ServerTimeMilliseconds <= CurrentSession.StartTimeMilliseconds)
if (CurrentSession.Configuration.Type is SessionType.Practice or SessionType.Qualifying)
{
return false;
}

var connectedCount = _entryCarManager.EntryCars.Count(e => e.Client != null);

if (CurrentSession.Configuration.Type != SessionType.Race)
{
return false;
}

if (CurrentSession.Configuration.IsOpen == IsOpenMode.Closed && connectedCount < 2)
{
Log.Information("Skipping race session: didn't reach minimum player count before cutoff ({PlayerCount}/2). Use 'IS_OPEN=1' to allow joining during the race", connectedCount);
return true;
}

if (CurrentSession.Configuration.IsOpen != IsOpenMode.CloseAtStart)
{
if (connectedCount > 0) return false;

Log.Information("Skipping race session: no player connected");
return true;
}

if (connectedCount < 2 && CurrentSession.IsCutoffReached)
var connectedCount = _entryCarManager.ConnectedCars.Count;

switch (CurrentSession.Configuration.IsOpen)
{
Log.Information("Skipping race session: didn't reach minimum player count before cutoff ({PlayerCount}/2). Use 'IS_OPEN=1' to allow joining during the race", connectedCount);
return true;
case IsOpenMode.Closed when connectedCount < 2:
Log.Information("Skipping race session: didn't reach minimum player count before cutoff ({PlayerCount}/2). Use 'IS_OPEN=1' to allow joining during the race", connectedCount);
return true;
case IsOpenMode.Closed:
return false;
case IsOpenMode.CloseAtStart when connectedCount >= 2 ||
ServerTimeMilliseconds <= CurrentSession.StartTimeMilliseconds:
return false;
case IsOpenMode.Open when connectedCount > 0 ||
ServerTimeMilliseconds <= CurrentSession.StartTimeMilliseconds:
return false;
}

return false;
Log.Information("Skipping race session: no player connected");
return true;
}

private void CalcOverTime()
Expand Down
2 changes: 1 addition & 1 deletion AssettoServer/Server/SessionState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class SessionState
public uint TargetLap { get; set; } = 0;
public uint LeaderLapCount { get; set; } = 0;
public bool LeaderHasCompletedLastLap { get; set; } = false;
public bool IsCutoffReached => _timeSource.ServerTimeMilliseconds > StartTimeMilliseconds - 20_000;
public bool IsCutoffReached => _timeSource.ServerTimeMilliseconds > StartTimeMilliseconds - Math.Max(30_000, Configuration.WaitTime * 1000);

public bool SessionOverFlag => Configuration switch
{
Expand Down