Fixes

Author: omar-o22

Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp

@@ -18,6 +18,7 @@ void CWeaponRPCs::LoadFunctions()
 {
     AddHandler(GIVE_WEAPON, GiveWeapon, "GiveWeapon");
     AddHandler(TAKE_WEAPON, TakeWeapon, "TakeWeapon");
+    AddHandler(TAKE_WEAPONS, TakeWeapons, "TakeWeapons");
     AddHandler(TAKE_ALL_WEAPONS, TakeAllWeapons, "TakeAllWeapons");
     AddHandler(SET_WEAPON_AMMO, SetWeaponAmmo, "SetWeaponAmmo");
     AddHandler(SET_WEAPON_SLOT, SetWeaponSlot, "SetWeaponSlot");
@@ -185,6 +186,42 @@ void CWeaponRPCs::TakeWeapon(CClientEntity* pSource, NetBitStreamInterface& bitS
     }
 }
 
+void CWeaponRPCs::TakeWeapons(CClientEntity* pSource, NetBitStreamInterface& bitStream)
+{
+    unsigned char count = 0;
+    if (!bitStream.Read(count))
+        return;
+
+    CClientPed* pPed = m_pPedManager->Get(pSource->GetID(), true);
+    if (!pPed)
+        return;
+
+    for (int i = 0; i < count; i++)
+    {
+        unsigned char ucWeaponID, ucAmmo, ucSlot;
+        if (!bitStream.Read(ucWeaponID)) continue;
+        if (!bitStream.Read(ucAmmo)) continue;
+        if (!bitStream.Read(ucSlot)) continue;
+
+        if (!CClientPickupManager::IsValidWeaponID(ucWeaponID))
+            continue;
+
+        if (pPed->IsLocalPlayer())
+        {
+            pPed->RemoveWeapon(static_cast<eWeaponType>(ucWeaponID));
+        }
+        else
+        {
+            CWeapon* pPlayerWeapon = pPed->GetWeapon((eWeaponType)ucWeaponID);
+            if (pPlayerWeapon)
+            {
+                pPlayerWeapon->SetAmmoInClip(0);
+                pPlayerWeapon->SetAmmoTotal(0);
+            }
+        }
+    }
+}
+
 void CWeaponRPCs::TakeAllWeapons(CClientEntity* pSource, NetBitStreamInterface& bitStream)
 {
     CClientPed* pPed = m_pPedManager->Get(pSource->GetID(), true);

Client/mods/deathmatch/logic/rpc/CWeaponRPCs.h

@@ -20,6 +20,7 @@ class CWeaponRPCs : public CRPCFunctions
 
     DECLARE_ELEMENT_RPC(GiveWeapon);
     DECLARE_ELEMENT_RPC(TakeWeapon);
+    DECLARE_ELEMENT_RPC(TakeWeapons);
     DECLARE_ELEMENT_RPC(TakeAllWeapons);
     DECLARE_ELEMENT_RPC(GiveWeaponAmmo);
     DECLARE_ELEMENT_RPC(TakeWeaponAmmo);

Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp

@@ -92,6 +92,7 @@ ADD_ENUM1(SET_VEHICLE_HEADLIGHT_COLOR)
 ADD_ENUM1(SET_VEHICLE_DOOR_OPEN_RATIO)
 ADD_ENUM1(GIVE_WEAPON)
 ADD_ENUM1(TAKE_WEAPON)
+ADD_ENUM1(TAKE_WEAPONS)
 ADD_ENUM1(TAKE_ALL_WEAPONS)
 ADD_ENUM1(SET_WEAPON_AMMO)
 ADD_ENUM1(SET_WEAPON_SLOT)

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -4943,11 +4943,13 @@ bool CStaticFunctionDefinitions::TakeAllWeapons(CElement* pElement)
         CPed* pPed = static_cast<CPed*>(pElement);
         if (pPed->IsSpawned())
         {
+            std::vector<std::tuple<unsigned char, unsigned char, unsigned char>> weapons;
 
             for (unsigned char ucWeaponSlot = 0; ucWeaponSlot < WEAPON_SLOTS; ++ucWeaponSlot)
             {
                 unsigned char ucWeaponID = pPed->GetWeaponType(ucWeaponSlot);
                 unsigned char ucAmmo = pPed->GetWeaponTotalAmmo(ucWeaponSlot);
+
                 if (ucWeaponID > 0)
                 {
                     CLuaArguments arguments;
@@ -4961,11 +4963,7 @@ bool CStaticFunctionDefinitions::TakeAllWeapons(CElement* pElement)
 
                     if (shouldTake)
                     {
-                        CBitStream      BitStream;
-                        SWeaponTypeSync weaponType;
-                        weaponType.data.ucWeaponType = ucWeaponID;
-                        BitStream.pBitStream->Write(&weaponType);
-                        m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, TAKE_WEAPON, *BitStream.pBitStream));
+                        weapons.push_back({ucWeaponID, ucAmmo, ucWeaponSlot});
 
                         pPed->SetWeaponType(0, ucWeaponSlot);
                         pPed->SetWeaponAmmoInClip(0, ucWeaponSlot);
@@ -4974,6 +4972,23 @@ bool CStaticFunctionDefinitions::TakeAllWeapons(CElement* pElement)
                 }
             }
 
+            if (!weapons.empty())
+            {
+                CBitStream    BitStream;
+                unsigned char weaponsTaken = (unsigned char)weapons.size();
+
+                BitStream.pBitStream->Write(weaponsTaken);
+
+                for (auto& w : weapons)
+                {
+                    BitStream.pBitStream->Write(std::get<0>(w));
+                    BitStream.pBitStream->Write(std::get<1>(w));
+                    BitStream.pBitStream->Write(std::get<2>(w));
+                }
+
+                m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, TAKE_WEAPONS, *BitStream.pBitStream));
+            }
+
             return true;
         }
     }

Shared/sdk/net/rpc_enums.h

@@ -101,6 +101,7 @@ enum eElementRPCFunctions
 
     GIVE_WEAPON,
     TAKE_WEAPON,
+    TAKE_WEAPONS,
     TAKE_ALL_WEAPONS,
     SET_WEAPON_AMMO,
     SET_WEAPON_SLOT,