Update esx_ambulancejob

ItsikNox · Sep 26, 2019 · e43525d · e43525d
1 parent ee6c863
commit e43525d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/WantToRemove esx_kashacters/esx_ambulancejob/client/main.lua b/WantToRemove esx_kashacters/esx_ambulancejob/client/main.lua
@@ -63,8 +63,7 @@ function RespawnPed(ped, coords)
 	SetEntityCoordsNoOffset(ped, coords.x, coords.y, coords.z, false, false, false, true)
 	NetworkResurrectLocalPlayer(coords.x, coords.y, coords.z, coords.heading, true, false)
 	SetPlayerInvincible(ped, false)
-  TriggerEvent('playerSpawned', coords.x, coords.y, coords.z, coords.heading)
-  --TriggerEvent('esx_ambulancejob:multicharacter', coords.x, coords.y, coords.z, coords.heading)
+	TriggerEvent('playerSpawned', coords.x, coords.y, coords.z, coords.heading)
 	ClearPedBloodDamage(ped)
 
 	ESX.UI.Menu.CloseAll()
@@ -779,7 +778,6 @@ function OpenPharmacyMenu()
 	)
 end
 
-
 AddEventHandler('playerSpawned', function()
 	IsDead = false
 
@@ -790,19 +788,6 @@ AddEventHandler('playerSpawned', function()
 	end
 end)
 
---[[
-RegisterNetEvent('esx_ambulancejob:multicharacter')
-AddEventHandler('esx_ambulancejob:multicharacter', function()
-	IsDead = false
-
-	if FirstSpawn then
-		TriggerServerEvent('esx_ambulancejob:firstSpawn')
-		exports.spawnmanager:setAutoSpawn(false) -- disable respawn
-		FirstSpawn = false
-	end
-end)
---]]
-
 RegisterNetEvent('esx:playerLoaded')
 AddEventHandler('esx:playerLoaded', function(xPlayer)
   PlayerData = xPlayer
@@ -1353,7 +1338,7 @@ end)
 RegisterNetEvent('esx_ambulancejob:requestDeath')
 AddEventHandler('esx_ambulancejob:requestDeath', function()
 	if Config.AntiCombatLog then
-		Citizen.Wait(8000)
+		Citizen.Wait(5000)
 		SetEntityHealth(GetPlayerPed(-1), 0)
 	end
 end)
@@ -1422,8 +1407,4 @@ Citizen.CreateThread(function()
 			end
 		end
     end
-end)
-
----------------------------------
---------- ikNox#6088 ------------
----------------------------------
+end)
diff --git a/WantToRemove esx_kashacters/esx_ambulancejob/config.lua b/WantToRemove esx_kashacters/esx_ambulancejob/config.lua
@@ -57,7 +57,7 @@ Config.AuthorizedVehicles = {
 		label = 'Ambulance'
 	},
 	{
-		model = 'dodgeSamu',
+		model = 'dodgeEMS',
 		label = 'Dodge'
 	}