Merge branch 'esx-framework:main' into main

1nexis · Mar 4, 2024 · 04227b2 · 04227b2
2 parents 05f2318 + b887903
commit 04227b2
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 47 deletions.
diff --git a/.github/workflows/simple-release.yml b/.github/workflows/simple-release.yml
@@ -19,6 +19,11 @@ on:
           type: string
           description: Separate the files or folders that you do not want to see in the release with a comma. 
           required: false
+          default: 'node_modules,package.json,package-lock.json'
+      neededNewBranch:
+          type: string
+          description: Specify true or false if you want to create a new branch.
+          required: false
 
 jobs:
   simple-create-release:
@@ -28,3 +33,4 @@ jobs:
       web: ${{ github.event.inputs.web }}
       versionNumber: ${{ github.event.inputs.versionNumber }}
       excludeOptions: ${{ github.event.inputs.excludeOptions }}
+      neededNewBranch: ${{ github.event.inputs.neededNewBranch }}
diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua
@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'cron'
 lua54 'yes'
-version '1.10.3'
+version '1.10.5'
 
 server_script 'server/main.lua'
diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
@@ -18,61 +18,67 @@ RegisterNetEvent("esx:requestModel", function(model)
     ESX.Streaming.RequestModel(model)
 end)
 
+function ESX.SpawnPlayer(skin, coords, cb)
+    local p = promise.new()
+    TriggerEvent("skinchanger:loadSkin", skin, function()
+        p:resolve()
+    end)
+    Citizen.Await(p)
+
+    local playerPed = PlayerPedId()
+    FreezeEntityPosition(playerPed, true)
+    SetEntityCoordsNoOffset(playerPed, coords.x, coords.y, coords.z, false, false, false, true)
+    SetEntityHeading(playerPed, coords.heading)
+    while not HasCollisionLoadedAroundEntity(playerPed) do
+        Wait(0)
+    end
+    FreezeEntityPosition(playerPed, false)
+    NetworkResurrectLocalPlayer(coords.x, coords.y, coords.z, coords.heading, true, true, false)
+    TriggerEvent('playerSpawned', coords)
+    cb()
+end
+
 RegisterNetEvent("esx:playerLoaded")
-AddEventHandler("esx:playerLoaded", function(xPlayer, isNew, skin)
+AddEventHandler("esx:playerLoaded", function(xPlayer, _, skin)
     ESX.PlayerData = xPlayer
 
-    if Config.Multichar then
-        Wait(3000)
-    else
-        exports.spawnmanager:spawnPlayer({
-            x = ESX.PlayerData.coords.x,
-            y = ESX.PlayerData.coords.y,
-            z = ESX.PlayerData.coords.z + 0.25,
-            heading = ESX.PlayerData.coords.heading,
-            model = `mp_m_freemode_01`,
-            skipFade = false,
-        }, function()
-            TriggerServerEvent("esx:onPlayerSpawn")
+    if not Config.Multichar then
+        ESX.SpawnPlayer(skin, ESX.PlayerData.coords, function()
             TriggerEvent("esx:onPlayerSpawn")
             TriggerEvent("esx:restoreLoadout")
-
-            if isNew then
-                TriggerEvent("skinchanger:loadDefaultModel", skin.sex == 0)
-            elseif skin then
-                TriggerEvent("skinchanger:loadSkin", skin)
-            end
-
+            TriggerServerEvent("esx:onPlayerSpawn")
             TriggerEvent("esx:loadingScreenOff")
             ShutdownLoadingScreen()
             ShutdownLoadingScreenNui()
         end)
     end
 
+    while not DoesEntityExist(ESX.PlayerData.ped) do
+        Wait(20)
+    end
+
     ESX.PlayerLoaded = true
 
-    while ESX.PlayerData.ped == nil do
-        Wait(20)
+    local metadata = ESX.PlayerData.metadata
+
+    if metadata.health then
+        SetEntityHealth(ESX.PlayerData.ped, metadata.health)
+    end
+    if metadata.armor and metadata.armor > 0 then
+        SetPedArmour(ESX.PlayerData.ped, metadata.armor)
     end
 
-    while not HasCollisionLoadedAroundEntity(ESX.PlayerData.ped) do
+    local timer = GetGameTimer()
+    while not HaveAllStreamingRequestsCompleted(ESX.PlayerData.ped) and (GetGameTimer() - timer) < 2000 do
         Wait(0)
-    end
+    end 
 
     if Config.EnablePVP then
         SetCanAttackFriendly(ESX.PlayerData.ped, true, false)
         NetworkSetFriendlyFireOption(true)
     end
 
     local playerId = PlayerId()
-    local metadata = ESX.PlayerData.metadata
-    if metadata.health then
-        SetEntityHealth(ESX.PlayerData.ped, metadata.health)
-    end
-    if metadata.armor and metadata.armor > 0 then
-        SetPedArmour(ESX.PlayerData.ped, metadata.armor)
-    end
-
     -- RemoveHudComponents
     for i = 1, #Config.RemoveHudComponents do
         if Config.RemoveHudComponents[i] then
@@ -196,10 +202,15 @@ AddEventHandler("esx:playerLoaded", function(xPlayer, isNew, skin)
         end
     end
 
+    if IsScreenFadedOut() then
+        DoScreenFadeIn(500)
+    end
+
     SetDefaultVehicleNumberPlateTextPattern(-1, Config.CustomAIPlates)
     StartServerSyncLoops()
 end)
 
+
 RegisterNetEvent("esx:onPlayerLogout")
 AddEventHandler("esx:onPlayerLogout", function()
     ESX.PlayerLoaded = false

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
@@ -25,6 +25,7 @@ local function GetData(vehicle)
 end
 
 CreateThread(function()
+    while not ESX.PlayerLoaded do Wait(200) end
     while true do
         ESX.SetPlayerData("coords", GetEntityCoords(playerPed))
         if playerPed ~= PlayerPedId() then

diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/config.lua
@@ -1,7 +1,7 @@
 Config = {}
 Config.Locale = GetConvar("esx:locale", "en")
 
-Config.OxInventory = GetResourceState("ox_inventory") ~= 'missing' 
+Config.OxInventory = GetResourceState("ox_inventory") ~= 'missing'
 
 Config.Accounts = {
     bank = {

diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
@@ -5,7 +5,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'ES Extended'
 lua54 'yes'
-version '1.10.3'
+version '1.10.5'
 
 shared_scripts {
 	'locale.lua',

diff --git a/[core]/esx_context/fxmanifest.lua b/[core]/esx_context/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 author 'ESX-Framework & Brayden'
 description 'Offical ESX Legacy Context Menu'
 lua54 'yes'
-version '1.10.3'
+version '1.10.5'
 
 ui_page 'index.html'
 

diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'ESX Identity'
 lua54 'yes'
-version '1.10.3'
+version '1.10.5'
 
 shared_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua
@@ -1,6 +1,6 @@
 game 'common'
 
-version '1.10.3'
+version '1.10.5'
 fx_version 'cerulean'
 author 'ESX-Framework'
 lua54 'yes'

diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'ESX Menu Default'
 lua54 'yes'
-version '1.10.3'
+version '1.10.5'
 
 client_scripts { '@es_extended/imports.lua', 'client/main.lua' }
 

diff --git a/[core]/esx_menu_dialog/fxmanifest.lua b/[core]/esx_menu_dialog/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'ESX Menu Dialog'
 lua54 'yes'
-version '1.10.3'
+version '1.10.5'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'ESX Menu List'
 lua54 'yes'
-version '1.10.3'
+version '1.10.5'
 
 
 client_scripts {

diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 author 'ESX-Framework - Linden - KASH'
 description 'Official Multicharacter System For ESX Legacy'
-version '1.10.3'
+version '1.10.5'
 lua54 'yes'
 
 dependencies { 'es_extended', 'esx_context', 'esx_identity', 'esx_skin' }

diff --git a/[core]/esx_notify/fxmanifest.lua b/[core]/esx_notify/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 lua54 'yes'
 game 'gta5'
-version '1.10.3'
+version '1.10.5'
 author 'ESX-Framework'
 description 'Official NUI Notification system for ESX'
 

diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
 lua54 'yes'
-version '1.10.3'
+version '1.10.5'
 description 'ESX Progressbar'
 
 client_scripts { 'Progress.lua' }

diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 description 'ESX Skin'
-version '1.10.3'
+version '1.10.5'
 lua54 'yes'
 
 shared_script '@es_extended/imports.lua'

diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 author 'ESX-Framework'
-version '1.10.3'
+version '1.10.5'
 description 'ESX TextUI'
 lua54 'yes'
 

diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 lua54 'yes'
 description 'Official ESX-Legacy resource for handling the Player`s Skin'
-version '1.10.3'
+version '1.10.5'
 
 client_scripts {
 	'@es_extended/locale.lua',