From 3ca6c68d2dcb7fef2ed22aa8f9b75dd7cbb5a2fb Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Mon, 12 Sep 2022 18:34:14 +0100
Subject: [PATCH] fix(esx_multicharacter & es_extended): Character not loading

---
 [esx]/es_extended/server/main.lua        | 14 ++++++++++++--
 [esx]/esx_multicharacter/client/main.lua | 12 ++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index 836fb7c8..135cf5e0 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -298,8 +298,18 @@ function loadESXPlayer(identifier, playerId, isNew)
   TriggerEvent('esx:playerLoaded', playerId, xPlayer, isNew)
 
   xPlayer.triggerEvent('esx:playerLoaded',
-    {accounts = xPlayer.getAccounts(), coords = xPlayer.getCoords(), identifier = xPlayer.getIdentifier(), inventory = xPlayer.getInventory(),
-     job = xPlayer.getJob(), loadout = xPlayer.getLoadout(), maxWeight = xPlayer.getMaxWeight(), money = xPlayer.getMoney(), dead = false}, isNew,
+    {
+      accounts = xPlayer.getAccounts(), 
+      coords = xPlayer.getCoords(), 
+      identifier = xPlayer.getIdentifier(), 
+      inventory = xPlayer.getInventory(),
+      job = xPlayer.getJob(), 
+      loadout = xPlayer.getLoadout(), 
+      maxWeight = xPlayer.getMaxWeight(), 
+      money = xPlayer.getMoney(),
+      sex = xPlayer.get("sex") or "m",
+      dead = false
+    }, isNew,
     userData.skin)
 
   if not Config.OxInventory then
diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua
index 0804e506..fccdc5f2 100644
--- a/[esx]/esx_multicharacter/client/main.lua
+++ b/[esx]/esx_multicharacter/client/main.lua
@@ -272,8 +272,9 @@ if ESX.GetConfig().Multichar then
 		local spawn = playerData.coords or Config.Spawn
 		if isNew or not skin or #skin == 1 then
 			local finished = false
-			local sex = skin.sex or 0
-			local model = sex == 0 and mp_m_freemode_01 or mp_f_freemode_01
+			skin = Config.Default[playerData.sex]
+			skin.sex = playerData.sex == "m" and 0 or 1
+			local model = skin.sex == 0 and mp_m_freemode_01 or mp_f_freemode_01
 			RequestModel(model)
 			while not HasModelLoaded(model) do
 				RequestModel(model)
@@ -281,13 +282,8 @@ if ESX.GetConfig().Multichar then
 			end
 			SetPlayerModel(PlayerId(), model)
 			SetModelAsNoLongerNeeded(model)
-			while not ESX.PlayerData.sex do
-				Wait(0)
-			end
-			skin = Config.Default[ESX.PlayerData.sex]
-			skin.sex = ESX.PlayerData.sex == "m" and 0 or 1
 			TriggerEvent('skinchanger:loadSkin', skin, function()
-				playerPed = PlayerPedId()
+				local playerPed = PlayerPedId()
 				SetPedAoBlobRendering(playerPed, true)
 				ResetEntityAlpha(playerPed)
 				TriggerEvent('esx_skin:openSaveableMenu', function()