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

Fix addjobloc cmd

Browse Source
This commit is contained in:
Vortrex
2021-01-05 01:24:19 -06:00
parent 151d5e8606
commit ceb7db95b1
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/server/job.js
View File

@@ -741,8 +741,8 @@ function createJobLocationCommand(command, params, client) {
return false; return false;
} }
createJobLocation(jobId, getPlayerPosition(client)); createJobLocation(jobId, getPlayerPosition(client), getPlayerInterior(client), getPlayerVirtualWorld(client));
messageAdmins(`[#AAAAAA]${client.name} [#FFFFFF]created a location for the [#AAAAAA]${jobData.name} [#FFFFFF]job`); messageAdmins(`[#AAAAAA]${client.name} [#FFFFFF]created a location for the [#AAAAAA]${getJobData(jobId).name} [#FFFFFF]job`);
return true; return true;
} }
@@ -943,7 +943,9 @@ function removePlayerFromJobWhiteListCommand(command, params, client) {
function forceAllPlayersToStopWorking() { function forceAllPlayersToStopWorking() {
getClients().forEach(function(client) { getClients().forEach(function(client) {
stopWorking(client); if(!client.console) {
stopWorking(client);
}
}); });
} }
@@ -1185,7 +1187,7 @@ function canPlayerUseJob(client, jobId) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function deleteJobLocation(jobLocationData) { function deleteJobLocation(jobLocationData) {
removeFromWorld(jobLocationData.pickup); //removeFromWorld(jobLocationData.pickup);
destroyElement(jobLocationData.pickup); destroyElement(jobLocationData.pickup);
} }
@@ -1248,6 +1250,8 @@ function createJobLocation(job, position, interior, dimension) {
getServerData().jobs[job].locations.push(jobLocationData); getServerData().jobs[job].locations.push(jobLocationData);
createJobLocationPickup(job, getServerData().jobs[job].locations.length-1);
saveJobLocationToDatabase(jobLocationData); saveJobLocationToDatabase(jobLocationData);
} }
@@ -1294,6 +1298,7 @@ function saveJobLocationToDatabase(jobLocationData) {
// If job location hasn't been added to database, ID will be 0 // If job location hasn't been added to database, ID will be 0
if(jobLocationData.databaseId == 0) { if(jobLocationData.databaseId == 0) {
let dbQueryString = `INSERT INTO job_loc (job_loc_job, job_loc_enabled, job_loc_pos_x, job_loc_pos_y, job_loc_pos_z, job_loc_int, job_loc_vw) VALUES (${jobLocationData.job}, ${boolToInt(jobLocationData.enabled)}, ${jobLocationData.position.x}, ${jobLocationData.position.y}, ${jobLocationData.position.z}, ${jobLocationData.interior}, ${jobLocationData.dimension})`; let dbQueryString = `INSERT INTO job_loc (job_loc_job, job_loc_enabled, job_loc_pos_x, job_loc_pos_y, job_loc_pos_z, job_loc_int, job_loc_vw) VALUES (${jobLocationData.job}, ${boolToInt(jobLocationData.enabled)}, ${jobLocationData.position.x}, ${jobLocationData.position.y}, ${jobLocationData.position.z}, ${jobLocationData.interior}, ${jobLocationData.dimension})`;
console.log(dbQueryString);
queryDatabase(dbConnection, dbQueryString); queryDatabase(dbConnection, dbQueryString);
jobLocationData.databaseId = getDatabaseInsertId(dbConnection); jobLocationData.databaseId = getDatabaseInsertId(dbConnection);
} else { } else {
@@ -1422,7 +1427,7 @@ function saveAllJobsToDatabase() {
function deleteJobLocationBlip(jobId, locationId) { function deleteJobLocationBlip(jobId, locationId) {
if(getJobData(jobId).locations[locationId].blip != null) { if(getJobData(jobId).locations[locationId].blip != null) {
removeFromWorld(getJobData(jobId).locations[locationId].blip); //removeFromWorld(getJobData(jobId).locations[locationId].blip);
destroyElement(getJobData(jobId).locations[locationId].blip); destroyElement(getJobData(jobId).locations[locationId].blip);
getJobData(jobId).locations[locationId].blip = null; getJobData(jobId).locations[locationId].blip = null;
} }
@@ -1432,7 +1437,7 @@ function deleteJobLocationBlip(jobId, locationId) {
function deleteJobLocationPickup(jobId, locationId) { function deleteJobLocationPickup(jobId, locationId) {
if(getJobData(jobId).locations[locationId].pickup != null) { if(getJobData(jobId).locations[locationId].pickup != null) {
removeFromWorld(getJobData(jobId).locations[locationId].pickup); //removeFromWorld(getJobData(jobId).locations[locationId].pickup);
destroyElement(getJobData(jobId).locations[locationId].pickup); destroyElement(getJobData(jobId).locations[locationId].pickup);
getJobData(jobId).locations[locationId].pickup = null; getJobData(jobId).locations[locationId].pickup = null;
} }