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

More RageMP prep

Browse Source
This commit is contained in:
Vortrex
2022-05-20 16:51:01 -05:00
parent db4967b5d0
commit ae6a08c457
15 changed files with 3709 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/server/business.js
View File

@@ -48,10 +48,10 @@ function loadBusinessesFromDatabase() {
let tempBusinesses = [];
let dbConnection = connectToDatabase();
let dbQuery = null;
let dbAssoc;
let dbAssoc = [];
if(dbConnection) {
<<<<<<< Updated upstream
dbQuery = queryDatabase(dbConnection, `SELECT * FROM biz_main WHERE biz_server = ${getServerId()}`);
if(dbQuery) {
if(dbQuery.numRows > 0) {
@@ -64,6 +64,15 @@ function loadBusinessesFromDatabase() {
}
}
freeDatabaseQuery(dbQuery);
=======
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM biz_main WHERE biz_server = ${getServerId()}`);
for(let i in dbAssoc) {
let tempBusinessData = new BusinessData(dbAssoc[i]);
//tempBusinessData.locations = loadBusinessLocationsFromDatabase(tempBusinessData.databaseId);
//tempBusinessData.gameScripts = loadBusinessGameScriptsFromDatabase(tempBusinessData.databaseId);
tempBusinesses.push(tempBusinessData);
logToConsole(LOG_VERBOSE, `[VRR.Business]: Business '${tempBusinessData.name}' (ID ${tempBusinessData.databaseId}) loaded from database successfully!`);
>>>>>>> Stashed changes
}
disconnectFromDatabase(dbConnection);
}

4
scripts/server/event.js
View File

@@ -627,7 +627,9 @@ function onPlayerSpawn(client) {
// ===========================================================================
function onPlayerCommand(event, client, command, params) {
// Only used for MP mods without an "add command handler" ability
// Not bound on GTA Connected or RageMP
function onPlayerCommand(client, command, params) {
if(!doesCommandExist(command)) {
processPlayerCommand(command, params, client);
}

14
scripts/server/house.js
View File

@@ -35,15 +35,11 @@ function loadHousesFromDatabase() {
let dbAssoc;
if(dbConnection) {
let dbQuery = queryDatabase(dbConnection, `SELECT * FROM house_main WHERE house_server = ${getServerId()}`);
if(dbQuery) {
if(dbQuery.numRows > 0) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempHouseData = new HouseData(dbAssoc);
tempHouses.push(tempHouseData);
logToConsole(LOG_VERBOSE, `[VRR.House]: House '${tempHouseData.description}' (ID ${tempHouseData.databaseId}) loaded!`);
}
}
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM house_main WHERE house_server = ${getServerId()}`);
for(let i in dbAssoc) {
let tempHouseData = new HouseData(dbAssoc[i]);
tempHouses.push(tempHouseData);
logToConsole(LOG_VERBOSE, `[VRR.House]: House '${tempHouseData.description}' (ID ${tempHouseData.databaseId}) loaded!`);
freeDatabaseQuery(dbQuery);
}
disconnectFromDatabase(dbConnection);

30
scripts/server/item.js
View File

@@ -28,17 +28,12 @@ function initItemScript() {
function loadItemsFromDatabase() {
let tempItems = [];
let dbConnection = connectToDatabase();
let dbFetchAssoc;
let dbAssoc;
if(dbConnection) {
let dbQuery = queryDatabase(dbConnection, `SELECT * FROM item_main WHERE item_server = ${getServerId()}`);
if(dbQuery) {
if(dbQuery.numRows > 0) {
while(dbFetchAssoc = fetchQueryAssoc(dbQuery)) {
let tempItemData = new ItemData(dbFetchAssoc);
tempItems.push(tempItemData);
}
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM item_main WHERE item_server = ${getServerId()}`);
for(let i in dbAssoc) {
let tempItemData = new ItemData(dbAssoc[i]);
tempItems.push(tempItemData);
}
disconnectFromDatabase(dbConnection);
}
@@ -50,17 +45,12 @@ function loadItemsFromDatabase() {
function loadItemTypesFromDatabase() {
let tempItemTypes = [];
let dbConnection = connectToDatabase();
let dbFetchAssoc;
let dbAssoc;
if(dbConnection) {
let dbQuery = queryDatabase(dbConnection, `SELECT * FROM item_type WHERE item_type_enabled = 1 AND item_type_server = ${getServerId()}`);
if(dbQuery) {
if(getQueryNumRows(dbQuery) > 0) {
while(dbFetchAssoc = fetchQueryAssoc(dbQuery)) {
let tempItemTypeData = new ItemTypeData(dbFetchAssoc);
tempItemTypes.push(tempItemTypeData);
}
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM item_type WHERE item_type_enabled = 1 AND item_type_server = ${getServerId()}`);
for(let i in dbAssoc) {
let tempItemTypeData = new ItemTypeData(dbAssoc[i]);
tempItemTypes.push(tempItemTypeData);
}
disconnectFromDatabase(dbConnection);
}

147
scripts/server/job.js
View File

@@ -27,24 +27,19 @@ function loadJobsFromDatabase() {
let tempJobs = [];
let dbConnection = connectToDatabase();
let dbQuery = null;
let dbAssoc;
if(dbConnection) {
dbQuery = queryDatabase(dbConnection, `SELECT * FROM job_main WHERE job_enabled = 1 AND job_server = ${getServerId()}`);
if(dbQuery) {
if(dbQuery.numRows > 0) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobData = new JobData(dbAssoc);
tempJobData.locations = loadJobLocationsFromDatabase(tempJobData.databaseId);
tempJobData.equipment = loadJobEquipmentsFromDatabase(tempJobData.databaseId);
tempJobData.uniforms = loadJobUniformsFromDatabase(tempJobData.databaseId);
tempJobData.routes = loadJobRoutesFromDatabase(tempJobData.databaseId);
tempJobs.push(tempJobData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job '${tempJobData.name}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
dbQuery = queryDatabase(dbConnection, );
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM job_main WHERE job_enabled = 1 AND job_server = ${getServerId()}`);
for(let i in dbAssoc) {
let tempJobData = new JobData(dbAssoc[i]);
tempJobData.locations = loadJobLocationsFromDatabase(tempJobData.databaseId);
tempJobData.equipment = loadJobEquipmentsFromDatabase(tempJobData.databaseId);
tempJobData.uniforms = loadJobUniformsFromDatabase(tempJobData.databaseId);
tempJobData.routes = loadJobRoutesFromDatabase(tempJobData.databaseId);
tempJobs.push(tempJobData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job '${tempJobData.name}' loaded from database successfully!`);
}
disconnectFromDatabase(dbConnection);
}
@@ -92,21 +87,15 @@ function loadJobRoutesFromDatabase(jobDatabaseId) {
let tempJobRoutes = [];
let dbConnection = connectToDatabase();
let dbQuery = null;
let dbAssoc;
if(dbConnection) {
dbQuery = queryDatabase(dbConnection, `SELECT * FROM job_route WHERE job_route_enabled = 1 AND job_route_job = ${jobDatabaseId}`);
if(dbQuery) {
if(dbQuery.numRows > 0) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobRouteData = new JobRouteData(dbAssoc);
tempJobRouteData.locations = loadJobRouteLocationsFromDatabase(tempJobRouteData.databaseId);
tempJobRoutes.push(tempJobRouteData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job route '${tempJobRouteData.name}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM job_route WHERE job_route_enabled = 1 AND job_route_job = ${jobDatabaseId}`);
for(let i in dbAssoc) {
let tempJobRouteData = new JobRouteData(dbAssoc[i]);
tempJobRouteData.locations = loadJobRouteLocationsFromDatabase(tempJobRouteData.databaseId);
tempJobRoutes.push(tempJobRouteData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job route '${tempJobRouteData.name}' loaded from database successfully!`);
}
disconnectFromDatabase(dbConnection);
}
@@ -122,20 +111,14 @@ function loadJobRouteLocationsFromDatabase(jobRouteId) {
let tempJobRouteLocations = [];
let dbConnection = connectToDatabase();
let dbQuery = null;
let dbAssoc;
if(dbConnection) {
dbQuery = queryDatabase(dbConnection, `SELECT * FROM job_route_loc WHERE job_route_loc_enabled = 1 AND job_route_loc_route = ${jobRouteId}`);
if(dbQuery) {
if(dbQuery.numRows > 0) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobRouteLocationData = new JobRouteLocationData(dbAssoc);
tempJobRouteLocations.push(tempJobRouteLocationData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job route location '${tempJobRouteLocationData.databaseId}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM job_route_loc WHERE job_route_loc_enabled = 1 AND job_route_loc_route = ${jobRouteId}`);
for(let i in dbAssoc) {
let tempJobRouteLocationData = new JobRouteLocationData(dbAssoc[i]);
tempJobRouteLocations.push(tempJobRouteLocationData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job route location '${tempJobRouteLocationData.databaseId}' loaded from database successfully!`);
}
disconnectFromDatabase(dbConnection);
}
@@ -151,21 +134,15 @@ function loadJobEquipmentsFromDatabase(jobDatabaseId) {
let tempJobEquipments = [];
let dbConnection = connectToDatabase();
let dbQuery = null;
let dbAssoc;
if(dbConnection) {
dbQuery = queryDatabase(dbConnection, "SELECT * FROM `job_equip` WHERE `job_equip_enabled` = 1 AND `job_equip_job` = " + toString(jobDatabaseId));
if(dbQuery) {
if(dbQuery.numRows > 0) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobEquipmentData = new JobEquipmentData(dbAssoc);
tempJobEquipmentData.items = loadJobEquipmentItemsFromDatabase(tempJobEquipmentData.databaseId);
tempJobEquipments.push(tempJobEquipmentData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job equipment '${tempJobEquipmentData.name}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM job_equip WHERE job_equip_enabled = 1 AND job_equip_job = ${jobDatabaseId}`);
for(let i in dbAssoc) {
let tempJobEquipmentData = new JobEquipmentData(dbAssoc[i]);
tempJobEquipmentData.items = loadJobEquipmentItemsFromDatabase(tempJobEquipmentData.databaseId);
tempJobEquipments.push(tempJobEquipmentData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job equipment '${tempJobEquipmentData.name}' loaded from database successfully!`);
}
disconnectFromDatabase(dbConnection);
}
@@ -181,20 +158,14 @@ function loadJobLocationsFromDatabase(jobDatabaseId) {
let tempJobLocations = [];
let dbConnection = connectToDatabase();
let dbQuery = null;
let dbAssoc;
if(dbConnection) {
dbQuery = queryDatabase(dbConnection, "SELECT * FROM `job_loc` WHERE `job_loc_enabled` = 1 AND `job_loc_job` = " + toString(jobDatabaseId));
if(dbQuery) {
if(dbQuery.numRows > 0) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobLocationData = new JobLocationData(dbAssoc);
tempJobLocations.push(tempJobLocationData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job location '${tempJobLocationData.databaseId}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM job_loc WHERE job_loc_enabled = 1 AND job_loc_job = ${jobDatabaseId}`);
for(let i in dbAssoc) {
let tempJobLocationData = new JobLocationData(dbAssoc[i]);
tempJobLocations.push(tempJobLocationData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job location '${tempJobLocationData.databaseId}' loaded from database successfully!`);
}
disconnectFromDatabase(dbConnection);
}
@@ -210,20 +181,14 @@ function loadJobUniformsFromDatabase(jobDatabaseId) {
let tempJobUniforms = [];
let dbConnection = connectToDatabase();
let dbQuery = null;
let dbAssoc;
if(dbConnection) {
dbQuery = queryDatabase(dbConnection, "SELECT * FROM `job_uniform` WHERE `job_uniform_enabled` = 1 AND `job_uniform_job` = " + toString(jobDatabaseId));
if(dbQuery) {
if(dbQuery.numRows > 0) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobUniformData = new JobUniformData(dbAssoc);
tempJobUniforms.push(tempJobUniformData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job uniform '${tempJobUniformData.databaseId}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM job_uniform WHERE job_uniform_enabled = 1 AND job_uniform_job = ${jobDatabaseId}`);
for(let i in dbAssoc) {
let tempJobUniformData = new JobUniformData(dbAssoc[i]);
tempJobUniforms.push(tempJobUniformData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job uniform '${tempJobUniformData.databaseId}' loaded from database successfully!`);
}
disconnectFromDatabase(dbConnection);
}
@@ -239,20 +204,14 @@ function loadJobEquipmentItemsFromDatabase(jobEquipmentDatabaseId) {
let tempJobEquipmentItems = [];
let dbConnection = connectToDatabase();
let dbQuery = null;
let dbAssoc;
if(dbConnection) {
dbQuery = queryDatabase(dbConnection, "SELECT * FROM `job_equip_item` WHERE `job_equip_item_enabled` = 1 AND `job_equip_item_equip` = " + toString(jobEquipmentDatabaseId));
if(dbQuery) {
if(dbQuery.numRows > 0) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobEquipmentItemData = new JobEquipmentItemData(dbAssoc);
tempJobEquipmentItems.push(tempJobEquipmentItemData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job equipment item '${tempJobEquipmentItemData.databaseId}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, `SELECT * FROM job_equip_item WHERE job_equip_item_enabled = 1 AND job_equip_item_equip = ${jobEquipmentDatabaseId}`);
for(let i in dbAssoc) {
let tempJobEquipmentItemData = new JobEquipmentItemData(dbAssoc[i]);
tempJobEquipmentItems.push(tempJobEquipmentItemData);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job equipment item '${tempJobEquipmentItemData.databaseId}' loaded from database successfully!`);
}
disconnectFromDatabase(dbConnection);
}
@@ -268,6 +227,14 @@ function createAllJobBlips() {
return false;
}
if(areServerElementsSupported()) {
return false;
}
if(areBlipsSupported()) {
return false;
}
logToConsole(LOG_DEBUG, `[VRR.Job] Spawning all job location blips ...`);
for(let i in getServerData().jobs) {
for(let j in getServerData().jobs[i].locations) {
@@ -288,6 +255,14 @@ function createAllJobPickups() {
return false;
}
if(areServerElementsSupported()) {
return false;
}
if(arePickupsSupported()) {
return false;
}
logToConsole(LOG_DEBUG, `[VRR.Job] Spawning all job location pickups ...`);
let pickupCount = 0;
for(let i in getServerData().jobs) {
@@ -1987,7 +1962,6 @@ function saveJobRouteToDatabase(jobRouteData) {
["job_route_detail", jobRouteData.detail],
];
let dbQuery = null;
if(jobRouteData.databaseId == 0) {
let queryString = createDatabaseInsertQuery("job_route", data);
dbQuery = queryDatabase(dbConnection, queryString);
@@ -2036,7 +2010,6 @@ function saveJobRouteLocationToDatabase(jobRouteLocationData) {
];
let dbQuery = null;
if(jobRouteLocationData.databaseId == 0) {
let queryString = createDatabaseInsertQuery("job_route_loc", data);
dbQuery = queryDatabase(dbConnection, queryString);
@@ -2082,7 +2055,6 @@ function saveJobLocationToDatabase(jobLocationData) {
["job_loc_vw", jobLocationData.dimension],
];
let dbQuery = null;
if(jobLocationData.databaseId == 0) {
let queryString = createDatabaseInsertQuery("job_loc", data);
dbQuery = queryDatabase(dbConnection, queryString);
@@ -2127,7 +2099,6 @@ function saveJobEquipmentToDatabase(jobEquipmentData) {
["job_equip_name", safeName],
];
let dbQuery = null;
if(tempJobRouteData.databaseId == 0) {
let queryString = createDatabaseInsertQuery("job_equip", data);
dbQuery = queryDatabase(dbConnection, queryString);
@@ -2170,7 +2141,6 @@ function saveJobEquipmentItemToDatabase(jobEquipmentItemData) {
["job_equip_item_value", jobEquipmentItemData.value],
];
let dbQuery = null;
if(tempJobRouteData.databaseId == 0) {
let queryString = createDatabaseInsertQuery("job_equip_item", data);
dbQuery = queryDatabase(dbConnection, queryString);
@@ -2214,7 +2184,6 @@ function saveJobUniformToDatabase(jobUniformData) {
["job_uniform_name", safeName],
];
let dbQuery = null;
if(tempJobRouteData.databaseId == 0) {
let queryString = createDatabaseInsertQuery("job_uniform", data);
dbQuery = queryDatabase(dbConnection, queryString);

152
scripts/server/native/connected.js
View File

@@ -838,8 +838,14 @@ function freeDatabaseQuery(dbQuery) {
// ===========================================================================
function fetchQueryAssoc(dbQuery) {
return dbQuery.fetchAssoc();
async function fetchQueryAssoc(dbQuery) {
let queryAssoc = new Promise(function() {
let result = dbConnection.query(queryString);
let tempAassoc = result.fetchAssoc();
result.free();
resolve(tempAassoc);
});
return queryAssoc;
}
// ===========================================================================
@@ -1166,4 +1172,146 @@ function doesEntityDataExist(entity, dataName) {
return null;
}
<<<<<<< Updated upstream
=======
// ===========================================================================
function getPlayerId(client) {
return client.index;
}
// ===========================================================================
function getPlayerIP(client) {
return client.ip;
}
// ===========================================================================
function getPlayerGameVersion(client) {
client.gameVersion;
}
// ===========================================================================
function setPlayerNativeAdminState(client, state) {
client.administrator = state;
}
// ===========================================================================
function despawnPlayer(client) {
client.despawnPlayer();
}
// ===========================================================================
function getGame() {
return server.game;
}
// ===========================================================================
function getCountryNameFromIP(ip) {
if(module.geoip.getCountryName(ip)) {
return module.geoip.getCountryName(ip);
}
return false;
}
// ===========================================================================
function getSubdivisionNameFromIP(ip) {
if(module.geoip.getSubdivisionName(ip)) {
return module.geoip.getSubdivisionName(ip);
}
return false;
}
// ===========================================================================
function getCityNameFromIP(ip) {
if(module.geoip.getCityNameFromIP(ip)) {
return module.geoip.getCityNameFromIP(ip);
}
return false;
}
// ===========================================================================
function getServerPort() {
return server.port;
}
// ===========================================================================
function serverBanIP(ip) {
server.banIP(ip);
}
// ===========================================================================
function setVehicleTrunkState(vehicle, trunkState) {
sendNetworkEventToPlayer("vrr.veh.trunk", null, getVehicleForNetworkEvent(vehicle), trunkState);
}
// ===========================================================================
function addAllEventHandlers() {
bindServerEventHandler("onResourceStart", onResourceStart)
bindServerEventHandler("onResourceStop", onResourceStart)
addServerEventHandler("onServerStop", onResourceStart);
addServerEventHandler("onResourceStart", onResourceStart);
addServerEventHandler("onResourceStop", onResourceStop);
addServerEventHandler("onServerStop", onResourceStop);
addServerEventHandler("onProcess", onProcess);
addServerEventHandler("onEntityProcess", onEntityProcess);
addServerEventHandler("onPlayerConnect", onInitialConnectionToServer);
addServerEventHandler("onPlayerJoin", onPlayerJoin);
addServerEventHandler("onPlayerJoined", onPlayerJoined);
addServerEventHandler("onPlayerChat", onPlayerChat);
addServerEventHandler("onPlayerQuit", onPlayerQuit);
addServerEventHandler("onElementStreamIn", onElementStreamIn);
addServerEventHandler("onElementStreamOut", onElementStreamOut);
addServerEventHandler("onPedSpawn", onPedSpawn);
addServerEventHandler("onPedEnterVehicle", onPedEnteringVehicle);
addServerEventHandler("onPedExitVehicle", onPedExitingVehicle);
addServerEventHandler("onPedEnteringVehicle", onPedEnteringVehicle);
addServerEventHandler("onPedExitingVehicle", onPedExitingVehicle);
}
// ===========================================================================
function addServerCommandHandler(command, handlerFunction) {
addCommandHandler(command, handlerFunction);
}
// ===========================================================================
function addServerEventHandler(eventName, handlerFunction) {
addEventHandler(eventName, function(event, ...args) {
let result = handlerFunction.apply(this, args);
if(result == false) {
event.preventDefault();
}
});
}
// ===========================================================================
function bindServerEventHandler(eventName, bindTo, handlerFunction) {
addEventHandler(eventName, bindTo, function(event, ...args) {
let result = handlerFunction.apply(this, args);
if(result == false) {
event.preventDefault();
}
});
}
>>>>>>> Stashed changes
// ===========================================================================

1187
scripts/server/native/ragemp.js Normal file
View File

File diff suppressed because it is too large Load Diff

50
scripts/server/npc.js
View File

@@ -59,14 +59,11 @@ function loadNPCsFromDatabase() {
let dbAssoc;
if(dbConnection) {
let dbQueryString = `SELECT * FROM npc_main WHERE npc_server = ${getServerId()} AND npc_enabled = 1`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempNPCData = new NPCData(dbAssoc);
tempNPCData.triggers = loadNPCTriggersFromDatabase();
tempNPCs.push(tempNPCData);
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString);
for(let i in dbAssoc) {
let tempNPCData = new NPCData(dbAssoc[i]);
tempNPCData.triggers = loadNPCTriggersFromDatabase();
tempNPCs.push(tempNPCData);
}
disconnectFromDatabase(dbConnection);
}
@@ -84,15 +81,12 @@ function loadNPCTriggersFromDatabase(npcDatabaseId) {
let dbAssoc;
if(dbConnection) {
let dbQueryString = `SELECT * FROM npc_trig WHERE npc_trig_npc = ${npcDatabaseId} AND npc_trig_enabled = 1`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempNPCTriggerData = new NPCTriggerData(dbAssoc);
tempNPCTriggerData.conditions = loadNPCTriggerConditionsFromDatabase(tempNPCTriggerData.databaseId);
tempNPCTriggerData.responses = loadNPCTriggerResponsesFromDatabase(tempNPCTriggerData.databaseId);
tempNPCTriggers.push(tempNPCTriggerData);
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString);
for(let i in dbAssoc) {
let tempNPCTriggerData = new NPCTriggerData(dbAssoc[i]);
tempNPCTriggerData.conditions = loadNPCTriggerConditionsFromDatabase(tempNPCTriggerData.databaseId);
tempNPCTriggerData.responses = loadNPCTriggerResponsesFromDatabase(tempNPCTriggerData.databaseId);
tempNPCTriggers.push(tempNPCTriggerData);
}
disconnectFromDatabase(dbConnection);
}
@@ -110,13 +104,10 @@ function loadNPCTriggerConditionsFromDatabase(npcTriggerDatabaseId) {
let dbAssoc;
if(dbConnection) {
let dbQueryString = `SELECT * FROM npc_cond WHERE npc_cond_trig = ${npcTriggerDatabaseId} AND npc_cond_enabled = 1`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempNPCTriggerConditionData = new NPCTriggerConditionData(dbAssoc);
tempNPCTriggerConditions.push(tempNPCTriggerConditionData);
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString);
for(let i in dbAssoc) {
let tempNPCTriggerConditionData = new NPCTriggerConditionData(dbAssoc[i]);
tempNPCTriggerConditions.push(tempNPCTriggerConditionData);
}
disconnectFromDatabase(dbConnection);
}
@@ -134,13 +125,10 @@ function loadNPCTriggerResponsesFromDatabase(npcTriggerDatabaseId) {
let dbAssoc;
if(dbConnection) {
let dbQueryString = `SELECT * FROM npc_resp WHERE npc_resp_trig = ${npcTriggerDatabaseId} AND npc_resp_enabled = 1`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempNPCTriggerResponseData = new NPCTriggerResponseData(dbAssoc);
tempNPCTriggerResponses.push(tempNPCTriggerResponseData);
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString);
for(let i in dbAssoc) {
let tempNPCTriggerResponseData = new NPCTriggerResponseData(dbAssoc[i]);
tempNPCTriggerResponses.push(tempNPCTriggerResponseData);
}
disconnectFromDatabase(dbConnection);
}

11
scripts/server/radio.js
View File

@@ -27,13 +27,10 @@ function loadRadioStationsFromDatabase() {
let dbAssoc;
if(dbConnection) {
let dbQueryString = `SELECT * FROM radio_main`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempRadioStationData = new RadioStationData(dbAssoc);
tempRadioStations.push(tempRadioStationData);
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString);
for(let i in dbAssoc) {
let tempRadioStationData = new RadioStationData(dbAssoc[i]);
tempRadioStations.push(tempRadioStationData);
}
disconnectFromDatabase(dbConnection);
}

59
scripts/server/subaccount.js
View File

@@ -20,13 +20,9 @@ function loadSubAccountFromName(firstName, lastName) {
firstName = escapeDatabaseString(dbConnection, firstName);
lastName = escapeDatabaseString(dbConnection, lastName);
let dbQueryString = `SELECT * FROM sacct_main INNER JOIN sacct_svr ON sacct_svr.sacct_svr_sacct=sacct_main.sacct_id AND sacct_svr.sacct_svr_server=${getServerId()} WHERE sacct_name_first = '${firstName}' AND sacct_name_last = '${lastName}' LIMIT 1;`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) {
let dbAssoc = fetchQueryAssoc(dbQuery);
freeDatabaseQuery(dbQuery);
return new SubAccountData(dbAssoc);
}
let dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString);
disconnectFromDatabase(dbConnection);
return new SubAccountData(dbAssoc[0]);
}
return false;
@@ -38,13 +34,9 @@ function loadSubAccountFromId(subAccountId) {
let dbConnection = connectToDatabase();
if(dbConnection) {
let dbQueryString = `SELECT * FROM sacct_main INNER JOIN sacct_svr ON sacct_svr.sacct_svr_sacct=sacct_main.sacct_id AND sacct_svr.sacct_svr_server=${getServerId()} WHERE sacct_id = ${subAccountId} LIMIT 1;`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) {
let dbAssoc = fetchQueryAssoc(dbQuery);
freeDatabaseQuery(dbQuery);
return new SubAccountData(dbAssoc);
}
let dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString);
disconnectFromDatabase(dbConnection);
return new SubAccountData(dbAssoc[0]);
}
return false;
@@ -59,35 +51,32 @@ function loadSubAccountsFromAccount(accountId) {
let dbConnection = connectToDatabase();
if(dbConnection) {
let dbQueryString = `SELECT * FROM sacct_main INNER JOIN sacct_svr ON sacct_svr.sacct_svr_sacct=sacct_main.sacct_id AND sacct_svr.sacct_svr_server=${getServerId()} WHERE sacct_acct = ${accountId} AND sacct_server = ${getServerId()}`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempSubAccount = new SubAccountData(dbAssoc);
dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString);
for(let i in dbAssoc) {
let tempSubAccount = new SubAccountData(dbAssoc[i]);
// Make sure skin is valid
if(tempSubAccount.skin == -1) {
tempSubAccount.skin = getServerConfig().newCharacter.skin;
}
// Make sure skin is valid
if(tempSubAccount.skin == -1) {
tempSubAccount.skin = getServerConfig().newCharacter.skin;
}
// Check if clan and rank are still valid
if(tempSubAccount.clan != 0) {
let clanId = getClanIdFromDatabaseId(tempSubAccount.clan);
if(!getClanData(clanId)) {
tempSubAccount.clan = 0;
// Check if clan and rank are still valid
if(tempSubAccount.clan != 0) {
let clanId = getClanIdFromDatabaseId(tempSubAccount.clan);
if(!getClanData(clanId)) {
tempSubAccount.clan = 0;
tempSubAccount.clanRank = 0;
tempSubAccount.clanTitle = "";
tempSubAccount.clanFlags = 0;
} else {
let rankId = getClanRankIdFromDatabaseId(clanId, tempSubAccount.clanRank);
if(!getClanRankData(clanId, rankId)) {
tempSubAccount.clanRank = 0;
tempSubAccount.clanTitle = "";
tempSubAccount.clanFlags = 0;
} else {
let rankId = getClanRankIdFromDatabaseId(clanId, tempSubAccount.clanRank);
if(!getClanRankData(clanId, rankId)) {
tempSubAccount.clanRank = 0;
}
}
}
tempSubAccounts.push(tempSubAccount);
}
freeDatabaseQuery(dbQuery);
tempSubAccounts.push(tempSubAccount);
}
disconnectFromDatabase(dbConnection);
}

11
scripts/server/vehicle.js
View File

@@ -28,13 +28,10 @@ function loadVehiclesFromDatabase() {
let dbAssoc;
if(dbConnection) {
let dbQueryString = `SELECT * FROM veh_main WHERE veh_server = ${getServerId()} AND veh_deleted = 0`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempVehicleData = new VehicleData(dbAssoc);
tempVehicles.push(tempVehicleData);
}
freeDatabaseQuery(dbQuery);
dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString);
for(let i in dbAssoc) {
let tempVehicleData = new VehicleData(dbAssoc[i]);
tempVehicles.push(tempVehicleData);
}
disconnectFromDatabase(dbConnection);
}