Feature/health armour

client/events.lua

@@ -3,10 +3,26 @@
 -- if LocalPlayer.state['isLoggedIn'] then
 RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
     ShutdownLoadingScreenNui()
+    local pid = PlayerPedId()
     LocalPlayer.state:set('isLoggedIn', true, false)
     if not QBCore.Config.Server.PVP then return end
-    SetCanAttackFriendly(PlayerPedId(), true, false)
+    SetCanAttackFriendly(pid, true, false)
     NetworkSetFriendlyFireOption(true)
+
+    CreateThread(function ()
+        Wait(4000) -- Wait for the player to load in properly
+        local player = PlayerId()
+        SetEntityMaxHealth(pid, 200)
+        SetPlayerHealthRechargeMultiplier(player, 0.0)
+        SetPlayerHealthRechargeLimit(player, 0.0)
+        if QBConfig.Player.SaveArmor then
+            SetPedArmour(pid, QBCore.PlayerData.metadata['armor'])
+        end
+
+        if QBConfig.Player.SaveHealth then
+            SetEntityHealth(pid, QBCore.PlayerData.metadata['health'])
+        end
+    end)
 end)
 
 RegisterNetEvent('QBCore:Client:OnPlayerUnload', function()

config.lua

@@ -13,6 +13,8 @@ QBConfig.Money.PayCheckTimeOut = 10                                 -- The time
 QBConfig.Money.PayCheckSociety = false                              -- If true paycheck will come from the society account that the player is employed at, requires qb-management
 
 QBConfig.Player = {}
+QBConfig.Player.SaveHealth = true -- Save player health on respawn.
+QBConfig.Player.SaveArmor = true -- Save player armor on respawn.
 QBConfig.Player.HungerRate = 4.2 -- Rate at which hunger goes down.
 QBConfig.Player.ThirstRate = 3.8 -- Rate at which thirst goes down.
 QBConfig.Player.Bloodtypes = {
@@ -67,6 +69,7 @@ QBConfig.Player.PlayerDefaults = {
         isdead = false,
         inlaststand = false,
         armor = 0,
+        health = 200,
         ishandcuffed = false,
         tracker = false,
         injail = 0,

server/events.lua

@@ -13,6 +13,19 @@ AddEventHandler('playerDropped', function(reason)
     local Player = QBCore.Players[src]
     TriggerEvent('qb-log:server:CreateLog', 'joinleave', 'Dropped', 'red', '**' .. GetPlayerName(src) .. '** (' .. Player.PlayerData.license .. ') left..' .. '\n **Reason:** ' .. reason)
     TriggerEvent('QBCore:Server:PlayerDropped', Player)
+
+    local ped = GetPlayerPed(src)
+
+    if QBConfig.Player.SaveHealth and ped then
+        local health = GetEntityHealth(ped)
+        Player.Functions.SetMetaData('health', health)
+    end
+
+    if QBConfig.Player.SaveArmor and ped then
+        local armour = GetPedArmour(ped)
+        Player.Functions.SetMetaData('armor', armour)
+    end
+
     Player.Functions.Save()
     QBCore.Player_Buckets[Player.PlayerData.license] = nil
     QBCore.Players[src] = nil
@@ -151,6 +164,7 @@ end)
 RegisterNetEvent('QBCore:UpdatePlayer', function()
     local src = source
     local Player = QBCore.Functions.GetPlayer(src)
+    local ped = GetPlayerPed(src)
     if not Player then return end
     local newHunger = Player.PlayerData.metadata['hunger'] - QBCore.Config.Player.HungerRate
     local newThirst = Player.PlayerData.metadata['thirst'] - QBCore.Config.Player.ThirstRate
@@ -162,6 +176,17 @@ RegisterNetEvent('QBCore:UpdatePlayer', function()
     end
     Player.Functions.SetMetaData('thirst', newThirst)
     Player.Functions.SetMetaData('hunger', newHunger)
+
+    if QBConfig.Player.SaveHealth and ped then
+        local health = GetEntityHealth(ped)
+        Player.Functions.SetMetaData('health', health)
+    end
+
+    if QBConfig.Player.SaveArmor and ped then
+        local armour = GetPedArmour(ped)
+        Player.Functions.SetMetaData('armor', armour)
+    end
+
     TriggerClientEvent('hud:client:UpdateNeeds', src, newHunger, newThirst)
     Player.Functions.Save()
 end)