fix: calling base method when the first base class did not have the v…

…irtual method (#2014)

* adding test for error

* adding test with multiple overrides

* calling methods in base type

* adding test for more than 1 override

Assets/Mirror/Editor/Weaver/Extensions.cs

@@ -218,6 +218,32 @@ public static List<MethodDefinition> GetMethods(this TypeDefinition td, string m
             return methods;
         }
 
+        public static MethodDefinition GetMethodInBaseType(this TypeDefinition td, string methodName)
+        {
+            TypeDefinition typedef = td;
+            while (typedef != null)
+            {
+                foreach (MethodDefinition md in typedef.Methods)
+                {
+                    if (md.Name == methodName)
+                        return md;
+                }
+
+                try
+                {
+                    TypeReference parent = typedef.BaseType;
+                    typedef = parent?.Resolve();
+                }
+                catch (AssemblyResolutionException)
+                {
+                    // this can happen for pluins.
+                    break;
+                }
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// 
         /// </summary>

Assets/Mirror/Editor/Weaver/Processors/MethodProcessor.cs

@@ -84,7 +84,19 @@ public static void FixRemoteCallToBaseMethod(TypeDefinition type, MethodDefiniti
                     calledMethod.Name == baseRemoteCallName)
                 {
                     TypeDefinition baseType = type.BaseType.Resolve();
-                    MethodDefinition baseMethod = baseType.GetMethod(callName);
+                    MethodDefinition baseMethod = baseType.GetMethodInBaseType(callName);
+
+                    if (baseMethod == null)
+                    {
+                        Weaver.Error($"Could not find base method for {callName}", method);
+                        return;
+                    }
+
+                    if (!baseMethod.IsVirtual)
+                    {
+                        Weaver.Error($"Could not find base method that was virutal {callName}", method);
+                        return;
+                    }
 
                     instruction.Operand = baseMethod;
 

Assets/Mirror/Tests/Editor/CommandOverrideTest.cs

@@ -42,6 +42,21 @@ public override void CmdSendInt(int someInt)
         }
     }
 
+    /// <summary>
+    /// test for 2 overrides
+    /// </summary>
+    class VirtualOverrideCommandWithBase2 : VirtualOverrideCommandWithBase
+    {
+        public event Action<int> onOverrideSendInt2;
+
+        [Command]
+        public override void CmdSendInt(int someInt)
+        {
+            base.CmdSendInt(someInt);
+            onOverrideSendInt2?.Invoke(someInt);
+        }
+    }
+
     public class CommandOverrideTest : RemoteTestBase
     {
         [Test]
@@ -132,5 +147,39 @@ public void OverrideVirtualWithBaseCallsBothVirtualAndBase()
             Assert.That(virtualCallCount, Is.EqualTo(1));
             Assert.That(overrideCallCount, Is.EqualTo(1));
         }
+
+        [Test]
+        public void OverrideVirtualWithBaseCallsAllMethodsThatCallBase()
+        {
+            VirtualOverrideCommandWithBase2 hostBehaviour = CreateHostObject<VirtualOverrideCommandWithBase2>(true);
+
+            const int someInt = 20;
+
+            int virtualCallCount = 0;
+            int overrideCallCount = 0;
+            int override2CallCount = 0;
+            hostBehaviour.onVirtualSendInt += incomingInt =>
+            {
+                virtualCallCount++;
+                Assert.That(incomingInt, Is.EqualTo(someInt));
+            };
+            hostBehaviour.onOverrideSendInt += incomingInt =>
+            {
+                overrideCallCount++;
+                Assert.That(incomingInt, Is.EqualTo(someInt));
+            };
+            hostBehaviour.onOverrideSendInt2 += incomingInt =>
+            {
+                override2CallCount++;
+                Assert.That(incomingInt, Is.EqualTo(someInt));
+            };
+
+
+            hostBehaviour.CmdSendInt(someInt);
+            ProcessMessages();
+            Assert.That(virtualCallCount, Is.EqualTo(1));
+            Assert.That(overrideCallCount, Is.EqualTo(1));
+            Assert.That(override2CallCount, Is.EqualTo(1));
+        }
     }
 }

Assets/Mirror/Tests/Editor/Weaver/.WeaverTests.csproj

@@ -100,6 +100,8 @@
     <Compile Include="WeaverCommandTests~\CommandWithArguments.cs" />
     <Compile Include="WeaverCommandTests~\OverrideAbstractCommand.cs" />
     <Compile Include="WeaverCommandTests~\OverrideVirtualCallBaseCommand.cs" />
+    <Compile Include="WeaverCommandTests~\OverrideVirtualCallsBaseCommandWithMultipleBaseClasses.cs" />
+    <Compile Include="WeaverCommandTests~\OverrideVirtualCallsBaseCommandWithOverride.cs" />
     <Compile Include="WeaverCommandTests~\OverrideVirtualCommand.cs" />
     <Compile Include="WeaverCommandTests~\VirtualCommand.cs" />
     <Compile Include="WeaverCommandTests~\CommandWithSenderConnectionAndOtherArgs.cs" />

Assets/Mirror/Tests/Editor/Weaver/WeaverCommandTests.cs

@@ -76,6 +76,18 @@ public void OverrideVirtualCallBaseCommand()
             Assert.That(weaverErrors, Is.Empty);
         }
 
+        [Test]
+        public void OverrideVirtualCallsBaseCommandWithMultipleBaseClasses()
+        {
+            Assert.That(weaverErrors, Is.Empty);
+        }
+
+        [Test]
+        public void OverrideVirtualCallsBaseCommandWithOverride()
+        {
+            Assert.That(weaverErrors, Is.Empty);
+        }
+
         [Test]
         public void AbstractCommand()
         {

Assets/Mirror/Tests/Editor/Weaver/WeaverCommandTests~/OverrideVirtualCallBaseCommand.cs

@@ -1,6 +1,5 @@
 using Mirror;
 
-
 namespace WeaverCommandTests.OverrideVirtualCallBaseCommand
 {
     class OverrideVirtualCallBaseCommand : baseBehaviour

Assets/Mirror/Tests/Editor/Weaver/WeaverCommandTests~/OverrideVirtualCallsBaseCommandWithMultipleBaseClasses.cs

@@ -0,0 +1,27 @@
+using Mirror;
+
+namespace WeaverCommandTests.OverrideVirtualCallsBaseCommandWithMultipleBaseClasses
+{
+    class OverrideVirtualCallsBaseCommandWithMultipleBaseClasses : middleBehaviour
+    {
+        [Command]
+        protected override void CmdDoSomething()
+        {
+            // do somethin
+            base.CmdDoSomething();
+        }
+    }
+
+    class middleBehaviour : baseBehaviour
+    {
+    }
+
+    class baseBehaviour : NetworkBehaviour
+    {
+        [Command]
+        protected virtual void CmdDoSomething()
+        {
+            // do more stuff
+        }
+    }
+}

Assets/Mirror/Tests/Editor/Weaver/WeaverCommandTests~/OverrideVirtualCallsBaseCommandWithOverride.cs

@@ -0,0 +1,34 @@
+using Mirror;
+
+namespace WeaverCommandTests.OverrideVirtualCallsBaseCommandWithOverride
+{
+    class OverrideVirtualCallsBaseCommandWithOverride : middleBehaviour
+    {
+        [Command]
+        protected override void CmdDoSomething()
+        {
+            // do something
+            base.CmdDoSomething();
+        }
+    }
+
+
+    class middleBehaviour : baseBehaviour
+    {
+        [Command]
+        protected override void CmdDoSomething()
+        {
+            // do something else
+            base.CmdDoSomething();
+        }
+    }
+
+    class baseBehaviour : NetworkBehaviour
+    {
+        [Command]
+        protected virtual void CmdDoSomething()
+        {
+            // do more stuff
+        }
+    }
+}

Assets/Mirror/Tests/Editor/Weaver/WeaverCommandTests~/OverrideVirtualCommand.cs

@@ -1,6 +1,5 @@
 using Mirror;
 
-
 namespace WeaverCommandTests.OverrideVirtualCommand
 {
     class OverrideVirtualCommand : baseBehaviour