Simplify AddPlayerForConnection (#62)

* Simplify AddPlayerForConnection BREAKING CHANGE: AddPlayerForConnection no longer receives the client * fix compilatio errors * fix build errors
MirageNet · Feb 12, 2020 · fb26755 · fb26755
1 parent 7436164
commit fb26755
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/Assets/Mirror/Components/NetworkRoomManager.cs b/Assets/Mirror/Components/NetworkRoomManager.cs
@@ -280,7 +280,7 @@ public override void OnServerAddPlayer(NetworkConnection conn)
                 if (newRoomGameObject == null)
                     newRoomGameObject = Instantiate(roomPlayerPrefab.gameObject, Vector3.zero, Quaternion.identity);
 
-                server.AddPlayerForConnection(conn, client, newRoomGameObject);
+                server.AddPlayerForConnection(conn, newRoomGameObject);
             }
             else
                 OnRoomServerAddPlayer(conn);

diff --git a/Assets/Mirror/Examples/Chat/Scripts/ChatNetworkManager.cs b/Assets/Mirror/Examples/Chat/Scripts/ChatNetworkManager.cs
@@ -40,7 +40,7 @@ private void OnCreatePlayer(NetworkConnection connection, CreatePlayerMessage cr
             playergo.GetComponent<Player>().playerName = createPlayerMessage.name;
 
             // set it as the player
-            server.AddPlayerForConnection(connection, client, playergo);
+            server.AddPlayerForConnection(connection, playergo);
 
             chatWindow.gameObject.SetActive(true);
         }

diff --git a/Assets/Mirror/Examples/Pong/Scripts/NetworkManagerPong.cs b/Assets/Mirror/Examples/Pong/Scripts/NetworkManagerPong.cs
@@ -17,7 +17,7 @@ public override void OnServerAddPlayer(NetworkConnection conn)
             // add player at correct spawn position
             Transform start = numPlayers == 0 ? leftRacketSpawn : rightRacketSpawn;
             GameObject player = Instantiate(playerPrefab, start.position, start.rotation);
-            server.AddPlayerForConnection(conn, client, player);
+            server.AddPlayerForConnection(conn, player);
 
             // spawn ball if two players
             if (numPlayers == 2)

diff --git a/Assets/Mirror/Runtime/NetworkManager.cs b/Assets/Mirror/Runtime/NetworkManager.cs
@@ -1256,7 +1256,7 @@ public virtual void OnServerAddPlayer(NetworkConnection conn)
                 ? Instantiate(playerPrefab, startPos.position, startPos.rotation)
                 : Instantiate(playerPrefab);
 
-            server.AddPlayerForConnection(conn, client, player);
+            server.AddPlayerForConnection(conn, player);
         }
 
         /// <summary>

diff --git a/Assets/Mirror/Runtime/NetworkServer.cs b/Assets/Mirror/Runtime/NetworkServer.cs
@@ -622,13 +622,13 @@ public bool ReplacePlayerForConnection(NetworkConnection conn, NetworkClient cli
         /// <param name="player">Player object spawned for the player.</param>
         /// <param name="assetId"></param>
         /// <returns></returns>
-        public bool AddPlayerForConnection(NetworkConnection conn, NetworkClient client, GameObject player, Guid assetId)
+        public bool AddPlayerForConnection(NetworkConnection conn, GameObject player, Guid assetId)
         {
             if (GetNetworkIdentity(player, out NetworkIdentity identity))
             {
                 identity.assetId = assetId;
             }
-            return AddPlayerForConnection(conn, client, player);
+            return AddPlayerForConnection(conn, player);
         }
 
         void SpawnObserversForConnection(NetworkConnection conn)
@@ -675,7 +675,7 @@ void SpawnObserversForConnection(NetworkConnection conn)
         /// <param name="client">Client associated to the player.</param>
         /// <param name="player">Player object spawned for the player.</param>
         /// <returns></returns>
-        public bool AddPlayerForConnection(NetworkConnection conn, NetworkClient client, GameObject player)
+        public bool AddPlayerForConnection(NetworkConnection conn, GameObject player)
         {
             NetworkIdentity identity = player.GetComponent<NetworkIdentity>();
             if (identity == null)
@@ -699,8 +699,7 @@ public bool AddPlayerForConnection(NetworkConnection conn, NetworkClient client,
             // set server to the NetworkIdentity
             identity.server = this;
 
-            // set client to the NetworkIdentity
-            identity.client = client;
+            identity.client = this.localClient;
 
             // Set the connection on the NetworkIdentity on the server, NetworkIdentity.SetLocalPlayer is not called on the server (it is on clients)
             identity.SetClientOwner(conn);