From 0609fcf7d4a2a06af0b04d91a6432aebe3008494 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Feb 2019 15:52:53 +0900
Subject: [PATCH 1/4] Fix TestCaseMultiScreen intermittent failures

---
 osu.Game.Tests/Visual/TestCaseMultiScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs
index fc4037f58b..8faaefb0bd 100644
--- a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs
+++ b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual
             Multiplayer multi = new Multiplayer();
 
             AddStep(@"show", () => LoadScreen(multi));
-            AddWaitStep(5);
+            AddUntilStep(() => multi.IsCurrentScreen(), "wait until current");
             AddStep(@"exit", multi.Exit);
         }
     }

From 618455f7ba3496591bc8ea2e8859e7ae74de3328 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Feb 2019 16:47:59 +0900
Subject: [PATCH 2/4] Remove exit step (needs login to show properly)

---
 osu.Game.Tests/Visual/TestCaseMultiScreen.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs
index 8faaefb0bd..ff95d5836d 100644
--- a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs
+++ b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Tests.Visual
             Multiplayer multi = new Multiplayer();
 
             AddStep(@"show", () => LoadScreen(multi));
-            AddUntilStep(() => multi.IsCurrentScreen(), "wait until current");
-            AddStep(@"exit", multi.Exit);
         }
     }
 }

From 4504aee089f3a2dd6400ef98aaf3d8705196a353 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Feb 2019 16:50:56 +0900
Subject: [PATCH 3/4] Unnecessary using

---
 osu.Game.Tests/Visual/TestCaseMultiScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs
index ff95d5836d..804e3c5b1f 100644
--- a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs
+++ b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using osu.Framework.Screens;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;

From ca8b7f24b46f69c92478408f42a9a549a86d0e2c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 19 Feb 2019 17:36:33 +0900
Subject: [PATCH 4/4] Remove PopulateAttributes()

---
 .../Difficulty/DifficultyCalculator.cs        | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index ecfca9c589..c6e54c52e7 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -25,14 +25,12 @@ namespace osu.Game.Rulesets.Difficulty
 
         protected override DifficultyAttributes Calculate(IBeatmap beatmap, Mod[] mods, double clockRate)
         {
-            var attributes = CreateDifficultyAttributes();
-            attributes.Mods = mods;
+            var skills = CreateSkills();
 
             if (!beatmap.HitObjects.Any())
-                return attributes;
+                return CreateDifficultyAttributes(beatmap, mods, skills, clockRate);
 
             var difficultyHitObjects = CreateDifficultyHitObjects(beatmap, clockRate).OrderBy(h => h.BaseObject.StartTime).ToList();
-            var skills = CreateSkills();
 
             double sectionLength = SectionLength * clockRate;
 
@@ -60,9 +58,7 @@ namespace osu.Game.Rulesets.Difficulty
             foreach (Skill s in skills)
                 s.SaveCurrentPeak();
 
-            PopulateAttributes(attributes, beatmap, skills, clockRate);
-
-            return attributes;
+            return CreateDifficultyAttributes(beatmap, mods, skills, clockRate);
         }
 
         /// <summary>
@@ -108,13 +104,13 @@ namespace osu.Game.Rulesets.Difficulty
         protected virtual Mod[] DifficultyAdjustmentMods => Array.Empty<Mod>();
 
         /// <summary>
-        /// Populates <see cref="DifficultyAttributes"/> after difficulty has been processed.
+        /// Creates <see cref="DifficultyAttributes"/> to describe beatmap's calculated difficulty.
         /// </summary>
-        /// <param name="attributes">The <see cref="DifficultyAttributes"/> to populate with information about the difficulty of <paramref name="beatmap"/>.</param>
         /// <param name="beatmap">The <see cref="IBeatmap"/> whose difficulty was processed.</param>
+        /// <param name="mods">The <see cref="Mod"/>s that were applied during the process.</param>
         /// <param name="skills">The skills which processed the difficulty.</param>
         /// <param name="clockRate">The rate at which the gameplay clock is run at.</param>
-        protected abstract void PopulateAttributes(DifficultyAttributes attributes, IBeatmap beatmap, Skill[] skills, double clockRate);
+        protected abstract DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate);
 
         /// <summary>
         /// Enumerates <see cref="DifficultyHitObject"/>s to be processed from <see cref="HitObject"/>s in the <see cref="IBeatmap"/>.
@@ -129,11 +125,5 @@ namespace osu.Game.Rulesets.Difficulty
         /// </summary>
         /// <returns>The <see cref="Skill"/>s.</returns>
         protected abstract Skill[] CreateSkills();
-
-        /// <summary>
-        /// Creates an empty <see cref="DifficultyAttributes"/>.
-        /// </summary>
-        /// <returns>The empty <see cref="DifficultyAttributes"/>.</returns>
-        protected abstract DifficultyAttributes CreateDifficultyAttributes();
     }
 }