From 79d0501458c8152923a3e42dadfad715f416abc8 Mon Sep 17 00:00:00 2001
From: Henric Backman <b-d-t@msn.com>
Date: Tue, 12 May 2020 05:06:30 +0200
Subject: [PATCH] cleanup

added missing trigger
updated readme
---
 esx_kashacters/client/main.lua | 64 ++--------------------------------
 esx_kashacters/server/main.lua | 19 ----------
 readme.md                      |  6 +++-
 3 files changed, 8 insertions(+), 81 deletions(-)

diff --git a/esx_kashacters/client/main.lua b/esx_kashacters/client/main.lua
index 09c0d0b8..85bdd9cc 100644
--- a/esx_kashacters/client/main.lua
+++ b/esx_kashacters/client/main.lua
@@ -59,69 +59,12 @@ AddEventHandler('kashactersC:SetupUI', function(Characters)
         characters = Characters,
     })
 end)
---[[
-RegisterNetEvent('kashactersC:SpawnCharacter')
-AddEventHandler('kashactersC:SpawnCharacter', function(isnew)
-    if isnew == true then
-		SetTimecycleModifier('default')
-		
-		local pos = { x = -1044.73, y = -2749.13, z = 21.3634 } -- DEFAULT SPAWN POSITION
-		RequestCollisionAtCoord(pos.x, pos.y, pos.z)
-		SetEntityCoords(GetPlayerPed(-1), pos.x, pos.y, pos.z)
-		DoScreenFadeIn(500)
-
-		Citizen.Wait(500)
-
-		cam2 = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", -1355.93,-1487.78,520.75, 300.00,0.00,0.00, 100.00, false, 0)
-		PointCamAtCoord(cam2, pos.x,pos.y,pos.z+200)
-		SetCamActiveWithInterp(cam2, cam, 900, true, true)
-
-		Citizen.Wait(900)	
-	    cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", pos.x,pos.y,pos.z+200, 300.00,0.00,0.00, 100.00, false, 0)
-		PointCamAtCoord(cam, pos.x,pos.y,pos.z+2)
-		SetCamActiveWithInterp(cam, cam2, 3700, true, true)
-
-		Citizen.Wait(3700)
-
-		PlaySoundFrontend(-1, "Zoom_Out", "DLC_HEIST_PLANNING_BOARD_SOUNDS", 1)
-		RenderScriptCams(false, true, 500, true, true)
-		PlaySoundFrontend(-1, "CAR_BIKE_WHOOSH", "MP_LOBBY_SOUNDS", 1)
-		FreezeEntityPosition(GetPlayerPed(-1), false)
-		Citizen.Wait(500)
-		SetPlayerInvincible(GetPlayerPed(-1), false);
-		SetEntityCollision(GetPlayerPed(-1), true, true)
-		SetCamActive(cam, false)
-		DestroyCam(cam, true)
-		IsChoosing = false
-
-		SetEntityVisible(GetPlayerPed(-1), true, false)
-
-		TriggerEvent('esx:kashloaded')
-        TriggerEvent('esx_identity:showRegisterIdentity')
-	else
-		SetTimecycleModifier('default')
-		DoScreenFadeIn(500)
-		Citizen.Wait(500)
-		RenderScriptCams(false, true, 500, true, true)
-		SetCamActive(cam, false)
-		DestroyCam(cam, true)
-		IsChoosing = false
-		DisplayHud(true)
-		DisplayRadar(true)
-		TriggerEvent('esx:kashloaded')
-		TriggerEvent("madrp-spawn")
-		--TriggerEvent('esx_ambulancejob:multicharacter', source)
-    end
-end)
-]]
 
 RegisterNetEvent('kashactersC:SpawnCharacter')
 AddEventHandler('kashactersC:SpawnCharacter', function(spawn, isnew)
-
-    SetTimecycleModifier('default')
-
     local pos = spawn
 
+    SetTimecycleModifier('default')
     SetEntityCoords(GetPlayerPed(-1), pos.x, pos.y, pos.z)
     DoScreenFadeIn(500)
 
@@ -153,11 +96,10 @@ AddEventHandler('kashactersC:SpawnCharacter', function(spawn, isnew)
     DisplayRadar(true)
 
     TriggerEvent('esx:kashloaded')
-
+    TriggerEvent('esx_ambulancejob:multicharacter', source)
     if isnew == true then
         TriggerEvent('esx_identity:showRegisterIdentity')
-     end
-
+    end
 end)
 
 RegisterNetEvent('kashactersC:ReloadCharacters')
diff --git a/esx_kashacters/server/main.lua b/esx_kashacters/server/main.lua
index 994ac3ce..07e2fb0b 100644
--- a/esx_kashacters/server/main.lua
+++ b/esx_kashacters/server/main.lua
@@ -24,26 +24,7 @@ AddEventHandler('kashactersS:SetupCharacters', function()
     local Characters = GetPlayerCharacters(src)
     TriggerClientEvent('kashactersC:SetupUI', src, Characters)
 end)
---[[
-RegisterServerEvent("kashactersS:CharacterChosen")
-AddEventHandler('kashactersS:CharacterChosen', function(charid, ischar)
-    local src = source
 
-	local isnew = true
-	if type(charid) == "number" and type(ischar) == "boolean" then
-		SetLastCharacter(src, charid)
-		SetCharToIdentifier(GetPlayerIdentifiers(src)[2], charid)
-		if ischar == true then
-			isnew = false
-		else
-			TriggerClientEvent('skinchanger:loadDefaultModel', src, isnew, cb)
-		end
-		TriggerClientEvent("kashactersC:SpawnCharacter", src, isnew)
-	else
-		-- Trigger Ban Event here to ban individuals trying to use SQL Injections
-	end
-end)
-]]
 RegisterServerEvent("kashactersS:CharacterChosen")
 AddEventHandler('kashactersS:CharacterChosen', function(charid, ischar)
     local src = source
diff --git a/readme.md b/readme.md
index ab65956b..4b79f0e5 100644
--- a/readme.md
+++ b/readme.md
@@ -267,13 +267,17 @@ end)
 RegisterNetEvent('esx_ambulancejob:multicharacter')
 AddEventHandler('esx_ambulancejob:multicharacter', function()
 	IsDead = false
-
+	if Config.AntiCombatLog then
+		while not PlayerLoaded do
+			Citizen.Wait(1000)
+		end
 		ESX.TriggerServerCallback('esx_ambulancejob:getDeathStatus', function(isDead)
 			if isDead and Config.AntiCombatLog then
 				ESX.ShowNotification(_U('combatlog_message'))
 				RemoveItemsAfterRPDeath()
 			end
 		end)
+	end
 end)
 ```
 ### Then change this