From 4cf2c6188d3ecfd8b4e44a601941215cc78d9f82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jul 2021 19:37:47 +0900
Subject: [PATCH] Add union attributes for derived class deserialisation

---
 osu.Game/Online/Multiplayer/MatchRulesetRoomState.cs          | 4 +++-
 osu.Game/Online/Multiplayer/MatchRulesetUserState.cs          | 4 +++-
 .../Multiplayer/MatchRulesets/TeamVs/TeamVsMatchRoomState.cs  | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MatchRulesetRoomState.cs b/osu.Game/Online/Multiplayer/MatchRulesetRoomState.cs
index be8e54d341..773c9a55e8 100644
--- a/osu.Game/Online/Multiplayer/MatchRulesetRoomState.cs
+++ b/osu.Game/Online/Multiplayer/MatchRulesetRoomState.cs
@@ -3,6 +3,7 @@
 
 using System;
 using MessagePack;
+using osu.Game.Online.Multiplayer.MatchRulesets.TeamVs;
 
 #nullable enable
 
@@ -14,7 +15,8 @@ namespace osu.Game.Online.Multiplayer
     /// </summary>
     [Serializable]
     [MessagePackObject]
-    public class MatchRulesetRoomState
+    [Union(0, typeof(TeamVsMatchRoomState))]
+    public abstract class MatchRulesetRoomState
     {
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MatchRulesetUserState.cs b/osu.Game/Online/Multiplayer/MatchRulesetUserState.cs
index 6fa0024c3d..36eae2447e 100644
--- a/osu.Game/Online/Multiplayer/MatchRulesetUserState.cs
+++ b/osu.Game/Online/Multiplayer/MatchRulesetUserState.cs
@@ -3,6 +3,7 @@
 
 using System;
 using MessagePack;
+using osu.Game.Online.Multiplayer.MatchRulesets.TeamVs;
 
 #nullable enable
 
@@ -14,7 +15,8 @@ namespace osu.Game.Online.Multiplayer
     /// </summary>
     [Serializable]
     [MessagePackObject]
-    public class MatchRulesetUserState
+    [Union(0, typeof(TeamVsMatchUserState))]
+    public abstract class MatchRulesetUserState
     {
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MatchRulesets/TeamVs/TeamVsMatchRoomState.cs b/osu.Game/Online/Multiplayer/MatchRulesets/TeamVs/TeamVsMatchRoomState.cs
index 57aae6e534..338b9c965d 100644
--- a/osu.Game/Online/Multiplayer/MatchRulesets/TeamVs/TeamVsMatchRoomState.cs
+++ b/osu.Game/Online/Multiplayer/MatchRulesets/TeamVs/TeamVsMatchRoomState.cs
@@ -8,6 +8,7 @@ using MessagePack;
 
 namespace osu.Game.Online.Multiplayer.MatchRulesets.TeamVs
 {
+    [MessagePackObject]
     public class TeamVsMatchRoomState : MatchRulesetRoomState
     {
         [Key(0)]