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

Re-add client-side houses and businesses

Browse Source
This commit is contained in:
Vortrex
2022-05-26 17:32:40 -05:00
parent 381ae3d398
commit 1c673f64bc
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/server/house.js
View File

@@ -841,10 +841,6 @@ function createAllHouseBlips() {
// =========================================================================== // ===========================================================================
function createHouseEntrancePickup(houseId) { function createHouseEntrancePickup(houseId) {
if(!areServerElementsSupported()) {
return false;
}
if(!getServerConfig().createHousePickups) { if(!getServerConfig().createHousePickups) {
return false; return false;
} }
@@ -869,6 +865,7 @@ function createHouseEntrancePickup(houseId) {
pickupModelId = getHouseData(houseId).entrancePickupModel; pickupModelId = getHouseData(houseId).entrancePickupModel;
} }
if(areServerElementsSupported()) {
let entrancePickup = createGamePickup(pickupModelId, getHouseData(houseId).entrancePosition, getGameConfig().pickupTypes[getGame()].house); let entrancePickup = createGamePickup(pickupModelId, getHouseData(houseId).entrancePosition, getGameConfig().pickupTypes[getGame()].house);
if(entrancePickup != null) { if(entrancePickup != null) {
setElementOnAllDimensions(entrancePickup, false); setElementOnAllDimensions(entrancePickup, false);
@@ -880,6 +877,14 @@ function createHouseEntrancePickup(houseId) {
getHouseData(houseId).entrancePickup = entrancePickup; getHouseData(houseId).entrancePickup = entrancePickup;
updateHousePickupLabelData(houseId); updateHousePickupLabelData(houseId);
} }
} else {
let pickupModelId = getGameConfig().pickupModels[getGame()].House;
if(houseData.entrancePickupModel != 0) {
pickupModelId = houseData.entrancePickupModel;
}
sendHouseToPlayer(null, houseId, houseId.description, houseId.entrancePosition, blipModelId, pickupModelId, houseId.hasInterior);
}
} }
// =========================================================================== // ===========================================================================
@@ -912,7 +917,7 @@ function createHouseEntranceBlip(houseId) {
blipModelId = getHouseData(houseId).entranceBlipModel; blipModelId = getHouseData(houseId).entranceBlipModel;
} }
let entranceBlip = createGameBlip(houseData.entrancePosition, blipModelId, getColourByName("houseGreen")); let entranceBlip = createGameBlip(houseData.entrancePosition, blipModelId, 1, getColourByName("houseGreen"));
if(entranceBlip != null) { if(entranceBlip != null) {
if(houseData.exitDimension != -1) { if(houseData.exitDimension != -1) {
setElementDimension(entranceBlip, houseData.entranceDimension); setElementDimension(entranceBlip, houseData.entranceDimension);