Added Register and Deregister MessageHandler to NetworkingManager

Author: TwoTenPvP

MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

@@ -353,7 +353,7 @@ protected int RegisterMessageHandler(string name, Action<uint, BitReader> action
             }
 
             networkedObject.targetMessageActions[behaviourOrder].Add(messageType, action);
-            int counter = MessageManager.AddIncomingMessageHandler(name, action, networkId);
+            int counter = MessageManager.AddIncomingMessageHandler(name, action);
             registeredMessageHandlers.Add(name, counter);
             return counter;
         }
@@ -389,7 +389,7 @@ protected int RegisterMessageHandler(string name, Action<uint, byte[]> action)
             };
 
             networkedObject.targetMessageActions[behaviourOrder].Add(messageType, convertedAction);
-            int counter = MessageManager.AddIncomingMessageHandler(name, convertedAction, networkId);
+            int counter = MessageManager.AddIncomingMessageHandler(name, convertedAction);
             registeredMessageHandlers.Add(name, counter);
             return counter;
         }

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -1221,6 +1221,32 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua
             }
         }
         #region SEND METHODS
+        /// <summary>
+        /// Registers a message handler
+        /// </summary>
+        /// <param name="name">The MessageType to register</param>
+        /// <param name="action">The callback to get invoked whenever a message is received</param>
+        /// <returns>HandlerId for the messageHandler that can be used to deregister the messageHandler</returns>
+        public int RegisterMessageHandler(string name, Action<uint, BitReader> action)
+        {
+            if (!MessageManager.messageTypes.ContainsKey(name))
+            {
+                if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The messageType " + name + " is not registered");
+                return -1;
+            }
+            return MessageManager.AddIncomingMessageHandler(name, action);
+        }
+
+        /// <summary>
+        /// Deregisters a given message handler
+        /// </summary>
+        /// <param name="name">The MessageType to deregister</param>
+        /// <param name="counter">The messageHandlerId to deregister</param>
+        public void DeregisterMessageHandler(string name, int counter)
+        {
+            MessageManager.RemoveIncomingMessageHandler(name, counter);
+        }
+
         /// <summary>
         /// Sends a buffer to the server from client
         /// </summary>

MLAPI/NetworkingManagerComponents/Core/MessageManager.cs

@@ -25,7 +25,7 @@ private static NetworkingManager netManager
         }
 
 
-        internal static int AddIncomingMessageHandler(string name, Action<uint, BitReader> action, uint networkId)
+        internal static int AddIncomingMessageHandler(string name, Action<uint, BitReader> action)
         {
             if (messageTypes.ContainsKey(name))
             {
@@ -69,7 +69,7 @@ internal static int AddIncomingMessageHandler(string name, Action<uint, BitReade
             }
         }
 
-        internal static void RemoveIncomingMessageHandler(string name, int counter, uint networkId)
+        internal static void RemoveIncomingMessageHandler(string name, int counter)
         {
             if (counter == -1)
                 return;