From f17fc54e6b285019dc530d575cfa05045c5691d8 Mon Sep 17 00:00:00 2001
From: John <johnbronnert@gmail.com>
Date: Tue, 25 Oct 2022 13:51:13 +0200
Subject: [PATCH 1/2] feat(esx_skin): update player weight on spawn

This updates the max weight on join, if a player has a bag.
---
 [esx]/esx_skin/client/main.lua |  7 +++++++
 [esx]/esx_skin/server/main.lua | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/[esx]/esx_skin/client/main.lua b/[esx]/esx_skin/client/main.lua
index cc49fbc8..3640626c 100644
--- a/[esx]/esx_skin/client/main.lua
+++ b/[esx]/esx_skin/client/main.lua
@@ -1,6 +1,13 @@
 local lastSkin, cam, isCameraActive
 local firstSpawn, zoomOffset, camOffset, heading, skinLoaded = true, 0.0, 0.0, 90.0, false
 
+RegisterNetEvent('esx:playerLoaded')
+AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
+    if ESX.IsPlayerLoaded() then
+        TriggerServerEvent('esx_skin:setWeight', skin)
+    end
+end)
+
 function OpenMenu(submitCb, cancelCb, restrict)
     local playerPed = PlayerPedId()
 
diff --git a/[esx]/esx_skin/server/main.lua b/[esx]/esx_skin/server/main.lua
index ff133355..73f47cd0 100644
--- a/[esx]/esx_skin/server/main.lua
+++ b/[esx]/esx_skin/server/main.lua
@@ -19,6 +19,22 @@ AddEventHandler('esx_skin:save', function(skin)
 	})
 end)
 
+RegisterServerEvent('esx_skin:setWeight')
+AddEventHandler('esx_skin:setWeight', function(skin)
+    local xPlayer = ESX.GetPlayerFromId(source)
+
+    if not ESX.GetConfig().OxInventory then
+        local defaultMaxWeight = ESX.GetConfig().MaxWeight
+        local backpackModifier = Config.BackpackWeight[skin.bags_1]
+
+        if backpackModifier then
+            xPlayer.setMaxWeight(defaultMaxWeight + backpackModifier)
+        else
+            xPlayer.setMaxWeight(defaultMaxWeight)
+        end
+    end
+end)
+
 RegisterServerEvent('esx_skin:responseSaveSkin')
 AddEventHandler('esx_skin:responseSaveSkin', function(skin)
 	local xPlayer = ESX.GetPlayerFromId(source)

From 33e1bb331cdc62f9ec5eab300a8ebaa44c6ba5f1 Mon Sep 17 00:00:00 2001
From: John <johnbronnert@gmail.com>
Date: Sun, 27 Nov 2022 21:16:46 +0100
Subject: [PATCH 2/2] fix(esx_skin): removed if statement

---
 [esx]/esx_skin/client/main.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/[esx]/esx_skin/client/main.lua b/[esx]/esx_skin/client/main.lua
index 3640626c..086a8cdf 100644
--- a/[esx]/esx_skin/client/main.lua
+++ b/[esx]/esx_skin/client/main.lua
@@ -3,9 +3,7 @@ local firstSpawn, zoomOffset, camOffset, heading, skinLoaded = true, 0.0, 0.0, 9
 
 RegisterNetEvent('esx:playerLoaded')
 AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
-    if ESX.IsPlayerLoaded() then
-        TriggerServerEvent('esx_skin:setWeight', skin)
-    end
+    TriggerServerEvent('esx_skin:setWeight', skin)
 end)
 
 function OpenMenu(submitCb, cancelCb, restrict)