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

Check for scene when entering/exiting property

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

60
scripts/server/misc.js
View File

@@ -211,7 +211,7 @@ function enterExitPropertyCommand(command, params, client) {
return false; return false;
} }
if (areServerElementsSupported()) { if (areServerElementsSupported() && getGame() != AGRP_GAME_MAFIA_ONE) {
if (!getPlayerData(client).currentPickup) { if (!getPlayerData(client).currentPickup) {
return false; return false;
} }
@@ -307,7 +307,8 @@ function enterExitPropertyCommand(command, params, client) {
meActionToNearbyPlayers(client, getLanguageLocaleString(englishId, "EntersProperty", typeString, nameString)); meActionToNearbyPlayers(client, getLanguageLocaleString(englishId, "EntersProperty", typeString, nameString));
if (closestProperty.exitScene != "" && isGameFeatureSupported("interiorScene")) { if (closestProperty.exitScene != "" && isGameFeatureSupported("interiorScene")) {
if (isMainWorldScene(closestProperty.exitScene)) { getPlayerCurrentSubAccount(client).spawnPosition = closestProperty.exitPosition;
if (isMainWorldScene(closestProperty.exitScene) || closestProperty.exitScene == "AGRP.MAINWORLD") {
setPlayerScene(client, getGameConfig().mainWorldScene[getGame()]); setPlayerScene(client, getGameConfig().mainWorldScene[getGame()]);
} else { } else {
setPlayerScene(client, closestProperty.exitScene); setPlayerScene(client, closestProperty.exitScene);
@@ -320,7 +321,7 @@ function enterExitPropertyCommand(command, params, client) {
} }
setTimeout(function () { setTimeout(function () {
handlePlayerEnteringExitingProperty(client); processPlayerEnteringExitingProperty(client);
}, 1100); }, 1100);
return true; return true;
} }
@@ -337,11 +338,12 @@ function enterExitPropertyCommand(command, params, client) {
meActionToNearbyPlayers(client, getLanguageLocaleString(englishId, "ExitsProperty", typeString, nameString)); meActionToNearbyPlayers(client, getLanguageLocaleString(englishId, "ExitsProperty", typeString, nameString));
if (closestProperty.exitScene != "" && isGameFeatureSupported("interiorScene")) { if (closestProperty.entranceScene != "" && isGameFeatureSupported("interiorScene")) {
if (isMainWorldScene(closestProperty.exitScene)) { getPlayerCurrentSubAccount(client).spawnPosition = closestProperty.entrancePosition;
if (isMainWorldScene(closestProperty.entranceScene) || closestProperty.entranceScene == "AGRP.MAINWORLD") {
setPlayerScene(client, getGameConfig().mainWorldScene[getGame()]); setPlayerScene(client, getGameConfig().mainWorldScene[getGame()]);
} else { } else {
setPlayerScene(client, closestProperty.exitScene); setPlayerScene(client, closestProperty.entranceScene);
} }
return false; return false;
@@ -352,7 +354,7 @@ function enterExitPropertyCommand(command, params, client) {
} }
setTimeout(function () { setTimeout(function () {
handlePlayerEnteringExitingProperty(client); processPlayerEnteringExitingProperty(client);
}, 1100); }, 1100);
} }
} }
@@ -863,9 +865,7 @@ function processPlayerDeath(client) {
updatePlayerSpawnedState(client, false); updatePlayerSpawnedState(client, false);
setPlayerControlState(client, false); setPlayerControlState(client, false);
setTimeout(function () { setTimeout(function () {
if (isFadeCameraSupported()) { fadePlayerCamera(client, false, 1000);
fadeCamera(client, false, 1.0);
}
setTimeout(function () { setTimeout(function () {
if (isPlayerInPaintBall(client)) { if (isPlayerInPaintBall(client)) {
respawnPlayerForPaintBall(client); respawnPlayerForPaintBall(client);
@@ -880,15 +880,9 @@ function processPlayerDeath(client) {
stopWorking(client); stopWorking(client);
} }
if (getGame() == AGRP_GAME_MAFIA_ONE) { spawnPlayer(client, closestJail.position, closestJail.heading, getGameConfig().skins[getGame()][getPlayerCurrentSubAccount(client).skin][0]);
spawnPlayer(client, getGameConfig().skins[getGame()][getPlayerCurrentSubAccount(client).skin][0], closestJail.position, closestJail.heading);
} else {
spawnPlayer(client, closestJail.position, closestJail.heading, getGameConfig().skins[getGame()][getPlayerCurrentSubAccount(client).skin][0]);
}
if (isFadeCameraSupported()) { fadePlayerCamera(client, true, 1000);
fadeCamera(client, true, 1.0);
}
updatePlayerSpawnedState(client, true); updatePlayerSpawnedState(client, true);
makePlayerStopAnimation(client); makePlayerStopAnimation(client);
setPlayerControlState(client, true); setPlayerControlState(client, true);
@@ -903,16 +897,8 @@ function processPlayerDeath(client) {
stopWorking(client); stopWorking(client);
} }
if (getGame() == AGRP_GAME_MAFIA_ONE) { spawnPlayer(client, closestHospital.position, closestHospital.heading, getGameConfig().skins[getGame()][getPlayerCurrentSubAccount(client).skin][0]);
spawnPlayer(client, getGameConfig().skins[getGame()][getPlayerCurrentSubAccount(client).skin][0], closestHospital.position, closestHospital.heading); fadePlayerCamera(client, true, 1000);
} else {
spawnPlayer(client, closestHospital.position, closestHospital.heading, getGameConfig().skins[getGame()][getPlayerCurrentSubAccount(client).skin][0]);
}
if (isFadeCameraSupported()) {
fadeCamera(client, true, 1.0);
}
updatePlayerSpawnedState(client, true); updatePlayerSpawnedState(client, true);
makePlayerStopAnimation(client); makePlayerStopAnimation(client);
setPlayerControlState(client, true); setPlayerControlState(client, true);
@@ -946,4 +932,20 @@ function isPlayerRestrained(client) {
return (getPlayerData(client).pedState == AGRP_PEDSTATE_BINDED); return (getPlayerData(client).pedState == AGRP_PEDSTATE_BINDED);
} }
// =========================================================================== // ===========================================================================
function getPlayerInPropertyData(client) {
let businessId = getPlayerBusiness(client);
if (businessId != -1) {
getPlayerData(client).inProperty = [AGRP_PROPERTY_TYPE_BUSINESS, businessId];
return false;
}
let houseId = getPlayerHouse(client);
if (houseId != -1) {
getPlayerData(client).inProperty = [AGRP_PROPERTY_TYPE_HOUSE, houseId];
return false;
}
getPlayerData(client).inProperty = null;
}