Mark the game as started only after all players get their role

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
index e02f9986c28091daf4c35504940c1140bc083a2a..b25f24456416822a53e743e91f4903d839f98a42 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
@@ -353,7 +353,7 @@ namespace Impostor.Server.Net.Inner.Objects
                     Rpc44SetRole.Deserialize(reader, out var role);
                     PlayerInfo.RoleType = role;
 
-                    if (Game.GameState == GameStates.Starting)
+                    if (Game.GameState == GameStates.Starting && Game.Players.All(clientPlayer => clientPlayer.Character?.PlayerInfo.RoleType != null))
                     {
                         await Game.StartedAsync();
                     }

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs
index 02a079a18379306af3e0a77bad02cb24f151dd5a..751dd2794667b6851dc0e31333c679e2556deb9b 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs
@@ -30,7 +30,7 @@ namespace Impostor.Server.Net.Inner.Objects
 
         public PlayerOutfit CurrentOutfit => Outfits[CurrentOutfitType];
 
-        public RoleTypes RoleType { get; internal set; }
+        public RoleTypes? RoleType { get; internal set; }
 
         public bool Disconnected { get; internal set; }