Merge 703a998790 into 04bb95311b

Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8f63ea2e505fd484193fb31c5c55ca73
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Mirror/Core/Attributes.cs

@@ -48,28 +48,28 @@ public class TargetRpcAttribute : Attribute
     }
 
     /// <summary>
-    /// Only an active server will run this method.
-    /// <para>Prints a warning if a client or in-active server tries to execute this method.</para>
+    /// Prevents clients from running this method.
+    /// <para>Prints a warning if a client tries to execute this method.</para>
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]
     public class ServerAttribute : Attribute {}
 
     /// <summary>
-    /// Only an active server will run this method.
+    /// Prevents clients from running this method.
     /// <para>No warning is thrown.</para>
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]
     public class ServerCallbackAttribute : Attribute {}
 
     /// <summary>
-    /// Only an active client will run this method.
-    /// <para>Prints a warning if the server or in-active client tries to execute this method.</para>
+    /// Prevents the server from running this method.
+    /// <para>Prints a warning if the server tries to execute this method.</para>
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]
     public class ClientAttribute : Attribute {}
 
     /// <summary>
-    /// Only an active client will run this method.
+    /// Prevents the server from running this method.
     /// <para>No warning is printed.</para>
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]

Assets/Mirror/Core/NetworkIdentity.cs

@@ -863,7 +863,7 @@ internal void OnStopLocalPlayer()
             for (int i = 0; i < components.Length; ++i)
             {
                 NetworkBehaviour component = components[i];
-                ulong nthBit = 1ul << i;
+                ulong nthBit = (1u << i);
 
                 bool dirty = component.IsDirty();
 
@@ -910,7 +910,7 @@ ulong ClientDirtyMask()
 
                 // on client, only consider owned components with SyncDirection to server
                 NetworkBehaviour component = components[i];
-                ulong nthBit = 1ul << i;
+                ulong nthBit = (1u << i);
 
                 if (isOwned && component.syncDirection == SyncDirection.ClientToServer)
                 {
@@ -928,7 +928,7 @@ ulong ClientDirtyMask()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal static bool IsDirty(ulong mask, int index)
         {
-            ulong nthBit = 1ul << index;
+            ulong nthBit = (ulong)(1 << index);
             return (mask & nthBit) != 0;
         }
 

Assets/Mirror/Tests/Common/MirrorTest.cs

@@ -1,5 +1,4 @@
 // base class for networking tests to make things easier.
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -82,18 +81,6 @@ protected void CreateNetworked(out GameObject go, out NetworkIdentity identity)
             instantiated.Add(go);
         }
 
-        protected void CreateNetworked(out GameObject go, out NetworkIdentity identity, Action<NetworkIdentity> preAwake)
-        {
-            go = new GameObject();
-            identity = go.AddComponent<NetworkIdentity>();
-            preAwake(identity);
-            // Awake is only called in play mode.
-            // call manually for initialization.
-            identity.Awake();
-            // track
-            instantiated.Add(go);
-        }
-
         // create GameObject + NetworkIdentity + NetworkBehaviour<T>
         // add to tracker list if needed (useful for cleanups afterwards)
         protected void CreateNetworked<T>(out GameObject go, out NetworkIdentity identity, out T component)
@@ -282,44 +269,6 @@ protected void CreateNetworkedAndSpawn(
             Assert.That(NetworkClient.spawned.ContainsKey(serverIdentity.netId));
         }
 
-        // create GameObject + NetworkIdentity + NetworkBehaviour & SPAWN
-        // => preAwake callbacks can be used to add network behaviours to the NI
-        // => ownerConnection can be NetworkServer.localConnection if needed.
-        // => returns objects from client and from server.
-        //    will be same in host mode.
-        protected void CreateNetworkedAndSpawn(
-            out GameObject serverGO, out NetworkIdentity serverIdentity, Action<NetworkIdentity> serverPreAwake,
-            out GameObject clientGO, out NetworkIdentity clientIdentity, Action<NetworkIdentity> clientPreAwake,
-            NetworkConnectionToClient ownerConnection = null)
-        {
-            // server & client need to be active before spawning
-            Debug.Assert(NetworkClient.active, "NetworkClient needs to be active before spawning.");
-            Debug.Assert(NetworkServer.active, "NetworkServer needs to be active before spawning.");
-
-            // create one on server, one on client
-            // (spawning has to find it on client, it doesn't create it)
-            CreateNetworked(out serverGO, out serverIdentity, serverPreAwake);
-            CreateNetworked(out clientGO, out clientIdentity, clientPreAwake);
-
-            // give both a scene id and register it on client for spawnables
-            clientIdentity.sceneId = serverIdentity.sceneId = (ulong)serverGO.GetHashCode();
-            NetworkClient.spawnableObjects[clientIdentity.sceneId] = clientIdentity;
-
-            // spawn
-            NetworkServer.Spawn(serverGO, ownerConnection);
-            ProcessMessages();
-
-            // double check isServer/isClient. avoids debugging headaches.
-            Assert.That(serverIdentity.isServer, Is.True);
-            Assert.That(clientIdentity.isClient, Is.True);
-
-            // double check that we have authority if we passed an owner connection
-            if (ownerConnection != null)
-                Debug.Assert(clientIdentity.isOwned == true, $"Behaviour Had Wrong Authority when spawned, This means that the test is broken and will give the wrong results");
-
-            // make sure the client really spawned it.
-            Assert.That(NetworkClient.spawned.ContainsKey(serverIdentity.netId));
-        }
         // create GameObject + NetworkIdentity + NetworkBehaviour & SPAWN
         // => ownerConnection can be NetworkServer.localConnection if needed.
         protected void CreateNetworkedAndSpawn<T>(out GameObject go, out NetworkIdentity identity, out T component, NetworkConnectionToClient ownerConnection = null)

Assets/Mirror/Tests/Editor/NetworkIdentity/NetworkIdentitySerializationTests.cs

@@ -1,5 +1,4 @@
 // OnDe/SerializeSafely tests.
-using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Mirror.Tests.EditorBehaviours.NetworkIdentities;
 using NUnit.Framework;
@@ -43,7 +42,7 @@ public void SerializeAndDeserializeAll()
             );
 
             // set sync modes
-            serverOwnerComp.syncMode = clientOwnerComp.syncMode = SyncMode.Owner;
+            serverOwnerComp.syncMode     = clientOwnerComp.syncMode     = SyncMode.Owner;
             serverObserversComp.syncMode = clientObserversComp.syncMode = SyncMode.Observers;
 
             // set unique values on server components
@@ -66,127 +65,10 @@ public void SerializeAndDeserializeAll()
             // deserialize client object with OBSERVERS payload
             reader = new NetworkReader(observersWriter.ToArray());
             clientIdentity.DeserializeClient(reader, true);
-            Assert.That(clientOwnerComp.value, Is.EqualTo(null));   // owner mode shouldn't be in data
+            Assert.That(clientOwnerComp.value, Is.EqualTo(null)); // owner mode shouldn't be in data
             Assert.That(clientObserversComp.value, Is.EqualTo(42)); // observers mode should be in data
         }
 
-        // test serialize -> deserialize of any supported number of components
-        [Test]
-        public void SerializeAndDeserializeN([NUnit.Framework.Range(1, 64)] int numberOfNBs)
-        {
-            List<SerializeTest1NetworkBehaviour> serverNBs = new List<SerializeTest1NetworkBehaviour>();
-            List<SerializeTest1NetworkBehaviour> clientNBs = new List<SerializeTest1NetworkBehaviour>();
-            // need two of both versions so we can serialize -> deserialize
-            CreateNetworkedAndSpawn(
-                out _, out NetworkIdentity serverIdentity, ni =>
-                {
-                    for (int i = 0; i < numberOfNBs; i++)
-                    {
-                        SerializeTest1NetworkBehaviour nb = ni.gameObject.AddComponent<SerializeTest1NetworkBehaviour>();
-                        nb.syncInterval = 0;
-                        nb.syncMode = SyncMode.Observers;
-                        serverNBs.Add(nb);
-                    }
-                },
-                out _, out NetworkIdentity clientIdentity, ni =>
-                {
-                    for (int i = 0; i < numberOfNBs; i++)
-                    {
-                        SerializeTest1NetworkBehaviour nb = ni.gameObject.AddComponent<SerializeTest1NetworkBehaviour>();
-                        nb.syncInterval = 0;
-                        nb.syncMode = SyncMode.Observers;
-                        clientNBs.Add(nb);
-                    }
-                }
-            );
-
-            // INITIAL SYNC
-            // set unique values on server components
-            for (int i = 0; i < serverNBs.Count; i++)
-            {
-                serverNBs[i].value = (i + 1) * 3;
-                serverNBs[i].SetDirty();
-            }
-
-            // serialize server object
-            serverIdentity.SerializeServer(true, ownerWriter, observersWriter);
-
-            // deserialize client object with OBSERVERS payload
-            NetworkReader reader = new NetworkReader(observersWriter.ToArray());
-            clientIdentity.DeserializeClient(reader, true);
-            for (int i = 0; i < clientNBs.Count; i++)
-            {
-                int expected = (i + 1) * 3;
-                Assert.That(clientNBs[i].value, Is.EqualTo(expected), $"Expected the clientNBs[{i}] to have a value of {expected}");
-            }
-
-            // clear dirty bits for incremental sync
-            foreach (SerializeTest1NetworkBehaviour serverNB in serverNBs)
-                serverNB.ClearAllDirtyBits();
-
-            // INCREMENTAL SYNC ALL
-            // set unique values on server components
-            for (int i = 0; i < serverNBs.Count; i++)
-            {
-                serverNBs[i].value = (i + 1) * 11;
-                serverNBs[i].SetDirty();
-            }
-
-            ownerWriter.Reset();
-            observersWriter.Reset();
-            // serialize server object
-            serverIdentity.SerializeServer(false, ownerWriter, observersWriter);
-
-            // deserialize client object with OBSERVERS payload
-            reader = new NetworkReader(observersWriter.ToArray());
-            clientIdentity.DeserializeClient(reader, false);
-            for (int i = 0; i < clientNBs.Count; i++)
-            {
-                int expected = (i + 1) * 11;
-                Assert.That(clientNBs[i].value, Is.EqualTo(expected), $"Expected the clientNBs[{i}] to have a value of {expected}");
-            }
-
-            // clear dirty bits for incremental sync
-            foreach (SerializeTest1NetworkBehaviour serverNB in serverNBs)
-                serverNB.ClearAllDirtyBits();
-
-            // INCREMENTAL SYNC INDIVIDUAL
-            for (int i = 0; i < numberOfNBs; i++)
-            {
-                // reset all client nbs
-                foreach (SerializeTest1NetworkBehaviour clientNB in clientNBs)
-                    clientNB.value = 0;
-
-                int expected = (i + 1) * 7;
-
-                // set unique value on server components
-                serverNBs[i].value = expected;
-                serverNBs[i].SetDirty();
-
-                ownerWriter.Reset();
-                observersWriter.Reset();
-                // serialize server object
-                serverIdentity.SerializeServer(false, ownerWriter, observersWriter);
-
-                // deserialize client object with OBSERVERS payload
-                reader = new NetworkReader(observersWriter.ToArray());
-                clientIdentity.DeserializeClient(reader, false);
-                for (int index = 0; index < clientNBs.Count; index++)
-                {
-                    SerializeTest1NetworkBehaviour clientNB = clientNBs[index];
-                    if (index == i)
-                    {
-                        Assert.That(clientNB.value, Is.EqualTo(expected), $"Expected the clientNBs[{index}] to have a value of {expected}");
-                    }
-                    else
-                    {
-                        Assert.That(clientNB.value, Is.EqualTo(0), $"Expected the clientNBs[{index}] to have a value of 0 since we're not syncing that index (on sync of #{i})");
-                    }
-                }
-            }
-        }
-
-
         // serialization should work even if a component throws an exception.
         // so if first component throws, second should still be serialized fine.
         [Test]
@@ -268,20 +150,20 @@ public void TooManyComponents()
         public void ErrorCorrection()
         {
             int original = 0x12345678;
-            byte safety = 0x78; // last byte
+            byte safety  =       0x78; // last byte
 
             // correct size shouldn't be corrected
-            Assert.That(NetworkBehaviour.ErrorCorrection(original + 0, safety), Is.EqualTo(original));
+            Assert.That(NetworkBehaviour.ErrorCorrection(original + 0, safety),  Is.EqualTo(original));
 
             // read a little too much
-            Assert.That(NetworkBehaviour.ErrorCorrection(original + 1, safety), Is.EqualTo(original));
-            Assert.That(NetworkBehaviour.ErrorCorrection(original + 2, safety), Is.EqualTo(original));
-            Assert.That(NetworkBehaviour.ErrorCorrection(original + 42, safety), Is.EqualTo(original));
+            Assert.That(NetworkBehaviour.ErrorCorrection(original + 1, safety),   Is.EqualTo(original));
+            Assert.That(NetworkBehaviour.ErrorCorrection(original + 2, safety),   Is.EqualTo(original));
+            Assert.That(NetworkBehaviour.ErrorCorrection(original + 42, safety),  Is.EqualTo(original));
 
             // read a little too less
-            Assert.That(NetworkBehaviour.ErrorCorrection(original - 1, safety), Is.EqualTo(original));
-            Assert.That(NetworkBehaviour.ErrorCorrection(original - 2, safety), Is.EqualTo(original));
-            Assert.That(NetworkBehaviour.ErrorCorrection(original - 42, safety), Is.EqualTo(original));
+            Assert.That(NetworkBehaviour.ErrorCorrection(original - 1, safety),   Is.EqualTo(original));
+            Assert.That(NetworkBehaviour.ErrorCorrection(original - 2, safety),   Is.EqualTo(original));
+            Assert.That(NetworkBehaviour.ErrorCorrection(original - 42, safety),  Is.EqualTo(original));
 
             // reading way too much / less is expected to fail.
             // we can only correct the last byte, not more.