From 0f9ff32cdc8ee2528024e2c8a3dbf545af5916d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Dec 2019 18:51:22 +0900
Subject: [PATCH] Fix beat playing while paused

---
 osu.Game/Graphics/Containers/BeatSyncedContainer.cs | 8 ++++++++
 osu.Game/Rulesets/Mods/ModNightcore.cs              | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index 2e76ab964f..1374b34aca 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Graphics.Containers
         private EffectControlPoint defaultEffect;
         private TrackAmplitudes defaultAmplitudes;
 
+        protected bool IsBeatSyncedWithTrack { get; private set; }
+
         protected override void Update()
         {
             Track track = null;
@@ -65,10 +67,16 @@ namespace osu.Game.Graphics.Containers
                 effectPoint = beatmap.ControlPointInfo.EffectPointAt(currentTrackTime);
 
                 if (timingPoint.BeatLength == 0)
+                {
+                    IsBeatSyncedWithTrack = false;
                     return;
+                }
+
+                IsBeatSyncedWithTrack = true;
             }
             else
             {
+                IsBeatSyncedWithTrack = false;
                 currentTrackTime = Clock.CurrentTime;
                 timingPoint = defaultTiming;
                 effectPoint = defaultEffect;
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 1c46b82f79..f1f25f70e6 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -75,7 +75,13 @@ namespace osu.Game.Rulesets.Mods
             {
                 base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
-                if (beatIndex < firstBeat || !firstBeat.HasValue)
+                if (!IsBeatSyncedWithTrack)
+                {
+                    firstBeat = null;
+                    return;
+                }
+
+                if (!firstBeat.HasValue || beatIndex < firstBeat)
                     firstBeat = Math.Max(0, (beatIndex / 16 + 1) * 16);
 
                 if (beatIndex > firstBeat)