Source

Author: Nico8340

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -4412,6 +4412,25 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
             }
             pDamagedPed->GetGamePlayer()->SetHealth(fPreviousHealth);
             pDamagedPed->GetGamePlayer()->SetArmor(fPreviousArmor);
+
+            if (IS_PLAYER(pDamagedPed) && pDamagedPed->IsLocalPlayer() && g_pNet->CanServerBitStream(eBitStreamVersion::PlayerDamageCancelled))
+            {
+                if (auto stream = g_pNet->AllocateNetBitStream())
+                {
+                    if (pInflictingEntity)
+                        stream->Write(pInflictingEntity->GetID());
+                    else
+                        stream->Write(0);
+
+                    stream->Write(static_cast<std::uint8_t>(weaponUsed));
+                    stream->Write(static_cast<std::uint8_t>(hitZone));
+                    stream->Write(fDamage);
+
+                    g_pNet->SendPacket(PACKET_ID_PLAYER_DAMAGE_CANCELLED, stream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
+                    g_pNet->DeallocateNetBitStream(stream);
+                }
+            }
+
             return false;
         }
 

Server/mods/deathmatch/logic/CGame.cpp

@@ -59,6 +59,7 @@
 #include "packets/CPlayerListPacket.h"
 #include "packets/CPlayerClothesPacket.h"
 #include "packets/CPlayerWorldSpecialPropertyPacket.h"
+#include "packets/CPlayerDamageCancelledPacket.h"
 #include "packets/CServerInfoSyncPacket.h"
 #include "packets/CLuaPacket.h"
 #include "../utils/COpenPortsTester.h"
@@ -1322,6 +1323,12 @@ bool CGame::ProcessPacket(CPacket& Packet)
             return true;
         }
 
+        case PACKET_ID_PLAYER_DAMAGE_CANCELLED:
+        {
+            Packet_PlayerDamageCancelled(static_cast<CPlayerDamageCancelledPacket&>(Packet));
+            return true;
+        }
+
         default:
             break;
     }
@@ -1642,6 +1649,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("onPlayerDamageCancelled", "attacker, cause, bodypart, loss", nullptr, false);
 
     // Ped events
     m_Events.AddEvent("onPedVehicleEnter", "vehicle, seat, jacked", NULL, false);
@@ -4307,6 +4315,32 @@ void CGame::Packet_PlayerWorldSpecialProperty(CPlayerWorldSpecialPropertyPacket&
     player->CallEvent("onPlayerChangesWorldSpecialProperty", arguments, nullptr);
 }
 
+void CGame::Packet_PlayerDamageCancelled(CPlayerDamageCancelledPacket& packet) noexcept
+{
+    CPlayer* player = packet.GetSourcePlayer();
+
+    if (!player)
+        return;
+
+    const std::uint32_t attacker = packet.GetAttacker();
+    const std::uint8_t cause = packet.GetCause();
+    const std::uint8_t bodypart = packet.GetBodypart();
+    const float loss = packet.GetLoss();
+
+    CLuaArguments arguments;
+
+    if (GetElementFromId<CElement>(attacker))
+        arguments.PushElement(GetElementFromId<CElement>(attacker));
+    else
+        arguments.PushNil();
+
+    arguments.PushNumber(cause);
+    arguments.PushNumber(bodypart);
+    arguments.PushNumber(loss);
+
+    player->CallEvent("onPlayerDamageCancelled", arguments, nullptr);
+}
+
 void CGame::Packet_PlayerModInfo(CPlayerModInfoPacket& Packet)
 {
     CPlayer* pPlayer = Packet.GetSourcePlayer();

Server/mods/deathmatch/logic/CPacketTranslator.cpp

@@ -49,6 +49,7 @@
 #include "packets/CPlayerNetworkStatusPacket.h"
 #include "packets/CPlayerResourceStartPacket.h"
 #include "packets/CPlayerWorldSpecialPropertyPacket.h"
+#include "packets/CPlayerDamageCancelledPacket.h"
 
 CPacketTranslator::CPacketTranslator(CPlayerManager* pPlayerManager)
 {
@@ -217,6 +218,10 @@ CPacket* CPacketTranslator::Translate(const NetServerPlayerID& Socket, ePacketID
             pTemp = new CPlayerWorldSpecialPropertyPacket;
             break;
 
+        case PACKET_ID_PLAYER_DAMAGE_CANCELLED:
+            pTemp = new CPlayerDamageCancelledPacket;
+            break;
+
         default:
             break;
     }

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

@@ -0,0 +1,22 @@
+/*****************************************************************************
+ *
+ *  PROJECT:     Multi Theft Auto
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        mods/deathmatch/logic/packets/CPlayerDamageCancelledPacket.cpp
+ *
+ *  Multi Theft Auto is available from https://www.multitheftauto.com/
+ *
+ *****************************************************************************/
+
+#include "StdInc.h"
+#include "CPlayerDamageCancelledPacket.h"
+
+bool CPlayerDamageCancelledPacket::Read(NetBitStreamInterface& stream) noexcept
+{
+    stream.Read(m_attacker);
+    stream.Read(m_cause);
+    stream.Read(m_bodypart);
+    stream.Read(m_loss);
+
+    return true;
+}

Shared/mods/deathmatch/logic/Enums.cpp

@@ -216,4 +216,5 @@ ADD_ENUM1(PACKET_ID_SERVER_INFO_SYNC)
 ADD_ENUM1(PACKET_ID_DISCORD_JOIN)
 ADD_ENUM1(PACKET_ID_PLAYER_RESOURCE_START)
 ADD_ENUM1(PACKET_ID_PLAYER_WORLD_SPECIAL_PROPERTY)
+ADD_ENUM1(PACKET_ID_PLAYER_DAMAGE_CANCELLED)
 IMPLEMENT_ENUM_END("ePacketID")