Fix damage event for grenades

Author: ArKaNeMaN

amxmodx/scripting/CWAPI-A-Test.sma

@@ -96,7 +96,7 @@ public CWAPI_OnLoad() {
     new iTestInteger = 0;
     TrieGetCell(tAbilityParams, "TestInteger", iTestInteger);
 
-    PrintMessage(iWeapon, ItemId, "@OnDamage(%d, %d, %d, %d, %d, %.2f, %d, %d): %d", iWeapon, ItemId, VictimId, InflictorId, AttackerId, fDamage, iDamageBits, tAbilityParams, iTestInteger);
+    PrintMessage(iWeapon, AttackerId, "@OnDamage(%d, %d, %d, %d, %d, %.2f, %d, %d): %d", iWeapon, ItemId, VictimId, InflictorId, AttackerId, fDamage, iDamageBits, tAbilityParams, iTestInteger);
 }
 
 @OnReload(const T_CustomWeapon:iWeapon, const ItemId, &iClipSize, &iAnim, &Float:fDelay, const Trie:tAbilityParams) {
@@ -135,8 +135,15 @@ public CWAPI_OnLoad() {
 }
 
 
-PrintMessage(const T_CustomWeapon:iWeapon, const ItemId, const sMsg[], const any:...) {
-    new UserId = get_member(ItemId, m_pPlayer);
+PrintMessage(const T_CustomWeapon:iWeapon, const fromIndex, const sMsg[], const any:...) {
+    new UserId = 0;
+    if (!is_nullent(fromIndex)) {
+        if (FClassnameIs(fromIndex, "player")) {
+            UserId = fromIndex;
+        } else {
+            UserId = get_member(fromIndex, m_pPlayer);
+        }
+    }
 
     new sFmtMsg[256];
     vformat(sFmtMsg, charsmax(sFmtMsg), sMsg, 4);

amxmodx/scripting/Cwapi/Core/CWeapons/Hooks.inc

@@ -132,8 +132,12 @@ public Hook_PlayerThrowGrenade_Post(const playerIndex, const grenadeItemIndex, F
     if (!CWeapons_GetByItem(grenadeItemIndex, weaponObject, weaponIndex)) {
         return HC_CONTINUE;
     }
-    
-    set_entvar(grenadeItemIndex, var_impulse, CWeapons_GetImpulse(weaponIndex));
+
+    new grenadeEntityIndex = GetHookChainReturn(ATYPE_INTEGER);
+    set_entvar(grenadeEntityIndex, var_impulse, CWeapons_GetImpulse(weaponIndex));
+
+    Dbg_Log("Hook_PlayerThrowGrenade_Post(%n, %d): grenadeEntityIndex = %d.", playerIndex, grenadeItemIndex, grenadeEntityIndex);
+    Dbg_Log("Hook_PlayerThrowGrenade_Post(%n, %d): Set impulse = %d (%d).", playerIndex, grenadeItemIndex, CWeapons_GetImpulse(weaponIndex), weaponIndex);
 
     return HC_CONTINUE;
 }
@@ -339,26 +343,32 @@ public Hook_PlayerTakeDamage_Post(const VictimId, InflictorId, AttackerId, Float
         return HC_CONTINUE;
     }
 
+    Dbg_Log("Hook_PlayerTakeDamage_Post(%d, %d, %d, %.2f, %d)", VictimId, InflictorId, AttackerId, fDamage, iDamageBits);
+
     new itemIndex = 0;
     if (FClassnameIs(InflictorId, "player")) {
         itemIndex = get_member(InflictorId, m_pActiveItem);
     }
+    Dbg_Log(" itemIndex = %d", itemIndex);
 
     /**
      * Для ножа почему-то вызывается хук дамага для тиммейтов,
      * хотя по факту урон не наносится.
      */
     if (
-        IsKnife(itemIndex)
+        (is_nullent(itemIndex) || IsKnife(itemIndex))
         && !rg_is_player_can_takedamage(VictimId, AttackerId)
     ) {
+        Dbg_Log(" knife, cant dmg");
         return HC_CONTINUE;
     }
 
     new weaponObject[S_CustomWeapon], T_CustomWeapon:weapon;
     if (!CWeapons_GetByInflictor(InflictorId, weaponObject, weapon)) {
+        Dbg_Log(" inflictor weapon not found");
         return HC_CONTINUE;
     }
+    Dbg_Log(" weaponObject = %d", weaponObject);
 
     CWeapons_Call(weaponObject, CWeapon_OnDamage, [weapon, itemIndex, VictimId, InflictorId, AttackerId, fDamage, iDamageBits]);
     if (Events_IsRet(CWAPI_STOP_MAIN)) {

amxmodx/scripting/Cwapi/Core/CustomWeapons.inc

@@ -218,8 +218,12 @@ T_CustomWeapon:CWeapons_FindByInflictor(const inflictorIndex) {
     new entityIndex = 0;
     if (FClassnameIs(inflictorIndex, "player")) {
         entityIndex = get_member(inflictorIndex, m_pActiveItem);
+        Dbg_Log("CWeapons_FindByInflictor: Player %d has active item %d", inflictorIndex, entityIndex);
     } else if (FClassnameIs(inflictorIndex, "grenade")) {
         entityIndex = inflictorIndex;
+        Dbg_Log("CWeapons_FindByInflictor: Grenade %d", inflictorIndex);
+    } else {
+        Dbg_Log("CWeapons_FindByInflictor: Unknown inflictor %d", inflictorIndex);
     }
 
     return CWeapons_GetWeaponFromEntity(entityIndex);