fixes

Author: omar-o22

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

@@ -188,20 +188,19 @@ void CWeaponRPCs::TakeWeapon(CClientEntity* pSource, NetBitStreamInterface& bitS
 
 void CWeaponRPCs::TakeWeapons(CClientEntity* pSource, NetBitStreamInterface& bitStream)
 {
-    std::uint8_t count = 0;
+    std::uint32_t count = 0;
     if (!bitStream.Read(count))
         return;
 
     CClientPed* pPed = m_pPedManager->Get(pSource->GetID(), true);
     if (!pPed)
         return;
 
-    for (std::uint8_t i = 0; i < count; i++)
+    for (std::uint32_t i = 0; i < count; i++)
     {
-        unsigned char weaponID, ammo, slot;
-        if (!bitStream.Read(weaponID)) continue;
-        if (!bitStream.Read(ammo)) continue;
-        if (!bitStream.Read(slot)) continue;
+        unsigned char weaponID;
+        if (!bitStream.Read(weaponID))
+            return;
 
         if (!CClientPickupManager::IsValidWeaponID(weaponID))
             continue;

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -4943,7 +4943,7 @@ 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;
+            std::vector<unsigned char> weapons;
 
             for (unsigned char ucWeaponSlot = 0; ucWeaponSlot < WEAPON_SLOTS; ++ucWeaponSlot)
             {
@@ -4963,7 +4963,7 @@ bool CStaticFunctionDefinitions::TakeAllWeapons(CElement* pElement)
 
                     if (shouldTake)
                     {
-                        weapons.push_back({ucWeaponID, ucAmmo, ucWeaponSlot});
+                        weapons.push_back(ucWeaponID);
 
                         pPed->SetWeaponType(0, ucWeaponSlot);
                         pPed->SetWeaponAmmoInClip(0, ucWeaponSlot);
@@ -4975,15 +4975,13 @@ bool CStaticFunctionDefinitions::TakeAllWeapons(CElement* pElement)
             if (!weapons.empty())
             {
                 CBitStream    BitStream;
-                std::size_t weaponsTaken = (std::size_t)weapons.size();
+                std::uint32_t weaponsTaken = (std::uint32_t)weapons.size();
 
                 BitStream.pBitStream->Write(weaponsTaken);
 
-                for (auto& w : weapons)
+                for (auto& weaponID : weapons)
                 {
-                    BitStream.pBitStream->Write(std::get<0>(w));
-                    BitStream.pBitStream->Write(std::get<1>(w));
-                    BitStream.pBitStream->Write(std::get<2>(w));
+                    BitStream.pBitStream->Write(weaponID);
                 }
 
                 m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, TAKE_WEAPONS, *BitStream.pBitStream));

Shared/sdk/net/rpc_enums.h

@@ -101,7 +101,6 @@ enum eElementRPCFunctions
 
     GIVE_WEAPON,
     TAKE_WEAPON,
-    TAKE_WEAPONS,
     TAKE_ALL_WEAPONS,
     SET_WEAPON_AMMO,
     SET_WEAPON_SLOT,
@@ -294,5 +293,7 @@ enum eElementRPCFunctions
 
     SET_ELEMENT_ON_FIRE,
 
+    TAKE_WEAPONS,
+
     NUM_RPC_FUNCS            // Add above this line
 };