Inventory Update

Author: GhzGarage

client/main.lua

@@ -1006,14 +1006,8 @@ local function openHouseStash()
     if not CurrentHouse then return end
     local stashLoc = vector3(stashLocation.x, stashLocation.y, stashLocation.z)
     if CheckDistance(stashLoc, 1.5) then
-        local houseTier = tonumber(Config.Houses[CurrentHouse].tier)
-        if Config.StashWeights[houseTier] and tonumber(Config.StashWeights[houseTier].maxweight) and tonumber(Config.StashWeights[houseTier].slots) then
-            TriggerServerEvent('inventory:server:OpenInventory', 'stash', CurrentHouse, Config.StashWeights[houseTier])
-        else
-            TriggerServerEvent('inventory:server:OpenInventory', 'stash', CurrentHouse)
-        end
-        TriggerEvent('inventory:client:SetCurrentStash', CurrentHouse)
         TriggerServerEvent('InteractSound_SV:PlayOnSource', 'StashOpen', 0.4)
+        TriggerServerEvent('qb-houses:server:openStash', CurrentHouse)
     end
 end
 
@@ -1386,7 +1380,6 @@ RegisterNetEvent('qb-houses:client:HomeInvasion', function()
                 if dist < 1 then
                     if Config.Houses[ClosestHouse].locked then
                         if not Config.Houses[ClosestHouse].IsRaming then
-
                             local success = exports['qb-minigames']:Skillbar('medium') -- calling like this will just change difficulty and still use 1234
                             if success then
                                 DoRamAnimation(true)

server/main.lua

@@ -210,14 +210,29 @@ end)
 RegisterNetEvent('qb-houses:server:viewHouse', function(house)
     local src = source
     local pData = QBCore.Functions.GetPlayer(src)
-
     local houseprice = Config.Houses[house].price
     local brokerfee = (houseprice / 100 * 5)
     local bankfee = (houseprice / 100 * 10)
     local taxes = (houseprice / 100 * 6)
+    TriggerClientEvent('qb-houses:client:viewHouse', src, houseprice, brokerfee, bankfee, taxes, pData.PlayerData.charinfo.firstname, pData.PlayerData.charinfo.lastname)
+end)
 
-    TriggerClientEvent('qb-houses:client:viewHouse', src, houseprice, brokerfee, bankfee, taxes,
-        pData.PlayerData.charinfo.firstname, pData.PlayerData.charinfo.lastname)
+RegisterNetEvent('qb-houses:server:openStash', function(CurrentHouse)
+    local src = source
+    local houseData = Config.Houses[CurrentHouse]
+    if not houseData then return end
+    local houseTier = houseData.tier
+    local stashSlots = Config.StashWeights[houseTier].slots
+    local stashWeight = Config.StashWeights[houseTier].maxweight
+    if stashSlots and stashWeight then
+        exports['qb-inventory']:OpenInventory(src, CurrentHouse, {
+            maxweight = stashWeight,
+            slots = stashSlots,
+            label = houseData.adress
+        })
+    else
+        exports['qb-inventory']:OpenInventory(src, CurrentHouse)
+    end
 end)
 
 RegisterNetEvent('qb-houses:server:buyHouse', function(house)