From 3bc7b15bde1f9bd97ffa4fd63d218d1f7dbed57e Mon Sep 17 00:00:00 2001 From: efraim9 <68015670+efraim9@users.noreply.github.com> Date: Thu, 4 Mar 2021 13:43:53 +0100 Subject: [PATCH 1/2] Added useLimitSystem/useWeightSystem --- config.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.lua b/config.lua index 6aa9f4d..fa8e396 100644 --- a/config.lua +++ b/config.lua @@ -85,6 +85,8 @@ Config.OpenKey = Keys["Y"] Config.OpenTime = 750 +Config.UseLimitSystem = true -- if set to true, hud uses old esx limit system, if set to false, you can use esx weight system which is newer + -- Limit, unit can be whatever you want. Originally grams (as average people can hold 25kg) Config.Limit = 25000 From 0ecb9f402370aef152c17a88e00b3a7022207417 Mon Sep 17 00:00:00 2001 From: efraim9 <68015670+efraim9@users.noreply.github.com> Date: Thu, 4 Mar 2021 18:55:27 +0100 Subject: [PATCH 2/2] canPlayerCarryItem function with decider which inventory system to use --- config.lua | 2 +- server/esx_trunk-sv.lua | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/config.lua b/config.lua index fa8e396..205c2eb 100644 --- a/config.lua +++ b/config.lua @@ -85,7 +85,7 @@ Config.OpenKey = Keys["Y"] Config.OpenTime = 750 -Config.UseLimitSystem = true -- if set to true, hud uses old esx limit system, if set to false, you can use esx weight system which is newer +Config.UseLimitSystem = true -- If true, default old esx inventory limit system will be used, if set to false, new esx inventory weigh system will be used -- Limit, unit can be whatever you want. Originally grams (as average people can hold 25kg) Config.Limit = 25000 diff --git a/server/esx_trunk-sv.lua b/server/esx_trunk-sv.lua index 6906c29..458c24f 100644 --- a/server/esx_trunk-sv.lua +++ b/server/esx_trunk-sv.lua @@ -98,6 +98,22 @@ ESX.RegisterServerCallback( end ) +function canPlayerCarryItem(targetItem, xPlayer, item, count) + if Config.UseLimitSystem then + if targetItem.limit == -1 or ((targetItem.count + count) <= targetItem.limit) then + return(true) + else + return(false) + end + else + if xPlayer.canCarryItem(item, count) then + return(true) + else + return(false) + end + end +end + RegisterServerEvent("esx_inventoryhud_trunk:getItem") AddEventHandler( "esx_inventoryhud_trunk:getItem", @@ -107,7 +123,7 @@ AddEventHandler( if type == "item_standard" then local targetItem = xPlayer.getInventoryItem(item) - if targetItem.limit == -1 or ((targetItem.count + count) <= targetItem.limit) then + if canPlayerCarryItem(targetItem, xPlayer, item, count) then TriggerEvent( "esx_inventoryhud_trunk:getSharedDataStore", plate,