Merge pull request esx-framework#1375 from esx-framework/dev

📦 Hotfix 1.10.7
Sub-Zero-Interactive · Jun 18, 2024 · c80916c · c80916c
2 parents 0bc2321 + e7bae05
commit c80916c
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 21 deletions.
diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua
@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'Allows resources to Run tasks at specific intervals.'
 lua54 'yes'
-version '1.10.6'
+version '1.10.7'
 
 server_script 'server/main.lua'
diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 description 'The Core resource that provides the functionalities for all other resources.'
 lua54 'yes'
-version '1.10.6'
+version '1.10.7'
 
 shared_scripts {
 	'locale.lua',
@@ -45,7 +45,6 @@ client_scripts {
 	'common/modules/*.lua',
 	'common/functions.lua',
 
-	'common/functions.lua',
 	'client/modules/actions.lua',
 	'client/modules/death.lua',
 	'client/modules/npwd.lua',

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
@@ -77,13 +77,24 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
     end
 
     ---@param vector boolean
-    ---@return vector3 | table
-    function self.getCoords(vector)
+    ---@param heading boolean  
+    ---@return vector3 | vector4 | table
+    function self.getCoords(vector, heading)
         local ped <const> = _GetPlayerPed(self.source)
-        local coordinates <const> = _GetEntityCoords(ped)
-        local heading <const> = _GetEntityHeading(ped)
+        local entityCoords <const> = _GetEntityCoords(ped)
+        local entityHeading <const> = _GetEntityHeading(ped)
 
-        return vector and vector4(coordinates.xyz, heading) or { x = coordinates.x, y = coordinates.y, z = coordinates.z, heading = heading }
+        local coordinates = { x = entityCoords.x, y = entityCoords.y, z = entityCoords.z }
+
+        if vector then
+            coordinates = (heading and vector4(entityCoords.xyz, entityHeading) or entityCoords)
+        else
+            if heading then
+                coordinates.heading = entityHeading
+            end
+        end
+
+        return coordinates
     end
 
     ---@param reason string

diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
@@ -199,7 +199,7 @@ function Core.SavePlayer(xPlayer, cb)
         xPlayer.job.name,
         xPlayer.job.grade,
         xPlayer.group,
-        json.encode(xPlayer.getCoords()),
+        json.encode(xPlayer.getCoords(false, true)),
         json.encode(xPlayer.getInventory(true)),
         json.encode(xPlayer.getLoadout(true)),
         json.encode(xPlayer.getMeta()),

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 'A simplistic context menu for ESX.'
 lua54 'yes'
-version '1.10.6'
+version '1.10.7'
 
 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 'Allows the player to Pick their characters: Name, Gender, Height and Date-of-birth.'
 lua54 'yes'
-version '1.10.6'
+version '1.10.7'
 
 shared_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua
@@ -3,7 +3,7 @@ game 'common'
 fx_version 'cerulean'
 author 'ESX-Framework'
 description 'Allows resources to Run tasks at specific intervals.'
-version '1.10.6'
+version '1.10.7'
 lua54 'yes'
 
 loadscreen 'index.html'

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 'A basic menu system for ESX Legacy.'
 lua54 'yes'
-version '1.10.6'
+version '1.10.7'
 
 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 'A basic input dialog for ESX Legacy.'
 lua54 'yes'
-version '1.10.6'
+version '1.10.7'
 
 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 'A basic table-based menu system for ESX Legacy.'
 lua54 'yes'
-version '1.10.6'
+version '1.10.7'
 
 
 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 'Allows players to have multiple characters on the same account.'
-version '1.10.6'
+version '1.10.7'
 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.6'
+version '1.10.7'
 author 'ESX-Framework'
 description 'A beautiful and simple 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'
 description 'A beautiful and simple NUI progress bar for ESX'
-version '1.10.6'
+version '1.10.7'
 lua54 'yes'
 
 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 'Allows players to customise their character\'s appearance'
-version '1.10.6'
+version '1.10.7'
 lua54 'yes'
 
 shared_script '@es_extended/imports.lua'

diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
 description 'A beautiful and simple Persistent Notification system for ESX.'
-version '1.10.6'
+version '1.10.7'
 lua54 'yes'
 
 client_scripts { 'TextUI.lua' }

diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 description 'Saves/loads character appearances for ESX Legacy.'
-version '1.10.6'
+version '1.10.7'
 lua54 'yes'
 
 client_scripts {