Merge pull request #895 from TheFantomas/vehicle-rewards-fix

fix(es_extended/client/main) Fix VehicleRewards (Added to Thread)

[core]/es_extended/client/main.lua

@@ -74,31 +74,7 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 		end
 	end
 
-	-- DisableVehicleRewards
-	if Config.DisableVehicleRewards then
-		local inVehicle = false
-
-		local function DisableVehicleRewardsThread()
-			CreateThread(function()
-				while inVehicle do
-					DisablePlayerVehicleRewards(playerId)
-					Wait(0)
-				end
-			end)
-		end
-
-		AddEventHandler('esx:enteredVehicle', function(vehicle, plate, seat, displayName, netId)
-			if GetVehicleClass(vehicle) == 18 then
-				DisableVehicleRewardsThread()
-			end
-		end)
-
-		AddEventHandler('esx:exitedVehicle', function(vehicle, plate, seat, displayName, netId)
-			inVehicle = false
-		end)
-	end
-
-	if Config.DisableHealthRegeneration or Config.DisableWeaponWheel or Config.DisableAimAssist then
+	if Config.DisableHealthRegeneration or Config.DisableWeaponWheel or Config.DisableAimAssist or Config.DisableVehicleRewards then
 		CreateThread(function()
 			while true do
 				if Config.DisableHealthRegeneration then
@@ -115,6 +91,10 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 						SetPlayerLockonRangeOverride(playerId, 2.0)
 					end
 				end
+				
+				if Config.DisableVehicleRewards then
+					DisablePlayerVehicleRewards(playerId)
+				end
 
 				Wait(0)
 			end

[core]/es_extended/config.lua

@@ -31,6 +31,7 @@ Config.EnablePVP                = true -- Allow Player to player combat
 Config.Multichar                = true -- Enable support for esx_multicharacter
 Config.Identity                 = true -- Select a characters identity data before they have loaded in (this happens by default with multichar)
 Config.DistanceGive 			= 4.0 -- Max distance when giving items, weapons etc.
+
 Config.DisableHealthRegeneration  = false -- Player will no longer regenerate health
 Config.DisableVehicleRewards      = false -- Disables Player Recieving weapons from vehicles
 Config.DisableNPCDrops            = false -- stops NPCs from dropping weapons on death