From a8b405791a76c320dfd397ac7be261dac07f2c7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Sep 2020 17:08:22 +0900
Subject: [PATCH] Fix non-convert slider and spinner serialization

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs           | 9 +++++++--
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs | 2 ++
 osu.Game/Rulesets/Objects/PathControlPoint.cs     | 3 +++
 osu.Game/Rulesets/Objects/Types/IHasDuration.cs   | 3 ---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 705e88040f..51f6a44a87 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using System.Linq;
 using System.Threading;
+using Newtonsoft.Json;
 using osu.Framework.Caching;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -21,6 +22,7 @@ namespace osu.Game.Rulesets.Osu.Objects
     {
         public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
 
+        [JsonIgnore]
         public double Duration
         {
             get => EndTime - StartTime;
@@ -112,8 +114,11 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public double TickDistanceMultiplier = 1;
 
-        public HitCircle HeadCircle;
-        public SliderTailCircle TailCircle;
+        [JsonIgnore]
+        public HitCircle HeadCircle { get; protected set; }
+
+        [JsonIgnore]
+        public SliderTailCircle TailCircle { get; protected set; }
 
         public Slider()
         {
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index c522dc623c..36b421586e 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -29,6 +30,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         public List<IList<HitSampleInfo>> NodeSamples { get; set; }
         public int RepeatCount { get; set; }
 
+        [JsonIgnore]
         public double Duration
         {
             get => this.SpanCount() * Distance / Velocity;
diff --git a/osu.Game/Rulesets/Objects/PathControlPoint.cs b/osu.Game/Rulesets/Objects/PathControlPoint.cs
index 0336f94313..f11917f4f4 100644
--- a/osu.Game/Rulesets/Objects/PathControlPoint.cs
+++ b/osu.Game/Rulesets/Objects/PathControlPoint.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -13,12 +14,14 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// The position of this <see cref="PathControlPoint"/>.
         /// </summary>
+        [JsonProperty]
         public readonly Bindable<Vector2> Position = new Bindable<Vector2>();
 
         /// <summary>
         /// The type of path segment starting at this <see cref="PathControlPoint"/>.
         /// If null, this <see cref="PathControlPoint"/> will be a part of the previous path segment.
         /// </summary>
+        [JsonProperty]
         public readonly Bindable<PathType?> Type = new Bindable<PathType?>();
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
index 185fd5977b..b558273650 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
@@ -1,8 +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 Newtonsoft.Json;
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
@@ -28,7 +26,6 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The duration of the HitObject.
         /// </summary>
-        [JsonIgnore]
         new double Duration { get; set; }
     }
 }