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

Author: TwoTenPvP

MLAPI/Core/NetworkingManager.cs

@@ -381,7 +381,18 @@ private void Init(bool server)
 
             for (int i = 0; i < NetworkConfig.NetworkedPrefabs.Count; i++)
             {
-                NetworkConfig.NetworkedPrefabs[i].Prefab.GetComponent<NetworkedObject>().ValidateHash();
+                if (NetworkConfig.NetworkedPrefabs[i] == null || NetworkConfig.NetworkedPrefabs[i].Prefab == null)
+                {
+                    if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError("Networked prefab cannot be null");
+                }
+                else if (NetworkConfig.NetworkedPrefabs[i].Prefab.GetComponent<NetworkedObject>() == null)
+                {
+                    if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError("Networked prefab is missing a NetworkedObject component");
+                }
+                else
+                {
+                    NetworkConfig.NetworkedPrefabs[i].Prefab.GetComponent<NetworkedObject>().ValidateHash();
+                }
             }
 
             NetworkConfig.NetworkTransport.OnTransportEvent += HandleRawTransportPoll;
@@ -615,7 +626,7 @@ private void Shutdown()
         private float lastTimeSyncTime;
         private void Update()
         {
-            if(IsListening)
+            if (IsListening)
             {
                 if ((NetworkTime - lastReceiveTickTime >= (1f / NetworkConfig.ReceiveTickrate)) || NetworkConfig.ReceiveTickrate <= 0)
                 {
@@ -634,6 +645,12 @@ private void Update()
                     NetworkProfiler.EndTick();
                 }
 
+                if (!IsListening)
+                {
+                    // If we get disconnected in the previous poll. IsListening will be set to false.
+                    return;
+                }
+
                 if (((NetworkTime - lastEventTickTime >= (1f / NetworkConfig.EventTickrate))))
                 {
                     NetworkProfiler.StartTick(TickType.Event);

MLAPI/Messaging/RpcTypeDefinition.cs

@@ -80,11 +80,21 @@ private RpcTypeDefinition(Type type)
 
                 Dictionary<ulong, ReflectionMethod> lookupTarget = rpcMethod.serverTarget ? serverMethods : clientMethods;
 
-                lookupTarget.Add(HashMethodNameAndValidate(method.Name), rpcMethod);
+                ulong nameHash = HashMethodNameAndValidate(method.Name);
+
+                if (!lookupTarget.ContainsKey(nameHash))
+                {
+                    lookupTarget.Add(nameHash, rpcMethod);
+                }
 
                 if (parameters.Length > 0)
                 {
-                    lookupTarget.Add(HashMethodNameAndValidate(NetworkedBehaviour.GetHashableMethodSignature(method)), rpcMethod);
+                    ulong signatureHash = HashMethodNameAndValidate(NetworkedBehaviour.GetHashableMethodSignature(method));
+
+                    if (!lookupTarget.ContainsKey(signatureHash))
+                    {
+                        lookupTarget.Add(signatureHash, rpcMethod);
+                    }
                 }
 
                 if (rpcMethod.useDelegate)