mirror of
https://github.com/ppy/osu.git
synced 2026-05-13 19:54:15 +08:00
Inline method calls to make multiple enumerations explicit
This commit is contained in:
@@ -257,10 +257,8 @@ namespace osu.Game.Overlays
|
||||
playableSet = getNextRandom(-1, allowProtectedTracks);
|
||||
else
|
||||
{
|
||||
var beatmapSets = getBeatmapSets(allowProtectedTracks);
|
||||
|
||||
playableSet = beatmapSets.TakeWhile(i => !i.Value.Equals(current?.BeatmapSetInfo)).LastOrDefault()
|
||||
?? beatmapSets.LastOrDefault();
|
||||
playableSet = getBeatmapSets(allowProtectedTracks).TakeWhile(i => !i.Value.Equals(current?.BeatmapSetInfo)).LastOrDefault()
|
||||
?? getBeatmapSets(allowProtectedTracks).LastOrDefault();
|
||||
}
|
||||
|
||||
if (playableSet != null)
|
||||
@@ -355,9 +353,8 @@ namespace osu.Game.Overlays
|
||||
playableSet = getNextRandom(1, allowProtectedTracks);
|
||||
else
|
||||
{
|
||||
var beatmapSets = getBeatmapSets(allowProtectedTracks);
|
||||
|
||||
playableSet = beatmapSets.SkipWhile(i => !i.Value.Equals(current?.BeatmapSetInfo)).ElementAtOrDefault(1) ?? beatmapSets.FirstOrDefault();
|
||||
playableSet = getBeatmapSets(allowProtectedTracks).SkipWhile(i => !i.Value.Equals(current?.BeatmapSetInfo)).ElementAtOrDefault(1)
|
||||
?? getBeatmapSets(allowProtectedTracks).FirstOrDefault();
|
||||
}
|
||||
|
||||
var playableBeatmap = playableSet?.Value.Beatmaps.FirstOrDefault();
|
||||
|
||||
Reference in New Issue
Block a user