Apply various inspections

ppy · Nov 12, 2023 · a04f9aa · a04f9aa
1 parent 4df1eb1
commit a04f9aa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -238,12 +238,12 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+            double preempt = adjustedDifficulty.ApproachRate < 6 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
 
             preempt /= rate;
             adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
 
-            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+            return adjustedDifficulty;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -334,17 +334,15 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            double preempt = adjustedDifficulty.ApproachRate < 5 ?
-                (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) :
-                (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+            double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
             preempt /= rate;
             adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
 
             double hitwindow = 80.0 - 6 * adjustedDifficulty.OverallDifficulty;
             hitwindow /= rate;
             adjustedDifficulty.OverallDifficulty = (float)(80.0 - hitwindow) / 6;
 
-            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+            return adjustedDifficulty;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -273,7 +273,7 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
             hitwindow /= rate;
             adjustedDifficulty.OverallDifficulty = (float)(5 * (35 - hitwindow) / 15 + 5);
 
-            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+            return adjustedDifficulty;
         }
     }
 }