Always hook control with playerInfo

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
index aa617bc3a39365d140904c23bf14b2d6d74bf564..011af37b0aabed70ed67c5f6818463dc1a97b7b9 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
@@ -138,7 +138,6 @@ namespace Impostor.Server.Net.Inner.Objects
 
             if (_allPlayers.TryAdd(playerId, playerInfo))
             {
-                control.PlayerInfo = playerInfo;
                 return playerInfo;
             }
 

diff --git a/src/Impostor.Server/Net/State/Game.Data.cs b/src/Impostor.Server/Net/State/Game.Data.cs
index 90bf765f5405a3e36094b74a0d7a6256bdbfe8a1..250c3078d81f5b6d28f2983810d6cf716df0addf 100644 (file)
--- a/src/Impostor.Server/Net/State/Game.Data.cs
+++ b/src/Impostor.Server/Net/State/Game.Data.cs
@@ -333,7 +333,8 @@ namespace Impostor.Server.Net.State
 
                     if (playerInfo != null)
                     {
-                        control.PlayerInfo.Controller = control;
+                        playerInfo.Controller = control;
+                        control.PlayerInfo = playerInfo;
                     }
 
                     await _eventManager.CallAsync(new PlayerSpawnedEvent(this, player, control));