Merge branch 'master' into beatmap-collection-inteface-types

This commit is contained in:
Dean Herbert
2021-11-12 19:41:29 +09:00
62 changed files with 176 additions and 154 deletions

View File

@ -16,12 +16,13 @@ namespace osu.Game.Beatmaps
{
public int ID { get; set; }
private int? onlineBeatmapSetID;
private int? onlineID;
public int? OnlineBeatmapSetID
[Column("OnlineBeatmapSetID")]
public int? OnlineID
{
get => onlineBeatmapSetID;
set => onlineBeatmapSetID = value > 0 ? value : null;
get => onlineID;
set => onlineID = value > 0 ? value : null;
}
public DateTimeOffset DateAdded { get; set; }
@ -93,7 +94,7 @@ namespace osu.Game.Beatmaps
#region Implementation of IHasOnlineID
public int OnlineID => OnlineBeatmapSetID ?? -1;
int IHasOnlineID<int>.OnlineID => OnlineID ?? -1;
#endregion