feat: INetworkPlayer now has a IsHost property

BREAKING CHANGE: NetworkPlayer constructor now requires isHost parameter
MirageNet · Jul 19, 2023 · 5d7e5b7 · 5d7e5b7
1 parent 485965f
commit 5d7e5b7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Assets/Mirage/Runtime/INetworkPlayer.cs b/Assets/Mirage/Runtime/INetworkPlayer.cs
@@ -107,6 +107,10 @@ public interface INetworkPlayer : IMessageSender, IVisibilityTracker, IObjectOwn
         PlayerAuthentication Authentication { get; }
         void SetAuthentication(PlayerAuthentication authentication, bool allowReplace = false);
         bool IsAuthenticated { get; }
+        /// <summary>
+        /// True if this Player is the local player on the server or client
+        /// </summary>
+        bool IsHost { get; }
 
         void Disconnect();
         void MarkAsDisconnected();

diff --git a/Assets/Mirage/Runtime/NetworkClient.cs b/Assets/Mirage/Runtime/NetworkClient.cs
@@ -156,7 +156,7 @@ public void Connect(string address = null, ushort? port = null)
                 Application.runInBackground = RunInBackground;
 
             // setup all the handlers
-            Player = new NetworkPlayer(connection);
+            Player = new NetworkPlayer(connection, false);
             dataHandler.SetConnection(connection, Player);
 
             RegisterMessageHandlers();
@@ -230,7 +230,7 @@ internal void ConnectHost(NetworkServer server, IDataHandler serverDataHandler)
 
             // set up client before connecting to server, server could invoke handlers
             IsLocalClient = true;
-            Player = new NetworkPlayer(clientConn);
+            Player = new NetworkPlayer(clientConn, true);
             dataHandler.SetConnection(clientConn, Player);
 
             // invoke started event after everything is set up, but before peer has connected

diff --git a/Assets/Mirage/Runtime/NetworkPlayer.cs b/Assets/Mirage/Runtime/NetworkPlayer.cs
@@ -34,6 +34,8 @@ public sealed class NetworkPlayer : INetworkPlayer
         /// </remarks>
         private readonly IConnection _connection;
 
+        public bool IsHost { get; }
+
         /// <summary>
         /// Has this player been marked as disconnected
         /// <para>Messages sent to disconnected players will be ignored</para>
@@ -155,12 +157,12 @@ public NetworkIdentity Identity
         /// Creates a new NetworkConnection with the specified address and connectionId
         /// </summary>
         /// <param name="networkConnectionId"></param>
-        public NetworkPlayer(IConnection connection)
+        public NetworkPlayer(IConnection connection, bool isHost)
         {
             _connection = connection ?? throw new ArgumentNullException(nameof(connection));
+            IsHost = isHost;
         }
 
-
         /// <summary>
         /// This sends a network message to the connection.
         /// </summary>

diff --git a/Assets/Mirage/Runtime/NetworkServer.cs b/Assets/Mirage/Runtime/NetworkServer.cs
@@ -330,7 +330,7 @@ public void UpdateSent()
 
         private void Peer_OnConnected(IConnection conn)
         {
-            var player = new NetworkPlayer(conn);
+            var player = new NetworkPlayer(conn, false);
             if (logger.LogEnabled()) logger.Log($"Server new player {player}");
 
             // add connection
@@ -416,7 +416,7 @@ internal void AddLocalConnection(NetworkClient client, IConnection connection)
                 throw new InvalidOperationException("Local client connection already exists");
             }
 
-            var player = new NetworkPlayer(connection);
+            var player = new NetworkPlayer(connection, true);
             LocalPlayer = player;
             LocalClient = client;