From 970a9ae0748d8d6f99fd6035c5f96673702665a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Dec 2021 17:22:24 +0900
Subject: [PATCH 1/2] Add update thread asserts to `RoomManager` methods

---
 osu.Game/Screens/OnlinePlay/Components/RoomManager.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index 02565c6ebe..6979b5bc30 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -7,11 +7,13 @@ using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Development;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
@@ -107,6 +109,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
         public void AddOrUpdateRoom(Room room)
         {
+            Debug.Assert(ThreadSafety.IsUpdateThread);
             Debug.Assert(room.RoomID.Value != null);
 
             if (ignoredRooms.Contains(room.RoomID.Value.Value))
@@ -136,12 +139,16 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
         public void RemoveRoom(Room room)
         {
+            Debug.Assert(ThreadSafety.IsUpdateThread);
+
             rooms.Remove(room);
             notifyRoomsUpdated();
         }
 
         public void ClearRooms()
         {
+            Debug.Assert(ThreadSafety.IsUpdateThread);
+
             rooms.Clear();
             notifyRoomsUpdated();
         }

From e98060ac37571471fa1477bd0038b64d219525db Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 10 Dec 2021 17:55:18 +0900
Subject: [PATCH 2/2] Remove unused using

---
 osu.Game/Screens/OnlinePlay/Components/RoomManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index 6979b5bc30..238aa4059d 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -13,7 +13,6 @@ using osu.Framework.Logging;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Utils;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {