d

client/main.lua

@@ -1,7 +1,12 @@
 local isPaused, isDead, pickups = false, false, {}
 
-if not Config.UseKashacters then
-  Citizen.CreateThread(function()
+if Config.UseKashacters then
+	RegisterNetEvent('esx:kashloaded')
+  AddEventHandler('esx:kashloaded', function()
+    TriggerServerEvent('esx:onPlayerJoined')
+  end)
+else
+	Citizen.CreateThread(function()
 
 	  while true do
 		  Citizen.Wait(0)
@@ -12,11 +17,6 @@ if not Config.UseKashacters then
 		  end
 	  end
   end)
-else
-	RegisterNetEvent('esx:kashloaded')
-  AddEventHandler('esx:kashloaded', function()
-    TriggerServerEvent('esx:onPlayerJoined')
-  end)
 end
 
 RegisterNetEvent('esx:playerLoaded')
@@ -25,6 +25,7 @@ AddEventHandler('esx:playerLoaded', function(playerData)
 	ESX.PlayerData = playerData
 
 	-- check if player is coming from loading screen
+if not Config.UseKashacters then
 	if GetEntityModel(PlayerPedId()) == GetHashKey('PLAYER_ZERO') then
 		local defaultModel = GetHashKey('a_m_y_stbla_02')
 		RequestModel(defaultModel)
@@ -38,6 +39,7 @@ AddEventHandler('esx:playerLoaded', function(playerData)
 		SetPedRandomComponentVariation(PlayerPedId(), true)
 		SetModelAsNoLongerNeeded(defaultModel)
 	end
+	end
 
 	-- freeze the player
 	FreezeEntityPosition(PlayerPedId(), true)
@@ -68,7 +70,6 @@ AddEventHandler('esx:playerLoaded', function(playerData)
 		})
 	end
 
-	local wait = 4000
 if Config.UseKashacters then
 --[[
     ESX.Game.Teleport(PlayerPedId(), {
@@ -89,28 +90,30 @@ ShutdownLoadingScreen()
 FreezeEntityPosition(PlayerPedId(), false)
 DoScreenFadeIn(0)
 StartServerSyncLoops()
-TriggerEvent('esx:loadingScreenOff')
 
-	else
-		ESX.Game.Teleport(PlayerPedId(), {
-			x = playerData.coords.x,
-			y = playerData.coords.y,
-			z = playerData.coords.z + 0.25,
-			heading = playerData.coords.heading
+else
+	ESX.Game.Teleport(PlayerPedId(), {
+		x = playerData.coords.x,
+		y = playerData.coords.y,
+		z = playerData.coords.z + 0.25,
+		heading = playerData.coords.heading
 	}, function()
-			TriggerServerEvent('esx:onPlayerSpawn')
-			TriggerEvent('esx:onPlayerSpawn')
-			TriggerEvent('playerSpawned') -- compatibility with old scripts, will be removed soon
-			TriggerEvent('esx:restoreLoadout')
+		TriggerServerEvent('esx:onPlayerSpawn')
+		TriggerEvent('esx:onPlayerSpawn')
+		TriggerEvent('playerSpawned') -- compatibility with old scripts, will be removed soon
+		TriggerEvent('esx:restoreLoadout')
 
-			Citizen.Wait(3000)
-			ShutdownLoadingScreen()
-			FreezeEntityPosition(PlayerPedId(), false)
-			DoScreenFadeIn(10000)
-			StartServerSyncLoops()
-			TriggerEvent('esx:loadingScreenOff')
+		Citizen.Wait(4000)
+		ShutdownLoadingScreen()
+		ShutdownLoadingScreenNui()
+		FreezeEntityPosition(PlayerPedId(), false)
+		DoScreenFadeIn(10000)
+		StartServerSyncLoops()
 	end)
+	TriggerEvent('esx:loadingScreenOff')
 end)
+end
+
 
 RegisterNetEvent('esx:setMaxWeight')
 AddEventHandler('esx:setMaxWeight', function(newMaxWeight) ESX.PlayerData.maxWeight = newMaxWeight end)

server/main.lua

@@ -13,12 +13,21 @@ end)
 function onPlayerJoined(playerId)
 	local identifier
 
-	for k,v in ipairs(GetPlayerIdentifiers(playerId)) do
-		if string.match(v, 'license:') then
-			identifier = string.sub(v, 9)
-			break
-		end
+  if not Config.UseKashacters then
+	  for k,v in ipairs(GetPlayerIdentifiers(playerId)) do
+		  if string.match(v, 'license:') then
+			  identifier = string.sub(v, 9)
+			  break
+		  end
+	  end
+  else
+    for k,v in ipairs(GetPlayerIdentifiers(playerId)) do
+			if string.match(v, 'license:') then
+					identifier = v
+					break
+			end
 	end
+end
 
 	if identifier then
 		if ESX.GetPlayerFromIdentifier(identifier) then
@@ -55,11 +64,20 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals)
 	local playerId, identifier = source
 	Citizen.Wait(100)
 
-	for k,v in ipairs(GetPlayerIdentifiers(playerId)) do
-		if string.match(v, 'license:') then
-			identifier = string.sub(v, 9)
-			break
-		end
+  if not Config.UseKashacters then
+	  for k,v in ipairs(GetPlayerIdentifiers(playerId)) do
+		  if string.match(v, 'license:') then
+			  identifier = string.sub(v, 9)
+			  break
+		  end
+	  end
+  else
+    for k,v in ipairs(GetPlayerIdentifiers(playerId)) do
+			if string.match(v, 'license:') then
+					identifier = v
+					break
+			end
+	end
 	end
 
 	if identifier then