From 2c45a327bb20713d74368f79a0500a07de860ee0 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Mon, 15 Nov 2021 19:54:35 +0900 Subject: [PATCH] Remove JsonIgnores, require opt-in properties --- osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs | 4 ---- osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs index 88f26db93c..7673d08440 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs @@ -30,16 +30,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty [JsonProperty("overall_difficulty")] public double OverallDifficulty { get; set; } - [JsonIgnore] public double DrainRate { get; set; } - [JsonIgnore] public int HitCircleCount { get; set; } - [JsonIgnore] public int SliderCount { get; set; } - [JsonIgnore] public int SpinnerCount { get; set; } public override IEnumerable<(int attributeId, object value)> ToDatabaseAttributes() diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs index e25a8476f0..cc9d111aa2 100644 --- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs +++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs @@ -9,12 +9,11 @@ using osu.Game.Rulesets.Mods; namespace osu.Game.Rulesets.Difficulty { + [JsonObject(MemberSerialization.OptIn)] public class DifficultyAttributes { - [JsonIgnore] public Mod[] Mods { get; set; } - [JsonIgnore] public Skill[] Skills { get; set; } [JsonProperty("star_rating", Order = -3)]