Fixed false error logs when using a Client and a Server in the same a…

…pplication
RiptideNetworking · Oct 20, 2021 · a0ad4e6 · a0ad4e6
1 parent dc12ef2
commit a0ad4e6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/Demos/Unity/Client/Assets/Scripts/Multiplayer/RiptideNetworking.dll b/Demos/Unity/Client/Assets/Scripts/Multiplayer/RiptideNetworking.dll
diff --git a/Demos/Unity/Server/Assets/Scripts/Multiplayer/RiptideNetworking.dll b/Demos/Unity/Server/Assets/Scripts/Multiplayer/RiptideNetworking.dll
diff --git a/RiptideNetworking/RiptideNetworking/Client.cs b/RiptideNetworking/RiptideNetworking/Client.cs
@@ -106,21 +106,21 @@ protected override void CreateMessageHandlersDictionary(Assembly assembly, byte
                 if (attribute.GroupId != messageHandlerGroupId)
                     break;
 
-                ushort messageId = attribute.MessageId;
-                if (messageHandlers.ContainsKey(messageId))
-                    RiptideLogger.Log("ERROR", $"Message handler method already exists for message ID {messageId}! Only one handler method is allowed per ID!");
-                else
+                Delegate clientMessageHandler = Delegate.CreateDelegate(typeof(MessageHandler), methods[i], false);
+                if (clientMessageHandler != null)
                 {
-                    Delegate clientMessageHandler = Delegate.CreateDelegate(typeof(MessageHandler), methods[i], false);
-                    if (clientMessageHandler != null)
-                        messageHandlers.Add(messageId, (MessageHandler)clientMessageHandler);
+                    // It's a message handler for Client instances
+                    if (messageHandlers.ContainsKey(attribute.MessageId))
+                        RiptideLogger.Log("ERROR", $"Message handler method already exists for message ID {attribute.MessageId}! Only one handler method is allowed per ID!");
                     else
-                    {
-                        // It's not a message handler for Client instances, but it might be one for Server instances
-                        Delegate serverMessageHandler = Delegate.CreateDelegate(typeof(Server.MessageHandler), methods[i], false);
-                        if (serverMessageHandler == null)
-                            RiptideLogger.Log("ERROR", $"Method '{methods[i].Name}' didn't match a message handler signature!");
-                    }
+                        messageHandlers.Add(attribute.MessageId, (MessageHandler)clientMessageHandler);
+                }
+                else
+                {
+                    // It's not a message handler for Client instances, but it might be one for Server instances
+                    Delegate serverMessageHandler = Delegate.CreateDelegate(typeof(Server.MessageHandler), methods[i], false);
+                    if (serverMessageHandler == null)
+                        RiptideLogger.Log("ERROR", $"Method '{methods[i].Name}' didn't match a message handler signature!");
                 }
             }
         }

diff --git a/RiptideNetworking/RiptideNetworking/Server.cs b/RiptideNetworking/RiptideNetworking/Server.cs
@@ -100,21 +100,21 @@ protected override void CreateMessageHandlersDictionary(Assembly assembly, byte
                 if (attribute.GroupId != messageHandlerGroupId)
                     break;
 
-                ushort messageId = attribute.MessageId;
-                if (messageHandlers.ContainsKey(messageId))
-                    RiptideLogger.Log("ERROR", $"Message handler method already exists for message ID {messageId}! Only one handler method is allowed per ID!");
-                else
+                Delegate clientMessageHandler = Delegate.CreateDelegate(typeof(MessageHandler), methods[i], false);
+                if (clientMessageHandler != null)
                 {
-                    Delegate clientMessageHandler = Delegate.CreateDelegate(typeof(MessageHandler), methods[i], false);
-                    if (clientMessageHandler != null)
-                        messageHandlers.Add(messageId, (MessageHandler)clientMessageHandler);
+                    // It's a message handler for Server instances
+                    if (messageHandlers.ContainsKey(attribute.MessageId))
+                        RiptideLogger.Log("ERROR", $"Message handler method already exists for message ID {attribute.MessageId}! Only one handler method is allowed per ID!");
                     else
-                    {
-                        // It's not a message handler for Server instances, but it might be one for Client instances
-                        Delegate serverMessageHandler = Delegate.CreateDelegate(typeof(Client.MessageHandler), methods[i], false);
-                        if (serverMessageHandler == null)
-                            RiptideLogger.Log("ERROR", $"Method '{methods[i].Name}' didn't match a message handler signature!");
-                    }
+                        messageHandlers.Add(attribute.MessageId, (MessageHandler)clientMessageHandler);
+                }
+                else
+                {
+                    // It's not a message handler for Server instances, but it might be one for Client instances
+                    Delegate serverMessageHandler = Delegate.CreateDelegate(typeof(Client.MessageHandler), methods[i], false);
+                    if (serverMessageHandler == null)
+                        RiptideLogger.Log("ERROR", $"Method '{methods[i].Name}' didn't match a message handler signature!");
                 }
             }
         }