sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17400 from nagilson/screen-mod-retention

Browse Source 
Fix mods from single player carrying over to multiplayer
This commit is contained in:
Dan Balasescu
2022-03-23 08:36:15 +09:00
committed by GitHub
parent cda46ec8a3 c8d48f89e8
commit 1ffa1e1219
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
View File

@ -335,6 +335,20 @@ namespace osu.Game.Tests.Visual.Navigation
exitViaBackButtonAndConfirm(); exitViaBackButtonAndConfirm();
} }
[Test]
public void TestModsResetOnEnteringMultiplayer()
{
var osuAutomationMod = new OsuModAutoplay();
AddStep("Enable autoplay", () => { Game.SelectedMods.Value = new[] { osuAutomationMod }; });
PushAndConfirm(() => new Screens.OnlinePlay.Multiplayer.Multiplayer());
AddUntilStep("Mods are removed", () => Game.SelectedMods.Value.Count == 0);
AddStep("Return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
AddUntilStep("Mods are restored", () => Game.SelectedMods.Value.Contains(osuAutomationMod));
}
[Test] [Test]
public void TestExitMultiWithEscape() public void TestExitMultiWithEscape()
{ {

2
osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
View File

@ -115,6 +115,8 @@ namespace osu.Game.Screens.OnlinePlay
this.FadeIn(); this.FadeIn();
waves.Show(); waves.Show();
Mods.SetDefault();
if (loungeSubScreen.IsCurrentScreen()) if (loungeSubScreen.IsCurrentScreen())
loungeSubScreen.OnEntering(last); loungeSubScreen.OnEntering(last);
else else