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

Check house data before moving entrance

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

30
scripts/server/house.js
View File

@@ -258,6 +258,11 @@ function setHouseBlipCommand(command, params, client) {
function moveHouseEntranceCommand(command, params, client) { function moveHouseEntranceCommand(command, params, client) {
let houseId = toInteger((isPlayerInAnyHouse(client)) ? getPlayerHouse(client) : getClosestHouseEntrance(getPlayerPosition(client))); let houseId = toInteger((isPlayerInAnyHouse(client)) ? getPlayerHouse(client) : getClosestHouseEntrance(getPlayerPosition(client)));
if(!getHouseData(houseId)) {
messagePlayer(client, "You need to be near or inside a house!");
return false;
}
getHouseData(houseId).entrancePosition = getPlayerPosition(client); getHouseData(houseId).entrancePosition = getPlayerPosition(client);
getHouseData(houseId).entranceDimension = getPlayerVirtualWorld(client); getHouseData(houseId).entranceDimension = getPlayerVirtualWorld(client);
getHouseData(houseId).entranceInterior = getPlayerInterior(client); getHouseData(houseId).entranceInterior = getPlayerInterior(client);
@@ -276,9 +281,14 @@ function moveHouseEntranceCommand(command, params, client) {
function moveHouseExitCommand(command, params, client) { function moveHouseExitCommand(command, params, client) {
let houseId = toInteger((isPlayerInAnyHouse(client)) ? getPlayerHouse(client) : getClosestHouseEntrance(getPlayerPosition(client))); let houseId = toInteger((isPlayerInAnyHouse(client)) ? getPlayerHouse(client) : getClosestHouseEntrance(getPlayerPosition(client)));
getHouseData(houseId).entrancePosition = getPlayerPosition(client); if(!getHouseData(houseId)) {
getHouseData(houseId).entranceDimension = getPlayerVirtualWorld(client); messagePlayer(client, "You need to be near or inside a house!");
getHouseData(houseId).entranceInterior = getPlayerInterior(client); return false;
}
getHouseData(houseId).exitPosition = getPlayerPosition(client);
getHouseData(houseId).exitDimension = getPlayerVirtualWorld(client);
getHouseData(houseId).exitInterior = getPlayerInterior(client);
deleteHouseExitBlip(houseId); deleteHouseExitBlip(houseId);
deleteHouseExitPickup(houseId); deleteHouseExitPickup(houseId);
@@ -286,7 +296,7 @@ function moveHouseExitCommand(command, params, client) {
createHouseExitBlip(houseId); createHouseExitBlip(houseId);
createHouseExitPickup(houseId); createHouseExitPickup(houseId);
messageAdmins(`[#AAAAAA]${client.name} [#FFFFFF]moved house [#11CC11]${getHouseData(houseId).name} [#FFFFFF]exit to their position`); messageAdmins(`[#AAAAAA]${client.name} [#FFFFFF]moved house [#11CC11]${getHouseData(houseId).description} [#FFFFFF]exit to their position`);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -526,7 +536,7 @@ function createHouseExitBlip(houseId) {
blipModelId = getHouseData(houseId).exitBlipModel; blipModelId = getHouseData(houseId).exitBlipModel;
} }
getHouseData(houseId).exitBlip = gta.createBlip(getHouseData(houseId).exitPosition, blipModelId, 1, getColourByName("houseGreen")); getHouseData(houseId).exitBlip = gta.createBlip(blipModelId, getHouseData(houseId).exitPosition, 1, getColourByName("houseGreen"));
getHouseData(houseId).exitBlip.onAllDimensions = false; getHouseData(houseId).exitBlip.onAllDimensions = false;
getHouseData(houseId).exitBlip.dimension = getHouseData(houseId).entranceDimension; getHouseData(houseId).exitBlip.dimension = getHouseData(houseId).entranceDimension;
//getHouseData(houseId).exitBlip.interior = getHouseData(houseId).exitInterior; //getHouseData(houseId).exitBlip.interior = getHouseData(houseId).exitInterior;
@@ -626,7 +636,7 @@ function doesHouseHaveInterior(houseId) {
function deleteHouseEntrancePickup(houseId) { function deleteHouseEntrancePickup(houseId) {
if(getHouseData(houseId).entrancePickup != null) { if(getHouseData(houseId).entrancePickup != null) {
removeFromWorld(getHouseData(houseId).entrancePickup); //removeFromWorld(getHouseData(houseId).entrancePickup);
destroyElement(getHouseData(houseId).entrancePickup); destroyElement(getHouseData(houseId).entrancePickup);
getHouseData(houseId).entrancePickup = null; getHouseData(houseId).entrancePickup = null;
} }
@@ -636,7 +646,7 @@ function deleteHouseEntrancePickup(houseId) {
function deleteHouseExitPickup(houseId) { function deleteHouseExitPickup(houseId) {
if(getHouseData(houseId).exitPickup != null) { if(getHouseData(houseId).exitPickup != null) {
removeFromWorld(getHouseData(houseId).exitPickup); //removeFromWorld(getHouseData(houseId).exitPickup);
destroyElement(getHouseData(houseId).exitPickup); destroyElement(getHouseData(houseId).exitPickup);
getHouseData(houseId).exitPickup = null; getHouseData(houseId).exitPickup = null;
} }
@@ -646,7 +656,7 @@ function deleteHouseExitPickup(houseId) {
function deleteHouseEntranceBlip(houseId) { function deleteHouseEntranceBlip(houseId) {
if(getHouseData(houseId).entranceBlip != null) { if(getHouseData(houseId).entranceBlip != null) {
removeFromWorld(getHouseData(houseId).entranceBlip); //removeFromWorld(getHouseData(houseId).entranceBlip);
destroyElement(getHouseData(houseId).entranceBlip); destroyElement(getHouseData(houseId).entranceBlip);
getHouseData(houseId).entranceBlip = null; getHouseData(houseId).entranceBlip = null;
} }
@@ -656,7 +666,7 @@ function deleteHouseEntranceBlip(houseId) {
function deleteHouseExitBlip(houseId) { function deleteHouseExitBlip(houseId) {
if(getHouseData(houseId).exitBlip != null) { if(getHouseData(houseId).exitBlip != null) {
removeFromWorld(getHouseData(houseId).exitBlip); //removeFromWorld(getHouseData(houseId).exitBlip);
destroyElement(getHouseData(houseId).exitBlip); destroyElement(getHouseData(houseId).exitBlip);
getHouseData(houseId).exitBlip = null; getHouseData(houseId).exitBlip = null;
} }
@@ -680,7 +690,7 @@ function reloadAllHousesCommand(command, params, client) {
} }
getServerData().houses = null; getServerData().houses = null;
getServerData().houses = loadHouseFromDatabase(); getServerData().houses = loadHousesFromDatabase();
createAllHousePickups(); createAllHousePickups();
createAllHouseBlips(); createAllHouseBlips();