From 930c66a439a590bd3e7395f318f539ccc4db5d50 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 30 Dec 2021 16:03:07 -0600 Subject: [PATCH] Reverted 1.4.0 stuff This reverts commit 7a5167743bc5ff520688adf0d9093cb007fb9dc6. Revert "Use new stream distance stuff" This reverts commit bdda7caf4c9b73521a2f8ae9b9ecf3783b8c8cca. Revert "Add blip/pickup distance to global cfg" This reverts commit 5a916c4a9853c1cbeb75be368050c01d5f5da253. Revert "Add utils for new element streaming funcs" This reverts commit 22d39ceb69e806ba9e819285d016f6a8aa9076d9. --- scripts/server/business.js | 19 ++++++++------ scripts/server/config.js | 7 ------ scripts/server/event.js | 3 +++ scripts/server/house.js | 11 ++------ scripts/server/native/connected.js | 40 ------------------------------ 5 files changed, 16 insertions(+), 64 deletions(-) diff --git a/scripts/server/business.js b/scripts/server/business.js index 5c23034b..e4e1fef6 100644 --- a/scripts/server/business.js +++ b/scripts/server/business.js @@ -1324,8 +1324,6 @@ function createBusinessEntrancePickup(businessId) { getBusinessData(businessId).entrancePickup = createGamePickup(pickupModelId, getBusinessData(businessId).entrancePosition, getGameConfig().pickupTypes[getServerGame()].business); setElementOnAllDimensions(getBusinessData(businessId).entrancePickup, false); setElementDimension(getBusinessData(businessId).entrancePickup, getBusinessData(businessId).entranceDimension); - setElementStreamInDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().businessPickupStreamInDistance); - setElementStreamOutDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().businessPickupStreamOutDistance); updateBusinessPickupLabelData(businessId); addToWorld(getBusinessData(businessId).entrancePickup); } @@ -1348,8 +1346,11 @@ function createBusinessEntranceBlip(businessId) { getBusinessData(businessId).entranceBlip = createGameBlip(getBusinessData(businessId).entrancePosition, blipModelId, 1, getColourByName("businessBlue")); setElementOnAllDimensions(getBusinessData(businessId).entranceBlip, false); setElementDimension(getBusinessData(businessId).entranceBlip, getBusinessData(businessId).entranceDimension); - setElementStreamInDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().businessBlipStreamInDistance); - setElementStreamOutDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().businessBlipStreamOutDistance); + //getBusinessData(businessId).entranceBlip.streamInDistance = 300; + //getBusinessData(businessId).entranceBlip.streamOutDistance = 350; + //getBusinessData(businessId).entranceBlip.interior = getBusinessData(businessId).entranceInterior; + //setEntityData(getBusinessData(businessId).entranceBlip, "vrr.owner.type", VRR_BLIP_BUSINESS_ENTRANCE, false); + //setEntityData(getBusinessData(businessId).entranceBlip, "vrr.owner.id", businessId, false); addToWorld(getBusinessData(businessId).entranceBlip); } } @@ -1372,8 +1373,9 @@ function createBusinessExitPickup(businessId) { getBusinessData(businessId).exitPickup = createGamePickup(pickupModelId, getBusinessData(businessId).exitPosition, getGameConfig().pickupTypes[getServerGame()].business); setElementDimension(getBusinessData(businessId).exitPickup, getBusinessData(businessId).exitDimension); setElementOnAllDimensions(getBusinessData(businessId).exitPickup, false); - setElementStreamInDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().businessPickupStreamInDistance); - setElementStreamOutDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().businessPickupStreamOutDistance); + //setEntityData(getBusinessData(businessId).entranceBlip, "vrr.owner.type", VRR_PICKUP_BUSINESS_EXIT, false); + //setEntityData(getBusinessData(businessId).entranceBlip, "vrr.owner.id", businessId, false); + //getBusinessData(businessId).exitPickup.interior = getBusinessData(businessId).exitInterior; updateBusinessPickupLabelData(businessId); addToWorld(getBusinessData(businessId).exitPickup); } @@ -1398,8 +1400,9 @@ function createBusinessExitBlip(businessId) { getBusinessData(businessId).exitBlip = createGameBlip(getBusinessData(businessId).exitPosition, blipModelId, 1, getColourByName("businessBlue")); setElementDimension(getBusinessData(businessId).exitBlip, getBusinessData(businessId).entranceDimension); setElementOnAllDimensions(getBusinessData(businessId).exitBlip, false); - setElementStreamInDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().businessBlipStreamInDistance); - setElementStreamOutDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().businessBlipStreamOutDistance); + //getBusinessData(businessId).exitBlip.interior = getBusinessData(businessId).exitInterior; + //setEntityData(getBusinessData(businessId).exitBlip, "vrr.owner.type", VRR_BLIP_BUSINESS_EXIT, false); + //setEntityData(getBusinessData(businessId).exitBlip, "vrr.owner.id", businessId, false); addToWorld(getBusinessData(businessId).exitBlip); } } diff --git a/scripts/server/config.js b/scripts/server/config.js index 65474917..78cd89a2 100644 --- a/scripts/server/config.js +++ b/scripts/server/config.js @@ -80,13 +80,6 @@ let globalConfig = { VRR_ITEM_USETYPE_VEHTIRE, ], vehicleInactiveRespawnDelay: 1800000, // 20 minutes - housePickupStreamInDistance: 50, - housePickupStreamOutDistance: 75, - businessPickupStreamInDistance: 50, - businessPickupStreamOutDistance: 75, - jobPickupStreamInDistance: 50, - jobPickupStreamOutDistance: 75, - vehicleTrunkRearDistance: 3, }; // =========================================================================== diff --git a/scripts/server/event.js b/scripts/server/event.js index ca3008e4..9aee4443 100644 --- a/scripts/server/event.js +++ b/scripts/server/event.js @@ -95,6 +95,9 @@ function onPlayerQuit(event, client, quitReasonId) { } messageDiscordEventChannel(`👋 ${getPlayerDisplayForConsole(client)} has left the server.`); + + clearTemporaryVehicles(); + clearTemporaryPeds(); } // =========================================================================== diff --git a/scripts/server/house.js b/scripts/server/house.js index 8ac3b0ff..0031955e 100644 --- a/scripts/server/house.js +++ b/scripts/server/house.js @@ -861,9 +861,6 @@ function createHouseEntrancePickup(houseId) { getHouseData(houseId).entrancePickup = createGamePickup(pickupModelId, getHouseData(houseId).entrancePosition, getGameConfig().pickupTypes[getServerGame()].house); setElementOnAllDimensions(getHouseData(houseId).entrancePickup, false); setElementDimension(getHouseData(houseId).entrancePickup, getHouseData(houseId).entranceDimension); - setElementStreamInDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().housePickupStreamInDistance); - setElementStreamOutDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().housePickupStreamOutDistance); - setEntityData(getHouseData(houseId).entrancePickup, "vrr.owner.type", VRR_PICKUP_HOUSE_ENTRANCE, false); setEntityData(getHouseData(houseId).entrancePickup, "vrr.owner.id", houseId, false); setEntityData(getHouseData(houseId).entrancePickup, "vrr.label.type", VRR_LABEL_HOUSE, true); @@ -900,8 +897,8 @@ function createHouseEntranceBlip(houseId) { getHouseData(houseId).entranceBlip = createGameBlip(getHouseData(houseId).entrancePosition, blipModelId, 1, getColourByName("houseGreen")); setElementDimension(getHouseData(houseId).entranceBlip, getHouseData(houseId).entranceDimension); setElementOnAllDimensions(getHouseData(houseId).entranceBlip, false); - setElementStreamInDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().houseBlipStreamInDistance); - setElementStreamOutDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().houseBlipStreamOutDistance); + //getHouseData(houseId).entranceBlip.streamInDistance = 300; + //getHouseData(houseId).entranceBlip.streamOutDistance = 350; setEntityData(getHouseData(houseId).entranceBlip, "vrr.owner.type", VRR_BLIP_HOUSE_ENTRANCE, false); setEntityData(getHouseData(houseId).entranceBlip, "vrr.owner.id", houseId, false); addToWorld(getHouseData(houseId).entranceBlip); @@ -926,8 +923,6 @@ function createHouseExitPickup(houseId) { getHouseData(houseId).exitPickup = createGamePickup(pickupModelId, getHouseData(houseId).exitPosition, getGameConfig().pickupTypes[getServerGame()].house); setElementDimension(getHouseData(houseId).exitPickup, getHouseData(houseId).exitDimension); setElementOnAllDimensions(getHouseData(houseId).exitPickup, false); - setElementStreamInDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().housePickupStreamInDistance); - setElementStreamOutDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().housePickupStreamOutDistance); setEntityData(getHouseData(houseId).exitPickup, "vrr.owner.type", VRR_PICKUP_HOUSE_EXIT, false); setEntityData(getHouseData(houseId).exitPickup, "vrr.owner.id", houseId, false); setEntityData(getHouseData(houseId).exitPickup, "vrr.label.type", VRR_LABEL_EXIT, true); @@ -954,8 +949,6 @@ function createHouseExitBlip(houseId) { getHouseData(houseId).exitBlip = createGameBlip(blipModelId, getHouseData(houseId).exitPosition, 1, getColourByName("houseGreen")); setElementDimension(getHouseData(houseId).exitBlip, getHouseData(houseId).entranceDimension); setElementOnAllDimensions(getHouseData(houseId).exitBlip, false); - setElementStreamInDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().houseBlipStreamInDistance); - setElementStreamOutDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().houseBlipStreamOutDistance); setEntityData(getHouseData(houseId).exitBlip, "vrr.owner.type", VRR_BLIP_HOUSE_EXIT, false); setEntityData(getHouseData(houseId).exitBlip, "vrr.owner.id", houseId, false); addToWorld(getHouseData(houseId).exitBlip); diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js index 7dd3118c..4f88d10e 100644 --- a/scripts/server/native/connected.js +++ b/scripts/server/native/connected.js @@ -424,46 +424,6 @@ function setElementOnAllDimensions(element, state) { // =========================================================================== -function setElementDefaultExistance(element, state) { - if(!isNull(element) && element != false) { - element.defaultExistance = state; - } -} - -// =========================================================================== - -function setElementExistsFor(element, client, state) { - if(!isNull(element) && element != false) { - element.setExistsFor(client, state); - } -} - -// =========================================================================== - -function clearElementExistsFor(element) { - if(!isNull(element) && element != false) { - element.clearExistsFor(); - } -} - -// =========================================================================== - -function setElementStreamInDistance(element, distance) { - if(!isNull(element) && element != false) { - element.streamInDistance = distance; - } -} - -// =========================================================================== - -function setElementStreamOutDistance(element, distance) { - if(!isNull(element) && element != false) { - element.streamOutDistance = distance; - } -} - -// =========================================================================== - function destroyGameElement(element) { if(!isNull(element) && element != false) { destroyElement(element);