refactor: separate player ownership from NetworkServer (#580)

NetworkServer should not have to deal with NetworkIdentities or their owners. Remove SendToClientOfPlayer method, it doesn't add value. BREAKING CHANGE: SendToClientOfPlayer removed. Use identity.ConnectionToClient.Send() instead
MirageNet · Feb 14, 2021 · 8d7efa6 · 8d7efa6
1 parent 68adb2b
commit 8d7efa6
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 34 deletions.
diff --git a/Assets/Mirror/Runtime/INetworkServer.cs b/Assets/Mirror/Runtime/INetworkServer.cs
@@ -35,7 +35,5 @@ public interface INetworkServer
         void RemoveConnection(INetworkConnection conn);
 
         void SendToAll<T>(T msg, int channelId = Channel.Reliable);
-
-        void SendToClientOfPlayer<T>(NetworkIdentity identity, T msg, int channelId = Channel.Reliable);
     }
 }
diff --git a/Assets/Mirror/Runtime/NetworkIdentity.cs b/Assets/Mirror/Runtime/NetworkIdentity.cs
@@ -1231,7 +1231,7 @@ void SendUpdateVarsMessage()
                     {
                         varsMessage.payload = ownerWriter.ToArraySegment();
                         if (ConnectionToClient != null && ConnectionToClient.IsReady)
-                            Server.SendToClientOfPlayer(this, varsMessage);
+                            ConnectionToClient.Send(varsMessage);
                     }
 
                     // send observersWriter to everyone but owner

diff --git a/Assets/Mirror/Runtime/NetworkServer.cs b/Assets/Mirror/Runtime/NetworkServer.cs
@@ -427,23 +427,5 @@ internal void OnAuthenticated(INetworkConnection conn)
 
             Authenticated?.Invoke(conn);
         }
-
-        /// <summary>
-        /// send this message to the player only
-        /// </summary>
-        /// <typeparam name="T">Message type</typeparam>
-        /// <param name="identity"></param>
-        /// <param name="msg"></param>
-        public void SendToClientOfPlayer<T>(NetworkIdentity identity, T msg, int channelId = Channel.Reliable)
-        {
-            if (identity != null)
-            {
-                identity.ConnectionToClient.Send(msg, channelId);
-            }
-            else
-            {
-                throw new InvalidOperationException("SendToClientOfPlayer: player has no NetworkIdentity: " + identity);
-            }
-        }
     }
 }
diff --git a/Assets/Mirror/Samples~/AdditiveScenes/Scripts/ZoneHandler.cs b/Assets/Mirror/Samples~/AdditiveScenes/Scripts/ZoneHandler.cs
@@ -21,7 +21,7 @@ void OnTriggerEnter(Collider other)
             if (logger.LogEnabled()) logger.LogFormat(LogType.Log, "Loading {0}", subScene);
 
             NetworkIdentity networkIdentity = other.gameObject.GetComponent<NetworkIdentity>();
-            Server.SendToClientOfPlayer(networkIdentity, new SceneMessage { scenePath = subScene, sceneOperation = SceneOperation.LoadAdditive });
+            networkIdentity.ConnectionToClient.Send(new SceneMessage { scenePath = subScene, sceneOperation = SceneOperation.LoadAdditive });
         }
 
         [Server]
@@ -30,7 +30,7 @@ void OnTriggerExit(Collider other)
             if (logger.LogEnabled()) logger.LogFormat(LogType.Log, "Unloading {0}", subScene);
 
             NetworkIdentity networkIdentity = other.gameObject.GetComponent<NetworkIdentity>();
-            Server.SendToClientOfPlayer(networkIdentity, new SceneMessage { scenePath = subScene, sceneOperation = SceneOperation.UnloadAdditive });
+            networkIdentity.ConnectionToClient.Send(new SceneMessage { scenePath = subScene, sceneOperation = SceneOperation.UnloadAdditive });
         }
     }
 }
diff --git a/Assets/Mirror/Weaver/Processors/ReaderWriterProcessor.cs b/Assets/Mirror/Weaver/Processors/ReaderWriterProcessor.cs
@@ -185,7 +185,6 @@ private void GenerateReadersWriters(MethodReference method, SequencePoint sequen
                 method.Is<NetworkClient>(nameof(NetworkClient.Send)) ||
                 method.Is<NetworkClient>(nameof(NetworkClient.SendAsync)) ||
                 method.Is<NetworkServer>(nameof(NetworkServer.SendToAll)) ||
-                method.Is<NetworkServer>(nameof(NetworkServer.SendToClientOfPlayer)) ||
                 method.Is<INetworkServer>(nameof(INetworkServer.SendToAll));
 
             bool generate = isMessage ||

diff --git a/Assets/Tests/Runtime/ClientServer/NetworkServerTests.cs b/Assets/Tests/Runtime/ClientServer/NetworkServerTests.cs
@@ -32,15 +32,6 @@ public void InitializeTest()
             Assert.That(server.LocalClientActive, Is.False);
         }
 
-        [Test]
-        public void SendToClientOfPlayerExceptionTest()
-        {
-            Assert.Throws<InvalidOperationException>(() =>
-            {
-                server.SendToClientOfPlayer(null, new ServerRpcMessage());
-            });
-        }
-
         [UnityTest]
         public IEnumerator ReadyMessageSetsClientReadyTest() => UniTask.ToCoroutine(async () =>
         {
@@ -73,7 +64,7 @@ public void SendToClientOfPlayerExceptionTest()
 
             connectionToServer.RegisterHandler<WovenTestMessage>(msg => invoked = true) ;
 
-            server.SendToClientOfPlayer(serverIdentity, message);
+            serverIdentity.ConnectionToClient.Send(message);
 
             connectionToServer.ProcessMessagesAsync().Forget();