From e3ad226075f96422f8bdb6989e9044a7bb0378d5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Dec 2018 16:11:00 +0900
Subject: [PATCH] Use the local beatmap if existing, fixing player not loading
 objects

---
 osu.Game/Screens/Multi/Match/MatchScreen.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Match/MatchScreen.cs b/osu.Game/Screens/Multi/Match/MatchScreen.cs
index dba9c8c14e..00e63c11f3 100644
--- a/osu.Game/Screens/Multi/Match/MatchScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchScreen.cs
@@ -141,7 +141,9 @@ namespace osu.Game.Screens.Multi.Match
             info.Mods.Value = item.RequiredMods;
 
             // Todo: item.Beatmap can be null here...
-            Beatmap.Value = beatmapManager.GetWorkingBeatmap(item.Beatmap);
+            var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == item.BeatmapID) ?? item.Beatmap;
+
+            Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
         private void onStart()