RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix mods not deserializing properly

This commit is contained in:
smoogipoo 2018-11-28 19:47:20 +09:00
parent 542a75d076
commit 554c858944
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Scoring/ScoreInfo.cs
View File

@ -5,7 +5,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Linq; using System.Linq;
using JetBrains.Annotations;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Database; using osu.Game.Database;
@ -39,22 +38,27 @@ public class ScoreInfo : IHasFiles<ScoreFileInfo>, IHasPrimaryKey, ISoftDelete
public RulesetInfo Ruleset { get; set; } public RulesetInfo Ruleset { get; set; }
[NotMapped] [NotMapped, JsonIgnore]
[JsonIgnore] public Mod[] Mods
public Mod[] Mods { get; set; } = { }; {
get
{
var deserialized = JsonConvert.DeserializeObject<string[]>(modsString);
return Ruleset.CreateInstance().GetAllMods().Where(mod => deserialized.Any(d => d == mod.ShortenedName)).ToArray();
}
set => modsString = JsonConvert.SerializeObject(value.Select(m => m.ShortenedName).ToArray());
}
[NotMapped, JsonIgnore]
private string modsString;
public string ModsString public string ModsString
{ {
get => JsonConvert.SerializeObject(Mods); get => modsString;
set set => modsString = value;
{
var deserialized = JsonConvert.DeserializeObject<SerializableMod[]>(value);
Mods = Ruleset.CreateInstance().GetAllMods().Where(mod => deserialized.Any(d => d.ShortenedName == mod.ShortenedName)).ToArray();
}
} }
[NotMapped] [NotMapped, JsonIgnore]
[JsonIgnore]
public User User; public User User;
public string UserString public string UserString
@ -82,15 +86,5 @@ public string UserString
public List<ScoreFileInfo> Files { get; set; } public List<ScoreFileInfo> Files { get; set; }
public bool DeletePending { get; set; } public bool DeletePending { get; set; }
[UsedImplicitly]
private class SerializableMod : Mod
{
public override string Name => ShortenedName;
public override string ShortenedName { get; } = string.Empty;
public override double ScoreMultiplier => 0;
}
} }
} }