Add attacker

Author: FileEX

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -4436,6 +4436,10 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
 
                 bitStream->Write(pDamagedPed->GetID());
 
+                bitStream->WriteBit(pInflictingEntity != nullptr);
+                if (pInflictingEntity)
+                    bitStream->Write(pInflictingEntity->GetID());
+
                 SWeaponTypeSync weapon;
                 weapon.data.ucWeaponType = weaponUsed;
                 bitStream->Write(&weapon);

Server/mods/deathmatch/logic/CGame.cpp

@@ -1657,7 +1657,7 @@ void CGame::AddBuiltInEvents()
     m_Events.AddEvent("onPlayerChangesProtectedData", "element, key, value", nullptr, false);
     m_Events.AddEvent("onPlayerChangesWorldSpecialProperty", "property, enabled", nullptr, false);
     m_Events.AddEvent("onPlayerTeleport", "previousX, previousY, previousZ, currentX, currentY, currentZ", nullptr, false);
-    m_Events.AddEvent("onDamageEventCancelled", "damagedEntity, weapon, damage, resourceName", nullptr, false);
+    m_Events.AddEvent("onDamageEventCancelled", "attacker, damagedEntity, weapon, damage, resourceName", nullptr, false);
 
     // Ped events
     m_Events.AddEvent("onPedVehicleEnter", "vehicle, seat, jacked", NULL, false);
@@ -4224,7 +4224,14 @@ void CGame::Packet_CancelDamageEvent(CDamageCancelEventPacket& packet) noexcept
     if (!damagedEntity)
         return;
 
+    CElement* attackerEntity = CElementIDs::GetElement(packet.GetAtackerEntityID());
+
     CLuaArguments arguments;
+    if (attackerEntity)
+        arguments.PushElement(attackerEntity);
+    else
+        arguments.PushNil();
+
     arguments.PushElement(damagedEntity);
     arguments.PushNumber(packet.GetWeaponType());
     arguments.PushNumber(packet.GetDamage());

Server/mods/deathmatch/logic/packets/CDamageCancelEventPacket.cpp

@@ -16,6 +16,9 @@ bool CDamageCancelEventPacket::Read(NetBitStreamInterface& bitStream) noexcept
 {
     bitStream.Read(m_damagedEntityID);
 
+    if (bitStream.ReadBit())
+        bitStream.Read(m_atackerEntityID);
+
     SWeaponTypeSync weaponType;
     bitStream.Read(&weaponType);
     m_weaponType = static_cast<eWeaponType>(weaponType.data.ucWeaponType);

Server/mods/deathmatch/logic/packets/CDamageCancelEventPacket.h

@@ -25,13 +25,15 @@ class CDamageCancelEventPacket final : public CPacket
     bool Read(NetBitStreamInterface& bitStream) noexcept;
 
     ElementID   GetDamagedEntityID() const noexcept { return m_damagedEntityID; }
+    ElementID   GetAtackerEntityID() const noexcept { return m_atackerEntityID; }
     eWeaponType GetWeaponType() const noexcept { return m_weaponType; }
     float       GetDamage() const noexcept { return m_damage; }
     std::string GetResourceName() const noexcept { return m_resourceName; }
 
 private:
     std::string m_resourceName{};
     ElementID   m_damagedEntityID;
+    ElementID   m_atackerEntityID{INVALID_ELEMENT_ID};
     float       m_damage;
     eWeaponType m_weaponType;
 };