From 8ccbe84f67b87ba97b45576c495a53e509fa878f Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sat, 24 Aug 2019 01:30:33 +0300
Subject: [PATCH] Loop on distinct rulesets of beatmap instead of all

---
 osu.Game/Overlays/Direct/DirectPanel.cs            | 12 +++---------
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs  | 14 +++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Direct/DirectPanel.cs b/osu.Game/Overlays/Direct/DirectPanel.cs
index b2f3c6befb..d6258061e1 100644
--- a/osu.Game/Overlays/Direct/DirectPanel.cs
+++ b/osu.Game/Overlays/Direct/DirectPanel.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Overlays.Direct
         private Container content;
 
         private BeatmapSetOverlay beatmapSetOverlay;
-        private RulesetStore rulesets;
 
         public PreviewTrack Preview => PlayButton.Preview;
         public Bindable<bool> PreviewPlaying => PlayButton.Playing;
@@ -70,10 +69,9 @@ namespace osu.Game.Overlays.Direct
         };
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay, RulesetStore rulesets)
+        private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay)
         {
             this.beatmapSetOverlay = beatmapSetOverlay;
-            this.rulesets = rulesets;
 
             AddInternal(content = new Container
             {
@@ -148,12 +146,8 @@ namespace osu.Game.Overlays.Direct
 
             if (SetInfo.Beatmaps.Count > maximum_difficulty_icons)
             {
-                foreach (var ruleset in rulesets.AvailableRulesets)
-                {
-                    List<BeatmapInfo> list;
-                    if ((list = SetInfo.Beatmaps.FindAll(b => b.Ruleset.Equals(ruleset))).Count > 0)
-                        icons.Add(new GroupedDifficultyIcon(list, ruleset, this is DirectListPanel ? Color4.White : Color4.Black));
-                }
+                foreach (var ruleset in SetInfo.Beatmaps.Select(b => b.Ruleset).Distinct())
+                    icons.Add(new GroupedDifficultyIcon(SetInfo.Beatmaps.FindAll(b => b.Ruleset.Equals(ruleset)), ruleset, this is DirectListPanel ? Color4.White : Color4.Black));
             }
             else
                 foreach (var b in SetInfo.Beatmaps.OrderBy(beatmap => beatmap.StarDifficulty))
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index c6bd726632..69b9aa399a 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay, RulesetStore rulesets)
+        private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay)
         {
             restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
             dialogOverlay = overlay;
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Select.Carousel
                                 {
                                     AutoSizeAxes = Axes.Both,
                                     Spacing = new Vector2(3),
-                                    Children = getDifficultyIcons(rulesets),
+                                    Children = getDifficultyIcons(),
                                 },
                             }
                         }
@@ -111,19 +111,15 @@ namespace osu.Game.Screens.Select.Carousel
 
         private const int maximum_difficulty_icons = 18;
 
-        private List<DifficultyIcon> getDifficultyIcons(RulesetStore rulesets)
+        private List<DifficultyIcon> getDifficultyIcons()
         {
             var beatmaps = ((CarouselBeatmapSet)Item).Beatmaps.ToList();
             var icons = new List<DifficultyIcon>();
 
             if (beatmaps.Count > maximum_difficulty_icons)
             {
-                foreach (var ruleset in rulesets.AvailableRulesets.OrderBy(r => r.ID))
-                {
-                    List<CarouselBeatmap> list;
-                    if ((list = beatmaps.FindAll(b => b.Beatmap.Ruleset.Equals(ruleset))).Count > 0)
-                        icons.Add(new FilterableGroupedDifficultyIcon(list, ruleset));
-                }
+                foreach (var ruleset in beatmaps.Select(b => b.Beatmap.Ruleset).Distinct())
+                    icons.Add(new FilterableGroupedDifficultyIcon(beatmaps.FindAll(b => b.Beatmap.Ruleset.Equals(ruleset)), ruleset));
             }
             else beatmaps.ForEach(b => icons.Add(new FilterableDifficultyIcon(b)));