chore: merge dev into main

client/main.lua

@@ -13,27 +13,15 @@ AddEventHandler('esx:onPlayerLogout', function()
 end)
 
 AddEventHandler('esx:onPlayerSpawn', function()
+  if firstSpawn then
+    firstSpawn = false
+    return
+  end
   isDead = false
   ClearTimecycleModifier()
   SetPedMotionBlur(PlayerPedId(), false)
   ClearExtraTimecycleModifier()
   EndDeathCam()
-  if firstSpawn then
-    firstSpawn = false
-
-    if Config.SaveDeathStatus then
-      while not ESX.PlayerLoaded do
-        Wait(1000)
-      end
-
-      ESX.TriggerServerCallback('esx_ambulancejob:getDeathStatus', function(shouldDie)
-        if shouldDie then
-          Wait(1000)
-          SetEntityHealth(PlayerPedId(), 0)
-        end
-      end)
-    end
-  end
 end)
 
 -- Create blips
@@ -148,6 +136,7 @@ function StartDeathLoop()
         DetachEntity(playerPed, true, false)
         ClearPedTasksImmediately(playerPed)
       end
+      Wait(0)
   end
   end)
 end
@@ -379,4 +368,4 @@ end)
 -- Load unloaded IPLs
 if Config.LoadIpl then
   RequestIpl('Coroner_Int_on') -- Morgue
-end
+end

config.lua

@@ -5,7 +5,6 @@ Config.Debug                      = ESX.GetConfig().EnableDebug
 Config.Marker                     = {type = 1, x = 1.5, y = 1.5, z = 0.5, r = 102, g = 0, b = 102, a = 100, rotate = false}
 
 Config.ReviveReward               = 700  -- Revive reward, set to 0 if you don't want it enabled
-Config.SaveDeathStatus              = true -- Save Death Status?
 Config.LoadIpl                    = true -- Disable if you're using fivem-ipl or other IPL loaders
 
 Config.Locale = GetConvar('esx:locale', 'en')

fxmanifest.lua

@@ -1,8 +1,8 @@
 fx_version 'adamant'
 game 'gta5'
 description 'Provides a way for players to RP as paramedics (heal/revive players)'
-version '1.0.1'
-legacyversion '1.9.1'
+version '1.0.2'
+legacyversion '1.11.4'
 lua54 'yes'
 
 shared_scripts {