sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make room duration/endsat nullable

Browse Source
This commit is contained in:
smoogipoo
2020-12-21 16:18:39 +09:00
parent c37840b37c
commit a59124dd93
6 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Online/Multiplayer/Room.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Online.Multiplayer
[Cached]
[JsonIgnore]
public readonly Bindable<TimeSpan> Duration = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30));
public readonly Bindable<TimeSpan?> Duration = new Bindable<TimeSpan?>();
[Cached]
[JsonIgnore]
@ -78,16 +78,22 @@ namespace osu.Game.Online.Multiplayer
}
[JsonProperty("duration")]
private int duration
private int? duration
{
get => (int)Duration.Value.TotalMinutes;
set => Duration.Value = TimeSpan.FromMinutes(value);
get => (int?)Duration.Value?.TotalMinutes;
set
{
if (value == null)
Duration.Value = null;
else
Duration.Value = TimeSpan.FromMinutes(value.Value);
}
}
// Only supports retrieval for now
[Cached]
[JsonProperty("ends_at")]
public readonly Bindable<DateTimeOffset> EndDate = new Bindable<DateTimeOffset>();
public readonly Bindable<DateTimeOffset?> EndDate = new Bindable<DateTimeOffset?>();
// Todo: Find a better way to do this (https://github.com/ppy/osu-framework/issues/1930)
[JsonProperty("max_attempts", DefaultValueHandling = DefaultValueHandling.Ignore)]