sync script events now need have the definded return type

Doxoh · Doxoh · commit dc89bf95a532 · 2023-08-06T13:30:07.000+02:00
diff --git a/api/AltV.Net.Async/AltAsync.RegisterEvents.cs b/api/AltV.Net.Async/AltAsync.RegisterEvents.cs
diff --git a/api/AltV.Net.Shared/FunctionParser/ScriptFunction.cs b/api/AltV.Net.Shared/FunctionParser/ScriptFunction.cs
@@ -40,7 +40,7 @@ public ScriptFunctionParameter(bool baseObjectCheck, Type parameterType)
             }
         }
 
-        public static ScriptFunction? Create(Delegate @delegate, Type[] types, bool isAsync = false)
+        public static ScriptFunction? Create(Delegate @delegate, Type[] types, Type? returnType = null, bool isAsync = false)
         {
             var parameters = @delegate.Method.GetParameters();
             if (parameters.Length != types.Length)
@@ -76,6 +76,20 @@ public ScriptFunctionParameter(bool baseObjectCheck, Type parameterType)
                 return null;
             }
 
+            if (!isAsync)
+            {
+                if (returnType 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))
+                {
+                    WrongReturnType(@delegate.Method, returnType, @delegate.Method.ReturnType);
+                    return null;
+                }
+            }
+
             if (isAsync && !typeof(Task).IsAssignableFrom(@delegate.Method.ReturnType))
             {
                 WrongReturnType(@delegate.Method, typeof(Task), @delegate.Method.ReturnType);
diff --git a/api/AltV.Net/Alt.RegisterEvents.cs b/api/AltV.Net/Alt.RegisterEvents.cs
@@ -311,7 +311,7 @@ public static void RegisterEvents(object target)
                                         {
                                             typeof(IPlayer), typeof(IEntity), typeof(uint), typeof(ushort),
                                             typeof(Position), typeof(BodyPart)
-                                        });
+                                        }, typeof(uint));
                                     if (scriptFunction == null) return;
                                     OnWeaponDamage +=
                                         (player, targetEntity, weapon, damage, shotOffset, damageOffset) =>
@@ -322,12 +322,12 @@ public static void RegisterEvents(object target)
                                             scriptFunction.Set(damage);
                                             scriptFunction.Set(shotOffset);
                                             scriptFunction.Set(damageOffset);
-                                            if (scriptFunction.Call() is bool value)
+                                            if (scriptFunction.Call() is uint value)
                                             {
                                                 return value;
                                             }
 
-                                            return true;
+                                            return 0;
                                         };
                                     break;
                                 }
@@ -354,7 +354,7 @@ public static void RegisterEvents(object target)
                                         {
                                             typeof(IPlayer), typeof(ExplosionType), typeof(Position), typeof(uint),
                                             typeof(IEntity)
-                                        });
+                                        }, typeof(bool));
                                     if (scriptFunction == null) return;
                                     OnExplosion += (player, explosionType, position, explosionFx, targetEntity) =>
                                     {
@@ -378,7 +378,7 @@ public static void RegisterEvents(object target)
                                         new[]
                                         {
                                             typeof(IPlayer), typeof(FireInfo[])
-                                        });
+                                        }, typeof(bool));
                                     if (scriptFunction == null) return;
                                     OnFire += (player, fireInfos) =>
                                     {
@@ -400,7 +400,7 @@ public static void RegisterEvents(object target)
                                         {
                                             typeof(IPlayer), typeof(Position), typeof(Position), typeof(uint),
                                             typeof(uint)
-                                        });
+                                        }, typeof(bool));
                                     if (scriptFunction == null) return;
                                     OnStartProjectile += (player, startPosition, direction, ammoHash, weaponHash) =>
                                     {
@@ -424,7 +424,7 @@ public static void RegisterEvents(object target)
                                         new[]
                                         {
                                             typeof(IPlayer), typeof(uint), typeof(uint)
-                                        });
+                                        }, typeof(bool));
                                     if (scriptFunction == null) return;
                                     OnPlayerWeaponChange += (player, oldWeapon, newWeapon) =>
                                     {
@@ -519,7 +519,7 @@ public static void RegisterEvents(object target)
                                         new[]
                                         {
                                             typeof(IVehicle), typeof(IPlayer), typeof(bool)
-                                        });
+                                        }, typeof(bool));
                                     if (scriptFunction == null) return;
                                     OnVehicleHorn += (targetVehicle, reporterPlayer, state) =>
                                     {
@@ -687,7 +687,7 @@ public static void RegisterEvents(object target)
                                         new[]
                                         {
                                             typeof(IPlayer), typeof(int)
-                                        });
+                                        }, 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
@@ -454,15 +454,13 @@ public virtual void OnWeaponDamageEvent(IntPtr eventPointer, IPlayer sourcePlaye
             uint weapon, ushort damage,
             Position shotOffset, BodyPart bodyPart)
         {
-            var cancel = false;
+            uint? weaponDamage = null;
             foreach (var @delegate in WeaponDamageEventHandler.GetEvents())
             {
                 try
                 {
-                    if (!@delegate(sourcePlayer, targetEntity, weapon, damage, shotOffset, bodyPart))
-                    {
-                        cancel = true;
-                    }
+                    var result = @delegate(sourcePlayer, targetEntity, weapon, damage, shotOffset, bodyPart);
+                    weaponDamage ??= result;
                 }
                 catch (TargetInvocationException exception)
                 {
@@ -474,11 +472,11 @@ public virtual void OnWeaponDamageEvent(IntPtr eventPointer, IPlayer sourcePlaye
                 }
             }
 
-            if (cancel)
+            if (weaponDamage is not null)
             {
                 unsafe
                 {
-                    Alt.Core.Library.Shared.Event_Cancel(eventPointer);
+                    Alt.Core.Library.Server.Event_WeaponDamageEvent_SetDamageValue(eventPointer, weaponDamage.Value);
                 }
             }
         }
diff --git a/api/AltV.Net/Events/Events.cs b/api/AltV.Net/Events/Events.cs
@@ -55,7 +55,7 @@ public delegate void PlayerConnectDeniedDelegate(PlayerConnectDeniedReason reaso
     public delegate bool ExplosionDelegate(IPlayer player, ExplosionType explosionType, Position position,
         uint explosionFx, IEntity targetEntity);
 
-    public delegate bool WeaponDamageDelegate(IPlayer player, IEntity target, uint weapon, ushort damage,
+    public delegate uint WeaponDamageDelegate(IPlayer player, IEntity target, uint weapon, ushort damage,
         Position shotOffset, BodyPart bodyPart);
 
     public delegate void VehicleDestroyDelegate(IVehicle vehicle);
diff --git a/runtime b/runtime
@@ -1 +1 @@
-Subproject commit d242c6f4e170900ca7ec36291f7d98afd10fceaa
+Subproject commit 9481ef887946296e61060d7b122bd615a389251f

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public ScriptFunctionParameter(bool baseObjectCheck, Type parameterType)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- public static ScriptFunction? Create(Delegate @delegate, Type[] types, bool isAsync = false)`
	`43`	`+ public static ScriptFunction? Create(Delegate @delegate, Type[] types, Type? returnType = null, bool isAsync = false)`
`44`	`44`	`{`
`45`	`45`	`var parameters = @delegate.Method.GetParameters();`
`46`	`46`	`if (parameters.Length != types.Length)`
`@@ -76,6 +76,20 @@ public ScriptFunctionParameter(bool baseObjectCheck, Type parameterType)`
`76`	`76`	`return null;`
`77`	`77`	`}`
`78`	`78`
	`79`	`+ if (!isAsync)`
	`80`	`+ {`
	`81`	`+ if (returnType is null && !typeof(void).IsAssignableFrom(@delegate.Method.ReturnType))`
	`82`	`+ {`
	`83`	`+ WrongReturnType(@delegate.Method, typeof(void), @delegate.Method.ReturnType);`
	`84`	`+ return null;`
	`85`	`+ }`
	`86`	`+ if (returnType is not null && !returnType.IsAssignableFrom(@delegate.Method.ReturnType))`
	`87`	`+ {`
	`88`	`+ WrongReturnType(@delegate.Method, returnType, @delegate.Method.ReturnType);`
	`89`	`+ return null;`
	`90`	`+ }`
	`91`	`+ }`
	`92`	`+`
`79`	`93`	`if (isAsync && !typeof(Task).IsAssignableFrom(@delegate.Method.ReturnType))`
`80`	`94`	`{`
`81`	`95`	`WrongReturnType(@delegate.Method, typeof(Task), @delegate.Method.ReturnType);`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ public static void RegisterEvents(object target)`
`311`	`311`	`{`
`312`	`312`	`typeof(IPlayer), typeof(IEntity), typeof(uint), typeof(ushort),`
`313`	`313`	`typeof(Position), typeof(BodyPart)`
`314`		`- });`
	`314`	`+ }, typeof(uint));`
`315`	`315`	`if (scriptFunction == null) return;`
`316`	`316`	`OnWeaponDamage +=`
`317`	`317`	`(player, targetEntity, weapon, damage, shotOffset, damageOffset) =>`
`@@ -322,12 +322,12 @@ public static void RegisterEvents(object target)`
`322`	`322`	`scriptFunction.Set(damage);`
`323`	`323`	`scriptFunction.Set(shotOffset);`
`324`	`324`	`scriptFunction.Set(damageOffset);`
`325`		`- if (scriptFunction.Call() is bool value)`
	`325`	`+ if (scriptFunction.Call() is uint value)`
`326`	`326`	`{`
`327`	`327`	`return value;`
`328`	`328`	`}`
`329`	`329`
`330`		`- return true;`
	`330`	`+ return 0;`
`331`	`331`	`};`
`332`	`332`	`break;`
`333`	`333`	`}`
`@@ -354,7 +354,7 @@ public static void RegisterEvents(object target)`
`354`	`354`	`{`
`355`	`355`	`typeof(IPlayer), typeof(ExplosionType), typeof(Position), typeof(uint),`
`356`	`356`	`typeof(IEntity)`
`357`		`- });`
	`357`	`+ }, typeof(bool));`
`358`	`358`	`if (scriptFunction == null) return;`
`359`	`359`	`OnExplosion += (player, explosionType, position, explosionFx, targetEntity) =>`
`360`	`360`	`{`
`@@ -378,7 +378,7 @@ public static void RegisterEvents(object target)`
`378`	`378`	`new[]`
`379`	`379`	`{`
`380`	`380`	`typeof(IPlayer), typeof(FireInfo[])`
`381`		`- });`
	`381`	`+ }, typeof(bool));`
`382`	`382`	`if (scriptFunction == null) return;`
`383`	`383`	`OnFire += (player, fireInfos) =>`
`384`	`384`	`{`
`@@ -400,7 +400,7 @@ public static void RegisterEvents(object target)`
`400`	`400`	`{`
`401`	`401`	`typeof(IPlayer), typeof(Position), typeof(Position), typeof(uint),`
`402`	`402`	`typeof(uint)`
`403`		`- });`
	`403`	`+ }, typeof(bool));`
`404`	`404`	`if (scriptFunction == null) return;`
`405`	`405`	`OnStartProjectile += (player, startPosition, direction, ammoHash, weaponHash) =>`
`406`	`406`	`{`
`@@ -424,7 +424,7 @@ public static void RegisterEvents(object target)`
`424`	`424`	`new[]`
`425`	`425`	`{`
`426`	`426`	`typeof(IPlayer), typeof(uint), typeof(uint)`
`427`		`- });`
	`427`	`+ }, typeof(bool));`
`428`	`428`	`if (scriptFunction == null) return;`
`429`	`429`	`OnPlayerWeaponChange += (player, oldWeapon, newWeapon) =>`
`430`	`430`	`{`
`@@ -519,7 +519,7 @@ public static void RegisterEvents(object target)`
`519`	`519`	`new[]`
`520`	`520`	`{`
`521`	`521`	`typeof(IVehicle), typeof(IPlayer), typeof(bool)`
`522`		`- });`
	`522`	`+ }, typeof(bool));`
`523`	`523`	`if (scriptFunction == null) return;`
`524`	`524`	`OnVehicleHorn += (targetVehicle, reporterPlayer, state) =>`
`525`	`525`	`{`
`@@ -687,7 +687,7 @@ public static void RegisterEvents(object target)`
`687`	`687`	`new[]`
`688`	`688`	`{`
`689`	`689`	`typeof(IPlayer), typeof(int)`
`690`		`- });`
	`690`	`+ }, typeof(bool));`
`691`	`691`	`if (scriptFunction == null) return;`
`692`	`692`	`OnRequestSyncScene += (source, sceneId) =>`
`693`	`693`	`{`
Original file line number	Diff line number	Diff line change
`@@ -454,15 +454,13 @@ public virtual void OnWeaponDamageEvent(IntPtr eventPointer, IPlayer sourcePlaye`
`454`	`454`	`uint weapon, ushort damage,`
`455`	`455`	`Position shotOffset, BodyPart bodyPart)`
`456`	`456`	`{`
`457`		`- var cancel = false;`
	`457`	`+ uint? weaponDamage = null;`
`458`	`458`	`foreach (var @delegate in WeaponDamageEventHandler.GetEvents())`
`459`	`459`	`{`
`460`	`460`	`try`
`461`	`461`	`{`
`462`		`- if (!@delegate(sourcePlayer, targetEntity, weapon, damage, shotOffset, bodyPart))`
`463`		`- {`
`464`		`- cancel = true;`
`465`		`- }`
	`462`	`+ var result = @delegate(sourcePlayer, targetEntity, weapon, damage, shotOffset, bodyPart);`
	`463`	`+ weaponDamage ??= result;`
`466`	`464`	`}`
`467`	`465`	`catch (TargetInvocationException exception)`
`468`	`466`	`{`
`@@ -474,11 +472,11 @@ public virtual void OnWeaponDamageEvent(IntPtr eventPointer, IPlayer sourcePlaye`
`474`	`472`	`}`
`475`	`473`	`}`
`476`	`474`
`477`		`- if (cancel)`
	`475`	`+ if (weaponDamage is not null)`
`478`	`476`	`{`
`479`	`477`	`unsafe`
`480`	`478`	`{`
`481`		`- Alt.Core.Library.Shared.Event_Cancel(eventPointer);`
	`479`	`+ Alt.Core.Library.Server.Event_WeaponDamageEvent_SetDamageValue(eventPointer, weaponDamage.Value);`
`482`	`480`	`}`
`483`	`481`	`}`
`484`	`482`	`}`