Merge branch 'master' of https://github.com/MidLevel/MLAPI

Author: TwoTenPvP

MLAPI/Core/NetworkingManager.cs

@@ -591,7 +591,8 @@ private void OnEnable()
             else
             {
                 Singleton = this;
-                if (OnSingletonReady != null) OnSingletonReady();
+                if (OnSingletonReady != null) 
+                    OnSingletonReady();
                 if (DontDestroy)
                     DontDestroyOnLoad(gameObject);
                 if (RunInBackground)

MLAPI/Messaging/CustomMessageManager.cs

@@ -6,6 +6,7 @@
 using MLAPI.Security;
 using MLAPI.Serialization;
 using MLAPI.Serialization.Pooled;
+using MLAPI.Hashing;
 
 namespace MLAPI.Messaging
 {
@@ -83,19 +84,60 @@ public static void SendUnnamedMessage(ulong clientId, BitStream stream, string c
         }
         #endregion
         #region Named
-
         /// <summary>
         /// Delegate used to handle named messages
         /// </summary>
         public delegate void HandleNamedMessageDelegate(ulong sender, Stream payload);
 
-        private static readonly Dictionary<ulong, HandleNamedMessageDelegate> namedMessageHandlers = new Dictionary<ulong, HandleNamedMessageDelegate>();
+        private static readonly Dictionary<ulong, HandleNamedMessageDelegate> namedMessageHandlers16 = new Dictionary<ulong, HandleNamedMessageDelegate>();
+        private static readonly Dictionary<ulong, HandleNamedMessageDelegate> namedMessageHandlers32 = new Dictionary<ulong, HandleNamedMessageDelegate>();
+        private static readonly Dictionary<ulong, HandleNamedMessageDelegate> namedMessageHandlers64 = new Dictionary<ulong, HandleNamedMessageDelegate>();
+
 
         internal static void InvokeNamedMessage(ulong hash, ulong sender, Stream stream)
         {
-            if (namedMessageHandlers.ContainsKey(hash))
+            if (NetworkingManager.Singleton == null)
             {
-                namedMessageHandlers[hash](sender, stream);
+                // We dont know what size to use. Try every (more collision prone)
+                if (namedMessageHandlers16.ContainsKey(hash))
+                {
+                    namedMessageHandlers16[hash](sender, stream);
+                }
+
+                if (namedMessageHandlers32.ContainsKey(hash))
+                {
+                    namedMessageHandlers32[hash](sender, stream);
+                }
+
+                if (namedMessageHandlers64.ContainsKey(hash))
+                {
+                    namedMessageHandlers64[hash](sender, stream);
+                }
+            }
+            else
+            {
+                // Only check the right size.
+                if (NetworkingManager.Singleton.NetworkConfig.RpcHashSize == HashSize.VarIntTwoBytes)
+                {
+                    if (namedMessageHandlers16.ContainsKey(hash))
+                    {
+                        namedMessageHandlers16[hash](sender, stream);
+                    }
+                }
+                else if (NetworkingManager.Singleton.NetworkConfig.RpcHashSize == HashSize.VarIntFourBytes)
+                {
+                    if (namedMessageHandlers32.ContainsKey(hash))
+                    {
+                        namedMessageHandlers32[hash](sender, stream);
+                    }
+                }
+                else if (NetworkingManager.Singleton.NetworkConfig.RpcHashSize == HashSize.VarIntEightBytes)
+                {
+                    if (namedMessageHandlers64.ContainsKey(hash))
+                    {
+                        namedMessageHandlers64[hash](sender, stream);
+                    }
+                }
             }
         }
 
@@ -106,9 +148,20 @@ internal static void InvokeNamedMessage(ulong hash, ulong sender, Stream stream)
         /// <param name="callback">The callback to run when a named message is received.</param>
         public static void RegisterNamedMessageHandler(string name, HandleNamedMessageDelegate callback)
         {
-            ulong hash = NetworkedBehaviour.HashMethodName(name);
+            namedMessageHandlers16[name.GetStableHash16()] = callback;
+            namedMessageHandlers32[name.GetStableHash32()] = callback;
+            namedMessageHandlers64[name.GetStableHash64()] = callback;
+        }
 
-            namedMessageHandlers[hash] = callback;
+        /// <summary>
+        /// Unregisters a named message handler.
+        /// </summary>
+        /// <param name="name">The name of the message.</param>
+        public static void UnregisterNamedMessageHandler(string name)
+        {
+            namedMessageHandlers16.Remove(name.GetStableHash16());
+            namedMessageHandlers32.Remove(name.GetStableHash32());
+            namedMessageHandlers64.Remove(name.GetStableHash64());
         }
 
         /// <summary>

MLAPI/Spawning/SpawnManager.cs

@@ -212,10 +212,13 @@ internal static void ChangeOwnership(NetworkedObject netObject, ulong clientId)
                 throw new SpawnStateException("Object is not spawned");
             }
 
-            for (int i = NetworkingManager.Singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.Count - 1; i > -1; i--)
+            if (NetworkingManager.Singleton.ConnectedClients.ContainsKey(netObject.OwnerClientId))
             {
-                if (NetworkingManager.Singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects[i] == netObject)
-                    NetworkingManager.Singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAt(i);
+                for (int i = NetworkingManager.Singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.Count - 1; i >= 0; i--)
+                {
+                    if (NetworkingManager.Singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects[i] == netObject)
+                        NetworkingManager.Singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAt(i);
+                }
             }
 
             NetworkingManager.Singleton.ConnectedClients[clientId].OwnedObjects.Add(netObject);