Apply review feedback

ppy · Jul 17, 2018 · 9f93318 · 9f93318
1 parent 825941a
commit 9f93318
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -49,8 +49,8 @@ protected override DifficultyAttributes Calculate(IBeatmap beatmap, Mod[] mods,
                 switch (hitObject)
                 {
                     // We want to only consider fruits that contribute to the combo. Droplets are addressed as accuracy and spinners are not relevant for "skill" calculations.
-                    case Fruit _:
-                        difficultyHitObjects.Add(new CatchDifficultyHitObject((CatchHitObject)hitObject, halfCatchWidth));
+                    case Fruit fruit:
+                        difficultyHitObjects.Add(new CatchDifficultyHitObject(fruit, halfCatchWidth));
                         break;
                     case JuiceStream _:
                         difficultyHitObjects.AddRange(hitObject.NestedHitObjects.OfType<CatchHitObject>().Where(o => !(o is TinyDroplet)).Select(o => new CatchDifficultyHitObject(o, halfCatchWidth)));

diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -87,8 +87,8 @@ protected override void SimulateAutoplay(Beatmap<TaikoHitObject> beatmap)
                         if (obj.IsStrong)
                             AddJudgement(new TaikoStrongHitJudgement());
                         break;
-                    case DrumRoll _:
-                        for (int i = 0; i < ((DrumRoll)obj).NestedHitObjects.OfType<DrumRollTick>().Count(); i++)
+                    case DrumRoll drumRoll:
+                        for (int i = 0; i < drumRoll.NestedHitObjects.OfType<DrumRollTick>().Count(); i++)
                         {
                             AddJudgement(new TaikoDrumRollTickJudgement { Result = HitResult.Great });
 

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -71,11 +71,11 @@ IEnumerable<Mod> createDifficultyAdjustmentModCombinations(IEnumerable<Mod> curr
                     case 1:
                         yield return currentSet.Single();
                         break;
+                    default:
+                        yield return new MultiMod(currentSet.ToArray());
+                        break;
                 }
 
-                if (currentSetCount > 1)
-                    yield return new MultiMod(currentSet.ToArray());
-
                 // Apply mods in the adjustment set recursively. Using the entire adjustment set would result in duplicate multi-mod mod
                 // combinations in further recursions, so a moving subset is used to eliminate this effect
                 for (int i = adjustmentSetStart; i < adjustmentSet.Length; i++)