From 36529bdd1b103ea5c5284b70e1cfbf30eec19f2b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:25:09 +0900
Subject: [PATCH] Use OriginalX for CatchHitObject.X instead of EffectiveX

And explicitly implement IHasXPosition interface to prevent use of the X property.
It should be preferred for beatmap conversion purpose.
---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index d40821c840..6a040efb91 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -31,14 +30,11 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => OriginalXBindable.Value = value;
         }
 
-        /// <summary>
-        /// The horizontal position of the fruit between 0 and <see cref="CatchPlayfield.WIDTH"/>.
-        /// </summary>
+        float IHasXPosition.X => OriginalX;
+
         public float X
         {
-            [Obsolete("Use EffectiveX instead")]
-            get => EffectiveX;
-            set => OriginalXBindable.Value = value;
+            set => OriginalX = value;
         }
 
         public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();