From 47442020074e75fa6b3d577236501b974f15a86a Mon Sep 17 00:00:00 2001
From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com>
Date: Tue, 26 Nov 2024 22:05:01 +0100
Subject: [PATCH] fix(es_extended/client/main): only apply metadata on first
 spawn

---
 [core]/es_extended/client/main.lua | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 6516355e..9912bbff 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -59,16 +59,21 @@ local function onPlayerSpawn()
     ESX.SetPlayerData("dead", false)
 end
 
+local isFirstSpawn = true
 AddEventHandler("playerSpawned", onPlayerSpawn)
 AddEventHandler("esx:onPlayerSpawn", function()
     onPlayerSpawn()
 
-    if ESX.PlayerData.metadata.health then
-        SetEntityHealth(ESX.PlayerData.ped, ESX.PlayerData.metadata.health)
-    end
+    if isFirstSpawn then
+        isFirstSpawn = false
 
-    if ESX.PlayerData.metadata.armor and ESX.PlayerData.metadata.armor > 0 then
-        SetPedArmour(ESX.PlayerData.ped, ESX.PlayerData.metadata.armor)
+        if ESX.PlayerData.metadata.health then
+            SetEntityHealth(ESX.PlayerData.ped, ESX.PlayerData.metadata.health)
+        end
+
+        if ESX.PlayerData.metadata.armor and ESX.PlayerData.metadata.armor > 0 then
+            SetPedArmour(ESX.PlayerData.ped, ESX.PlayerData.metadata.armor)
+        end
     end
 end)