mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 13:22:55 +08:00
use base.GetFileContents to get file stream
This commit is contained in:
parent
395dd23966
commit
63dd8bd991
@ -8,7 +8,6 @@ using System.Text;
|
|||||||
using osu.Framework.Platform;
|
using osu.Framework.Platform;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
using osu.Game.Beatmaps.Formats;
|
using osu.Game.Beatmaps.Formats;
|
||||||
using osu.Game.Extensions;
|
|
||||||
using osu.Game.IO;
|
using osu.Game.IO;
|
||||||
using osu.Game.Rulesets.Objects;
|
using osu.Game.Rulesets.Objects;
|
||||||
using osu.Game.Rulesets.Objects.Types;
|
using osu.Game.Rulesets.Objects.Types;
|
||||||
@ -36,7 +35,7 @@ namespace osu.Game.Database
|
|||||||
return base.GetFileContents(model, file);
|
return base.GetFileContents(model, file);
|
||||||
|
|
||||||
// Read the beatmap contents and skin
|
// Read the beatmap contents and skin
|
||||||
using var contentStream = UserFileStorage.GetStream(file.File.GetStoragePath());
|
using var contentStream = base.GetFileContents(model, file);
|
||||||
|
|
||||||
if (contentStream == null)
|
if (contentStream == null)
|
||||||
return null;
|
return null;
|
||||||
@ -44,7 +43,7 @@ namespace osu.Game.Database
|
|||||||
using var contentStreamReader = new LineBufferedReader(contentStream);
|
using var contentStreamReader = new LineBufferedReader(contentStream);
|
||||||
var beatmapContent = new LegacyBeatmapDecoder().Decode(contentStreamReader);
|
var beatmapContent = new LegacyBeatmapDecoder().Decode(contentStreamReader);
|
||||||
|
|
||||||
using var skinStream = UserFileStorage.GetStream(file.File.GetStoragePath());
|
using var skinStream = base.GetFileContents(model, file);
|
||||||
using var skinStreamReader = new LineBufferedReader(contentStream);
|
using var skinStreamReader = new LineBufferedReader(contentStream);
|
||||||
var beatmapSkin = new LegacySkin(new SkinInfo(), null!)
|
var beatmapSkin = new LegacySkin(new SkinInfo(), null!)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user