make WeaponDamageDelegate dynamic return

Author: Doxoh

api/AltV.Net/Core.Events.cs

@@ -407,7 +407,8 @@ public virtual void OnPlayerDeathEvent(IPlayer player, IEntity killer, uint weap
             }
         }
 
-        public void OnPlayerHeal(IntPtr playerPointer, ushort oldHealth, ushort newHealth, ushort oldArmour, ushort newArmour)
+        public void OnPlayerHeal(IntPtr playerPointer, ushort oldHealth, ushort newHealth, ushort oldArmour,
+            ushort newArmour)
         {
             var player = PoolManager.Player.Get(playerPointer);
             if (player == null)
@@ -420,7 +421,8 @@ public void OnPlayerHeal(IntPtr playerPointer, ushort oldHealth, ushort newHealt
             OnPlayerHealEvent(player, oldHealth, newHealth, oldArmour, newArmour);
         }
 
-        public virtual void OnPlayerHealEvent(IPlayer player, ushort oldHealth, ushort newHealth, ushort oldArmour, ushort newArmour)
+        public virtual void OnPlayerHealEvent(IPlayer player, ushort oldHealth, ushort newHealth, ushort oldArmour,
+            ushort newArmour)
         {
             foreach (var @delegate in PlayerHealEventHandler.GetEvents())
             {
@@ -510,12 +512,21 @@ public virtual void OnWeaponDamageEvent(IntPtr eventPointer, IPlayer sourcePlaye
             Position shotOffset, BodyPart bodyPart)
         {
             uint? weaponDamage = null;
+            var cancel = false;
             foreach (var @delegate in WeaponDamageEventHandler.GetEvents())
             {
                 try
                 {
                     var result = @delegate(sourcePlayer, targetEntity, weapon, damage, shotOffset, bodyPart);
-                    weaponDamage ??= result;
+
+                    if (result is bool)
+                    {
+                        cancel = true;
+                    }
+                    else if (uint.TryParse(result, out uint newDamage))
+                    {
+                        weaponDamage ??= newDamage;
+                    }
                 }
                 catch (TargetInvocationException exception)
                 {
@@ -534,6 +545,14 @@ public virtual void OnWeaponDamageEvent(IntPtr eventPointer, IPlayer sourcePlaye
                     Alt.Core.Library.Server.Event_WeaponDamageEvent_SetDamageValue(eventPointer, weaponDamage.Value);
                 }
             }
+
+            if (cancel)
+            {
+                unsafe
+                {
+                    Alt.Core.Library.Shared.Event_Cancel(eventPointer);
+                }
+            }
         }
 
         public void OnPlayerChangeVehicleSeat(IntPtr vehiclePointer, IntPtr playerPointer, byte oldSeat,

api/AltV.Net/Events/Events.cs

@@ -59,7 +59,7 @@ public delegate void PlayerHealDelegate(IPlayer target, ushort oldHealth, ushort
     public delegate bool ExplosionDelegate(IPlayer player, ExplosionType explosionType, Position position,
         uint explosionFx, IEntity targetEntity);
 
-    public delegate uint WeaponDamageDelegate(IPlayer player, IEntity target, uint weapon, ushort damage,
+    public delegate dynamic WeaponDamageDelegate(IPlayer player, IEntity target, uint weapon, ushort damage,
         Position shotOffset, BodyPart bodyPart);
 
     public delegate void VehicleDestroyDelegate(IVehicle vehicle);