From a0627bbc879a21eba5e9a1d3a9f72b1ffc645501 Mon Sep 17 00:00:00 2001
From: js6pak <kubastaron@hotmail.com>
Date: Sun, 28 Mar 2021 20:46:31 +0200
Subject: [PATCH] Always hook control with playerInfo

---
 src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs | 1 -
 src/Impostor.Server/Net/State/Game.Data.cs             | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
index aa617bc..011af37 100644
--- 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 90bf765..250c307 100644
--- 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));
-- 
2.39.5