From 611a12b4acc2816e7a6c5e7a1ffaa78a67128ec6 Mon Sep 17 00:00:00 2001
From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com>
Date: Sun, 17 Nov 2024 17:15:34 +0100
Subject: [PATCH 1/3] fix(skinchanger/client/main): fix HeadOverlay not being
 applied correctly

---
 [core]/skinchanger/client/main.lua | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/[core]/skinchanger/client/main.lua b/[core]/skinchanger/client/main.lua
index 85620d81..3d0722f6 100644
--- a/[core]/skinchanger/client/main.lua
+++ b/[core]/skinchanger/client/main.lua
@@ -140,7 +140,7 @@ function SkinChanger:SetFace()
 end
 
 function SkinChanger:SetHeadOverlay()
-    local features = {{"age_1", "age_2"}, {"blemishes_1", "blemishes_2"}, {"beard_1", "beard_2"}, {"eyebrows_1", "eyebrows_2"}, {"makeup_1", "makeup_2"}, {"lipstick_1", "lipstick_2"}, {"blush_1", "blush_2"}, {"complexion_1", "complexion_2"}, {"sun_1", "sun_2"}, {"moles_1", "moles_2"}, {"chest_1", "chest_2"}}
+    local features = {{"blemishes_1", "blemishes_2"}, {"beard_1", "beard_2"}, {"eyebrows_1", "eyebrows_2"}, {"age_1", "age_2"}, {"makeup_1", "makeup_2"}, {"blush_1", "blush_2"}, {"complexion_1", "complexion_2"}, {"sun_1", "sun_2"}, {"lipstick_1", "lipstick_2"}, {"moles_1", "moles_2"}, {"chest_1", "chest_2"}}
     for i = 1, #features, 1 do
         local feature = features[i]
         SetPedHeadOverlay(self.playerPed, i - 1, self.character[feature[1]], Normalise(self.character[feature[2]], 10))
@@ -148,10 +148,9 @@ function SkinChanger:SetHeadOverlay()
 end
 
 function SkinChanger:SetHeadOverlayColour()
-    local features = {{"beard_3", "beard_4"}, {"eyebrows_3", "eyebrows_4"}, {"makeup_3", "makeup_4"}, {"lipstick_3", "lipstick_4"}, {"blush_3", 0}, {"chest_3", 0}}
-    for i = 1, #features, 1 do
-        local feature = features[i]
-        SetPedHeadOverlayColor(self.playerPed, i - 1, 1, self.character[feature[1]], self.character[feature[2]])
+    local features = {[1] = {"beard_3", "beard_4"}, [2] = {"eyebrows_3", "eyebrows_4"}, [4] = {"makeup_3", "makeup_4"}, [5] = {"blush_3", 0}, [8] = {"lipstick_3", "lipstick_4"}, [10] = {"chest_3", 0}}
+    for i, feature in pairs(features) do
+        SetPedHeadOverlayColor(self.playerPed, i, 1, self.character[feature[1]], self.character[feature[2]])
     end
     if self.character["bodyb_1"] == -1 then
         SetPedHeadOverlay(self.playerPed, 11, 255, (self.character["bodyb_2"] / 10) + 0.0) -- Body Blemishes + opacity

From 3890f2a2f2a8cb9b23c39a1980132dc8b3ac504b Mon Sep 17 00:00:00 2001
From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com>
Date: Sun, 17 Nov 2024 02:04:16 +0100
Subject: [PATCH 2/3] fix(es_extended/client/modules/actions): correctly update
 ped reference in TrackPed

---
 [core]/es_extended/client/modules/actions.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 2e375589..750d3bea 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -45,9 +45,9 @@ function Actions:TrackPed()
 
     if playerPed ~= newPed then
         ESX.PlayerData.ped = newPed
-        ESX.SetPlayerData("ped", playerPed)
+        ESX.SetPlayerData("ped", newPed)
 
-        TriggerEvent("esx:playerPedChanged", playerPed)
+        TriggerEvent("esx:playerPedChanged", newPed)
     end
 end
 

From 92bfb32c1210dee28ad9efcf61ffac9cd6fe41af Mon Sep 17 00:00:00 2001
From: Kasey FItton <kaseyfitton@hotmail.co.uk>
Date: Sat, 16 Nov 2024 01:00:13 +0000
Subject: [PATCH 3/3] fix(skinchanger): wrong operator

---
 [core]/skinchanger/client/main.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/skinchanger/client/main.lua b/[core]/skinchanger/client/main.lua
index 3d0722f6..67be80d5 100644
--- a/[core]/skinchanger/client/main.lua
+++ b/[core]/skinchanger/client/main.lua
@@ -104,7 +104,7 @@ function SkinChanger:ValidClothes(key)
     ["blemishes_2"] = true, ["blemishes_3"] = true, ["blush_1"] = true, ["blush_2"] = true, ["blush_3"] = true, ["complexion_1"] = true, ["complexion_2"] = true,
     ["sun_1"] = true, ["sun_2"] = true, ["moles_1"] = true, ["moles_2"] = true, ["chest_1"] = true, ["chest_2"] = true, ["chest_3"] = true, ["bodyb_1"] = true,
     ["bodyb_2"] = true, ["bodyb_3"] = true, ["bodyb_4"] = true}
-    return keys[key] ~= nil
+    return keys[key] == nil
 end
 
 local function Normalise(weight, divison)