From 6c09237956c6535c54c37ef4ee2877af3cd0f10a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Mar 2022 19:57:09 +0900
Subject: [PATCH] Reorder fields in `BeatmapOffsetControl` and
 `MasterGameplayClockContainer`

---
 .../Play/MasterGameplayClockContainer.cs      | 16 +++++++-------
 .../PlayerSettings/BeatmapOffsetControl.cs    | 22 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index c7c967abfd..2b6db5f59e 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -61,6 +61,14 @@ namespace osu.Game.Screens.Play
         private Bindable<double> userAudioOffset;
         private double startOffset;
 
+        private IDisposable beatmapOffsetSubscription;
+
+        [Resolved]
+        private RealmAccess realm { get; set; }
+
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
             : base(beatmap.Track)
         {
@@ -71,14 +79,6 @@ namespace osu.Game.Screens.Play
             firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
         }
 
-        [Resolved]
-        private RealmAccess realm { get; set; }
-
-        [Resolved]
-        private OsuConfigManager config { get; set; }
-
-        private IDisposable beatmapOffsetSubscription;
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 1cd89f691e..02359afd16 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -44,6 +44,17 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         private readonly FillFlowContainer referenceScoreContainer;
 
+        private IDisposable beatmapOffsetSubscription;
+
+        [Resolved]
+        private RealmAccess realm { get; set; }
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         public BeatmapOffsetControl()
         {
             RelativeSizeAxes = Axes.X;
@@ -74,17 +85,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
             };
         }
 
-        [Resolved]
-        private RealmAccess realm { get; set; }
-
-        [Resolved]
-        private IBindable<WorkingBeatmap> beatmap { get; set; }
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        private IDisposable beatmapOffsetSubscription;
-
         protected override void LoadComplete()
         {
             base.LoadComplete();