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

Merge remote-tracking branch 'ppy/master' into leaderboard-mod-filter

Browse Source
This commit is contained in:
naoey
2019-07-05 08:38:33 +05:30
parent f04adb7192 0ec01f7b0f
commit 98a242cc37
25 changed files with 180 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Online/API/Requests/GetScoresRequest.cs
View File

@ -38,7 +38,10 @@ namespace osu.Game.Online.API.Requests
private void onSuccess(APILegacyScores r)
{
foreach (APILegacyScoreInfo score in r.Scores)
{
score.Beatmap = beatmap;
score.Ruleset = ruleset;
}
}
protected override string Target => $@"beatmaps/{beatmap.OnlineBeatmapID}/scores{createQueryParameters()}";

11
osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
View File

@ -116,17 +116,6 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty(@"mods")]
private string[] modStrings { get; set; }
public override BeatmapInfo Beatmap
{
get => base.Beatmap;
set
{
base.Beatmap = value;
if (Beatmap.Ruleset != null)
Ruleset = value.Ruleset;
}
}
public override RulesetInfo Ruleset
{
get => base.Ruleset;

6
osu.Game/Online/Leaderboards/Leaderboard.cs
View File

@ -231,12 +231,6 @@ namespace osu.Game.Online.Leaderboards
if (getScoresRequest == null)
return;
if (api?.IsLoggedIn != true)
{
PlaceholderState = PlaceholderState.NotLoggedIn;
return;
}
getScoresRequest.Failure += e => Schedule(() =>
{
if (e is OperationCanceledException)