1.9.3

esx-framework · Feb 25, 2023 · 4ce57fc · 4ce57fc
2 parents 0e53b30 + 26257ac
commit 4ce57fc
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 32 deletions.
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.9.2'
+version '1.9.3'
 
 server_script 'server/main.lua'
diff --git a/[core]/es_extended/client/common.lua b/[core]/es_extended/client/common.lua
@@ -8,5 +8,5 @@ end
 
 AddEventHandler("esx:getSharedObject", function()
 	local Invoke = GetInvokingResource()
-	print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke))
+	print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
 end)
diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
@@ -162,24 +162,31 @@ AddEventHandler('esx:restoreLoadout', function()
 	end
 end)
 
+-- Credit: https://github.com/LukeWasTakenn, https://github.com/LukeWasTakenn/luke_garages/blob/master/client/client.lua#L331-L352
 AddStateBagChangeHandler('VehicleProperties', nil, function(bagName, key, value)
-	if value then
-		Wait(0)
-		local NetId = value.NetId
-		local Vehicle = NetworkGetEntityFromNetworkId(NetId)
-		local Tries = 0
-		while Vehicle == 0 do
-			Vehicle = NetworkGetEntityFromNetworkId(NetId)
-			Wait(100)
-			Tries = Tries + 1
-			if Tries > 300 then
-				break
-			end
-		end
-		if NetworkGetEntityOwner(Vehicle) == PlayerId() then
-			ESX.Game.SetVehicleProperties(Vehicle, value)
-		end
+	if not value then 
+		return 
 	end
+
+    local netId = bagName:gsub('entity:', '')
+    local timer = GetGameTimer()
+    while not NetworkDoesEntityExistWithNetworkId(tonumber(netId)) do
+	    Wait(0)
+	    if GetGameTimer() - timer > 10000 then
+	        return
+	    end
+    end
+
+    local vehicle = NetToVeh(tonumber(netId))
+    local timer = GetGameTimer()
+    while NetworkGetEntityOwner(vehicle) ~= PlayerId() do
+        Wait(0)
+	    if GetGameTimer() - timer > 10000 then
+	        return
+	    end
+    end
+
+    ESX.Game.SetVehicleProperties(vehicle, value)
 end)
 
 RegisterNetEvent('esx:setAccountMoney')

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
@@ -24,6 +24,7 @@ CreateThread(function()
 
         if playerPed ~= PlayerPedId() then
             playerPed = PlayerPedId()
+            ESX.SetPlayerData('ped', playerPed)
             TriggerEvent('esx:playerPedChanged', playerPed)
             TriggerServerEvent('esx:playerPedChanged', PedToNet(playerPed))
         end

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

diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
@@ -16,7 +16,7 @@ Core.playersByIdentifier = {}
 
 AddEventHandler("esx:getSharedObject", function()
 	local Invoke = GetInvokingResource()
-	print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke))
+	print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
 end)
 
 exports('getSharedObject', function()

diff --git a/[core]/es_extended/server/onesync.lua b/[core]/es_extended/server/onesync.lua
@@ -74,7 +74,6 @@ function ESX.OneSync.SpawnVehicle(model, coords, heading, properties, cb)
 				end
 
 				local networkId = NetworkGetNetworkIdFromEntity(createdVehicle)
-				vehicleProperties.NetId = networkId
 				Entity(createdVehicle).state:set('VehicleProperties', vehicleProperties, true)
 				cb(networkId)
 			else 

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.9.2'
+version '1.9.3'
 
 ui_page 'index.html'
 

diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Identity'
 lua54 'yes'
-version '1.9.2'
+version '1.9.3'
 
 shared_scripts {
 	'@es_extended/imports.lua',

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

diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Menu Default'
 lua54 'yes'
-version '1.9.2'
+version '1.9.3'
 
 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
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Menu Dialog'
 lua54 'yes'
-version '1.9.2'
+version '1.9.3'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Menu List'
 lua54 'yes'
-version '1.9.2'
+version '1.9.3'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'cerulean'
 game 'gta5'
 author 'ESX-Framework - Linden - KASH'
 description 'Official Multicharacter System For ESX Legacy'
-version '1.9.2'
+version '1.9.3'
 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
@@ -1,7 +1,7 @@
 fx_version 'adamant'
 lua54 'yes'
 game 'gta5'
-version '1.9.2'
+version '1.9.3'
 author 'ESX-Framework'
 description 'Official NUI Notification system for ESX'
 

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

diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Skin'
 
-version '1.9.2'
+version '1.9.3'
 lua54 'yes'
 shared_script '@es_extended/imports.lua'
 

diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
@@ -1,7 +1,7 @@
 fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
-version '1.9.2'
+version '1.9.3'
 description 'ESX TextUI'
 lua54 'yes'
 client_scripts { 'TextUI.lua' }

diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua
@@ -6,7 +6,7 @@ lua54 'yes'
 
 description 'Official ESX-Legacy resource for handling the Player`s Skin'
 
-version '1.9.2'
+version '1.9.3'
 
 client_scripts {
 	'@es_extended/locale.lua',