feat: Add IncludeOwner option to SendToAll (#387)

* feat: Add IncludeOwner option to SendToAll * fix code smell * SendRPCInternal use SendToObservers * SendUpdateVarsMessage to use SendToObservers
MirageNet · Oct 6, 2020 · 6b0a005 · 6b0a005
1 parent d3f7209
commit 6b0a005
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Assets/Mirror/Runtime/NetworkBehaviour.cs b/Assets/Mirror/Runtime/NetworkBehaviour.cs
@@ -283,7 +283,7 @@ protected void SendRPCInternal(Type invokeClass, string rpcName, NetworkWriter w
             // The public facing parameter is excludeOwner in [ClientRpc]
             // so we negate it here to logically align with SendToReady.
             bool includeOwner = !excludeOwner;
-            Server.SendToReady(NetIdentity, message, includeOwner, channelId);
+            Server.SendToObservers(NetIdentity, message, includeOwner, channelId);
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]

diff --git a/Assets/Mirror/Runtime/NetworkIdentity.cs b/Assets/Mirror/Runtime/NetworkIdentity.cs
@@ -1344,7 +1344,7 @@ void SendUpdateVarsMessage()
                     if (observersWritten > 0)
                     {
                         varsMessage.payload = observersWriter.ToArraySegment();
-                        Server.SendToReady(this, varsMessage, false);
+                        Server.SendToObservers(this, varsMessage, false);
                     }
 
                     // clear dirty bits only for the components that we serialized

diff --git a/Assets/Mirror/Runtime/NetworkServer.cs b/Assets/Mirror/Runtime/NetworkServer.cs
@@ -364,12 +364,29 @@ internal void ActivateHostScene()
         /// <param name="identity"></param>
         /// <param name="msg"></param>
         /// <param name="channelId"></param>
-        void SendToObservers<T>(NetworkIdentity identity, T msg, int channelId = Channels.DefaultReliable)
+        internal void SendToObservers<T>(NetworkIdentity identity, T msg, bool includeOwner = true, int channelId = Channels.DefaultReliable)
         {
             if (logger.LogEnabled()) logger.Log("Server.SendToObservers id:" + typeof(T));
 
-            if (identity.observers.Count > 0)
+            if (identity.observers.Count == 0)
+                return;
+
+            if(includeOwner)
+            {
                 NetworkConnection.Send(identity.observers, msg, channelId);
+            }
+            else
+            {
+                HashSet<INetworkConnection> connectionsExcludeSelf = new HashSet<INetworkConnection>();
+                foreach(INetworkConnection conn in identity.observers)
+                {
+                    if(identity.ConnectionToClient != conn)
+                    {
+                        connectionsExcludeSelf.Add(conn);
+                    }
+                }
+                NetworkConnection.Send(connectionsExcludeSelf, msg, channelId);
+            }
         }
 
         /// <summary>