hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear equip and respawn job veh on stopwork

Browse Source
This commit is contained in:
Vortrex
2021-11-30 21:52:26 -06:00
parent c725c46450
commit ef80e28470
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/server/job.js
View File

@@ -418,15 +418,9 @@ function stopWorkingCommand(command, params, client) {
return false; return false;
} }
//if(getPlayerCurrentSubAccount(client).job != closestJob.jobType) { deleteJobItems(client);
// messagePlayerError(client, "This is not your job!");
// messagePlayerInfo(client, "Use /quitjob if you want to quit your current job and take this one.");
// break;
//}
messagePlayerSuccess(client, "You have stopped working!");
stopWorking(client); stopWorking(client);
//showApproachCurrentJobTip(client); messagePlayerSuccess(client, "You have stopped working!");
return true; return true;
} }
@@ -549,14 +543,7 @@ function stopWorking(client) {
//client.player.removeFromVehicle(); //client.player.removeFromVehicle();
} }
let vehicleData = getVehicleData(jobVehicle); respawnVehicle(jobVehicle);
jobVehicle.fix();
jobVehicle.position = vehicleData.spawnPosition;
jobVehicle.heading = vehicleData.spawnRotation;
jobVehicle.locked = true;
jobVehicle.engine = false;
jobVehicle.lights = false;
jobVehicle.siren = true;
getPlayerCurrentSubAccount(client).lastJobVehicle = false; getPlayerCurrentSubAccount(client).lastJobVehicle = false;
} }
@@ -569,27 +556,27 @@ function stopWorking(client) {
let jobId = getPlayerJob(client); let jobId = getPlayerJob(client);
switch(getJobType(jobId)) { switch(getJobType(jobId)) {
case VRR_JOB_POLICE: case VRR_JOB_POLICE:
messagePlayerInfo(client, "Your uniform, equipment, and police car have been returned to the police station"); messagePlayerInfo(client, "Your uniform, equipment, and vehicle have been returned to the police station");
break; break;
case VRR_JOB_MEDICAL: case VRR_JOB_MEDICAL:
messagePlayerInfo(client, "Your uniform and ambulance have been returned to the hospital"); messagePlayerInfo(client, "Your uniform, equipment, and vehicle have been returned to the hospital");
break; break;
case VRR_JOB_FIRE: case VRR_JOB_FIRE:
messagePlayerInfo(client, "Your uniform and fire truck have been returned to the fire station"); messagePlayerInfo(client, "Your uniform, equipment, and vehicle have been returned to the fire station");
break; break;
case VRR_JOB_BUS: case VRR_JOB_BUS:
messagePlayerInfo(client, "Your bus has been returned to the bus depot"); messagePlayerInfo(client, "Your vehicle has been returned to the bus depot");
break; break;
case VRR_JOB_TAXI: case VRR_JOB_TAXI:
messagePlayerInfo(client, "Your taxi has been returned to the taxi depot"); messagePlayerInfo(client, "Your vehicle has been returned to the taxi depot");
break; break;
case VRR_JOB_GARBAGE: case VRR_JOB_GARBAGE:
messagePlayerInfo(client, "Your trash truck has been returned to the city landfill"); messagePlayerInfo(client, "Your vehicle has been returned to the city trash dump");
break; break;
case VRR_JOB_WEAPON: case VRR_JOB_WEAPON: