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

Try fix RestartTest (#36725)

Browse Source
This commit is contained in:
Leon Friedrich
2025-04-19 22:17:03 +10:00
committed by GitHub
parent c45f291425
commit 49da5c540b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
View File

@@ -85,7 +85,7 @@ public sealed class FailAndStartPresetTest
Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.NotReadyToPlay)); Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.NotReadyToPlay));
// Try to start nukeops without readying up // Try to start nukeops without readying up
await pair.WaitCommand("setgamepreset TestPresetTenPlayers"); await pair.WaitCommand("setgamepreset TestPresetTenPlayers 9999");
await pair.WaitCommand("startround"); await pair.WaitCommand("startround");
await pair.RunTicksSync(10); await pair.RunTicksSync(10);
@@ -99,7 +99,7 @@ public sealed class FailAndStartPresetTest
// Ready up and start nukeops // Ready up and start nukeops
await pair.WaitClientCommand("toggleready True"); await pair.WaitClientCommand("toggleready True");
Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.ReadyToPlay)); Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.ReadyToPlay));
await pair.WaitCommand("setgamepreset TestPreset"); await pair.WaitCommand("setgamepreset TestPreset 9999");
await pair.WaitCommand("startround"); await pair.WaitCommand("startround");
await pair.RunTicksSync(10); await pair.RunTicksSync(10);

6
Content.Server/GameTicking/GameTicker.GamePreset.cs
View File

@@ -109,7 +109,11 @@ public sealed partial class GameTicker
// Reset counter is checked and changed at the end of each round // Reset counter is checked and changed at the end of each round
// So if the game is in the lobby, the first requested round will happen before the check, and we need one less check // So if the game is in the lobby, the first requested round will happen before the check, and we need one less check
if (CurrentPreset is null) if (CurrentPreset is null)
ResetCountdown = resetDelay.Value -1; ResetCountdown = resetDelay.Value - 1;
}
else
{
ResetCountdown = null;
} }
Preset = preset; Preset = preset;