Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit f312d1ecda65 · 2025-03-29T11:11:37.000Z
605e16d Revert modified checks for vehicle in & out packet (#4129)
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -2973,7 +2973,7 @@ void CGame::Packet_Vehicle_InOut(CVehicleInOutPacket& Packet)
             // Grab the ped with the chosen ID
             ElementID PedID = Packet.GetPedID();
             CElement* pPedElement = CElementIDs::GetElement(PedID);
-            if (pPedElement && IS_PED(pPedElement) && (pPedElement == pPlayer || !IS_PLAYER(pPedElement)))
+            if (pPedElement && IS_PED(pPedElement))
             {
                 CPed*     pPed = static_cast<CPed*>(pPedElement);
                 bool      bValidPed = false;

Original file line number	Diff line number	Diff line change
`@@ -2973,7 +2973,7 @@ void CGame::Packet_Vehicle_InOut(CVehicleInOutPacket& Packet)`
`2973`	`2973`	`// Grab the ped with the chosen ID`
`2974`	`2974`	`ElementID PedID = Packet.GetPedID();`
`2975`	`2975`	`CElement* pPedElement = CElementIDs::GetElement(PedID);`
`2976`		`- if (pPedElement && IS_PED(pPedElement) && (pPedElement == pPlayer \|\| !IS_PLAYER(pPedElement)))`
	`2976`	`+ if (pPedElement && IS_PED(pPedElement))`
`2977`	`2977`	`{`
`2978`	`2978`	`CPed* pPed = static_cast<CPed*>(pPedElement);`
`2979`	`2979`	`bool bValidPed = false;`