small fixes

Doxoh · Doxoh · commit de5c7d779ba1 · 2023-08-30T20:46:13.000+02:00
diff --git a/api/AltV.Net.Shared/FunctionParser/ScriptFunction.cs b/api/AltV.Net.Shared/FunctionParser/ScriptFunction.cs
@@ -14,6 +14,11 @@ private static void WrongReturnType(MethodInfo methodInfo, Type expected, Type g
             Console.WriteLine(
                 $"{methodInfo.DeclaringType?.FullName}.{methodInfo.Name}({string.Join(", ", methodInfo.GetParameters().Select(m => $"{m.ParameterType.FullName} {m.Name}"))}): Expected {expected} return type, but got {got}");
         }
+        private static void WrongReturnTypes(MethodInfo methodInfo, Type[] expected, Type got)
+        {
+            Console.WriteLine(
+                $"{methodInfo.DeclaringType?.FullName}.{methodInfo.Name}({string.Join(", ", methodInfo.GetParameters().Select(m => $"{m.ParameterType.FullName} {m.Name}"))}): Expected {expected} return type, but got {got}");
+        }
 
         private static void WrongType(MethodInfo methodInfo, Type expected, Type got)
         {
@@ -40,7 +45,7 @@ public ScriptFunctionParameter(bool baseObjectCheck, Type parameterType)
             }
         }
 
-        public static ScriptFunction? Create(Delegate @delegate, Type[] types, Type? returnType = null, bool isAsync = false)
+        public static ScriptFunction? Create(Delegate @delegate, Type[] types, Type[]? returnTypes = null, bool isAsync = false)
         {
             var parameters = @delegate.Method.GetParameters();
             if (parameters.Length != types.Length)
@@ -78,15 +83,29 @@ public ScriptFunctionParameter(bool baseObjectCheck, Type parameterType)
 
             if (!isAsync)
             {
-                if (returnType is null && !typeof(void).IsAssignableFrom(@delegate.Method.ReturnType))
+                if (returnTypes is null && !typeof(void).IsAssignableFrom(@delegate.Method.ReturnType))
                 {
                     WrongReturnType(@delegate.Method, typeof(void), @delegate.Method.ReturnType);
                     return null;
                 }
-                if (returnType is not null && !returnType.IsAssignableFrom(@delegate.Method.ReturnType))
+                if (returnTypes is not null)
                 {
-                    WrongReturnType(@delegate.Method, returnType, @delegate.Method.ReturnType);
-                    return null;
+                    var validType = false;
+
+                    foreach (var returnType in returnTypes)
+                    {
+                        if (returnType.IsAssignableFrom(@delegate.Method.ReturnType))
+                        {
+                            validType = true;
+                            break;
+                        }
+                    }
+
+                    if (!validType)
+                    {
+                        WrongReturnTypes(@delegate.Method, returnTypes, @delegate.Method.ReturnType);
+                        return null;
+                    }
                 }
             }
 
diff --git a/api/AltV.Net/Alt.RegisterEvents.cs b/api/AltV.Net/Alt.RegisterEvents.cs
@@ -327,7 +327,7 @@ public static void RegisterEvents(object target)
                                         {
                                             typeof(IPlayer), typeof(IEntity), typeof(uint), typeof(ushort),
                                             typeof(Position), typeof(BodyPart)
-                                        }, typeof(uint));
+                                        }, new[] {typeof(uint), typeof(bool)});
                                     if (scriptFunction == null) return;
                                     OnWeaponDamage +=
                                         (player, targetEntity, weapon, damage, shotOffset, damageOffset) =>
@@ -338,9 +338,14 @@ public static void RegisterEvents(object target)
                                             scriptFunction.Set(damage);
                                             scriptFunction.Set(shotOffset);
                                             scriptFunction.Set(damageOffset);
-                                            if (scriptFunction.Call() is uint value)
+                                            if (scriptFunction.Call() is uint uintValue)
                                             {
-                                                return value;
+                                                return uintValue;
+                                            }
+
+                                            if (scriptFunction.Call() is bool boolValue)
+                                            {
+                                                return boolValue;
                                             }
 
                                             return 0;
@@ -370,7 +375,7 @@ public static void RegisterEvents(object target)
                                         {
                                             typeof(IPlayer), typeof(ExplosionType), typeof(Position), typeof(uint),
                                             typeof(IEntity)
-                                        }, typeof(bool));
+                                        }, new[] {typeof(bool) });
                                     if (scriptFunction == null) return;
                                     OnExplosion += (player, explosionType, position, explosionFx, targetEntity) =>
                                     {
@@ -394,7 +399,7 @@ public static void RegisterEvents(object target)
                                         new[]
                                         {
                                             typeof(IPlayer), typeof(FireInfo[])
-                                        }, typeof(bool));
+                                        },  new[] {typeof(bool) });
                                     if (scriptFunction == null) return;
                                     OnFire += (player, fireInfos) =>
                                     {
@@ -416,7 +421,7 @@ public static void RegisterEvents(object target)
                                         {
                                             typeof(IPlayer), typeof(Position), typeof(Position), typeof(uint),
                                             typeof(uint)
-                                        }, typeof(bool));
+                                        },  new[] {typeof(bool) });
                                     if (scriptFunction == null) return;
                                     OnStartProjectile += (player, startPosition, direction, ammoHash, weaponHash) =>
                                     {
@@ -530,7 +535,7 @@ public static void RegisterEvents(object target)
                                         new[]
                                         {
                                             typeof(IVehicle), typeof(IPlayer), typeof(bool)
-                                        }, typeof(bool));
+                                        },  new[] {typeof(bool) });
                                     if (scriptFunction == null) return;
                                     OnVehicleHorn += (targetVehicle, reporterPlayer, state) =>
                                     {
@@ -698,7 +703,7 @@ public static void RegisterEvents(object target)
                                         new[]
                                         {
                                             typeof(IPlayer), typeof(int)
-                                        }, typeof(bool));
+                                        },  new[] {typeof(bool) });
                                     if (scriptFunction == null) return;
                                     OnRequestSyncScene += (source, sceneId) =>
                                     {
diff --git a/api/AltV.Net/Core.Events.cs b/api/AltV.Net/Core.Events.cs
@@ -519,7 +519,7 @@ public virtual void OnWeaponDamageEvent(IntPtr eventPointer, IPlayer sourcePlaye
                 {
                     var result = @delegate(sourcePlayer, targetEntity, weapon, damage, shotOffset, bodyPart);
 
-                    if (result is bool)
+                    if (result is bool and false)
                     {
                         cancel = true;
                     }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,11 @@ private static void WrongReturnType(MethodInfo methodInfo, Type expected, Type g`
`14`	`14`	`Console.WriteLine(`
`15`	`15`	`$"{methodInfo.DeclaringType?.FullName}.{methodInfo.Name}({string.Join(", ", methodInfo.GetParameters().Select(m => $"{m.ParameterType.FullName} {m.Name}"))}): Expected {expected} return type, but got {got}");`
`16`	`16`	`}`
	`17`	`+ private static void WrongReturnTypes(MethodInfo methodInfo, Type[] expected, Type got)`
	`18`	`+ {`
	`19`	`+ Console.WriteLine(`
	`20`	`+ $"{methodInfo.DeclaringType?.FullName}.{methodInfo.Name}({string.Join(", ", methodInfo.GetParameters().Select(m => $"{m.ParameterType.FullName} {m.Name}"))}): Expected {expected} return type, but got {got}");`
	`21`	`+ }`
`17`	`22`
`18`	`23`	`private static void WrongType(MethodInfo methodInfo, Type expected, Type got)`
`19`	`24`	`{`
`@@ -40,7 +45,7 @@ public ScriptFunctionParameter(bool baseObjectCheck, Type parameterType)`
`40`	`45`	`}`
`41`	`46`	`}`
`42`	`47`
`43`		`- public static ScriptFunction? Create(Delegate @delegate, Type[] types, Type? returnType = null, bool isAsync = false)`
	`48`	`+ public static ScriptFunction? Create(Delegate @delegate, Type[] types, Type[]? returnTypes = null, bool isAsync = false)`
`44`	`49`	`{`
`45`	`50`	`var parameters = @delegate.Method.GetParameters();`
`46`	`51`	`if (parameters.Length != types.Length)`
`@@ -78,15 +83,29 @@ public ScriptFunctionParameter(bool baseObjectCheck, Type parameterType)`
`78`	`83`
`79`	`84`	`if (!isAsync)`
`80`	`85`	`{`
`81`		`- if (returnType is null && !typeof(void).IsAssignableFrom(@delegate.Method.ReturnType))`
	`86`	`+ if (returnTypes is null && !typeof(void).IsAssignableFrom(@delegate.Method.ReturnType))`
`82`	`87`	`{`
`83`	`88`	`WrongReturnType(@delegate.Method, typeof(void), @delegate.Method.ReturnType);`
`84`	`89`	`return null;`
`85`	`90`	`}`
`86`		`- if (returnType is not null && !returnType.IsAssignableFrom(@delegate.Method.ReturnType))`
	`91`	`+ if (returnTypes is not null)`
`87`	`92`	`{`
`88`		`- WrongReturnType(@delegate.Method, returnType, @delegate.Method.ReturnType);`
`89`		`- return null;`
	`93`	`+ var validType = false;`
	`94`	`+`
	`95`	`+ foreach (var returnType in returnTypes)`
	`96`	`+ {`
	`97`	`+ if (returnType.IsAssignableFrom(@delegate.Method.ReturnType))`
	`98`	`+ {`
	`99`	`+ validType = true;`
	`100`	`+ break;`
	`101`	`+ }`
	`102`	`+ }`
	`103`	`+`
	`104`	`+ if (!validType)`
	`105`	`+ {`
	`106`	`+ WrongReturnTypes(@delegate.Method, returnTypes, @delegate.Method.ReturnType);`
	`107`	`+ return null;`
	`108`	`+ }`
`90`	`109`	`}`
`91`	`110`	`}`
`92`	`111`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ public static void RegisterEvents(object target)`
`327`	`327`	`{`
`328`	`328`	`typeof(IPlayer), typeof(IEntity), typeof(uint), typeof(ushort),`
`329`	`329`	`typeof(Position), typeof(BodyPart)`
`330`		`- }, typeof(uint));`
	`330`	`+ }, new[] {typeof(uint), typeof(bool)});`
`331`	`331`	`if (scriptFunction == null) return;`
`332`	`332`	`OnWeaponDamage +=`
`333`	`333`	`(player, targetEntity, weapon, damage, shotOffset, damageOffset) =>`
`@@ -338,9 +338,14 @@ public static void RegisterEvents(object target)`
`338`	`338`	`scriptFunction.Set(damage);`
`339`	`339`	`scriptFunction.Set(shotOffset);`
`340`	`340`	`scriptFunction.Set(damageOffset);`
`341`		`- if (scriptFunction.Call() is uint value)`
	`341`	`+ if (scriptFunction.Call() is uint uintValue)`
`342`	`342`	`{`
`343`		`- return value;`
	`343`	`+ return uintValue;`
	`344`	`+ }`
	`345`	`+`
	`346`	`+ if (scriptFunction.Call() is bool boolValue)`
	`347`	`+ {`
	`348`	`+ return boolValue;`
`344`	`349`	`}`
`345`	`350`
`346`	`351`	`return 0;`
`@@ -370,7 +375,7 @@ public static void RegisterEvents(object target)`
`370`	`375`	`{`
`371`	`376`	`typeof(IPlayer), typeof(ExplosionType), typeof(Position), typeof(uint),`
`372`	`377`	`typeof(IEntity)`
`373`		`- }, typeof(bool));`
	`378`	`+ }, new[] {typeof(bool) });`
`374`	`379`	`if (scriptFunction == null) return;`
`375`	`380`	`OnExplosion += (player, explosionType, position, explosionFx, targetEntity) =>`
`376`	`381`	`{`
`@@ -394,7 +399,7 @@ public static void RegisterEvents(object target)`
`394`	`399`	`new[]`
`395`	`400`	`{`
`396`	`401`	`typeof(IPlayer), typeof(FireInfo[])`
`397`		`- }, typeof(bool));`
	`402`	`+ }, new[] {typeof(bool) });`
`398`	`403`	`if (scriptFunction == null) return;`
`399`	`404`	`OnFire += (player, fireInfos) =>`
`400`	`405`	`{`
`@@ -416,7 +421,7 @@ public static void RegisterEvents(object target)`
`416`	`421`	`{`
`417`	`422`	`typeof(IPlayer), typeof(Position), typeof(Position), typeof(uint),`
`418`	`423`	`typeof(uint)`
`419`		`- }, typeof(bool));`
	`424`	`+ }, new[] {typeof(bool) });`
`420`	`425`	`if (scriptFunction == null) return;`
`421`	`426`	`OnStartProjectile += (player, startPosition, direction, ammoHash, weaponHash) =>`
`422`	`427`	`{`
`@@ -530,7 +535,7 @@ public static void RegisterEvents(object target)`
`530`	`535`	`new[]`
`531`	`536`	`{`
`532`	`537`	`typeof(IVehicle), typeof(IPlayer), typeof(bool)`
`533`		`- }, typeof(bool));`
	`538`	`+ }, new[] {typeof(bool) });`
`534`	`539`	`if (scriptFunction == null) return;`
`535`	`540`	`OnVehicleHorn += (targetVehicle, reporterPlayer, state) =>`
`536`	`541`	`{`
`@@ -698,7 +703,7 @@ public static void RegisterEvents(object target)`
`698`	`703`	`new[]`
`699`	`704`	`{`
`700`	`705`	`typeof(IPlayer), typeof(int)`
`701`		`- }, typeof(bool));`
	`706`	`+ }, new[] {typeof(bool) });`
`702`	`707`	`if (scriptFunction == null) return;`
`703`	`708`	`OnRequestSyncScene += (source, sceneId) =>`
`704`	`709`	`{`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ public virtual void OnWeaponDamageEvent(IntPtr eventPointer, IPlayer sourcePlaye`
`519`	`519`	`{`
`520`	`520`	`var result = @delegate(sourcePlayer, targetEntity, weapon, damage, shotOffset, bodyPart);`
`521`	`521`
`522`		`- if (result is bool)`
	`522`	`+ if (result is bool and false)`
`523`	`523`	`{`
`524`	`524`	`cancel = true;`
`525`	`525`	`}`