From 316c705343fb90713b88267bb1404585d15f47ce Mon Sep 17 00:00:00 2001
From: NRTnarathip <61742272+NRTnarathip@users.noreply.github.com>
Date: Thu, 17 Feb 2022 15:45:45 +0700
Subject: [PATCH] Fix Bug: game crash when player in zone drugshop

Optimize, Add feture marker zone drugshop, Fixed the issue of pressing open menu not working when press key backspace for cancel ui
---
 [esx_addons]/esx_drugs/client/main.lua | 65 +++++++++++++++++++-------
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/[esx_addons]/esx_drugs/client/main.lua b/[esx_addons]/esx_drugs/client/main.lua
index 84226dab..04304c16 100644
--- a/[esx_addons]/esx_drugs/client/main.lua
+++ b/[esx_addons]/esx_drugs/client/main.lua
@@ -1,31 +1,62 @@
 local menuOpen = false
-local wasOpen = false
+local inZoneDrugShop = false
+local inRangeMarkerDrugShop = false
+local cfgMarker = Config.Marker;
 
+--slow loop
 CreateThread(function()
 	while true do
-		local time = 800
 		local playerPed = PlayerPedId()
 		local coords = GetEntityCoords(playerPed)
+		local distDrugShop = #(coords - Config.CircleZones.DrugDealer.coords)
 
-		if #(coords - Config.CircleZones.DrugDealer.coords) < 2.0 then
-			if not menuOpen then
-				ESX.ShowHelpNotification(_U('dealer_prompt'))
+		inRangeMarkerDrugShop = false
+		if(distDrugShop <= Config.Marker.Distance) then
+			inRangeMarkerDrugShop = true
+		end
 
-				if IsControlJustReleased(0, 38) then
-					wasOpen = true
-					OpenDrugShop()
-				end
-			else
-				Wait(500)
-			end
+		if distDrugShop < 1 then
+			inZoneDrugShop = true
 		else
-			if wasOpen then
-				wasOpen = false
+			inZoneDrugShop = false
+			if menuOpen then
+				menuOpen=false
 				ESX.UI.Menu.CloseAll()
 			end
-
-			Wait(time)
 		end
+
+		Wait(500)
+	end
+end)
+
+--drawk marker
+CreateThread(function()
+	while true do 
+		if(inRangeMarkerDrugShop) then
+			local coordsMarker = Config.CircleZones.DrugDealer.coords
+			local color = cfgMarker.Color
+			DrawMarker(cfgMarker.Type, coordsMarker.x, coordsMarker.y,coordsMarker.z - 1.0,
+			0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 
+			cfgMarker.Size, color.r,color.g,color.b,color.a,
+			false, true, 2, false, nil, nil, false)
+		end
+		Wait(0)
+	end
+end)
+
+--main loop
+CreateThread(function ()
+	while true do 
+		if inZoneDrugShop then
+			if(not menuOpen) then
+				ESX.ShowHelpNotification(_U('dealer_prompt'),true)
+				if IsControlJustPressed(0, 38) then
+					OpenDrugShop()
+				end
+			end
+		end
+
+		Wait(15)
 	end
 end)
 
@@ -139,4 +170,4 @@ CreateThread(function()
 	for k,zone in pairs(Config.CircleZones) do
 		CreateBlipCircle(zone.coords, zone.name, zone.radius, zone.color, zone.sprite)
 	end
-end)
\ No newline at end of file
+end)