Merge pull request #552 from bitpredator/dev

chore: code cleanup and fixes + remove store dmvshool
bitpredator · Nov 5, 2023 · 1f74927 · 1f74927
2 parents 79658bc + e3bb7a8
commit 1f74927
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 28 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -32,5 +32,7 @@
 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
+10. [SQL]: chore: update database @bitpredator
+11. [maps]: delete: remove maps verpi_driving_school @bitpredator
+12. [ox_inventory]: chore: remove store dmvshool @bitpredator
+13. [BasicItem]: chore: code cleanup and fixes @bitpredator
diff --git 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
@@ -1,3 +1,3 @@
-Locales['en'] = {
+Locales['it'] = {
     ['you_have_licensed'] = 'hai ricevuto la tua licenza'
 }
diff --git 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)

diff --git 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 = {