Commit af4f7fa

authored

Fix onVehicleExit doesn't trigger if pulled out (#3492)

1 parent 2043acf commit af4f7faCopy full SHA for af4f7fa

File tree

1 file changed

+24

-0

lines changed

Server/mods/deathmatch/logic
- CGame.cpp

1 file changed

+24

-0

lines changed

`‎Server/mods/deathmatch/logic/CGame.cpp‎`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3659,6 +3659,7 @@ void CGame::Packet_Vehicle_InOut(CVehicleInOutPacket& Packet)`
`3659`	`3659`	`if (pPed->GetVehicleAction() == CPed::VEHICLEACTION_JACKING)`
`3660`	`3660`	`{`
`3661`	`3661`	`unsigned char ucDoor = Packet.GetDoor();`
	`3662`	`+ unsigned char ucOccupiedSeat = pPed->GetOccupiedVehicleSeat();`
`3662`	`3663`	`float fAngle = Packet.GetDoorAngle();`
`3663`	`3664`	`CPed* pJacked = pVehicle->GetOccupant(0);`
`3664`	`3665`
`@@ -3692,6 +3693,29 @@ void CGame::Packet_Vehicle_InOut(CVehicleInOutPacket& Packet)`
`3692`	`3693`	`CVehicleInOutPacket JackedReply(pJacked->GetID(), VehicleID, 0, VEHICLE_NOTIFY_OUT_RETURN);`
`3693`	`3694`	`m_pPlayerManager->BroadcastOnlyJoined(JackedReply);`
`3694`	`3695`
	`3696`	`+ CLuaArguments Arguments;`
	`3697`	`+ Arguments.PushElement(pVehicle); // vehicle`
	`3698`	`+ Arguments.PushNumber(ucOccupiedSeat); // seat`
	`3699`	`+ Arguments.PushElement(pPed); // jacker`
	`3700`	`+ Arguments.PushBoolean(false); // forcedByScript`
	`3701`	`+`
	`3702`	`+ if (pJacked->IsPlayer())`
	`3703`	`+ {`
	`3704`	`+ pJacked->CallEvent("onPlayerVehicleExit", Arguments);`
	`3705`	`+ }`
	`3706`	`+ else`
	`3707`	`+ {`
	`3708`	`+ pJacked->CallEvent("onPedVehicleExit", Arguments);`
	`3709`	`+ }`
	`3710`	`+`
	`3711`	`+ CLuaArguments Arguments2;`
	`3712`	`+ Arguments2.PushElement(pJacked); // jacked`
	`3713`	`+ Arguments2.PushNumber(ucOccupiedSeat); // seat`
	`3714`	`+ Arguments2.PushElement(pPed); // jacker`
	`3715`	`+ Arguments2.PushBoolean(false); // forcedByScript`
	`3716`	`+`
	`3717`	`+ pVehicle->CallEvent("onVehicleExit", Arguments2);`
	`3718`	`+`
`3695`	`3719`	`if (!sendListIncompatiblePlayers.empty())`
`3696`	`3720`	`{`
`3697`	`3721`	`// Warp the ped out of the vehicle manually for incompatible players`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit af4f7fa

File tree

1 file changed

1 file changed

`‎Server/mods/deathmatch/logic/CGame.cpp‎`

0 commit comments