Skip to content

Fix network desync when removePedFromVehicle called during vehicle enter (#1519) #4450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix network desync when removePedFromVehicle called during vehicle enter (#1519) #4450

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
defa81b
Add vehicle action handling
MohabCodeX Sep 10, 2025
f34a9d1
Merge branch 'master' into fix/vehicle-enter-cancel-desync
MohabCodeX Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#include "packets/CConsoleEchoPacket.h"
#include "packets/CChatClearPacket.h"
#include "packets/CElementRPCPacket.h"
#include "packets/CVehicleInOutPacket.h"
#include "version.h"
#include <net/rpc_enums.h>

Expand Down Expand Up @@ -4350,6 +4351,28 @@ bool CStaticFunctionDefinitions::RemovePedFromVehicle(CElement* pElement)
auto ucOccupiedSeat = static_cast<unsigned char>(pPed->GetOccupiedVehicleSeat());
if (pVehicle)
{
unsigned int uiVehicleAction = pPed->GetVehicleAction();

// Handle mid-enter/exit states
if (uiVehicleAction == CPed::VEHICLEACTION_ENTERING || uiVehicleAction == CPed::VEHICLEACTION_JACKING)
{
pVehicle->SetOccupant(nullptr, ucOccupiedSeat);
pPed->SetOccupiedVehicle(nullptr, 0);
pPed->SetVehicleAction(CPed::VEHICLEACTION_NONE);

if (uiVehicleAction == CPed::VEHICLEACTION_JACKING)
pPed->SetJackingVehicle(nullptr);

// Clean up client handshake
if (IS_PLAYER(pPed))
{
CVehicleInOutPacket Reply(pPed->GetID(), pVehicle->GetID(), ucOccupiedSeat, CGame::VEHICLE_NOTIFY_IN_ABORT_RETURN);
m_pPlayerManager->BroadcastOnlyJoined(Reply);
}

return true;
}

CLuaArguments Arguments;
Arguments.PushElement(pVehicle); // vehicle
Arguments.PushNumber(ucOccupiedSeat); // seat
Expand All @@ -4369,8 +4392,8 @@ bool CStaticFunctionDefinitions::RemovePedFromVehicle(CElement* pElement)
pVehicle->CallEvent("onVehicleExit", Arguments2);

// Remove him from the vehicle
pVehicle->SetOccupant(NULL, ucOccupiedSeat);
pPed->SetOccupiedVehicle(NULL, 0);
pVehicle->SetOccupant(nullptr, ucOccupiedSeat);
pPed->SetOccupiedVehicle(nullptr, 0);
pPed->SetVehicleAction(CPed::VEHICLEACTION_NONE);

// Tell the players
Expand Down