h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 14:07:24 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into cinema-mod

Browse Source
This commit is contained in:
Albie 2019-11-23 18:38:41 +00:00 committed by GitHub
commit aa00909ef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -202,7 +202,8 @@ namespace osu.Game.Tournament
{
foreach (var p in t.Players)
{
PopulateUser(p);
if (p.Username == null || p.Statistics == null)
PopulateUser(p);
addedInfo = true;
}
}
@ -243,7 +244,6 @@ namespace osu.Game.Tournament
{
user.Username = res.Username;
user.Statistics = res.Statistics;
user.Username = res.Username;
user.Country = res.Country;
user.Cover = res.Cover;

2
osu.Game/Online/API/Requests/GetBeatmapRequest.cs
View File

@ -15,6 +15,6 @@ namespace osu.Game.Online.API.Requests
this.beatmap = beatmap;
}
protected override string Target => $@"beatmaps/lookup?id={beatmap.OnlineBeatmapID}&checksum={beatmap.MD5Hash}&filename={System.Uri.EscapeUriString(beatmap.Path)}";
protected override string Target => $@"beatmaps/lookup?id={beatmap.OnlineBeatmapID}&checksum={beatmap.MD5Hash}&filename={System.Uri.EscapeUriString(beatmap.Path ?? string.Empty)}";
}
}

2
osu.iOS.props
View File

@ -86,6 +86,6 @@
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="SharpRaven" Version="2.4.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
<PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.1112.0" ExcludeAssets="all" />
<PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.1104.0" ExcludeAssets="all" />
</ItemGroup>
</Project>