From 5aa284781eef3baab0c28e54f26c8a1f9ba0f993 Mon Sep 17 00:00:00 2001
From: RORIdev <t3ctotalmenterandom1@outlook.com>
Date: Wed, 3 Apr 2019 19:20:20 -0300
Subject: [PATCH] Reverted back Player.cs changes.

---
 osu.Game/Rulesets/Mods/ModEasy.cs | 5 +++--
 osu.Game/Screens/Play/Player.cs   | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModEasy.cs b/osu.Game/Rulesets/Mods/ModEasy.cs
index c0f75b7c83..16f54d0743 100644
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mods
 {
     public abstract class ModEasy : Mod, IApplicableToDifficulty, IApplicableToScoreProcessor
     {
-        public static int Lives = 2;
+        public int Lives = 2;
         public override string Name => "Easy";
         public override string Acronym => "EZ";
         public override IconUsage Icon => OsuIcon.ModEasy;
@@ -31,7 +31,8 @@ public void ApplyToDifficulty(BeatmapDifficulty difficulty)
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
-            scoreProcessor.Health.ValueChanged += valueChanged =>{
+            scoreProcessor.Health.ValueChanged += valueChanged =>
+            {
                 if (scoreProcessor.Health.Value == 0)
                 {
                     if (Lives != 0)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 68f8fd38d3..0eebefec86 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -51,8 +51,6 @@ public class Player : ScreenWithBeatmapBackground
 
         public int RestartCount;
 
-        public int Lives = 2;
-
         [Resolved]
         private ScoreManager scoreManager { get; set; }
 
@@ -329,13 +327,17 @@ private bool onFail()
         {
             if (Beatmap.Value.Mods.Value.OfType<IApplicableFailOverride>().Any(m => !m.AllowFail))
                 return false;
+
             GameplayClockContainer.Stop();
+
             HasFailed = true;
+
             // There is a chance that we could be in a paused state as the ruleset's internal clock (see FrameStabilityContainer)
             // could process an extra frame after the GameplayClock is stopped.
             // In such cases we want the fail state to precede a user triggered pause.
             if (PauseOverlay.State == Visibility.Visible)
                 PauseOverlay.Hide();
+
             FailOverlay.Retries = RestartCount;
             FailOverlay.Show();
             return true;