From d33f9e349afbdc1f2cde1edb52e620e5dfa31059 Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Sun, 5 Nov 2023 20:04:38 +0100
Subject: [PATCH 1/2] chore: remove store dmvshool

---
 .github/CHANGELOG.md                             |  5 +++--
 .../resources/[ox]/ox_inventory/data/shops.lua   | 16 ----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 10cce1ae9..f19d0226f 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -32,5 +32,6 @@
 7. [npwd + es_extended]: chore: removed support for npwd_crypto @bitpredator
 8. [ox_lib]: chore: ox_lib update to version '3.11.0' @bitpredator
 9. [esx_addons]: chore: replace esx_drivingschooljob with esx_dmvschool @bitpredator
-10.[SQL]: chore: update database @bitpredator
-11.[maps]: delete: remove maps verpi_driving_school @bitpredator
\ No newline at end of file
+10. [SQL]: chore: update database @bitpredator
+11. [maps]: delete: remove maps verpi_driving_school @bitpredator
+12. [ox_inventory] chore: remove store dmvshool @bitpredator
\ No newline at end of file
diff --git a/server-data/resources/[ox]/ox_inventory/data/shops.lua b/server-data/resources/[ox]/ox_inventory/data/shops.lua
index f96329bdd..3a289f27e 100644
--- a/server-data/resources/[ox]/ox_inventory/data/shops.lua
+++ b/server-data/resources/[ox]/ox_inventory/data/shops.lua
@@ -74,22 +74,6 @@ return {
 		}
 	},
 
-	DmvSchool = {
-		name = 'Scuola Guida',
-		groups = {
-			['driving'] = 4
-		},
-		blip = {
-			id = 403, colour = 69, scale = 0.8
-		}, inventory = {
-			{ name = 'dmvcard',   price = 10000 }
-		}, locations = {
-			vec3(214.694519, -1400.452759, 30.577271)
-		}, targets = {
-
-		}
-	},
-
     Government = {
 		name = 'Governo',
 		blip = {

From e3bb7a846ccbd302a663f67203bc546af463d597 Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Sun, 5 Nov 2023 20:48:24 +0100
Subject: [PATCH 2/2] chore: code cleanup and fixes

---
 .github/CHANGELOG.md                                     | 3 ++-
 .../resources/[esx_addons]/BasicItem/client/main.lua     | 9 +--------
 .../resources/[esx_addons]/BasicItem/locales/it.lua      | 2 +-
 .../resources/[esx_addons]/BasicItem/server/main.lua     | 2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index f19d0226f..d4f78c3e0 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -34,4 +34,5 @@
 9. [esx_addons]: chore: replace esx_drivingschooljob with esx_dmvschool @bitpredator
 10. [SQL]: chore: update database @bitpredator
 11. [maps]: delete: remove maps verpi_driving_school @bitpredator
-12. [ox_inventory] chore: remove store dmvshool @bitpredator
\ No newline at end of file
+12. [ox_inventory]: chore: remove store dmvshool @bitpredator
+13. [BasicItem]: chore: code cleanup and fixes @bitpredator
\ No newline at end of file
diff --git a/server-data/resources/[esx_addons]/BasicItem/client/main.lua b/server-data/resources/[esx_addons]/BasicItem/client/main.lua
index 0966068ce..275b89b55 100644
--- a/server-data/resources/[esx_addons]/BasicItem/client/main.lua
+++ b/server-data/resources/[esx_addons]/BasicItem/client/main.lua
@@ -1,11 +1,4 @@
-ESX = nil
-CreateThread(function()
-    ESX = exports["es_extended"]:getSharedObject()
-    while ESX.GetPlayerData().job == nil do
-        Wait(10)
-    end
-    ESX.PlayerData = ESX.GetPlayerData()
-end)
+ESX = exports["es_extended"]:getSharedObject()
 
 RegisterNetEvent("IDCARD:USE")
 AddEventHandler("IDCARD:USE", function()
diff --git a/server-data/resources/[esx_addons]/BasicItem/locales/it.lua b/server-data/resources/[esx_addons]/BasicItem/locales/it.lua
index 9373fe5d5..473116835 100644
--- a/server-data/resources/[esx_addons]/BasicItem/locales/it.lua
+++ b/server-data/resources/[esx_addons]/BasicItem/locales/it.lua
@@ -1,3 +1,3 @@
-Locales['en'] = {
+Locales['it'] = {
     ['you_have_licensed'] = 'hai ricevuto la tua licenza'
 }
\ No newline at end of file
diff --git a/server-data/resources/[esx_addons]/BasicItem/server/main.lua b/server-data/resources/[esx_addons]/BasicItem/server/main.lua
index e08d48058..589f5a110 100644
--- a/server-data/resources/[esx_addons]/BasicItem/server/main.lua
+++ b/server-data/resources/[esx_addons]/BasicItem/server/main.lua
@@ -1,5 +1,5 @@
-ESX = nil
 ESX = exports["es_extended"]:getSharedObject()
+
 ESX.RegisterUsableItem('idcard', function(source)
     local _source = source
     TriggerClientEvent("IDCARD:USE", _source)