review fixes

Author: Proxy-99

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

@@ -770,11 +770,15 @@ void CElementRPCs::SetElementOnFire(CClientEntity* pSource, NetBitStreamInterfac
 void CElementRPCs::SetElementCollidableWith(CClientEntity* pSource, NetBitStreamInterface& bitStream)
 {
     ElementID ElementID;
-    bool      bCollidable;
+
+      if (!bitStream.Can(eBitStreamVersion::SetElementCollidableWith_Serverside))
+        return;
 
     bitStream.Read(ElementID);
-    bitStream.ReadBit(bCollidable);
 
-   CClientEntity* pCollidableWith = CElementIDs::GetElement(ElementID);
-   pSource->SetCollidableWith(pCollidableWith, bCollidable);
+   CClientEntity* collidableWith = CElementIDs::GetElement(ElementID);
+
+   if (collidableWith == nullptr)            // validity check  
+       return;
+   pSource->SetCollidableWith(collidableWith, bitStream.ReadBit());
 }

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -12567,37 +12567,36 @@ bool CStaticFunctionDefinitions::SpawnVehicleFlyingComponent(CVehicle* const veh
 }
 
 bool CStaticFunctionDefinitions::SetElementCollidableWith(CElement* element, CElement* withElement, bool canCollide)
+{
+    switch (element->GetType())
     {
-        switch (element->GetType())
+        case EElementType::PLAYER:
+        case EElementType::PED:
+        case EElementType::OBJECT:
+        case EElementType::WEAPON:
+        case EElementType::VEHICLE:
         {
-            case EElementType::PLAYER:
-            case EElementType::PED:
-            case EElementType::OBJECT:
-            case EElementType::WEAPON:
-            case EElementType::VEHICLE:
+            switch (withElement->GetType())
             {
-                switch (withElement->GetType())
+                case EElementType::PLAYER:
+                case EElementType::PED:
+                case EElementType::OBJECT:
+                case EElementType::WEAPON:
+                case EElementType::VEHICLE:
                 {
-                    case EElementType::PLAYER:
-                    case EElementType::PED:
-                    case EElementType::OBJECT:
-                    case EElementType::WEAPON:
-                    case EElementType::VEHICLE:
-                    {
-                        CBitStream BitStream;
-                        BitStream.pBitStream->Write(withElement->GetID());
-                        BitStream.pBitStream->WriteBit(canCollide);
-                        m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(element, SET_ELEMENT_COLLIDABLE_WITH, *BitStream.pBitStream));
-                        return true;
-                    }
-                    default:
-                        break;
+                    CBitStream BitStream;
+                    BitStream.pBitStream->Write(withElement->GetID());
+                    BitStream.pBitStream->WriteBit(canCollide);
+                    m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(element, SET_ELEMENT_COLLIDABLE_WITH, *BitStream.pBitStream));
+                    return true;
                 }
+                default:
                 break;
             }
-            default:
-                break;
+            break;
         }
-
-        return false;
+        default:
+        break;
     }
+    return false;
+}

Shared/sdk/net/bitstream.h

@@ -612,6 +612,10 @@ enum class eBitStreamVersion : unsigned short
     // 2025-01-29
     PedSync_CameraRotation,
 
+    //Add setElementCollidableWith serverside
+    // 2025-03-14
+    SetElementCollidableWith_Serverside,
+
     // 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,