Skip to content

Fix NPC_PutInVehicle crash when OnPlayerSpawn destroys the vehicle #1282

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
r4sheed wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix NPC_PutInVehicle crash when OnPlayerSpawn destroys the vehicle #1282

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions Server/Components/CAPI/Impl/NPCs/APIs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,7 @@ OMP_CAPI(NPC_PutInVehicle, bool(objectPtr npc, objectPtr vehicle, int seatId))
{
POOL_ENTITY_RET(vehicles, IVehicle, vehicle, vehicle_, false);
POOL_ENTITY_RET(npcs, INPC, npc, npc_, false);
npc_->putInVehicle(*vehicle_, seatId);
return true;
return npc_->putInVehicle(*vehicle_, seatId);
}

OMP_CAPI(NPC_RemoveFromVehicle, bool(objectPtr npc))
Expand Down
12 changes: 10 additions & 2 deletions Server/Components/NPCs/NPC/npc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ void NPC::respawn()
float health = getHealth();
float armour = getArmour();
auto vehicle = vehicle_;
int vehicleId = vehicle ? vehicle->getID() : INVALID_VEHICLE_ID;
int vehicleSeat = vehicleSeat_;
int skin = player_->getSkin();
PlayerSpecialAction specialAction = getSpecialAction();
Expand Down Expand Up @@ -393,7 +394,7 @@ void NPC::respawn()
setSkin(skin);
setSpecialAction(specialAction);

if (vehicle)
if (vehicle && npcComponent_->getVehiclesPool()->get(vehicleId) == vehicle)
{
putInVehicle(*vehicle, vehicleSeat);
}
Expand Down Expand Up @@ -1548,9 +1549,16 @@ void NPC::exitVehicle()

bool NPC::putInVehicle(IVehicle& vehicle, uint8_t seat)
{
if (player_->getState() != PlayerState_OnFoot && spawning_ == false)
auto state = player_->getState();
if (state != PlayerState_OnFoot && state != PlayerState_Spawned && spawning_ == false)
{
// spawn() runs OnPlayerSpawn, which may destroy the vehicle
int vehicleId = vehicle.getID();
spawn();
if (npcComponent_->getVehiclesPool()->get(vehicleId) != &vehicle)
{
return false;
}
}

auto maxPassengerSeats = getVehiclePassengerSeats(vehicle.getModel());
Expand Down
3 changes: 1 addition & 2 deletions Server/Components/Pawn/Scripting/NPC/Natives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,7 @@ SCRIPT_API(NPC_ExitVehicle, bool(INPC& npc))

SCRIPT_API(NPC_PutInVehicle, bool(INPC& npc, IVehicle& vehicle, int seatId))
{
npc.putInVehicle(vehicle, seatId);
return true;
return npc.putInVehicle(vehicle, seatId);
}

SCRIPT_API(NPC_RemoveFromVehicle, bool(INPC& npc))
Expand Down