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

Merge branch 'master' into fix-disabled-set-crash

Browse Source
This commit is contained in:
Dan Balasescu
2019-03-05 17:25:13 +09:00
committed by GitHub
parent 56697339b3 a676eed2f9
commit fd147dae21
372 changed files with 3325 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Multi/Match/MatchSubScreen.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Screens.Multi.Match
protected Bindable<PlaylistItem> CurrentItem { get; private set; }
[Resolved]
protected Bindable<IEnumerable<Mod>> CurrentMods { get; private set; }
protected Bindable<IEnumerable<Mod>> SelectedMods { get; private set; }
[Resolved]
private BeatmapManager beatmapManager { get; set; }
@ -194,7 +194,7 @@ namespace osu.Game.Screens.Multi.Match
var localBeatmap = e.NewValue?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == e.NewValue.Beatmap.OnlineBeatmapID);
Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
CurrentMods.Value = e.NewValue?.RequiredMods ?? Enumerable.Empty<Mod>();
SelectedMods.Value = e.NewValue?.RequiredMods ?? Enumerable.Empty<Mod>();
if (e.NewValue?.Ruleset != null)
Ruleset.Value = e.NewValue.Ruleset;
}
@ -222,7 +222,7 @@ namespace osu.Game.Screens.Multi.Match
private void onStart()
{
Beatmap.Value.Mods.Value = CurrentMods.Value.ToArray();
Beatmap.Value.Mods.Value = SelectedMods.Value.ToArray();
switch (type.Value)
{