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

Revert location overhaul (unfinished)

Browse Source
This commit is contained in:
Vortrex
2021-06-21 15:12:52 -05:00
parent 49dde311a2
commit c006afcb23
4 changed files with 222 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/server/job.js
View File

@@ -1331,35 +1331,6 @@ function saveJobToDatabase(jobData) {
// ===========================================================================
function saveJobToDatabase(jobData) {
if(jobData == null) {
// Invalid job data
return false;
}
console.log(`[VRR.Job]: Saving job ${jobData.name} to database ...`);
let dbConnection = connectToDatabase();
if(dbConnection) {
let safeName = escapeDatabaseString(dbConnection, jobData.name);
// If job hasn't been added to database, ID will be 0
if(jobData.databaseId == 0) {
let dbQueryString = `INSERT INTO job_main (job_name, job_enabled, job_pickup, job_blip, job_type, job_colour_r, job_colour_g, job_colour_b, job_whitelist, job_blacklist) VALUES ('${safeName}', ${boolToInt(jobData.enabled)}, ${jobData.pickupModel}, ${jobData.blipModel}, ${jobData.type}, ${jobData.colourArray[0]}, ${jobData.colourArray[1]}, ${jobData.colourArray[2]})`;
queryDatabase(dbConnection, dbQueryString);
jobData.databaseId = getDatabaseInsertId(dbConnection);
} else {
let dbQueryString = `UPDATE job_main SET job_name='${safeName}', job_enabled=${boolToInt(jobData.enabled)}, job_pickup=${jobData.pickupModel}, job_blip=${jobData.blipModel}, job_type=${jobData.type}, job_colour_r=${jobData.colourArray[0]}, job_colour_g=${jobData.colourArray[1]}, job_colour_b=${jobData.colourArray[2]} WHERE job_id=${jobData.databaseId}`;
queryDatabase(dbConnection, dbQueryString);
}
disconnectFromDatabase(dbConnection);
return true;
}
console.log(`[VRR.Job]: Saved job ${jobData.name} to database!`);
return false;
}
// ---------------------------------------------------------------------------
function saveJobLocationToDatabase(jobLocationData) {
if(jobLocationData == null) {
// Invalid job location data