Apply adjustments for struct attributes

ppy · Nov 20, 2024 · b85fb3e · b85fb3e
1 parent f0c1056
commit b85fb3e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs b/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs
@@ -104,12 +104,12 @@ private void run(WorkingBeatmap beatmap, Action<ProcessableItem, MySqlConnection
 
         private void processDifficulty(ProcessableItem item, MySqlConnection conn)
         {
-            foreach (var attribute in item.Ruleset.CreateDifficultyCalculator(item.WorkingBeatmap).CalculateAllLegacyCombinations())
+            foreach (var (mods, attributes) in item.Ruleset.CreateDifficultyCalculator(item.WorkingBeatmap).CalculateAllLegacyCombinations())
             {
                 if (dryRun)
                     continue;
 
-                LegacyMods legacyMods = item.Ruleset.ConvertToLegacyMods(attribute.Mods);
+                LegacyMods legacyMods = item.Ruleset.ConvertToLegacyMods(mods);
 
                 conn.Execute(
                     "INSERT INTO `osu_beatmap_difficulty` (`beatmap_id`, `mode`, `mods`, `diff_unified`) "
@@ -120,14 +120,14 @@ private void processDifficulty(ProcessableItem item, MySqlConnection conn)
                         BeatmapId = item.BeatmapID,
                         Mode = item.RulesetID,
                         Mods = (int)legacyMods,
-                        Diff = attribute.StarRating
+                        Diff = attributes.StarRating
                     });
 
                 if (item.Ranked && !AppSettings.SKIP_INSERT_ATTRIBUTES)
                 {
                     var parameters = new List<object>();
 
-                    foreach (var mapping in attribute.ToDatabaseAttributes())
+                    foreach (var mapping in attributes.ToDatabaseAttributes())
                     {
                         parameters.Add(new
                         {
@@ -168,13 +168,13 @@ private void processDifficulty(ProcessableItem item, MySqlConnection conn)
                     object param = new
                     {
                         BeatmapId = item.BeatmapID,
-                        Diff = attribute.StarRating,
+                        Diff = attributes.StarRating,
                         AR = item.WorkingBeatmap.BeatmapInfo.Difficulty.ApproachRate,
                         OD = item.WorkingBeatmap.BeatmapInfo.Difficulty.OverallDifficulty,
                         HP = item.WorkingBeatmap.BeatmapInfo.Difficulty.DrainRate,
                         CS = item.WorkingBeatmap.BeatmapInfo.Difficulty.CircleSize,
                         BPM = Math.Round(bpm, 2),
-                        MaxCombo = attribute.MaxCombo,
+                        MaxCombo = attributes.MaxCombo,
                         CountCircle = countCircle,
                         CountSlider = countSlider,
                         CountSpinner = countSpinner,