Remove estimations where score data is available for osu! difficulty calculations

osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs

@@ -24,6 +24,8 @@
         private int countOk;
         private int countMeh;
         private int countMiss;
+        private int countLargeTickMiss;
+        private int countSliderEndsDropped;
 
         private double effectiveMissCount;
 
@@ -44,7 +46,15 @@
             countOk = score.Statistics.GetValueOrDefault(HitResult.Ok);
             countMeh = score.Statistics.GetValueOrDefault(HitResult.Meh);
             countMiss = score.Statistics.GetValueOrDefault(HitResult.Miss);
-            effectiveMissCount = calculateEffectiveMissCount(osuAttributes);
+            countLargeTickMiss = score.Statistics.GetValueOrDefault(HitResult.LargeTickMiss);
+
+            if (!usingClassicSliderAccuracy)
+                countSliderEndsDropped = osuAttributes.SliderCount - score.Statistics.GetValueOrDefault(HitResult.SliderTailHit);
+
+            if (usingClassicSliderAccuracy)
+                effectiveMissCount = calculateEffectiveMissCount(osuAttributes);
+            else
+                effectiveMissCount = countMiss;
 
             double multiplier = PERFORMANCE_BASE_MULTIPLIER;
 
@@ -124,8 +134,11 @@
 
             if (attributes.SliderCount > 0)
             {
-                double estimateSliderEndsDropped = Math.Clamp(Math.Min(countOk + countMeh + countMiss, attributes.MaxCombo - scoreMaxCombo), 0, estimateDifficultSliders);
-                double sliderNerfFactor = (1 - attributes.SliderFactor) * Math.Pow(1 - estimateSliderEndsDropped / estimateDifficultSliders, 3) + attributes.SliderFactor;
+                double estimateSliderEndsDropped;
+                estimateSliderEndsDropped = usingClassicSliderAccuracy ? Math.Clamp(Math.Min(countOk + countMeh + countMiss, attributes.MaxCombo - scoreMaxCombo), 0, estimateDifficultSliders) : Math.Min(countSliderEndsDropped + countLargeTickMiss, estimateDifficultSliders);
+
+                double sliderNerfFactor = 0;
+                sliderNerfFactor = (1 - attributes.SliderFactor) * Math.Pow(1 - estimateSliderEndsDropped / estimateDifficultSliders, 3) + attributes.SliderFactor;
                 aimValue *= sliderNerfFactor;
             }