starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 05:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

formatting & whitespaces (again)

Browse Source
This commit is contained in:
TheFantomas
2023-09-23 23:15:09 +02:00
parent 25f26a8cdc
commit 48e7e462da
9 changed files with 251 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/client/functions.lua
+10 -10
View File
@@ -607,10 +607,10 @@ function ESX.Game.GetVehicleProperties(vehicle)
local doorsBroken, windowsBroken, tyreBurst = {}, {}, {}
local numWheels = tostring(GetVehicleNumberOfWheels(vehicle))
local TyresIndex = { -- Wheel index list according to the number of vehicle wheels.
['2'] = { 0, 4 }, -- Bike and cycle.
['3'] = { 0, 1, 4, 5 }, -- Vehicle with 3 wheels (get for wheels because some 3 wheels vehicles have 2 wheels on front and one rear or the reverse).
['4'] = { 0, 1, 4, 5 }, -- Vehicle with 4 wheels.
local TyresIndex = { -- Wheel index list according to the number of vehicle wheels.
['2'] = { 0, 4 }, -- Bike and cycle.
['3'] = { 0, 1, 4, 5 }, -- Vehicle with 3 wheels (get for wheels because some 3 wheels vehicles have 2 wheels on front and one rear or the reverse).
['4'] = { 0, 1, 4, 5 }, -- Vehicle with 4 wheels.
['6'] = { 0, 1, 2, 3, 4, 5 } -- Vehicle with 6 wheels.
}
@@ -1077,8 +1077,8 @@ function ESX.ShowInventory()
elements[1].title = TranslateCap('inventory', currentWeight, Config.MaxWeight)
for i=1, #Config.Weapons do
local v = Config.Weapons[i]
for i = 1, #Config.Weapons do
local v = Config.Weapons[i]
local weaponHash = joaat(v.name)
if HasPedGotWeapon(playerPed, weaponHash, false) then
@@ -1097,8 +1097,8 @@ function ESX.ShowInventory()
canRemove = true
}
end
end
end
ESX.CloseContext()
ESX.OpenContext("right", elements, function(_, element)
@@ -1324,7 +1324,7 @@ AddEventHandler('onResourceStop', function(resourceName)
end
end
end)
-- Credits to txAdmin for the list.
-- Credits to txAdmin for the list.
local mismatchedTypes = {
[`airtug`] = "automobile", -- trailer
[`avisa`] = "submarine", -- boat
@@ -1365,7 +1365,7 @@ local mismatchedTypes = {
---@return string
function ESX.GetVehicleType(model)
model = type(model) == 'string' and joaat(model) or model
if not IsModelInCdimage(model) then return end
if not IsModelInCdimage(model) then return end
if mismatchedTypes[model] then
return mismatchedTypes[model]
end
[core]/es_extended/locales/de.lua
+5 -5
View File
@@ -101,10 +101,10 @@ Locales["de"] = {
['command_setjob_invalid'] = 'Der Job Grad oder beides sind ungültig',
['command_setgroup'] = 'Setzt eine Berechtigungs Gruppe für einen User',
['command_setgroup_group'] = 'Name der Gruppe',
['command_removeaccountmoney'] = 'Entfernt Geld von einem bestimmten Account',
['command_removeaccountmoney_account'] = 'Account von wem es entfernt werden soll',
['command_removeaccountmoney_amount'] = 'Anzahl die Entfernt werden soll',
['command_removeaccountmoney_invalid'] = 'Name des Accounts Ungültig',
['command_removeaccountmoney'] = 'Entfernt Geld von einem bestimmten Account',
['command_removeaccountmoney_account'] = 'Account von wem es entfernt werden soll',
['command_removeaccountmoney_amount'] = 'Anzahl die Entfernt werden soll',
['command_removeaccountmoney_invalid'] = 'Name des Accounts Ungültig',
['commanderror_argumentmismatch'] = 'Ungültiger Argument (gegeben %s, gewollt %s)',
['commanderror_argumentmismatch_number'] = 'Ungültiges Argument #%s daten typ (string gegeben, gewollte nummer)',
['commanderror_argumentmismatch_string'] = 'Invalid Argument #%s data type (passed number, wanted string)',
@@ -233,7 +233,7 @@ Locales["de"] = {
["weapon_tactilerifle"] = "Service Karabiner",
-- Drug Wars DLC
['weapon_candycane'] = 'Zuckerstange',
['weapon_candycane'] = 'Zuckerstange',
['weapon_acidpackage'] = 'Säure Paket',
['weapon_pistolxm3'] = 'WM 29 Pistole',
['weapon_railgunxm3'] = 'Railgun',
[core]/es_extended/locales/el.lua
+87 -87
View File
@@ -27,96 +27,96 @@ Locales["el"] = {
["amount_invalid"] = "Μη έγκυρη ποσότητα",
["players_nearby"] = "Δεν υπάρχουν κοντινοί παίκτες",
["ex_inv_lim"] = "Δεν είναι δυνατή η ενέργεια, υπέρβαση του μέγιστου βάρους των %s",
["imp_invalid_quantity"] = "Δεν είναι δυνατή η ενέργεια, η ποσότητα δεν είναι έγκυρη",
["imp_invalid_amount"] = "Δεν είναι δυνατή η ενέργεια, το ποσό δεν είναι έγκυρο",
["threw_standard"] = "Ρίχνοντας %sx %s",
["threw_account"] = "Ρίχνοντας $%s %s",
["threw_weapon"] = "Ρίχνοντας %s",
["threw_weapon_ammo"] = "Ρίχνοντας %s με ~o~%sx %s",
["threw_weapon_already"] = "Ήδη έχετε αυτό το όπλο",
["threw_cannot_pickup"] = "Η αποθήκη είναι γεμάτη, δεν μπορείτε να σηκώσετε!",
["threw_pickup_prompt"] = "Πατήστε E για να σηκώσετε",
["imp_invalid_quantity"] = "Δεν είναι δυνατή η ενέργεια, η ποσότητα δεν είναι έγκυρη",
["imp_invalid_amount"] = "Δεν είναι δυνατή η ενέργεια, το ποσό δεν είναι έγκυρο",
["threw_standard"] = "Ρίχνοντας %sx %s",
["threw_account"] = "Ρίχνοντας $%s %s",
["threw_weapon"] = "Ρίχνοντας %s",
["threw_weapon_ammo"] = "Ρίχνοντας %s με ~o~%sx %s",
["threw_weapon_already"] = "Ήδη έχετε αυτό το όπλο",
["threw_cannot_pickup"] = "Η αποθήκη είναι γεμάτη, δεν μπορείτε να σηκώσετε!",
["threw_pickup_prompt"] = "Πατήστε E για να σηκώσετε",
-- Key mapping
["keymap_showinventory"] = "Εμφάνιση Αποθήκης",
-- Key mapping
["keymap_showinventory"] = "Εμφάνιση Αποθήκης",
-- Salary related
["received_salary"] = "Έχετε λάβει μισθό: $%s",
["received_help"] = "Έχετε λάβει το βοήθημά σας: $%s",
["company_nomoney"] = "Η εταιρεία στην οποία είστε απασχολούμενος/η δεν έχει αρκετά χρήματα για να καταβάλει τον μισθό σας",
["received_paycheck"] = "λάβατε μισθό",
["bank"] = "Τράπεζα Maze",
["account_bank"] = "Τραπεζικός Λογαριασμός",
["account_black_money"] = "Βρώμικα Χρήματα",
["account_money"] = "Μετρητά",
-- Salary related
["received_salary"] = "Έχετε λάβει μισθό: $%s",
["received_help"] = "Έχετε λάβει το βοήθημά σας: $%s",
["company_nomoney"] = "Η εταιρεία στην οποία είστε απασχολούμενος/η δεν έχει αρκετά χρήματα για να καταβάλει τον μισθό σας",
["received_paycheck"] = "λάβατε μισθό",
["bank"] = "Τράπεζα Maze",
["account_bank"] = "Τραπεζικός Λογαριασμός",
["account_black_money"] = "Βρώμικα Χρήματα",
["account_money"] = "Μετρητά",
["act_imp"] = "Δεν είναι δυνατή η εκτέλεση της ενέργειας",
["in_vehicle"] = "Δεν είναι δυνατή η εκτέλεση της ενέργειας, ο παίκτης βρίσκεται σε όχημα",
["not_in_vehicle"] = "Δεν είναι δυνατή η εκτέλεση της ενέργειας, ο παίκτης δεν βρίσκεται σε κάποιο όχημα",
["act_imp"] = "Δεν είναι δυνατή η εκτέλεση της ενέργειας",
["in_vehicle"] = "Δεν είναι δυνατή η εκτέλεση της ενέργειας, ο παίκτης βρίσκεται σε όχημα",
["not_in_vehicle"] = "Δεν είναι δυνατή η εκτέλεση της ενέργειας, ο παίκτης δεν βρίσκεται σε κάποιο όχημα",
-- Commands
['command_bring'] = 'Φέρτε τον παίκτη σε εσάς',
['command_car'] = 'Κλήση οχήματος',
['command_car_car'] = 'Μοντέλο ή κωδικός οχήματος',
['command_cardel'] = 'Κατάργηση οχημάτων κοντά',
['command_cardel_radius'] = 'Καταργεί όλα τα οχήματα εντός της καθορισμένης ακτίνας',
-- Commands
['command_bring'] = 'Φέρτε τον παίκτη σε εσάς',
['command_car'] = 'Κλήση οχήματος',
['command_car_car'] = 'Μοντέλο ή κωδικός οχήματος',
['command_cardel'] = 'Κατάργηση οχημάτων κοντά',
['command_cardel_radius'] = 'Καταργεί όλα τα οχήματα εντός της καθορισμένης ακτίνας',
['command_repair'] = 'Επισκέυασε το όχημα σου',
['command_repair_success'] = 'Το όχημα σου επισκευάστηκε',
['command_repair_success_target'] = 'Ένας διαχειριστής επισκεύασε το όχημα σου',
['command_clear'] = 'Καθαρισμός κειμένου στο chat',
['command_clearall'] = 'Καθαρισμός κειμένου στο chat για όλους τους παίκτες',
['command_clearinventory'] = 'Κατάργηση όλων των αντικειμένων από την αποθήκη των παικτών',
['command_clearloadout'] = 'Κατάργηση όλων των όπλων από την εξάρτηση των παικτών',
['command_freeze'] = 'Πάγωμα ενός παίκτη',
['command_unfreeze'] = 'Ξεπάγωμα ενός παίκτη',
['command_giveaccountmoney'] = 'Δώστε χρήματα σε καθορισμένο λογαριασμό',
['command_giveaccountmoney_account'] = 'Λογαριασμός προς προσθήκη',
['command_giveaccountmoney_amount'] = 'Ποσό προς προσθήκη',
['command_giveaccountmoney_invalid'] = 'Μη έγκυρο όνομα λογαριασμού',
['command_removeaccountmoney'] = 'Κατάργηση χρημάτων από καθορισμένο λογαριασμό',
['command_removeaccountmoney_account'] = 'Λογαριασμός από τον οποίο θα καταργηθούν τα χρήματα',
['command_removeaccountmoney_amount'] = 'Ποσό προς αφαίρεση',
['command_removeaccountmoney_invalid'] = 'Μη έγκυρο όνομα λογαριασμού',
['command_giveitem'] = 'Δώστε σε έναν παίκτη ένα αντικείμενο',
['command_giveitem_item'] = 'Όνομα αντικειμένου',
['command_giveitem_count'] = 'Ποσότητα',
['command_giveweapon'] = 'Δώστε σε έναν παίκτη ένα όπλο',
['command_giveweapon_weapon'] = 'Όνομα όπλου',
['command_giveweapon_ammo'] = 'Ποσότητα πυρομαχικών',
['command_giveweapon_hasalready'] = 'Ο παίκτης έχει ήδη αυτό το όπλο',
['command_giveweaponcomponent'] = 'Δώστε σε έναν παίκτη μια εξάρτηση όπλου',
['command_giveweaponcomponent_component'] = 'Όνομα εξάρτησης',
['command_giveweaponcomponent_invalid'] = 'Μη έγκυρη εξάρτηση όπλου',
['command_giveweaponcomponent_hasalready'] = 'Ο παίκτης έχει ήδη αυτήν την εξάρτηση όπλου',
['command_giveweaponcomponent_missingweapon'] = 'Ο παίκτης δεν έχει αυτό το όπλο',
['command_goto'] = 'Τηλεμεταφέρεστε σε έναν παίκτη',
['command_kill'] = 'Σκοτώστε έναν παίκτη',
['command_save'] = 'Εξαναγκαστική αποθήκευση δεδομένων ενός παίκτη',
['command_saveall'] = 'Εξαναγκαστική αποθήκευση όλων των δεδομένων των παικτών',
['command_setaccountmoney'] = 'Ορίστε τα χρήματα σε έναν καθορισμένο λογαριασμό',
['command_setaccountmoney_amount'] = 'Ποσό',
['command_setcoords'] = 'Τηλεμεταφερθείτε σε καθορισμένες συντεταγμένες',
['command_setcoords_x'] = 'Τιμή X',
['command_setcoords_y'] = 'Τιμή Y',
['command_setcoords_z'] = 'Τιμή Z',
['command_setjob'] = 'Ορίστε το επάγγελμα ενός παίκτη',
['command_setjob_job'] = 'Όνομα',
['command_setjob_grade'] = 'Βαθμός επαγγέλματος',
['command_setjob_invalid'] = 'Το επάγγελμα, ο βαθμός ή και οι δύο είναι μη έγκυρα',
['command_setgroup'] = 'Ορίστε την ομάδα δικαιωμάτων ενός παίκτη',
['command_setgroup_group'] = 'Όνομα Ομάδας',
['commanderror_argumentmismatch'] = 'Μη έγκυρος αριθμός ορισμάτων (δόθηκαν %s, αναμενόμενα %s)',
['commanderror_argumentmismatch_number'] = 'Μη έγκυρος τύπος δεδομένων για το όρισμα #%s (δόθηκε συμβολοσειρά, αναμενόμενος αριθμός)',
['commanderror_argumentmismatch_string'] = 'Μη έγκυρος τύπος δεδομένων για το όρισμα #%s (δόθηκε αριθμός, αναμενόμενη συμβολοσειρά)',
['commanderror_invaliditem'] = 'Μη έγκυρο αντικείμενο',
['commanderror_invalidweapon'] = 'Μη έγκυρο όπλο',
['commanderror_console'] = 'Η εντολή δεν μπορεί να εκτελεστεί από την κονσόλα',
['commanderror_invalidcommand'] = 'Μη έγκυρη εντολή - /%s',
['commanderror_invalidplayerid'] = 'Ο καθορισμένος παίκτης δεν είναι συνδεδεμένος',
['commandgeneric_playerid'] = 'Αναγνωριστικό διακομιστή του παίκτη',
['command_giveammo_noweapon_found'] = 'Ο %s δεν έχει αυτό το όπλο',
['command_giveammo_weapon'] = 'Όνομα όπλου',
['command_giveammo_ammo'] = 'Ποσότητα πυρομαχικών',
['command_clear'] = 'Καθαρισμός κειμένου στο chat',
['command_clearall'] = 'Καθαρισμός κειμένου στο chat για όλους τους παίκτες',
['command_clearinventory'] = 'Κατάργηση όλων των αντικειμένων από την αποθήκη των παικτών',
['command_clearloadout'] = 'Κατάργηση όλων των όπλων από την εξάρτηση των παικτών',
['command_freeze'] = 'Πάγωμα ενός παίκτη',
['command_unfreeze'] = 'Ξεπάγωμα ενός παίκτη',
['command_giveaccountmoney'] = 'Δώστε χρήματα σε καθορισμένο λογαριασμό',
['command_giveaccountmoney_account'] = 'Λογαριασμός προς προσθήκη',
['command_giveaccountmoney_amount'] = 'Ποσό προς προσθήκη',
['command_giveaccountmoney_invalid'] = 'Μη έγκυρο όνομα λογαριασμού',
['command_removeaccountmoney'] = 'Κατάργηση χρημάτων από καθορισμένο λογαριασμό',
['command_removeaccountmoney_account'] = 'Λογαριασμός από τον οποίο θα καταργηθούν τα χρήματα',
['command_removeaccountmoney_amount'] = 'Ποσό προς αφαίρεση',
['command_removeaccountmoney_invalid'] = 'Μη έγκυρο όνομα λογαριασμού',
['command_giveitem'] = 'Δώστε σε έναν παίκτη ένα αντικείμενο',
['command_giveitem_item'] = 'Όνομα αντικειμένου',
['command_giveitem_count'] = 'Ποσότητα',
['command_giveweapon'] = 'Δώστε σε έναν παίκτη ένα όπλο',
['command_giveweapon_weapon'] = 'Όνομα όπλου',
['command_giveweapon_ammo'] = 'Ποσότητα πυρομαχικών',
['command_giveweapon_hasalready'] = 'Ο παίκτης έχει ήδη αυτό το όπλο',
['command_giveweaponcomponent'] = 'Δώστε σε έναν παίκτη μια εξάρτηση όπλου',
['command_giveweaponcomponent_component'] = 'Όνομα εξάρτησης',
['command_giveweaponcomponent_invalid'] = 'Μη έγκυρη εξάρτηση όπλου',
['command_giveweaponcomponent_hasalready'] = 'Ο παίκτης έχει ήδη αυτήν την εξάρτηση όπλου',
['command_giveweaponcomponent_missingweapon'] = 'Ο παίκτης δεν έχει αυτό το όπλο',
['command_goto'] = 'Τηλεμεταφέρεστε σε έναν παίκτη',
['command_kill'] = 'Σκοτώστε έναν παίκτη',
['command_save'] = 'Εξαναγκαστική αποθήκευση δεδομένων ενός παίκτη',
['command_saveall'] = 'Εξαναγκαστική αποθήκευση όλων των δεδομένων των παικτών',
['command_setaccountmoney'] = 'Ορίστε τα χρήματα σε έναν καθορισμένο λογαριασμό',
['command_setaccountmoney_amount'] = 'Ποσό',
['command_setcoords'] = 'Τηλεμεταφερθείτε σε καθορισμένες συντεταγμένες',
['command_setcoords_x'] = 'Τιμή X',
['command_setcoords_y'] = 'Τιμή Y',
['command_setcoords_z'] = 'Τιμή Z',
['command_setjob'] = 'Ορίστε το επάγγελμα ενός παίκτη',
['command_setjob_job'] = 'Όνομα',
['command_setjob_grade'] = 'Βαθμός επαγγέλματος',
['command_setjob_invalid'] = 'Το επάγγελμα, ο βαθμός ή και οι δύο είναι μη έγκυρα',
['command_setgroup'] = 'Ορίστε την ομάδα δικαιωμάτων ενός παίκτη',
['command_setgroup_group'] = 'Όνομα Ομάδας',
['commanderror_argumentmismatch'] = 'Μη έγκυρος αριθμός ορισμάτων (δόθηκαν %s, αναμενόμενα %s)',
['commanderror_argumentmismatch_number'] = 'Μη έγκυρος τύπος δεδομένων για το όρισμα #%s (δόθηκε συμβολοσειρά, αναμενόμενος αριθμός)',
['commanderror_argumentmismatch_string'] = 'Μη έγκυρος τύπος δεδομένων για το όρισμα #%s (δόθηκε αριθμός, αναμενόμενη συμβολοσειρά)',
['commanderror_invaliditem'] = 'Μη έγκυρο αντικείμενο',
['commanderror_invalidweapon'] = 'Μη έγκυρο όπλο',
['commanderror_console'] = 'Η εντολή δεν μπορεί να εκτελεστεί από την κονσόλα',
['commanderror_invalidcommand'] = 'Μη έγκυρη εντολή - /%s',
['commanderror_invalidplayerid'] = 'Ο καθορισμένος παίκτης δεν είναι συνδεδεμένος',
['commandgeneric_playerid'] = 'Αναγνωριστικό διακομιστή του παίκτη',
['command_giveammo_noweapon_found'] = 'Ο %s δεν έχει αυτό το όπλο',
['command_giveammo_weapon'] = 'Όνομα όπλου',
['command_giveammo_ammo'] = 'Ποσότητα πυρομαχικών',
['tpm_nowaypoint'] = 'Δεν έχει οριστεί σημείο προορισμού.',
['tpm_success'] = 'Επιτυχής τηλεμεταφορά',
@@ -232,11 +232,11 @@ Locales["el"] = {
["weapon_precisionrifle"] = "Όπλο Ακρίβειας",
["weapon_tactilerifle"] = "Όπλο Εξυπηρέτησης",
-- Drug wars dlc
-- Drug wars dlc
["weapon_candycane"] = "Candycane",
["weapon_acidpackage"] = "Acid Package",
["weapon_pistolxm3"] = "Pistol8 x3m",
["weapon_railgunxm3"] = "Railgun",
["weapon_pistolxm3"] = "Pistol8 x3m",
["weapon_railgunxm3"] = "Railgun",
-- Ρίψεις
["weapon_ball"] = "Μπάλα",
@@ -342,7 +342,7 @@ Locales["el"] = {
["component_ammo_fmj"] = "Σφαίρες FMJ",
["component_ammo_armor"] = "Σφαίρες Διάτρησης Θωράκισης",
["component_ammo_explosive"] = "Εκρηκτικές Σφαίρες Διάτρησης Θωράκισης",
["component_shells_default"] = "Προεπιλεγμένες Φυσίγγια",
["component_shells_incendiary"] = "Φυσίγγια Διαμαντινών",
["component_shells_armor"] = "Φυσίγγια Θωράκισης Χάλυβα",
[core]/es_extended/locales/en.lua
+4 -4
View File
@@ -232,12 +232,12 @@ Locales["en"] = {
["weapon_precisionrifle"] = "Precision Rifle",
["weapon_tactilerifle"] = "Service Carbine",
-- Drug wars dlc
-- Drug wars dlc
["weapon_candycane"] = "Candycane",
["weapon_acidpackage"] = "Acid Package",
["weapon_pistolxm3"] = "Pistol8 x3m",
["weapon_railgunxm3"] = "Railgun",
["weapon_pistolxm3"] = "Pistol8 x3m",
["weapon_railgunxm3"] = "Railgun",
-- Thrown
["weapon_ball"] = "Baseball",
["weapon_bzgas"] = "BZ Gas",
[core]/es_extended/locales/fr.lua
+2 -2
View File
@@ -232,10 +232,10 @@ Locales["fr"] = {
["weapon_precisionrifle"] = "Fusil de précision",
["weapon_tactilerifle"] = "Carabine tactique",
-- Drug wars dlc
-- Drug wars dlc
["weapon_candycane"] = "Sucre d'orge",
["weapon_acidpackage"] = "Paquet d'acide",
["weapon_pistolxm3"] = "Pistolet 8 x3m",
["weapon_pistolxm3"] = "Pistolet 8 x3m",
["weapon_railgunxm3"] = "Fusil électro-magnétique",
-- Thrown
[core]/es_extended/locales/it.lua
+9 -9
View File
@@ -73,10 +73,10 @@ Locales["it"] = {
['command_giveaccountmoney_account'] = 'Account a cui aggiungere',
['command_giveaccountmoney_amount'] = 'Quantità da aggiungere',
['command_giveaccountmoney_invalid'] = 'Nome account non valido',
['command_removeaccountmoney'] = 'Rimuovi soldi da un account specifico',
['command_removeaccountmoney_account'] = 'Account a cui togliere',
['command_removeaccountmoney_amount'] = 'Quantità da rimuovere',
['command_removeaccountmoney_invalid'] = 'Nome account non valido',
['command_removeaccountmoney'] = 'Rimuovi soldi da un account specifico',
['command_removeaccountmoney_account'] = 'Account a cui togliere',
['command_removeaccountmoney_amount'] = 'Quantità da rimuovere',
['command_removeaccountmoney_invalid'] = 'Nome account non valido',
['command_giveitem'] = 'Dai un oggetto ad un giocatore',
['command_giveitem_item'] = 'Nome oggetto',
['command_giveitem_count'] = 'Quantità',
@@ -208,7 +208,7 @@ Locales["it"] = {
["weapon_militaryrifle"] = "Fucile militare",
["weapon_specialcarbine"] = "Carabina speciale",
["weapon_specialcarbine_mk2"] = "Carabina speciale MK2",
["weapon_heavyrifle"] = "Fucile pesante",
["weapon_heavyrifle"] = "Fucile pesante",
-- Sniper
["weapon_heavysniper"] = "Cecchino pesante",
@@ -233,10 +233,10 @@ Locales["it"] = {
["weapon_tactilerifle"] = "Carabina di servizio",
-- Drug Wars DLC
['weapon_candycane'] = 'Bastoncino di zucchero',
['weapon_acidpackage'] = 'Pacco di acidi',
['weapon_pistolxm3'] = 'Pistola WM 29',
['weapon_railgunxm3'] = 'Railgun',
['weapon_candycane'] = 'Bastoncino di zucchero',
['weapon_acidpackage'] = 'Pacco di acidi',
['weapon_pistolxm3'] = 'Pistola WM 29',
['weapon_railgunxm3'] = 'Railgun',
-- Thrown
["weapon_ball"] = "Palla",
[core]/es_extended/locales/nl.lua
+4 -4
View File
@@ -48,7 +48,7 @@ Locales["nl"] = {
["bank"] = "Maze Bank",
["account_bank"] = "Bank",
["account_black_money"] = "Zwart geld",
["account_money"] = "Contant",
["account_money"] = "Contant",
["act_imp"] = "Kan actie niet uitvoeren",
["in_vehicle"] = "Kan actie niet uitvoeren, de speler zit in een voertuig.",
@@ -226,8 +226,8 @@ Locales["nl"] = {
-- Drug Wars DLC
["weapon_candycane"] = "Snoep stok",
["weapon_acidpackage"] = "LSD pakket",
["weapon_pistolxm3"] = "WM 29 Pistool",
["weapon_railgunxm3"] = "Railgun",
["weapon_pistolxm3"] = "WM 29 Pistool",
["weapon_railgunxm3"] = "Railgun",
-- Thrown
["weapon_ball"] = "Honkbal",
@@ -369,4 +369,4 @@ Locales["nl"] = {
["tint_lspd"] = "blauwe skin",
["tint_orange"] = "oranje skin",
["tint_platinum"] = "platina skin",
}
}
[core]/es_extended/server/commands.lua
+92 -92
View File
@@ -1,12 +1,12 @@
ESX.RegisterCommand({'setcoords', 'tp'}, 'admin', function(xPlayer, args)
ESX.RegisterCommand({ 'setcoords', 'tp' }, 'admin', function(xPlayer, args)
xPlayer.setCoords({ x = args.x, y = args.y, z = args.z })
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Set Coordinates /setcoords Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "X Coord", value = args.x, inline = true },
{ name = "Y Coord", value = args.y, inline = true },
{ name = "Z Coord", value = args.z, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "X Coord", value = args.x, inline = true },
{ name = "Y Coord", value = args.y, inline = true },
{ name = "Z Coord", value = args.z, inline = true },
})
end
end, false, {
@@ -27,11 +27,11 @@ ESX.RegisterCommand('setjob', 'admin', function(xPlayer, args, showError)
args.playerId.setJob(args.job, args.grade)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Set Job /setjob Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Job", value = args.job, inline = true },
{ name = "Grade", value = args.grade, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Job", value = args.job, inline = true },
{ name = "Grade", value = args.grade, inline = true },
})
end
end, true, {
@@ -75,9 +75,9 @@ ESX.RegisterCommand('car', 'admin', function(xPlayer, args, showError)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Spawn Car /car Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Vehicle", value = args.car, inline = true }
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Vehicle", value = args.car, inline = true }
})
end
@@ -120,8 +120,8 @@ ESX.RegisterCommand({ 'cardel', 'dv' }, 'admin', function(xPlayer, args)
end
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Delete Vehicle /dv Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
})
end
end, false, {
@@ -133,7 +133,7 @@ end, false, {
})
ESX.RegisterCommand({ 'fix', 'repair' }, 'admin', function(xPlayer, args, showError)
local xTarget = args.playerId
local xTarget = args.playerId
local ped = GetPlayerPed(xTarget.source)
local pedVehicle = GetVehiclePedIsIn(ped, false)
if not pedVehicle or GetPedInVehicleSeat(pedVehicle, -1) ~= ped then
@@ -147,9 +147,9 @@ ESX.RegisterCommand({ 'fix', 'repair' }, 'admin', function(xPlayer, args, showEr
end
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Fix Vehicle /fix Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = xTarget.name, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = xTarget.name, inline = true },
})
end
end, true, {
@@ -167,11 +167,11 @@ ESX.RegisterCommand('setaccountmoney', 'admin', function(xPlayer, args, showErro
args.playerId.setAccountMoney(args.account, args.amount, "Government Grant")
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Set Account Money /setaccountmoney Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Account", value = args.account, inline = true },
{ name = "Amount", value = args.amount, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Account", value = args.account, inline = true },
{ name = "Amount", value = args.amount, inline = true },
})
end
end, true, {
@@ -191,11 +191,11 @@ ESX.RegisterCommand('giveaccountmoney', 'admin', function(xPlayer, args, showErr
args.playerId.addAccountMoney(args.account, args.amount, "Government Grant")
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Give Account Money /giveaccountmoney Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Account", value = args.account, inline = true },
{ name = "Amount", value = args.amount, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Account", value = args.account, inline = true },
{ name = "Amount", value = args.amount, inline = true },
})
end
end, true, {
@@ -215,11 +215,11 @@ ESX.RegisterCommand('removeaccountmoney', 'admin', function(xPlayer, args, showE
args.playerId.removeAccountMoney(args.account, args.amount, "Government Tax")
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Remove Account Money /removeaccountmoney Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Account", value = args.account, inline = true },
{ name = "Amount", value = args.amount, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Account", value = args.account, inline = true },
{ name = "Amount", value = args.amount, inline = true },
})
end
end, true, {
@@ -237,11 +237,11 @@ if not Config.OxInventory then
args.playerId.addInventoryItem(args.item, args.count)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Give Item /giveitem Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Item", value = args.item, inline = true },
{ name = "Quantity", value = args.count, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Item", value = args.item, inline = true },
{ name = "Quantity", value = args.count, inline = true },
})
end
end, true, {
@@ -261,11 +261,11 @@ if not Config.OxInventory then
args.playerId.addWeapon(args.weapon, args.ammo)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Give Weapon /giveweapon Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Weapon", value = args.weapon, inline = true },
{ name = "Ammo", value = args.ammo, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Weapon", value = args.weapon, inline = true },
{ name = "Ammo", value = args.ammo, inline = true },
})
end
end, true, {
@@ -285,11 +285,11 @@ if not Config.OxInventory then
args.playerId.addWeaponAmmo(args.weapon, args.ammo)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Give Ammunition /giveammo Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Weapon", value = args.weapon, inline = true },
{ name = "Ammo", value = args.ammo, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Weapon", value = args.weapon, inline = true },
{ name = "Ammo", value = args.ammo, inline = true },
})
end
end, true, {
@@ -314,11 +314,11 @@ if not Config.OxInventory then
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Give Weapon Component /giveweaponcomponent Triggered!",
"pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Weapon", value = args.weaponName, inline = true },
{ name = "Component", value = args.componentName, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Weapon", value = args.weaponName, inline = true },
{ name = "Component", value = args.componentName, inline = true },
})
end
end
@@ -347,8 +347,8 @@ ESX.RegisterCommand({ 'clearall', 'clsall' }, 'admin', function(xPlayer)
TriggerClientEvent('chat:clear', -1)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Clear Chat /clearall Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
})
end
end, true, { help = TranslateCap('command_clearall') })
@@ -367,9 +367,9 @@ if not Config.OxInventory then
TriggerEvent('esx:playerInventoryCleared', args.playerId)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Clear Inventory /clearinventory Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
})
end
end, true, {
@@ -387,9 +387,9 @@ if not Config.OxInventory then
TriggerEvent('esx:playerLoadoutCleared', args.playerId)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "/clearloadout Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
})
end
end, true, {
@@ -410,10 +410,10 @@ ESX.RegisterCommand('setgroup', 'admin', function(xPlayer, args)
args.playerId.setGroup(args.group)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "/setgroup Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Group", value = args.group, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Group", value = args.group, inline = true },
})
end
end, true, {
@@ -467,8 +467,8 @@ ESX.RegisterCommand('tpm', "admin", function(xPlayer)
xPlayer.triggerEvent("esx:tpm")
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Admin Teleport /tpm Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
})
end
end, true)
@@ -478,10 +478,10 @@ ESX.RegisterCommand('goto', "admin", function(xPlayer, args)
xPlayer.setCoords(targetCoords)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Admin Teleport /goto Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Target Coords", value = targetCoords, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Target Coords", value = targetCoords, inline = true },
})
end
end, true, {
@@ -498,10 +498,10 @@ ESX.RegisterCommand('bring', "admin", function(xPlayer, args)
args.playerId.setCoords(playerCoords)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Admin Teleport /bring Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Target Coords", value = targetCoords, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Target Coords", value = targetCoords, inline = true },
})
end
end, true, {
@@ -516,9 +516,9 @@ ESX.RegisterCommand('kill', "admin", function(xPlayer, args)
args.playerId.triggerEvent("esx:killPlayer")
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Kill Command /kill Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
})
end
end, true, {
@@ -533,9 +533,9 @@ ESX.RegisterCommand('freeze', "admin", function(xPlayer, args)
args.playerId.triggerEvent('esx:freezePlayer', "freeze")
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Admin Freeze /freeze Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
})
end
end, true, {
@@ -550,9 +550,9 @@ ESX.RegisterCommand('unfreeze', "admin", function(xPlayer, args)
args.playerId.triggerEvent('esx:freezePlayer', "unfreeze")
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Admin UnFreeze /unfreeze Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Target", value = args.playerId.name, inline = true },
})
end
end, true, {
@@ -567,17 +567,17 @@ ESX.RegisterCommand("noclip", 'admin', function(xPlayer)
xPlayer.triggerEvent('esx:noclip')
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Admin NoClip /noclip Triggered!", "pink", {
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
{ name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },
{ name = "ID", value = xPlayer and xPlayer.source or "Unknown ID", inline = true },
})
end
end, false)
ESX.RegisterCommand('players', "admin", function()
local xPlayers = ESX.GetExtendedPlayers() -- Returns all xPlayers
local xPlayers = ESX.GetExtendedPlayers() -- Returns all xPlayers
print(('^5%s^2 online player(s)^0'):format(#xPlayers))
for i = 1, #(xPlayers) do
for i = 1, #(xPlayers) do
local xPlayer = xPlayers[i]
print(('^1[^2ID: ^5%s^0 | ^2Name : ^5%s^0 | ^2Group : ^5%s^0 | ^2Identifier : ^5%s^1]^0\n'):format(xPlayer.source, xPlayer.getName(), xPlayer.getGroup(), xPlayer.identifier))
end
print(('^1[^2ID: ^5%s^0 | ^2Name : ^5%s^0 | ^2Group : ^5%s^0 | ^2Identifier : ^5%s^1]^0\n'):format(xPlayer.source, xPlayer.getName(), xPlayer.getGroup(), xPlayer.identifier))
end
end, true)
[core]/es_extended/server/main.lua
+38 -38
View File
@@ -325,12 +325,12 @@ function loadESXPlayer(identifier, playerId, isNew)
xPlayer.set('height', userData.height)
end
end
--saved player health and armor in metadata
local ped = GetPlayerPed(xPlayer.source)
if ped then
xPlayer.setMeta('health', xPlayer.getMeta('health') or GetEntityHealth(ped))
xPlayer.setMeta('armor', xPlayer.getMeta('armor') or GetPedArmour(ped))
end
--saved player health and armor in metadata
local ped = GetPlayerPed(xPlayer.source)
if ped then
xPlayer.setMeta('health', xPlayer.getMeta('health') or GetEntityHealth(ped))
xPlayer.setMeta('armor', xPlayer.getMeta('armor') or GetPedArmour(ped))
end
TriggerEvent('esx:playerLoaded', playerId, xPlayer, isNew)
@@ -386,9 +386,9 @@ AddEventHandler('playerDropped', function(reason)
if xPlayer then
TriggerEvent('esx:playerDropped', playerId, reason)
local job = xPlayer.getJob().name
local job = xPlayer.getJob().name
local currentJob = ESX.JobsPlayerCount[job]
ESX.JobsPlayerCount[job] = ((currentJob and currentJob > 0) and currentJob or 1) -1
ESX.JobsPlayerCount[job] = ((currentJob and currentJob > 0) and currentJob or 1) - 1
GlobalState[("%s:count"):format(job)] = ESX.JobsPlayerCount[job]
Core.playersByIdentifier[xPlayer.identifier] = nil
Core.SavePlayer(xPlayer, function()
@@ -397,21 +397,21 @@ AddEventHandler('playerDropped', function(reason)
end
end)
AddEventHandler("esx:playerLoaded", function(playerId, xPlayer, isNew)
local job = xPlayer.getJob().name
AddEventHandler("esx:playerLoaded", function()
local job = xPlayer.getJob().name
local jobKey = ("%s:count"):format(job)
ESX.JobsPlayerCount[job] = (ESX.JobsPlayerCount[job] or 0) +1
ESX.JobsPlayerCount[job] = (ESX.JobsPlayerCount[job] or 0) + 1
GlobalState[jobKey] = ESX.JobsPlayerCount[job]
end)
AddEventHandler("esx:setJob", function(src, job, lastJob)
AddEventHandler("esx:setJob", function(_, job, lastJob)
local lastJobKey = ('%s:count'):format(lastJob.name)
local jobKey = ('%s:count'):format(job.name)
local currentLastJob = ESX.JobsPlayerCount[lastJob.name]
ESX.JobsPlayerCount[lastJob.name] = ((currentLastJob and currentLastJob > 0) and currentLastJob or 1) -1
ESX.JobsPlayerCount[job.name] = (ESX.JobsPlayerCount[job.name] or 0) + 1
ESX.JobsPlayerCount[lastJob.name] = ((currentLastJob and currentLastJob > 0) and currentLastJob or 1) - 1
ESX.JobsPlayerCount[job.name] = (ESX.JobsPlayerCount[job.name] or 0) + 1
GlobalState[lastJobKey] = ESX.JobsPlayerCount[lastJob.name]
GlobalState[jobKey] = ESX.JobsPlayerCount[job.name]
@@ -616,11 +616,11 @@ if not Config.OxInventory then
local pickup, xPlayer, success = Core.Pickups[pickupId], ESX.GetPlayerFromId(source)
if pickup then
local playerPickupDistance = #(pickup.coords - xPlayer.getCoords(true))
if(playerPickupDistance > 5.0) then
print(('[^3WARNING^7] Player Detected Cheating (Out of range pickup): ^5%s^7'):format(xPlayer.getIdentifier()))
return
end
local playerPickupDistance = #(pickup.coords - xPlayer.getCoords(true))
if (playerPickupDistance > 5.0) then
print(('[^3WARNING^7] Player Detected Cheating (Out of range pickup): ^5%s^7'):format(xPlayer.getIdentifier()))
return
end
if pickup.type == 'item_standard' then
if xPlayer.canCarryItem(pickup.name, pickup.count) then
@@ -738,30 +738,30 @@ AddEventHandler('txAdmin:events:serverShuttingDown', function()
end)
local DoNotUse = {
['essentialmode'] = true,
['es_admin2'] = true,
['basic-gamemode'] = true,
['mapmanager'] = true,
['fivem-map-skater'] = true,
['fivem-map-hipster'] = true,
['qb-core'] = true,
['default_spawnpoint'] = true,
['essentialmode'] = true,
['es_admin2'] = true,
['basic-gamemode'] = true,
['mapmanager'] = true,
['fivem-map-skater'] = true,
['fivem-map-hipster'] = true,
['qb-core'] = true,
['default_spawnpoint'] = true,
}
AddEventHandler('onResourceStart', function(key)
if DoNotUse[string.lower(key)] then
while GetResourceState(key) ~= 'started' do
Wait(0)
end
if DoNotUse[string.lower(key)] then
while GetResourceState(key) ~= 'started' do
Wait(0)
end
StopResource(key)
print(("[^1ERROR^7] WE STOPPED A RESOURCE THAT WILL BREAK ^1ESX^7, PLEASE REMOVE ^5%s^7"):format(key))
end
print(("[^1ERROR^7] WE STOPPED A RESOURCE THAT WILL BREAK ^1ESX^7, PLEASE REMOVE ^5%s^7"):format(key))
end
end)
for key in pairs(DoNotUse) do
if GetResourceState(key) == 'started' or GetResourceState(key) == 'starting' then
if GetResourceState(key) == 'started' or GetResourceState(key) == 'starting' then
StopResource(key)
print(("[^1ERROR^7] WE STOPPED A RESOURCE THAT WILL BREAK ^1ESX^7, PLEASE REMOVE ^5%s^7"):format(key))
end
print(("[^1ERROR^7] WE STOPPED A RESOURCE THAT WILL BREAK ^1ESX^7, PLEASE REMOVE ^5%s^7"):format(key))
end
end