Skip to content

Fix push sync vehicle syncer hijack #4887

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
Zephkek wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −8
Open

Fix push sync vehicle syncer hijack #4887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,21 +485,22 @@ void CUnoccupiedVehicleSync::Packet_UnoccupiedVehiclePushSync(CUnoccupiedVehicle
{
// Convert to a CVehicle
CVehicle* pVehicle = static_cast<CVehicle*>(pVehicleElement);
// Is the player syncing this vehicle and there is no driver? Also only process
// this packet if the time context matches.
if (pVehicle->GetSyncer() != pPlayer && pVehicle->GetTimeSinceLastPush() >= MIN_PUSH_ANTISPAM_RATE &&

CPlayer* pSyncer = pVehicle->GetSyncer();
const bool bCanClaimSync = !pSyncer || (!IsSyncerPersistent() && pPlayer->GetContactElement() == pVehicle);

// Push sync is collision-driven, but the packet only carries a vehicle ID.
// Require server-accepted contact before replacing an existing syncer.
if (pVehicle->IsUnoccupiedSyncable() && pSyncer != pPlayer && bCanClaimSync && pVehicle->GetTimeSinceLastPush() >= MIN_PUSH_ANTISPAM_RATE &&
IsPointNearPoint3D(pVehicle->GetPosition(), pPlayer->GetPosition(), static_cast<float>(g_TickRateSettings.iVehicleContactSyncRadius)) &&
pVehicle->GetDimension() == pPlayer->GetDimension())
{
// Is there no player driver?
CPed* pOccupant = pVehicle->GetOccupant(0);
if (!pOccupant || !IS_PLAYER(pOccupant))
{
// Change our syncer
if (!pVehicle->GetSyncer() || !IsSyncerPersistent())
{
OverrideSyncer(pVehicle, pPlayer);
}
// Assign the pusher as syncer.
OverrideSyncer(pVehicle, pPlayer);

// Reset our push time
pVehicle->ResetLastPushTime();
Expand Down
Loading