Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: code cleanup and fixes + remove store dmvshool #552

Merged
merged 2 commits into from
Nov 5, 2023
Merged

chore: code cleanup and fixes + remove store dmvshool #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d33f9e3
chore: remove store dmvshool
bitpredator Nov 5, 2023
e3bb7a8
chore: code cleanup and fixes
bitpredator Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 1 addition & 8 deletions server-data/resources/[esx_addons]/BasicItem/client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
2 changes: 1 addition & 1 deletion server-data/resources/[esx_addons]/BasicItem/locales/it.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Locales['en'] = {
Locales['it'] = {
['you_have_licensed'] = 'hai ricevuto la tua licenza'
}
2 changes: 1 addition & 1 deletion server-data/resources/[esx_addons]/BasicItem/server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ESX = nil
ESX = exports["es_extended"]:getSharedObject()

ESX.RegisterUsableItem('idcard', function(source)
local _source = source
TriggerClientEvent("IDCARD:USE", _source)
Expand Down
16 changes: 0 additions & 16 deletions server-data/resources/[ox]/ox_inventory/data/shops.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
Loading