Verify bitstream for remote players

multitheftauto · Jan 13, 2024 · d9fb3b1 · d9fb3b1
1 parent d0a0bc1
commit d9fb3b1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp
@@ -172,6 +172,9 @@ void CPlayerRPCs::TakePlayerScreenShot(NetBitStreamInterface& bitStream)
 
 void CPlayerRPCs::RemotePlayerSwitchWeapon(CClientEntity* pSource, NetBitStreamInterface& bitStream)
 {
+    if (!bitStream.Can(eBitStreamVersion::OnPlayerWeaponSwitch_Remote))
+        return;
+
     uint lastSlot, currentSlot;
     if (bitStream.Read(lastSlot) && bitStream.Read(currentSlot))
     {

diff --git a/Server/mods/deathmatch/logic/CRPCFunctions.cpp b/Server/mods/deathmatch/logic/CRPCFunctions.cpp
@@ -181,14 +181,16 @@ void CRPCFunctions::PlayerWeapon(NetBitStreamInterface& bitStream)
             m_pSourcePlayer->CallEvent("onPlayerWeaponSwitch", Arguments);
 
             SViewerMapType& nearList = m_pSourcePlayer->GetNearPlayerList();
+
             if (!nearList.empty())
             {
                 static std::vector<CPlayer*> playersInNearList;
                 playersInNearList.reserve(nearList.size());
                 playersInNearList.clear();
 
                 for (const auto& player : nearList)
-                    playersInNearList.push_back(player.first);
+                    if (player.first->CanBitStream(eBitStreamVersion::OnPlayerWeaponSwitch_Remote))
+                        playersInNearList.push_back(player.first);
 
                 if (!playersInNearList.empty())
                 {

diff --git a/Shared/sdk/net/bitstream.h b/Shared/sdk/net/bitstream.h
@@ -540,6 +540,10 @@ enum class eBitStreamVersion : unsigned short
     // 2023-10-12
     CPlayerJoinCompletePacket_ServerName,
 
+    // Send weapon switch for other players
+    // 2023-01-13
+    OnPlayerWeaponSwitch_Remote,
+
     // This allows us to automatically increment the BitStreamVersion when things are added to this enum.
     // Make sure you only add things above this comment.
     Next,