refactor: move LocalPlayer to ClientObjectManager (#619)

BREAKING CHANGE: removed NetworkClient.LocalPlayer, use ClientObjectManager.LocalPlayer instead
MirageNet · Feb 22, 2021 · df1e379 · df1e379
1 parent e0dd626
commit df1e379
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/Assets/Mirage/Runtime/ClientObjectManager.cs b/Assets/Mirage/Runtime/ClientObjectManager.cs
@@ -39,6 +39,11 @@ public class ClientObjectManager : MonoBehaviour, IClientObjectManager, IObjectL
         [SerializeField] SpawnEvent _unSpawned = new SpawnEvent();
         public SpawnEvent UnSpawned => _unSpawned;
 
+        /// <summary>
+        /// NetworkIdentity of the localPlayer
+        /// </summary>
+        public NetworkIdentity LocalPlayer => Client.Connection?.Identity;
+
         [Header("Prefabs")]
         /// <summary>
         /// List of prefabs that will be registered with the spawning system.
@@ -578,7 +583,7 @@ internal void OnRpcMessage(RpcMessage msg)
 
         void CheckForLocalPlayer(NetworkIdentity identity)
         {
-            if (identity && identity == Client.LocalPlayer)
+            if (identity && identity == LocalPlayer)
             {
                 // Set isLocalPlayer to true on this NetworkIdentity and trigger OnStartLocalPlayer in all scripts on the same GO
                 identity.ConnectionToServer = Client.Connection;

diff --git a/Assets/Mirage/Runtime/IClientObjectManager.cs b/Assets/Mirage/Runtime/IClientObjectManager.cs
@@ -24,6 +24,11 @@ public interface IClientObjectManager
         /// </summary>
         SpawnEvent UnSpawned { get; }
 
+        /// <summary>
+        /// NetworkIdentity of the localPlayer
+        /// </summary>
+        NetworkIdentity LocalPlayer { get; }
+
         NetworkIdentity GetPrefab(Guid assetId);
 
         void RegisterPrefab(NetworkIdentity identity);

diff --git a/Assets/Mirage/Runtime/INetworkClient.cs b/Assets/Mirage/Runtime/INetworkClient.cs
@@ -26,11 +26,6 @@ public interface INetworkClient
         /// </summary>
         INetworkConnection Connection { get; }
 
-        /// <summary>
-        /// NetworkIdentity of the localPlayer
-        /// </summary>
-        NetworkIdentity LocalPlayer { get; }
-
         /// <summary>
         /// active is true while a client is connecting/connected
         /// (= while the network is active)

diff --git a/Assets/Mirage/Runtime/NetworkClient.cs b/Assets/Mirage/Runtime/NetworkClient.cs
@@ -64,11 +64,6 @@ public class NetworkClient : MonoBehaviour, INetworkClient
         /// </summary>
         public INetworkConnection Connection { get; internal set; }
 
-        /// <summary>
-        /// NetworkIdentity of the localPlayer
-        /// </summary>
-        public NetworkIdentity LocalPlayer => Connection?.Identity;
-
         internal ConnectState connectState = ConnectState.Disconnected;
 
         /// <summary>

diff --git a/Assets/Mirage/Runtime/NetworkIdentity.cs b/Assets/Mirage/Runtime/NetworkIdentity.cs
@@ -129,7 +129,7 @@ public sealed class NetworkIdentity : MonoBehaviour
         /// This returns true if this object is the one that represents the player on the local machine.
         /// <para>This is set when the server has spawned an object for this particular client.</para>
         /// </summary>
-        public bool IsLocalPlayer => Client != null && Client.LocalPlayer == this;
+        public bool IsLocalPlayer => ClientObjectManager != null && ClientObjectManager.LocalPlayer == this;
 
         /// <summary>
         /// This returns true if this object is the authoritative player object on the client.

diff --git a/Assets/Mirage/Samples~/Tanks/Scripts/TankGameManager.cs b/Assets/Mirage/Samples~/Tanks/Scripts/TankGameManager.cs
@@ -146,10 +146,10 @@ int GetAlivePlayerCount()
         void FindLocalTank()
         {
             //Check to see if the player is loaded in yet
-            if (NetworkManager.Client.LocalPlayer == null)
+            if (NetworkManager.ClientObjectManager.LocalPlayer == null)
                 return;
 
-            LocalPlayer = NetworkManager.Client.LocalPlayer.GetComponent<Tank>();
+            LocalPlayer = NetworkManager.ClientObjectManager.LocalPlayer.GetComponent<Tank>();
         }
 
         void UpdateStats()