Merge pull request #1113 from esx-framework/dev

🚑 Major fix 1.10.1
esx-framework · Jul 10, 2023 · 2c5b5c9 · 2c5b5c9
2 parents e85f6ed + f5eb5db
commit 2c5b5c9
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 39 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.10'
+version '1.10.1'
 
 server_script 'server/main.lua'
diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
@@ -689,7 +689,7 @@ function ESX.Game.GetVehicleProperties(vehicle)
 
         neonColor = table.pack(GetVehicleNeonLightsColour(vehicle)),
         extras = extras,
-        dirftTyresEnabled = driftTyresEnabled,
+        driftTyresEnabled = driftTyresEnabled,
         tyreSmokeColor = table.pack(GetVehicleTyreSmokeColor(vehicle)),
 
         modSpoilers = GetVehicleMod(vehicle, 0),
@@ -913,16 +913,10 @@ function ESX.Game.SetVehicleProperties(vehicle, props)
         ToggleVehicleMod(vehicle, 22, props.modXenon)
     end
     if props.modFrontWheels ~= nil then
-        SetVehicleMod(vehicle, 23, props.modFrontWheels, false)
-    end
-    if props.modCustomFrontWheels ~= nil then
-        SetVehicleMod(vehicle, 23, props.modCustomFrontWheels, false)
+        SetVehicleMod(vehicle, 23, props.modFrontWheels, props.modCustomFrontWheels)
     end
     if props.modBackWheels ~= nil then
-        SetVehicleMod(vehicle, 24, props.modBackWheels, false)
-    end
-    if props.modCustomBackWheels ~= nil then
-        SetVehicleMod(vehicle, 24, props.modCustomBackWheels, false)
+        SetVehicleMod(vehicle, 24, props.modBackWheels, props.modCustomBackWheels)
     end
     if props.modPlateHolder ~= nil then
         SetVehicleMod(vehicle, 25, props.modPlateHolder, false)

diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
@@ -332,9 +332,7 @@ if not Config.OxInventory then
 
 	RegisterNetEvent('esx:removeWeapon')
 	AddEventHandler('esx:removeWeapon', function(weapon)
-		local playerPed = ESX.PlayerData.ped
-		RemoveWeaponFromPed(playerPed, joaat(weapon))
-		SetPedAmmo(ESX.PlayerData.ped, joaat(weapon), 0)
+		print("[^1ERROR^7] event ^5'esx:removeWeapon'^7 Has Been Removed. Please use ^5xPlayer.removeWeapon^7 Instead!")
 	end)
 
 	RegisterNetEvent('esx:removeWeaponComponent')

diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
@@ -1,11 +1,9 @@
 fx_version 'adamant'
 
 game 'gta5'
-
 description 'ES Extended'
-
 lua54 'yes'
-version '1.10'
+version '1.10.1'
 
 shared_scripts {
 	'locale.lua',

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
@@ -460,7 +460,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 	end
 
 	function self.removeWeapon(weaponName)
-		local weaponLabel
+		local weaponLabel, playerPed = nil, GetPlayerPed(self.source)
+
+		if not playerPed then 
+			return print("[^1ERROR^7] xPlayer.removeWeapon ^5invalid^7 player ped!")
+		end
 
 		for k, v in ipairs(self.loadout) do
 			if v.name == weaponName then
@@ -469,14 +473,18 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 				for _, v2 in ipairs(v.components) do
 					self.removeWeaponComponent(weaponName, v2)
 				end
+
+				local weaponHash = joaat(v.name)
+
+				RemoveWeaponFromPed(playerPed, weaponHash)
+				SetPedAmmo(playerPed, weaponHash, 0)
 
 				table.remove(self.loadout, k)
 				break
 			end
 		end
 
 		if weaponLabel then
-			self.triggerEvent('esx:removeWeapon', weaponName)
 			self.triggerEvent('esx:removeInventoryItem', weaponLabel, false, true)
 		end
 	end

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

diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua
@@ -1,10 +1,9 @@
 fx_version 'adamant'
 
 game 'gta5'
-
 description 'ESX Identity'
 lua54 'yes'
-version '1.10'
+version '1.10.1'
 
 shared_scripts {
 	'@es_extended/imports.lua',

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

diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua
@@ -1,10 +1,9 @@
 fx_version 'adamant'
 
 game 'gta5'
-
 description 'ESX Menu Default'
 lua54 'yes'
-version '1.10'
+version '1.10.1'
 
 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
@@ -1,10 +1,9 @@
 fx_version 'adamant'
 
 game 'gta5'
-
 description 'ESX Menu Dialog'
 lua54 'yes'
-version '1.10'
+version '1.10.1'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua
@@ -1,10 +1,10 @@
 fx_version 'adamant'
 
 game 'gta5'
-
 description 'ESX Menu List'
 lua54 'yes'
-version '1.10'
+version '1.10.1'
+
 
 client_scripts {
 	'@es_extended/imports.lua',

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

diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua
@@ -1,8 +1,9 @@
 fx_version 'adamant'
+
 game 'gta5'
 author 'ESX-Framework'
 lua54 'yes'
-version '1.10'
+version '1.10.1'
 description 'ESX Progressbar'
 
 client_scripts { 'Progress.lua' }

diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua
@@ -1,11 +1,10 @@
 fx_version 'adamant'
 
 game 'gta5'
-
 description 'ESX Skin'
-
-version '1.10'
+version '1.10.1'
 lua54 'yes'
+
 shared_script '@es_extended/imports.lua'
 
 server_scripts {

diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
@@ -1,9 +1,11 @@
 fx_version 'adamant'
+
 game 'gta5'
 author 'ESX-Framework'
-version '1.10'
+version '1.10.1'
 description 'ESX TextUI'
 lua54 'yes'
+
 client_scripts { 'TextUI.lua' }
 shared_script '@es_extended/imports.lua'
 ui_page 'nui/index.html'

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