From 38978958c49fe34fbd6ba67572e5766906e4783f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 23 Sep 2017 11:37:50 +0200 Subject: [PATCH] fix(client): Fix restoring of loadout --- client/main.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index 5a9db470..d2e669ba 100644 --- a/client/main.lua +++ b/client/main.lua @@ -71,10 +71,7 @@ AddEventHandler('playerSpawned', function() end -- Restore loadout - for i=1, #ESX.PlayerData.loadout, 1 do - local weaponHash = GetHashKey(ESX.PlayerData.loadout[i].name) - GiveWeaponToPed(playerPed, weaponHash, ESX.PlayerData.loadout[i].ammo, false, false) - end + TriggerEvent('esx:restoreLoadout') PlayerSpawned = true @@ -94,6 +91,8 @@ AddEventHandler('esx:restoreLoadout', function () local playerPed = GetPlayerPed(-1) + RemoveAllPedWeapons(playerPed, true) + for i=1, #ESX.PlayerData.loadout, 1 do local weaponHash = GetHashKey(ESX.PlayerData.loadout[i].name) GiveWeaponToPed(playerPed, weaponHash, ESX.PlayerData.loadout[i].ammo, false, false)