From c17e47026623afde64aaf11b8334b5ebcd221696 Mon Sep 17 00:00:00 2001
From: Fire937 <atoli.huppe@gmail.com>
Date: Fri, 10 Apr 2020 00:01:35 +0200
Subject: [PATCH] Fix PositionalSound calculation implementation

The position used to calculate the stereo balance is now the position of
the drawable (as opposed to the position specified in the beatmap file
previously).
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ed9efba89f..30a9106ddc 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The stereo balance of the samples played if <i>Positional hitsounds</i> is set.
         /// </summary>
-        protected virtual float PositionalSound => (HitObject is IHasXPosition position) ? (position.X / 512f - 0.5f) * 0.8f : 0;
+        protected virtual float PositionalSound => (Position.X / 512f - 0.5f) * 0.8f;
 
         private BindableList<HitSampleInfo> samplesBindable;
         private Bindable<double> startTimeBindable;
@@ -114,7 +114,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected DrawableHitObject([NotNull] HitObject hitObject)
         {
             HitObject = hitObject ?? throw new ArgumentNullException(nameof(hitObject));
-            positionalSoundAdjustment.Value = PositionalSound;
         }
 
         [BackgroundDependencyLoader]
@@ -377,7 +376,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Plays all the hit sounds for this <see cref="DrawableHitObject"/>.
         /// This is invoked automatically when this <see cref="DrawableHitObject"/> is hit.
         /// </summary>
-        public virtual void PlaySamples() => Samples?.Play();
+        public virtual void PlaySamples()
+        {
+            positionalSoundAdjustment.Value = PositionalSound;
+            Samples?.Play();
+        }
 
         protected override void Update()
         {