Implement reviewers suggestions

multitheftauto · Feb 11, 2024 · c9d7e05 · c9d7e05
1 parent 62a7fa0
commit c9d7e05
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp
@@ -176,15 +176,15 @@ void CPlayerRPCs::RemotePlayerSwitchWeapon(CClientEntity* pSource, NetBitStreamI
         return;
 
     uint lastSlot, currentSlot;
-    if (bitStream.Read(lastSlot) && bitStream.Read(currentSlot))
-    {
-        CClientPlayer* pPlayer = m_pPlayerManager->Get(pSource->GetID());
-        if (IS_REMOTE_PLAYER(pPlayer))
-        {
-            CLuaArguments Arguments;
-            Arguments.PushNumber(lastSlot);
-            Arguments.PushNumber(currentSlot);
-            pPlayer->CallEvent("onClientPlayerWeaponSwitch", Arguments, true);
-        }
-    }
+    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/Server/mods/deathmatch/logic/CRPCFunctions.cpp b/Server/mods/deathmatch/logic/CRPCFunctions.cpp
@@ -189,8 +189,12 @@ void CRPCFunctions::PlayerWeapon(NetBitStreamInterface& bitStream)
                 playersInNearList.clear();
 
                 for (const auto& player : nearList)
+                {
                     if (player.first->CanBitStream(eBitStreamVersion::OnPlayerWeaponSwitch_Remote))
+                    {
                         playersInNearList.push_back(player.first);
+                    }
+                }
 
                 if (!playersInNearList.empty())
                 {