From 152e9ecccf0f6150236d70a0d90f6d3a721e87aa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 18:34:11 +0300
Subject: [PATCH] Make `BeatmapAvailability` class in-line with other online
 data structures

---
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs | 2 +-
 osu.Game/Online/Rooms/BeatmapAvailability.cs       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 92c92f438d..f515b574df 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// The availability state of the beatmap, set to <see cref="DownloadState.LocallyAvailable"/> by default.
         /// </summary>
-        public BeatmapAvailability BeatmapAvailability { get; set; } = new BeatmapAvailability(DownloadState.LocallyAvailable);
+        public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
         public User? User { get; set; }
 
diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index ca53cb2295..04dcd2a84a 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Online.Rooms
     /// <summary>
     /// The local availability information about a certain beatmap for the client.
     /// </summary>
-    public readonly struct BeatmapAvailability : IEquatable<BeatmapAvailability>
+    public class BeatmapAvailability : IEquatable<BeatmapAvailability>
     {
         /// <summary>
         /// The beatmap's availability state.
@@ -49,7 +49,7 @@ namespace osu.Game.Online.Rooms
             DownloadProgress = downloadProgress;
         }
 
-        public bool Equals(BeatmapAvailability other) => State == other.State && DownloadProgress == other.DownloadProgress;
+        public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;
 
         public override string ToString() => $"{string.Join(", ", State, $"{DownloadProgress:0.00%}")}";
     }