h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 18:32:55 +08:00
Code Issues Releases Wiki Activity

Fix gameplay proceeding when no frames have been received yet

Browse Source
This commit is contained in:
Dean Herbert 2020-10-27 18:28:49 +09:00
parent d4467d20a2
commit b3d793a505
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
View File

@ -56,6 +56,9 @@ namespace osu.Game.Tests.Visual.Gameplay
public void TestBasicSpectatingFlow() public void TestBasicSpectatingFlow()
{ {
loadSpectatingScreen(); loadSpectatingScreen();
AddAssert("screen hasn't changed", () => Stack.CurrentScreen is Spectator);
AddStep("start play", () => testSpectatorStreamingClient.StartPlay()); AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
sendFrames(); sendFrames();
@ -73,6 +76,18 @@ namespace osu.Game.Tests.Visual.Gameplay
AddAssert("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value); AddAssert("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
} }
[Test]
public void TestPlayStartsWithNoFrames()
{
loadSpectatingScreen();
AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
AddUntilStep("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
}
[Test] [Test]
public void TestSpectatingDuringGameplay() public void TestSpectatingDuringGameplay()
{ {

6
osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
View File

@ -162,6 +162,12 @@ namespace osu.Game.Rulesets.Replays
// if we didn't change frames, we need to ensure we are allowed to run frames in between, else return null. // if we didn't change frames, we need to ensure we are allowed to run frames in between, else return null.
} }
} }
else
{
// if we never received frames and are expecting to, block.
if (!replay.HasReceivedAllFrames)
return null;
}
return CurrentTime = time; return CurrentTime = time;
} }