Fix hitobject count when creating from an IBeatmap

ppy · Dec 13, 2023 · 8c760e5 · 8c760e5
1 parent c31ff84
commit 8c760e5
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
@@ -1,8 +1,10 @@
 // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Scoring.Legacy
 {
@@ -44,7 +46,14 @@ public class LegacyBeatmapConversionDifficultyInfo : IBeatmapDifficultyInfo
 
         public static LegacyBeatmapConversionDifficultyInfo FromAPIBeatmap(APIBeatmap apiBeatmap) => FromBeatmapInfo(apiBeatmap);
 
-        public static LegacyBeatmapConversionDifficultyInfo FromBeatmap(IBeatmap beatmap) => FromBeatmapInfo(beatmap.BeatmapInfo);
+        public static LegacyBeatmapConversionDifficultyInfo FromBeatmap(IBeatmap beatmap) => new LegacyBeatmapConversionDifficultyInfo
+        {
+            SourceRuleset = beatmap.BeatmapInfo.Ruleset,
+            CircleSize = beatmap.Difficulty.CircleSize,
+            OverallDifficulty = beatmap.Difficulty.OverallDifficulty,
+            CircleCount = beatmap.HitObjects.Count - beatmap.HitObjects.Count(h => h is IHasDuration),
+            TotalObjectCount = beatmap.HitObjects.Count
+        };
 
         public static LegacyBeatmapConversionDifficultyInfo FromBeatmapInfo(IBeatmapInfo beatmapInfo) => new LegacyBeatmapConversionDifficultyInfo
         {