Revert "Trigger onClientPlayerWeaponSwitch Event for Remote Players (fix

#1141) (#3291)" This reverts commit c4d63b4. For details, see comment on PR #3291
multitheftauto · May 23, 2024 · 032dbd3 · 032dbd3
1 parent 66ebffd
commit 032dbd3
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 54 deletions.
diff --git a/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp
@@ -23,7 +23,6 @@ void CPlayerRPCs::LoadFunctions()
     AddHandler(SET_PLAYER_NAMETAG_SHOWING, SetPlayerNametagShowing, "SetPlayerNametagShowing");
     AddHandler(SET_PLAYER_TEAM, SetPlayerTeam, "SetPlayerTeam");
     AddHandler(TAKE_PLAYER_SCREEN_SHOT, TakePlayerScreenShot, "TakePlayerScreenShot");
-    AddHandler(REMOTE_PLAYER_WEAPON_SWITCH, RemotePlayerSwitchWeapon, "RemotePlayerSwitchWeapon");
 }
 
 void CPlayerRPCs::SetPlayerMoney(NetBitStreamInterface& bitStream)
@@ -169,22 +168,3 @@ void CPlayerRPCs::TakePlayerScreenShot(NetBitStreamInterface& bitStream)
 
     m_pClientGame->TakePlayerScreenShot(usSizeX, usSizeY, strTag, ucQuality, uiMaxBandwidth, usMaxPacketSize, pResource, uiServerSentTime);
 }
-
-void CPlayerRPCs::RemotePlayerSwitchWeapon(CClientEntity* pSource, NetBitStreamInterface& bitStream)
-{
-    if (!bitStream.Can(eBitStreamVersion::OnPlayerWeaponSwitch_Remote))
-        return;
-
-    uint lastSlot, currentSlot;
-    if (!(bitStream.Read(lastSlot) && bitStream.Read(currentSlot)))
-        return;
-
-    CClientPlayer* pPlayer = m_pPlayerManager->Get(pSource->GetID());
-    if (!IS_REMOTE_PLAYER(pPlayer))
-        return;
-
-    CLuaArguments Arguments;
-    Arguments.PushNumber(lastSlot);
-    Arguments.PushNumber(currentSlot);
-    pPlayer->CallEvent("onClientPlayerWeaponSwitch", Arguments, true);
-}
diff --git a/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.h b/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.h
@@ -27,5 +27,4 @@ class CPlayerRPCs : public CRPCFunctions
     DECLARE_ELEMENT_RPC(SetPlayerNametagShowing);
     DECLARE_ELEMENT_RPC(SetPlayerTeam);
     DECLARE_RPC(TakePlayerScreenShot);
-    DECLARE_ELEMENT_RPC(RemotePlayerSwitchWeapon);
 };
diff --git a/Server/mods/deathmatch/logic/CRPCFunctions.cpp b/Server/mods/deathmatch/logic/CRPCFunctions.cpp
@@ -17,7 +17,6 @@
 #include "CElementIDs.h"
 #include "CWeaponNames.h"
 #include "CPerfStatManager.h"
-#include "packets/CElementRPCPacket.h"
 #include "CKeyBinds.h"
 #include "CStaticFunctionDefinitions.h"
 #include "net/SyncStructures.h"
@@ -179,32 +178,6 @@ void CRPCFunctions::PlayerWeapon(NetBitStreamInterface& bitStream)
             Arguments.PushNumber(m_pSourcePlayer->GetWeaponType(uiSlot));
 
             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)
-                {
-                    if (player.first->CanBitStream(eBitStreamVersion::OnPlayerWeaponSwitch_Remote))
-                    {
-                        playersInNearList.push_back(player.first);
-                    }
-                }
-
-                if (!playersInNearList.empty())
-                {
-                    CBitStream BitStream;
-                    BitStream.pBitStream->Write((unsigned int)ucPrevSlot);
-                    BitStream.pBitStream->Write(uiSlot);
-
-                    m_pPlayerManager->Broadcast(CElementRPCPacket(m_pSourcePlayer, REMOTE_PLAYER_WEAPON_SWITCH, *BitStream.pBitStream), playersInNearList);
-                }
-            }
         }
 
         m_pSourcePlayer->SetWeaponSlot(uiSlot);

diff --git a/Shared/sdk/net/bitstream.h b/Shared/sdk/net/bitstream.h
@@ -540,15 +540,10 @@ enum class eBitStreamVersion : unsigned short
     // 2023-10-12
     CPlayerJoinCompletePacket_ServerName,
 
-    // Send weapon switch for other players
-    // 2023-01-13
-    OnPlayerWeaponSwitch_Remote,
-
     // Add "roadsignstext" to setWorldSpecialPropertyEnabled
     // 2024-05-17
     WorldSpecialProperty_RoadSignsText,
 
-
     // 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,

diff --git a/Shared/sdk/net/rpc_enums.h b/Shared/sdk/net/rpc_enums.h
@@ -104,7 +104,6 @@ enum eElementRPCFunctions
     TAKE_ALL_WEAPONS,
     SET_WEAPON_AMMO,
     SET_WEAPON_SLOT,
-    REMOTE_PLAYER_WEAPON_SWITCH,
 
     DESTROY_ALL_BLIPS,
     SET_BLIP_ICON,