From 93bcc8fbdbcedbc715349e6e6028c847b0132ca7 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Wed, 31 Aug 2022 15:17:01 +0100
Subject: [PATCH] refactor(es_extended): better config performance

---
 [esx]/es_extended/client/main.lua | 22 +++++++++++++++++-----
 [esx]/es_extended/config.lua      | 18 +++++++++---------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua
index cb0db13b..2da4c721 100644
--- a/[esx]/es_extended/client/main.lua
+++ b/[esx]/es_extended/client/main.lua
@@ -65,41 +65,53 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 			local RemoveAllPickupsOfType = RemoveAllPickupsOfType
 			local HideHudComponentThisFrame = HideHudComponentThisFrame
 			local PlayerId = PlayerId()
+			local DisabledComps = {}
+			for i=1, #(Config.RemoveHudCommonents) do
+				if Config.RemoveHudCommonents[i] then
+					DisabledComps[#DisabledComps + 1] = i
+				end
+		 end
 			while true do 
-				Wait(0)
+				local Sleep = true
 
 				if Config.DisableHealthRegeneration then
+					Sleep = false
 					SetPlayerHealthRechargeMultiplier(PlayerId, 0.0)
 				end
 
 				if Config.DisableWeaponWheel then
+					Sleep = false
 					BlockWeaponWheelThisFrame()
 					DisableControlAction(0, 37,true)
 				end
 
 				if Config.DisableAimAssist then
+					Sleep = false
 					if IsPedArmed(ESX.PlayerData.ped, 4) then
 						SetPlayerLockonRangeOverride(PlayerId, 2.0)
 					end
 				end
 
 				if Config.DisableVehicleRewards then
+					Sleep = false
 					DisablePlayerVehicleRewards(PlayerId)
 				end
 			
 				if Config.DisableNPCDrops then
+					Sleep = false
 					RemoveAllPickupsOfType(0xDF711959) -- carbine rifle
 					RemoveAllPickupsOfType(0xF9AFB48F) -- pistol
 					RemoveAllPickupsOfType(0xA9355DCD) -- pumpshotgun
 				end
 
-				if Config.RemoveHudCommonents then
-					for i=1, #(Config.RemoveHudCommonents) do
-						 if Config.RemoveHudCommonents[i] then
+				if #DisabledComps > 0 then
+					Sleep = false
+					for i=1, #(DisabledComps) do
 								HideHudComponentThisFrame(i)
-						 end
 					end
 				end
+				
+			Wait(Sleep and 1500 or 0)
 			end
 		end)
 
diff --git a/[esx]/es_extended/config.lua b/[esx]/es_extended/config.lua
index c7f034b6..15292053 100644
--- a/[esx]/es_extended/config.lua
+++ b/[esx]/es_extended/config.lua
@@ -32,28 +32,28 @@ 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.DisableHealthRegen         = false -- Player will no longer regenerate health
-Config.DisableVehicleRewards      = true -- Disables Player Recieving weapons from vehicles
-Config.DisableNPCDrops            = true -- stops NPCs from dropping weapons on death
+Config.DisableVehicleRewards      = false -- Disables Player Recieving weapons from vehicles
+Config.DisableNPCDrops            = false -- stops NPCs from dropping weapons on death
 Config.DisableWeaponWheel         = false -- Disables default weapon wheel
-Config.DisableAimAssist           = true -- disables AIM assist (mainly on controllers)
+Config.DisableAimAssist           = false -- disables AIM assist (mainly on controllers)
 Config.RemoveHudCommonents = {
-	[1] = true, --WANTED_STARS,
+	[1] = false, --WANTED_STARS,
 	[2] = false, --WEAPON_ICON
-	[3] = true, --CASH
-	[4] = true,  --MP_CASH
+	[3] = false, --CASH
+	[4] = false,  --MP_CASH
 	[5] = false, --MP_MESSAGE
 	[6] = false, --VEHICLE_NAME
 	[7] = false,-- AREA_NAME
-	[8] = true,-- VEHICLE_CLASS
+	[8] = false,-- VEHICLE_CLASS
 	[9] = false, --STREET_NAME
 	[10] = false, --HELP_TEXT
 	[11] = false, --FLOATING_HELP_TEXT_1
 	[12] = false, --FLOATING_HELP_TEXT_2
-	[13] = true, --CASH_CHANGE
+	[13] = false, --CASH_CHANGE
 	[14] = false, --RETICLE
 	[15] = false, --SUBTITLE_TEXT
 	[16] = false, --RADIO_STATIONS
-	[17] = true, --SAVING_GAME,
+	[17] = false, --SAVING_GAME,
 	[18] = false, --GAME_STREAM
 	[19] = false, --WEAPON_WHEEL
 	[20] = false, --WEAPON_WHEEL_STATS