Add onPlayerWeaponGiven/onPlayerWeaponTaken events

Author: omar-o22

Server/mods/deathmatch/logic/CGame.cpp

@@ -1654,6 +1654,8 @@ 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("onPlayerWeaponGiven", "weaponID", nullptr, false);
+    m_Events.AddEvent("onPlayerWeaponTaken", "weaponID, weaponAmmo, weaponSlot", nullptr, false);
 
     // Ped events
     m_Events.AddEvent("onPedVehicleEnter", "vehicle, seat, jacked", NULL, false);
@@ -1662,6 +1664,8 @@ void CGame::AddBuiltInEvents()
     m_Events.AddEvent("onPedWeaponSwitch", "previous, current", NULL, false);
     m_Events.AddEvent("onPedWeaponReload", "weapon, clip, ammo", nullptr, false);
     m_Events.AddEvent("onPedDamage", "loss", NULL, false);
+    m_Events.AddEvent("onPedWeaponGiven", "weaponID", nullptr, false);
+    m_Events.AddEvent("onPedWeaponTaken", "weaponID, weaponAmmo, weaponSlot", nullptr, false);
 
     // Element events
     m_Events.AddEvent("onElementColShapeHit", "colshape, matchingDimension", NULL, false);

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -4823,6 +4823,18 @@ bool CStaticFunctionDefinitions::GiveWeapon(CElement* pElement, unsigned char uc
 
                 unsigned char ucWeaponSlot = CWeaponNames::GetSlotFromWeapon(ucWeaponID);
                 unsigned char ucPreviousWeaponID = pPed->GetWeaponType(ucWeaponSlot);
+                
+                CLuaArguments arguments;
+                arguments.PushNumber(ucWeaponID);
+                arguments.PushNumber(usAmmo);
+                arguments.PushNumber(ucWeaponSlot);
+                if (IS_PLAYER(pElement))
+                    if (!pPed->CallEvent("onPlayerWeaponGiven", arguments))
+                        return false;
+                else
+                    if (!pPed->CallEvent("onPedWeaponGiven", arguments))
+                        return false;
+
                 pPed->SetWeaponType(ucWeaponID, ucWeaponSlot);
                 if (bSetAsCurrent)
                     pPed->SetWeaponSlot(ucWeaponSlot);
@@ -4878,6 +4890,17 @@ bool CStaticFunctionDefinitions::TakeWeapon(CElement* pElement, unsigned char uc
             {
                 CBitStream BitStream;
 
+                CLuaArguments arguments;
+                arguments.PushNumber(ucWeaponID);
+                arguments.PushNumber(usAmmo);
+                arguments.PushNumber(ucWeaponSlot);
+                if (IS_PLAYER(pElement))
+                    if (!pPed->CallEvent("onPlayerWeaponTaken", arguments))
+                        return false;
+                else
+                    if (!pPed->CallEvent("onPedWeaponTaken", arguments))
+                        return false;
+
                 SWeaponTypeSync weaponType;
                 weaponType.data.ucWeaponType = ucWeaponID;
                 BitStream.pBitStream->Write(&weaponType);
@@ -4928,14 +4951,43 @@ bool CStaticFunctionDefinitions::TakeAllWeapons(CElement* pElement)
         CPed* pPed = static_cast<CPed*>(pElement);
         if (pPed->IsSpawned())
         {
-            CBitStream BitStream;
-            m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, TAKE_ALL_WEAPONS, *BitStream.pBitStream));
 
             for (unsigned char ucWeaponSlot = 0; ucWeaponSlot < WEAPON_SLOTS; ++ucWeaponSlot)
             {
-                pPed->SetWeaponType(0, ucWeaponSlot);
-                pPed->SetWeaponAmmoInClip(0, ucWeaponSlot);
-                pPed->SetWeaponTotalAmmo(0, ucWeaponSlot);
+                unsigned char ucWeaponID = pPed->GetWeaponType(ucWeaponSlot);
+                unsigned char ucAmmo = pPed->GetWeaponTotalAmmo(ucWeaponSlot);
+                if (ucWeaponID > 0)
+                {
+                    CLuaArguments arguments;
+                    arguments.PushNumber(ucWeaponID);
+                    arguments.PushNumber(ucAmmo);
+                    arguments.PushNumber(ucWeaponSlot);
+
+                    bool bTake = true;
+                    if (IS_PLAYER(pElement))
+                    {
+                        if (!pPed->CallEvent("onPlayerWeaponTaken", arguments))
+                            bTake = false;
+                    }
+                    else
+                    {
+                        if (!pPed->CallEvent("onPedWeaponTaken", arguments))
+                            bTake = false;
+                    }
+
+                    if (bTake)
+                    {
+                        CBitStream      BitStream;
+                        SWeaponTypeSync weaponType;
+                        weaponType.data.ucWeaponType = ucWeaponID;
+                        BitStream.pBitStream->Write(&weaponType);
+                        m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, TAKE_WEAPON, *BitStream.pBitStream));
+
+                        pPed->SetWeaponType(0, ucWeaponSlot);
+                        pPed->SetWeaponAmmoInClip(0, ucWeaponSlot);
+                        pPed->SetWeaponTotalAmmo(0, ucWeaponSlot);
+                    }
+                }
             }
 
             return true;