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

Fix client house/business handling

Browse Source
This commit is contained in:
Vortrex
2022-09-29 11:14:11 -05:00
parent e18b7c9b31
commit a715cdcc9f
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/server/netevents.js
View File

@@ -131,9 +131,9 @@ function playerClientStarted(client) {
// =========================================================================== // ===========================================================================
function playerClientStopped(client) { function playerClientStopped(client) {
logToConsole(LOG_DEBUG, `[AGRP.Client] ${getPlayerDisplayForConsole(client)}'s client resources have stopped (possibly error?). Kicking them from the server ...`); logToConsole(LOG_DEBUG, `[AGRP.Client] ${getPlayerDisplayForConsole(client)}'s client resources have stopped (possibly error?)`);
getPlayerData(client).customDisconnectReason = "ClientScriptVerificationFail"; //getPlayerData(client).customDisconnectReason = "ClientScriptVerificationFail";
disconnectPlayer(client); //disconnectPlayer(client);
} }
// =========================================================================== // ===========================================================================
@@ -1103,19 +1103,19 @@ function setPlayerInfiniteRun(client, state) {
// ========================================================================== // ==========================================================================
function sendBusinessToPlayer(client, businessId, name, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior, hasItems) { function sendBusinessToPlayer(client, businessId, name, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior, locked, hasItems) {
sendNetworkEventToPlayer("agrp.business", client, businessId, name, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior, hasItems); sendNetworkEventToPlayer("agrp.business", client, businessId, name, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior, locked, hasItems);
} }
// ========================================================================== // ==========================================================================
function sendHouseToPlayer(client, houseId, description, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior) { function sendHouseToPlayer(client, houseId, description, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior, locked) {
sendNetworkEventToPlayer("agrp.house", client, houseId, description, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior); sendNetworkEventToPlayer("agrp.house", client, houseId, description, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior, locked);
} }
// ========================================================================== // ==========================================================================
function sendJobToPlayer(client, jobId, jobLocationId, name, position) { function sendJobToPlayer(client, jobId, jobLocationId, name, position, blipModel, pickupModel) {
sendNetworkEventToPlayer("agrp.job", client, jobId, jobLocationId, name, position); sendNetworkEventToPlayer("agrp.job", client, jobId, jobLocationId, name, position);
} }
@@ -1149,7 +1149,7 @@ function sendAllJobsToPlayer(client) {
let jobs = getServerData().jobs; let jobs = getServerData().jobs;
for (let i in jobs) { for (let i in jobs) {
for (let j in jobs[i].locations) { for (let j in jobs[i].locations) {
sendJobToPlayer(client, jobs[i].index, jobs[i].locations[j].index, jobs[i].name, jobs[i].locations[j].position, jobs[i].blipModel); sendJobToPlayer(client, jobs[i].index, jobs[i].locations[j].index, jobs[i].name, jobs[i].locations[j].position, jobs[i].pickupModel, jobs[i].blipModel);
} }
} }
} }
@@ -1298,6 +1298,11 @@ function sendMapChangeWarningToPlayer(client, changingToNight) {
function playerMapLoaded(client, mapName) { function playerMapLoaded(client, mapName) {
//updateAllInteriorVehiclesForPlayer(client, propertyData.exitInterior, propertyData.exitDimension); //updateAllInteriorVehiclesForPlayer(client, propertyData.exitInterior, propertyData.exitDimension);
getPlayerData(client).scene = mapName;
setTimeout(function () {
processPlayerEnteringExitingProperty(client);
}, 500);
} }
// ========================================================================== // ==========================================================================
@@ -1306,4 +1311,10 @@ function setMapChangeWarningForPlayer(client, isChanging) {
sendNetworkEventToPlayer("agrp.mapChangeWarning", client, isChanging); sendNetworkEventToPlayer("agrp.mapChangeWarning", client, isChanging);
} }
// ==========================================================================
function fadePlayerCamera(client, fadeIn, time, colour = toColour(0, 0, 0, 255)) {
sendNetworkEventToPlayer("agrp.fadeCamera", client, fadeIn, time, colour);
}
// ========================================================================== // ==========================================================================