From a7baa279fcec0d5636bdbe8ed0a1012aa51d0784 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Tue, 18 Jul 2023 01:51:30 +1000
Subject: [PATCH] refactor(client): check if zone was created before calling
 RemoveZone

Minor optimisation but mostly to mitigate ox_target warnings.
---
 modules/inventory/client.lua | 14 ++++++++++----
 modules/shops/client.lua     |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/inventory/client.lua b/modules/inventory/client.lua
index d6213b28f1..02741d76e6 100644
--- a/modules/inventory/client.lua
+++ b/modules/inventory/client.lua
@@ -234,12 +234,15 @@ Inventory.Evidence = setmetatable(data('evidence'), {
 		for _, evidence in pairs(self) do
 			if evidence.point then
 				evidence.point:remove()
-			end
+            elseif evidence.zone then
+                exports.qtarget:RemoveZone(evidence.target.name)
+                evidence.zone = nil
+            end
 
 			if client.hasGroup(shared.police) then
 				if shared.target then
 					if evidence.target then
-						exports.qtarget:RemoveZone(evidence.target.name)
+                        evidence.zone = true
 						exports.qtarget:AddBoxZone(evidence.target.name, evidence.target.loc, evidence.target.length or 0.5, evidence.target.width or 0.5,
 						{
 							name = evidence.target.name,
@@ -287,12 +290,15 @@ Inventory.Stashes = setmetatable(data('stashes'), {
 
 			if stash.point then
 				stash.point:remove()
-			end
+            elseif stash.zone then
+                exports.qtarget:RemoveZone(stash.name)
+                stash.zone = nil
+            end
 
 			if not stash.groups or client.hasGroup(stash.groups) then
 				if shared.target then
 					if stash.target then
-						exports.qtarget:RemoveZone(stash.name)
+                        stash.zone = true
 						exports.qtarget:AddBoxZone(stash.name, stash.target.loc, stash.target.length or 0.5, stash.target.width or 0.5,
 						{
 							name = stash.name,
diff --git a/modules/shops/client.lua b/modules/shops/client.lua
index 8aad8c1e9d..1dfb4b4a3d 100644
--- a/modules/shops/client.lua
+++ b/modules/shops/client.lua
@@ -97,6 +97,7 @@ local function wipeShops()
 
 		if shop.zoneId then
             pcall(exports.qtarget.RemoveZone, nil, shop.zoneId)
+            shop.zoneId = nil
 		end
 
 		if shop.remove then