diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua index e5d6aec7..340ffde6 100644 --- a/[esx]/es_extended/client/main.lua +++ b/[esx]/es_extended/client/main.lua @@ -1,11 +1,14 @@ local pickups = {} Citizen.CreateThread(function() - while NetworkIsPlayerActive(PlayerId()) and not Config.Multichar do - Citizen.Wait(5) - DoScreenFadeOut(0) - TriggerServerEvent('esx:onPlayerJoined') - break + while not Config.Multichar do + Citizen.Wait(0) + if NetworkIsPlayerActive(PlayerId()) then + exports.spawnmanager:setAutoSpawn(false) + DoScreenFadeOut(0) + TriggerServerEvent('esx:onPlayerJoined') + break + end end end) diff --git a/[esx]/esx_identity/client/main.lua b/[esx]/esx_identity/client/main.lua index cf5359c1..3f49ae4d 100644 --- a/[esx]/esx_identity/client/main.lua +++ b/[esx]/esx_identity/client/main.lua @@ -1,13 +1,5 @@ -ESX = nil local loadingScreenFinished = false -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - RegisterNetEvent('esx_identity:alreadyRegistered') AddEventHandler('esx_identity:alreadyRegistered', function() while not loadingScreenFinished do diff --git a/[esx]/esx_identity/config.lua b/[esx]/esx_identity/config.lua index 2c21e317..524e8b4a 100644 --- a/[esx]/esx_identity/config.lua +++ b/[esx]/esx_identity/config.lua @@ -3,18 +3,8 @@ Config.Locale = 'en' -- [Config.EnableCommands] -- Enables Commands Such As /char and /chardel -Config.EnableCommands = true +Config.EnableCommands = false --- [Config.UseSteamID] --- Changes the identifiers from Rockstar License To Steam. In order to use this, you will have to have --- made edits to your ESX in order to use Steam identifiers all around, because new ESX uses Rockstar --- license. I just made it easier for people that convert to steam identifiers. - --- [Config.UseDeferrals] --- EXPERIMENTAL Character Registration Method. This will allow players to create identities in deferrals --- before they ever join the server. This still needs time of testing to see what issues that we have --- in linux servers and windows servers, and which artifacts it will work on, and which artifacts it --- will not work on. If you don't know a lot about this, I would suggest to set it false for now. Config.UseDeferrals = false -- EXPERIMENTAL Character Registration Method. diff --git a/[esx]/esx_identity/fxmanifest.lua b/[esx]/esx_identity/fxmanifest.lua index 72cf2823..4dbd7d4b 100644 --- a/[esx]/esx_identity/fxmanifest.lua +++ b/[esx]/esx_identity/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Identity' -version '1.4.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx]/esx_identity/server/main.lua b/[esx]/esx_identity/server/main.lua index ba3de70b..88223d0d 100644 --- a/[esx]/esx_identity/server/main.lua +++ b/[esx]/esx_identity/server/main.lua @@ -1,20 +1,7 @@ -ESX = nil -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) local playerIdentity = {} local alreadyRegistered = {} local multichar = ESX.GetConfig().Multichar -if multichar == nil then - ESX.GetIdentifier = function(playerId) - for k,v in ipairs(GetPlayerIdentifiers(playerId)) do - if string.match(v, 'license:') then - local identifier = string.gsub(v, 'license:', '') - return identifier - end - end - end -end - if Config.UseDeferrals then AddEventHandler('playerConnecting', function(playerName, setKickReason, deferrals) deferrals.defer() @@ -160,11 +147,8 @@ elseif not Config.UseDeferrals then Citizen.Wait(10) end - local xPlayers = ESX.GetPlayers() - - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - + local xPlayers = ESX.GetExtendedPlayers() + for _, xPlayer in pairs(xPlayers) do if xPlayer then checkIdentity(xPlayer) end diff --git a/[esx]/esx_menu_default/client/main.lua b/[esx]/esx_menu_default/client/main.lua index a8b2f6f8..54a6d428 100644 --- a/[esx]/esx_menu_default/client/main.lua +++ b/[esx]/esx_menu_default/client/main.lua @@ -1,11 +1,5 @@ -ESX = nil - Citizen.CreateThread(function() - while ESX == nil do - Citizen.Wait(5) - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - end - + local ESX = exports['es_extended']:getSharedObject() local GUI, MenuType = {}, 'default' GUI.Time = 0 @@ -29,23 +23,24 @@ Citizen.CreateThread(function() ESX.UI.Menu.RegisterType(MenuType, openMenu, closeMenu) - AddEventHandler('esx_menu_default:message:menu_submit', function(data) + RegisterNUICallback('menu_submit', function(data, cb) local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name) - if menu.submit ~= nil then menu.submit(data, menu) end + cb('OK') end) - AddEventHandler('esx_menu_default:message:menu_cancel', function(data) + RegisterNUICallback('menu_cancel', function(data, cb) local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name) if menu.cancel ~= nil then menu.cancel(data, menu) end + cb('OK') end) - AddEventHandler('esx_menu_default:message:menu_change', function(data) + RegisterNUICallback('menu_change', function(data, cb) local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name) for i=1, #data.elements, 1 do @@ -61,6 +56,7 @@ Citizen.CreateThread(function() if menu.change ~= nil then menu.change(data, menu) end + cb('OK') end) Citizen.CreateThread(function() diff --git a/[esx]/esx_menu_default/fxmanifest.lua b/[esx]/esx_menu_default/fxmanifest.lua index ad8b00e9..574ef7dd 100644 --- a/[esx]/esx_menu_default/fxmanifest.lua +++ b/[esx]/esx_menu_default/fxmanifest.lua @@ -4,10 +4,9 @@ game 'gta5' description 'ESX Menu Default' -version '1.0.4' +version 'legacy' client_scripts { - '@es_extended/client/wrapper.lua', 'client/main.lua' } diff --git a/[esx]/esx_menu_default/html/js/app.js b/[esx]/esx_menu_default/html/js/app.js index 320fc386..3c9acd69 100644 --- a/[esx]/esx_menu_default/html/js/app.js +++ b/[esx]/esx_menu_default/html/js/app.js @@ -127,28 +127,28 @@ }; ESX_MENU.submit = function(namespace, name, data) { - SendMessage(ESX_MENU.ResourceName, 'menu_submit', { + $.post('http://' + ESX_MENU.ResourceName + '/menu_submit', JSON.stringify({ _namespace: namespace, _name: name, current: data, elements: ESX_MENU.opened[namespace][name].elements - }); + })); }; ESX_MENU.cancel = function(namespace, name) { - SendMessage(ESX_MENU.ResourceName, 'menu_cancel', { + $.post('http://' + ESX_MENU.ResourceName + '/menu_cancel', JSON.stringify({ _namespace: namespace, _name: name - }); + })); }; ESX_MENU.change = function(namespace, name, data) { - SendMessage(ESX_MENU.ResourceName, 'menu_change', { + $.post('http://' + ESX_MENU.ResourceName + '/menu_change', JSON.stringify({ _namespace: namespace, _name: name, current: data, elements: ESX_MENU.opened[namespace][name].elements - }); + })); }; ESX_MENU.getFocused = function() { diff --git a/[esx]/esx_menu_default/html/ui.html b/[esx]/esx_menu_default/html/ui.html index d90d6b94..9e2a4979 100644 --- a/[esx]/esx_menu_default/html/ui.html +++ b/[esx]/esx_menu_default/html/ui.html @@ -11,7 +11,6 @@ - diff --git a/[esx]/esx_menu_dialog/client/main.lua b/[esx]/esx_menu_dialog/client/main.lua index 447ca4c3..8afb263f 100644 --- a/[esx]/esx_menu_dialog/client/main.lua +++ b/[esx]/esx_menu_dialog/client/main.lua @@ -1,12 +1,7 @@ Citizen.CreateThread(function() - ESX = nil + local ESX = exports['es_extended']:getSharedObject() local Timeouts, OpenedMenus, MenuType = {}, {}, 'dialog' - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - local openMenu = function(namespace, name, data) for i=1, #Timeouts, 1 do ESX.ClearTimeout(Timeouts[i]) diff --git a/[esx]/esx_menu_dialog/fxmanifest.lua b/[esx]/esx_menu_dialog/fxmanifest.lua index f5dc6573..5398d943 100644 --- a/[esx]/esx_menu_dialog/fxmanifest.lua +++ b/[esx]/esx_menu_dialog/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu Dialog' -version '1.1.0' +version 'legacy' client_scripts { '@es_extended/client/wrapper.lua', diff --git a/[esx]/esx_menu_list/client/main.lua b/[esx]/esx_menu_list/client/main.lua index dd8e301a..ee6d7c50 100644 --- a/[esx]/esx_menu_list/client/main.lua +++ b/[esx]/esx_menu_list/client/main.lua @@ -1,12 +1,5 @@ -ESX = nil - Citizen.CreateThread(function() - - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - + local ESX = exports['es_extended']:getSharedObject() local MenuType = 'list' local OpenedMenus = {} diff --git a/[esx]/esx_menu_list/fxmanifest.lua b/[esx]/esx_menu_list/fxmanifest.lua index 047862ad..b607bba6 100644 --- a/[esx]/esx_menu_list/fxmanifest.lua +++ b/[esx]/esx_menu_list/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu List' -version '1.0.2' +version 'legacy' client_scripts { '@es_extended/client/wrapper.lua', diff --git a/[esx]/esx_skin/client/main.lua b/[esx]/esx_skin/client/main.lua index 42b92c59..e99e8a10 100644 --- a/[esx]/esx_skin/client/main.lua +++ b/[esx]/esx_skin/client/main.lua @@ -1,14 +1,6 @@ -ESX = nil -local lastSkin, playerLoaded, cam, isCameraActive +local lastSkin, cam, isCameraActive local firstSpawn, zoomOffset, camOffset, heading, skinLoaded = true, 0.0, 0.0, 90.0, false -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - function OpenMenu(submitCb, cancelCb, restrict) local playerPed = PlayerPedId() @@ -249,34 +241,15 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) end, cancelCb, restrict) end -AddEventHandler('esx:onPlayerSpawn', function() - Citizen.CreateThread(function() - while not playerLoaded do - Citizen.Wait(100) - end - - if firstSpawn and ESX.GetConfig().Multichar ~= true then - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) - if skin == nil then - TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) - else - TriggerEvent('skinchanger:loadSkin', skin) - end - end) - - firstSpawn = false - end - end) -end) - AddEventHandler('esx_skin:resetFirstSpawn', function() firstSpawn = true skinLoaded = false + ESX.PlayerLoaded = false end) AddEventHandler('esx_skin:playerRegistered', function() Citizen.CreateThread(function() - while not playerLoaded do + while not ESX.PlayerLoaded do Citizen.Wait(100) end @@ -300,7 +273,7 @@ end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) - playerLoaded = true + ESX.PlayerLoaded = true end) AddEventHandler('esx_skin:getLastSkin', function(cb) cb(lastSkin) end) diff --git a/[esx]/esx_skin/fxmanifest.lua b/[esx]/esx_skin/fxmanifest.lua index dcc7ba05..34ecaff3 100644 --- a/[esx]/esx_skin/fxmanifest.lua +++ b/[esx]/esx_skin/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Skin' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx]/esx_skin/server/main.lua b/[esx]/esx_skin/server/main.lua index cd92fa3f..01dbba3e 100644 --- a/[esx]/esx_skin/server/main.lua +++ b/[esx]/esx_skin/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_skin:save') AddEventHandler('esx_skin:save', function(skin) local xPlayer = ESX.GetPlayerFromId(source) diff --git a/[esx_addons]/esx_accessories/client/main.lua b/[esx_addons]/esx_accessories/client/main.lua index 7e8d71e9..1cd80e2b 100644 --- a/[esx_addons]/esx_accessories/client/main.lua +++ b/[esx_addons]/esx_accessories/client/main.lua @@ -1,15 +1,7 @@ -ESX = nil local HasAlreadyEnteredMarker, isDead = false, false local LastZone, CurrentAction, CurrentActionMsg local CurrentActionData = {} -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - function OpenAccessoryMenu() ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'set_unset_accessory', { title = _U('set_unset'), @@ -157,47 +149,56 @@ Citizen.CreateThread(function() end end) +local nearMarker = false -- Display markers Citizen.CreateThread(function() while true do - Citizen.Wait(0) - local coords = GetEntityCoords(PlayerPedId()) + local sleep = 500 + local coords = GetEntityCoords(ESX.PlayerData.ped) for k,v in pairs(Config.Zones) do for i = 1, #v.Pos, 1 do - if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i], true) < Config.DrawDistance) then + if(Config.Type ~= -1 and #(coords - v.Pos[i]) < Config.DrawDistance) then DrawMarker(Config.Type, v.Pos[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) + sleep = 0 + break end end end + if sleep == 0 then nearMarker = true else nearMarker = false end + Citizen.Wait(sleep) end end) Citizen.CreateThread(function() while true do - Citizen.Wait(200) - - local coords = GetEntityCoords(PlayerPedId()) - local isInMarker = false - local currentZone = nil - for k,v in pairs(Config.Zones) do - for i = 1, #v.Pos, 1 do - if GetDistanceBetweenCoords(coords, v.Pos[i], true) < Config.Size.x then - isInMarker = true - currentZone = k + local sleep = 500 + if nearMarker then + sleep = 200 + local coords = GetEntityCoords(ESX.PlayerData.ped) + local isInMarker = false + local currentZone = nil + for k,v in pairs(Config.Zones) do + for i = 1, #v.Pos, 1 do + if #(coords - v.Pos[i]) < Config.Size.x then + isInMarker = true + currentZone = k + break + end end end - end - if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then - HasAlreadyEnteredMarker = true - LastZone = currentZone - TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) - end + if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then + HasAlreadyEnteredMarker = true + LastZone = currentZone + TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) + end - if not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false - TriggerEvent('esx_accessories:hasExitedMarker', LastZone) + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + TriggerEvent('esx_accessories:hasExitedMarker', LastZone) + end end + Citizen.Wait(sleep) end end) diff --git a/[esx_addons]/esx_accessories/fxmanifest.lua b/[esx_addons]/esx_accessories/fxmanifest.lua index bdd4121b..a1d13121 100644 --- a/[esx_addons]/esx_accessories/fxmanifest.lua +++ b/[esx_addons]/esx_accessories/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Accessories' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_accessories/server/main.lua b/[esx_addons]/esx_accessories/server/main.lua index 74446a04..75e0a4d6 100644 --- a/[esx_addons]/esx_accessories/server/main.lua +++ b/[esx_addons]/esx_accessories/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_accessories:pay') AddEventHandler('esx_accessories:pay', function() local xPlayer = ESX.GetPlayerFromId(source) diff --git a/[esx_addons]/esx_addonaccount/fxmanifest.lua b/[esx_addons]/esx_addonaccount/fxmanifest.lua index 534538e1..ae6a5ebf 100644 --- a/[esx_addons]/esx_addonaccount/fxmanifest.lua +++ b/[esx_addons]/esx_addonaccount/fxmanifest.lua @@ -4,9 +4,10 @@ game 'gta5' description 'ESX Addon Account' -version '1.0.1' +version 'legacy' server_scripts { + '@es_extended/imports.lua', '@mysql-async/lib/MySQL.lua', 'server/classes/addonaccount.lua', 'server/main.lua' diff --git a/[esx_addons]/esx_addonaccount/server/main.lua b/[esx_addons]/esx_addonaccount/server/main.lua index b238a2f9..26172ea4 100644 --- a/[esx_addons]/esx_addonaccount/server/main.lua +++ b/[esx_addons]/esx_addonaccount/server/main.lua @@ -1,7 +1,4 @@ local AccountsIndex, Accounts, SharedAccounts = {}, {}, {} -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) MySQL.ready(function() local result = MySQL.Sync.fetchAll('SELECT * FROM addon_account') diff --git a/[esx_addons]/esx_addoninventory/fxmanifest.lua b/[esx_addons]/esx_addoninventory/fxmanifest.lua index 6680ece9..ce07097a 100644 --- a/[esx_addons]/esx_addoninventory/fxmanifest.lua +++ b/[esx_addons]/esx_addoninventory/fxmanifest.lua @@ -4,9 +4,10 @@ game 'gta5' description 'ESX Addon Inventory' -version '1.1.0' +version 'legacy' server_scripts { + '@es_extended/imports.lua', '@mysql-async/lib/MySQL.lua', 'server/classes/addoninventory.lua', 'server/main.lua' diff --git a/[esx_addons]/esx_addoninventory/server/main.lua b/[esx_addons]/esx_addoninventory/server/main.lua index 6a2eb0b0..e9193177 100644 --- a/[esx_addons]/esx_addoninventory/server/main.lua +++ b/[esx_addons]/esx_addoninventory/server/main.lua @@ -1,8 +1,5 @@ Items = {} local InventoriesIndex, Inventories, SharedInventories = {}, {}, {} -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) MySQL.ready(function() local items = MySQL.Sync.fetchAll('SELECT * FROM items') diff --git a/[esx_addons]/esx_ambulancejob/client/job.lua b/[esx_addons]/esx_ambulancejob/client/job.lua index c2d977f2..0c3f7666 100644 --- a/[esx_addons]/esx_ambulancejob/client/job.lua +++ b/[esx_addons]/esx_ambulancejob/client/job.lua @@ -389,24 +389,20 @@ end) RegisterNetEvent('esx_ambulancejob:putInVehicle') AddEventHandler('esx_ambulancejob:putInVehicle', function() local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) + local vehicle, distance = ESX.Game.GetClosestVehicle() - if IsAnyVehicleNearPoint(coords, 5.0) then - local vehicle = GetClosestVehicle(coords, 5.0, 0, 71) + if vehicle and distance < 5 then + local maxSeats, freeSeat = GetVehicleMaxNumberOfPassengers(vehicle) - if DoesEntityExist(vehicle) then - local maxSeats, freeSeat = GetVehicleMaxNumberOfPassengers(vehicle) - - for i=maxSeats - 1, 0, -1 do - if IsVehicleSeatFree(vehicle, i) then - freeSeat = i - break - end + for i=maxSeats - 1, 0, -1 do + if IsVehicleSeatFree(vehicle, i) then + freeSeat = i + break end + end - if freeSeat then - TaskWarpPedIntoVehicle(playerPed, vehicle, freeSeat) - end + if freeSeat then + TaskWarpPedIntoVehicle(playerPed, vehicle, freeSeat) end end end) diff --git a/[esx_addons]/esx_ambulancejob/client/main.lua b/[esx_addons]/esx_ambulancejob/client/main.lua index 9420f855..a5d382c0 100644 --- a/[esx_addons]/esx_ambulancejob/client/main.lua +++ b/[esx_addons]/esx_ambulancejob/client/main.lua @@ -1,32 +1,18 @@ -local firstSpawn, PlayerLoaded = true, false +local firstSpawn = true isDead, isSearched, medic = false, false, 0 -ESX = nil - -AddEventHandler("onClientMapStart", function() - exports.spawnmanager:spawnPlayer() - Citizen.Wait(5000) - exports.spawnmanager:setAutoSpawn(false) -end) - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(100) - end - - PlayerLoaded = true - ESX.PlayerData = ESX.GetPlayerData() -end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) ESX.PlayerData = xPlayer - PlayerLoaded = true + ESX.PlayerLoaded = true +end) + +RegisterNetEvent('esx:onPlayerLogout') +AddEventHandler('esx:onPlayerLogout', function() + ESX.PlayerLoaded = false + ESX.PlayerData = {} + firstSpawn = true end) RegisterNetEvent('esx:setJob') @@ -41,13 +27,13 @@ AddEventHandler('esx:onPlayerSpawn', function() firstSpawn = false if Config.AntiCombatLog then - while not PlayerLoaded do - Citizen.Wait(5000) + while not ESX.PlayerLoaded do + Citizen.Wait(1000) end ESX.TriggerServerCallback('esx_ambulancejob:getDeathStatus', function(shouldDie) if shouldDie then - Citizen.Wait(10000) + Citizen.Wait(5000) SetEntityHealth(PlayerPedId(), 0) end end) diff --git a/[esx_addons]/esx_ambulancejob/fxmanifest.lua b/[esx_addons]/esx_ambulancejob/fxmanifest.lua index acdbc0be..b207a63a 100644 --- a/[esx_addons]/esx_ambulancejob/fxmanifest.lua +++ b/[esx_addons]/esx_ambulancejob/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Ambulance Job' -version '1.2.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_ambulancejob/server/main.lua b/[esx_addons]/esx_ambulancejob/server/main.lua index 4faed9a0..7f7f1b17 100644 --- a/[esx_addons]/esx_ambulancejob/server/main.lua +++ b/[esx_addons]/esx_ambulancejob/server/main.lua @@ -1,8 +1,5 @@ -ESX = nil local playersHealing, deadPlayers = {}, {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - TriggerEvent('esx_phone:registerNumber', 'ambulance', _U('alert_ambulance'), true, true) TriggerEvent('esx_society:registerSociety', 'ambulance', 'Ambulance', 'society_ambulance', 'society_ambulance', 'society_ambulance', {type = 'public'}) diff --git a/[esx_addons]/esx_animations/client/main.lua b/[esx_addons]/esx_animations/client/main.lua index e23b5e7a..153d48e0 100644 --- a/[esx_addons]/esx_animations/client/main.lua +++ b/[esx_addons]/esx_animations/client/main.lua @@ -1,13 +1,5 @@ local isDead = false local inAnim = false -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) AddEventHandler('esx:onPlayerDeath', function(data) isDead = true end) diff --git a/[esx_addons]/esx_animations/fxmanifest.lua b/[esx_addons]/esx_animations/fxmanifest.lua index e7dda640..c1777fa7 100644 --- a/[esx_addons]/esx_animations/fxmanifest.lua +++ b/[esx_addons]/esx_animations/fxmanifest.lua @@ -4,9 +4,10 @@ game 'gta5' description 'ESX Animations' -version '1.0.0' +version 'legacy' client_scripts { + '@es_extended/imports.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_atm/client/main.lua b/[esx_addons]/esx_atm/client/main.lua index 34a37354..7db84456 100644 --- a/[esx_addons]/esx_atm/client/main.lua +++ b/[esx_addons]/esx_atm/client/main.lua @@ -1,13 +1,5 @@ -- internal variables local hasAlreadyEnteredMarker, isInATMMarker, menuIsShowed = false, false, false -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) RegisterNetEvent('esx_atm:closeATM') AddEventHandler('esx_atm:closeATM', function() diff --git a/[esx_addons]/esx_atm/fxmanifest.lua b/[esx_addons]/esx_atm/fxmanifest.lua index 83e9eaa1..1c820f23 100644 --- a/[esx_addons]/esx_atm/fxmanifest.lua +++ b/[esx_addons]/esx_atm/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Atm' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_atm/server/main.lua b/[esx_addons]/esx_atm/server/main.lua index c1700a8f..5832a03c 100644 --- a/[esx_addons]/esx_atm/server/main.lua +++ b/[esx_addons]/esx_atm/server/main.lua @@ -1,6 +1,3 @@ -ESX = nil -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_atm:deposit') AddEventHandler('esx_atm:deposit', function(amount) local _source = source diff --git a/[esx_addons]/esx_bankerjob/client/main.lua b/[esx_addons]/esx_bankerjob/client/main.lua index 36467b27..228cafe4 100644 --- a/[esx_addons]/esx_bankerjob/client/main.lua +++ b/[esx_addons]/esx_bankerjob/client/main.lua @@ -1,18 +1,4 @@ local CurrentActionData, CurrentAction, CurrentActionMsg, hasAlreadyEnteredMarker, lastZone = {} -ESX = nil - -Citizen.CreateThread(function () - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(100) - end - - ESX.PlayerData = ESX.GetPlayerData() -end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function (xPlayer) diff --git a/[esx_addons]/esx_bankerjob/fxmanifest.lua b/[esx_addons]/esx_bankerjob/fxmanifest.lua index ea46e12e..1e955d39 100644 --- a/[esx_addons]/esx_bankerjob/fxmanifest.lua +++ b/[esx_addons]/esx_bankerjob/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Banker job' -version '1.0.1' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@async/async.lua', diff --git a/[esx_addons]/esx_bankerjob/server/main.lua b/[esx_addons]/esx_bankerjob/server/main.lua index 96f5130e..9af78dbf 100644 --- a/[esx_addons]/esx_bankerjob/server/main.lua +++ b/[esx_addons]/esx_bankerjob/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - TriggerEvent('esx_phone:registerNumber', 'banker', _('phone_receive'), false, false) TriggerEvent('esx_society:registerSociety', 'banker', _U('phone_label'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'}) @@ -40,11 +36,10 @@ AddEventHandler('esx_bankerjob:customerWithdraw', function (target, amount) end) ESX.RegisterServerCallback('esx_bankerjob:getCustomers', function (source, cb) - local xPlayers = ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() local customers = {} - for i=1, #xPlayers do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + for _, xPlayer in pairs(xPlayers) do TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function(account) table.insert(customers, { diff --git a/[esx_addons]/esx_barbershop/client/main.lua b/[esx_addons]/esx_barbershop/client/main.lua index c2dee892..afa79bdc 100644 --- a/[esx_addons]/esx_barbershop/client/main.lua +++ b/[esx_addons]/esx_barbershop/client/main.lua @@ -1,13 +1,5 @@ -ESX = nil local hasAlreadyEnteredMarker, lastZone, currentAction, currentActionMsg, hasPaid -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - function OpenShopMenu() hasPaid = false diff --git a/[esx_addons]/esx_barbershop/fxmanifest.lua b/[esx_addons]/esx_barbershop/fxmanifest.lua index c58f6d49..1adcca76 100644 --- a/[esx_addons]/esx_barbershop/fxmanifest.lua +++ b/[esx_addons]/esx_barbershop/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Barber Shop' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_barbershop/server/main.lua b/[esx_addons]/esx_barbershop/server/main.lua index 516beaa5..4da9ee48 100644 --- a/[esx_addons]/esx_barbershop/server/main.lua +++ b/[esx_addons]/esx_barbershop/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_barbershop:pay') AddEventHandler('esx_barbershop:pay', function() local _source = source diff --git a/[esx_addons]/esx_basicneeds/client/main.lua b/[esx_addons]/esx_basicneeds/client/main.lua index 07502a5c..631651ff 100644 --- a/[esx_addons]/esx_basicneeds/client/main.lua +++ b/[esx_addons]/esx_basicneeds/client/main.lua @@ -1,14 +1,6 @@ -ESX = nil local IsDead = false local IsAnimated = false -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - AddEventHandler('esx_basicneeds:resetStatus', function() TriggerEvent('esx_status:set', 'hunger', 500000) TriggerEvent('esx_status:set', 'thirst', 500000) diff --git a/[esx_addons]/esx_basicneeds/fxmanifest.lua b/[esx_addons]/esx_basicneeds/fxmanifest.lua index c130b420..1258f13a 100644 --- a/[esx_addons]/esx_basicneeds/fxmanifest.lua +++ b/[esx_addons]/esx_basicneeds/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Basic Needs' -version '1.0.1' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_basicneeds/server/main.lua b/[esx_addons]/esx_basicneeds/server/main.lua index a3fa31e0..29cdc75c 100644 --- a/[esx_addons]/esx_basicneeds/server/main.lua +++ b/[esx_addons]/esx_basicneeds/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - ESX.RegisterUsableItem('bread', function(source) local xPlayer = ESX.GetPlayerFromId(source) xPlayer.removeInventoryItem('bread', 1) diff --git a/[esx_addons]/esx_billing/client/main.lua b/[esx_addons]/esx_billing/client/main.lua index 9a033169..2aba26b1 100644 --- a/[esx_addons]/esx_billing/client/main.lua +++ b/[esx_addons]/esx_billing/client/main.lua @@ -1,13 +1,5 @@ -ESX = nil local isDead = false -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - function ShowBillsMenu() ESX.TriggerServerCallback('esx_billing:getBills', function(bills) if #bills > 0 then diff --git a/[esx_addons]/esx_billing/fxmanifest.lua b/[esx_addons]/esx_billing/fxmanifest.lua index 3f5bd13f..781765c3 100644 --- a/[esx_addons]/esx_billing/fxmanifest.lua +++ b/[esx_addons]/esx_billing/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Billing' -version '1.2.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_billing/server/main.lua b/[esx_addons]/esx_billing/server/main.lua index c4e71ad5..92ef1283 100644 --- a/[esx_addons]/esx_billing/server/main.lua +++ b/[esx_addons]/esx_billing/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_billing:sendBill') AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, label, amount) local xPlayer = ESX.GetPlayerFromId(source) diff --git a/[esx_addons]/esx_boat/client/main.lua b/[esx_addons]/esx_boat/client/main.lua index 63eacd3e..9e9d3206 100644 --- a/[esx_addons]/esx_boat/client/main.lua +++ b/[esx_addons]/esx_boat/client/main.lua @@ -1,20 +1,6 @@ -ESX = nil -isInShopMenu = false +local isInShopMenu = false local spawnedVehicles = {} -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while not ESX.GetPlayerData().job do - Citizen.Wait(10) - end - - ESX.PlayerData = ESX.GetPlayerData() -end) - function OpenBoatShop(shop) isInShopMenu = true diff --git a/[esx_addons]/esx_boat/client/marker.lua b/[esx_addons]/esx_boat/client/marker.lua index 46e18481..5a41c196 100644 --- a/[esx_addons]/esx_boat/client/marker.lua +++ b/[esx_addons]/esx_boat/client/marker.lua @@ -1,9 +1,9 @@ local HasAlreadyEnteredMarker = false local LastZone = nil -CurrentAction = nil -CurrentActionMsg = '' -CurrentActionData = {} +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} -- Key controls Citizen.CreateThread(function() diff --git a/[esx_addons]/esx_boat/fxmanifest.lua b/[esx_addons]/esx_boat/fxmanifest.lua index 8e613ee4..2fee0493 100644 --- a/[esx_addons]/esx_boat/fxmanifest.lua +++ b/[esx_addons]/esx_boat/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Boat' -version '1.0.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_boat/server/main.lua b/[esx_addons]/esx_boat/server/main.lua index 94cecd05..1b8479ff 100644 --- a/[esx_addons]/esx_boat/server/main.lua +++ b/[esx_addons]/esx_boat/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - MySQL.ready(function() ParkBoats() end) diff --git a/[esx_addons]/esx_boilerplate/.editorconfig b/[esx_addons]/esx_boilerplate/.editorconfig deleted file mode 100644 index 9b425256..00000000 --- a/[esx_addons]/esx_boilerplate/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -root = true - -[*] -indent_size = 4 -indent_style = tab -end_of_line = crlf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true \ No newline at end of file diff --git a/[esx_addons]/esx_boilerplate/client/main.lua b/[esx_addons]/esx_boilerplate/client/main.lua deleted file mode 100644 index c7f146b4..00000000 --- a/[esx_addons]/esx_boilerplate/client/main.lua +++ /dev/null @@ -1,19 +0,0 @@ -ESX = nil -local PlayerData = {} - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - -RegisterNetEvent('esx:playerLoaded') -AddEventHandler('esx:playerLoaded', function(xPlayer) - PlayerData = xPlayer -end) - -RegisterNetEvent('esx:setJob') -AddEventHandler('esx:setJob', function(job) - PlayerData.job = job -end) diff --git a/[esx_addons]/esx_boilerplate/server/main.lua b/[esx_addons]/esx_boilerplate/server/main.lua deleted file mode 100644 index 6927089b..00000000 --- a/[esx_addons]/esx_boilerplate/server/main.lua +++ /dev/null @@ -1,4 +0,0 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - diff --git a/[esx_addons]/esx_clotheshop/client/main.lua b/[esx_addons]/esx_clotheshop/client/main.lua index ae4aef7b..a2bc4d0f 100644 --- a/[esx_addons]/esx_clotheshop/client/main.lua +++ b/[esx_addons]/esx_clotheshop/client/main.lua @@ -1,14 +1,6 @@ local hasAlreadyEnteredMarker, hasPaid, currentActionData = false, false, {} local lastZone, currentAction, currentActionMsg -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) function OpenShopMenu() hasPaid = false diff --git a/[esx_addons]/esx_clotheshop/fxmanifest.lua b/[esx_addons]/esx_clotheshop/fxmanifest.lua index 83665169..ee13d31a 100644 --- a/[esx_addons]/esx_clotheshop/fxmanifest.lua +++ b/[esx_addons]/esx_clotheshop/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Clothes Shop' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_clotheshop/server/main.lua b/[esx_addons]/esx_clotheshop/server/main.lua index 9ae3754b..ee739197 100644 --- a/[esx_addons]/esx_clotheshop/server/main.lua +++ b/[esx_addons]/esx_clotheshop/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_clotheshop:saveOutfit') AddEventHandler('esx_clotheshop:saveOutfit', function(label, skin) local xPlayer = ESX.GetPlayerFromId(source) diff --git a/[esx_addons]/esx_cruisecontrol/client/main.lua b/[esx_addons]/esx_cruisecontrol/client/main.lua index ecad619b..1aacd508 100644 --- a/[esx_addons]/esx_cruisecontrol/client/main.lua +++ b/[esx_addons]/esx_cruisecontrol/client/main.lua @@ -1,89 +1,80 @@ -local Player = nil +local Player = nil local CruisedSpeed, CruisedSpeedKm, VehicleVectorY = 0, 0, 0 -ESX = nil - Citizen.CreateThread(function () - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Wait(0) - end -end) - -Citizen.CreateThread(function () - while true do - Wait(0) - if IsControlJustPressed(1, 246) and IsDriver() then - Player = GetPlayerPed(-1) - TriggerCruiseControl() - end - end + while true do + Wait(0) + if IsControlJustPressed(1, 246) and IsDriver() then + Player = PlayerPedId() + TriggerCruiseControl() + end + end end) function TriggerCruiseControl () - if CruisedSpeed == 0 and IsDriving() then - if GetVehiculeSpeed() > 0 and GetVehicleCurrentGear(GetVehicle()) > 0 then - CruisedSpeed = GetVehiculeSpeed() - CruisedSpeedKm = TransformToKm(CruisedSpeed) + if CruisedSpeed == 0 and IsDriving() then + if GetVehicleSpeed() > 0 and GetVehicleCurrentGear(GetVehicle()) > 0 then + CruisedSpeed = GetVehicleSpeed() + CruisedSpeedKm = TransformToKm(CruisedSpeed) - ESX.ShowNotification(_U('activated') .. ': ~b~ ' .. CruisedSpeedKm .. ' km/h') + ESX.ShowNotification(_U('activated') .. ': ~b~ ' .. CruisedSpeedKm .. ' km/h') - Citizen.CreateThread(function () - while CruisedSpeed > 0 and IsInVehicle() == Player do - Wait(0) + Citizen.CreateThread(function () + while CruisedSpeed > 0 and IsInVehicle() == Player do + Wait(0) - if not IsTurningOrHandBraking() and GetVehiculeSpeed() < (CruisedSpeed - 1.5) then - CruisedSpeed = 0 - ESX.ShowNotification(_U('deactivated')) - Wait(2000) - break - end + if not IsTurningOrHandBraking() and GetVehicleSpeed() < (CruisedSpeed - 1.5) then + CruisedSpeed = 0 + ESX.ShowNotification(_U('deactivated')) + Wait(2000) + break + end - if not IsTurningOrHandBraking() and IsVehicleOnAllWheels(GetVehicle()) and GetVehiculeSpeed() < CruisedSpeed then - SetVehicleForwardSpeed(GetVehicle(), CruisedSpeed) - end + if not IsTurningOrHandBraking() and IsVehicleOnAllWheels(GetVehicle()) and GetVehicleSpeed() < CruisedSpeed then + SetVehicleForwardSpeed(GetVehicle(), CruisedSpeed) + end - if IsControlJustPressed(1, 246) then - CruisedSpeed = GetVehiculeSpeed() - CruisedSpeedKm = TransformToKm(CruisedSpeed) - end + if IsControlJustPressed(1, 246) then + CruisedSpeed = GetVehicleSpeed() + CruisedSpeedKm = TransformToKm(CruisedSpeed) + end - if IsControlJustPressed(2, 72) then - CruisedSpeed = 0 - ESX.ShowNotification(_U('deactivated')) - Wait(2000) - break - end - end - end) - end - end + if IsControlJustPressed(2, 72) then + CruisedSpeed = 0 + ESX.ShowNotification(_U('deactivated')) + Wait(2000) + break + end + end + end) + end + end end function IsTurningOrHandBraking () - return IsControlPressed(2, 76) or IsControlPressed(2, 63) or IsControlPressed(2, 64) + return IsControlPressed(2, 76) or IsControlPressed(2, 63) or IsControlPressed(2, 64) end function IsDriving () - return IsPedInAnyVehicle(Player, false) + return IsPedInAnyVehicle(Player, false) end function GetVehicle () - return GetVehiclePedIsIn(Player, false) + return GetVehiclePedIsIn(Player, false) end function IsInVehicle () - return GetPedInVehicleSeat(GetVehicle(), -1) + return GetPedInVehicleSeat(GetVehicle(), -1) end function IsDriver () - return GetPedInVehicleSeat(GetVehiclePedIsIn(GetPlayerPed(-1), false), -1) == GetPlayerPed(-1) + return GetPedInVehicleSeat(GetVehiclePedIsIn(PlayerPedId(), false), -1) == PlayerPedId() end -function GetVehiculeSpeed () - return GetEntitySpeed(GetVehicle()) +function GetVehicleSpeed () + return GetEntitySpeed(GetVehicle()) end function TransformToKm (speed) - return math.floor(speed * 3.6 + 0.5) + return math.floor(speed * 3.6 + 0.5) end diff --git a/[esx_addons]/esx_cruisecontrol/fxmanifest.lua b/[esx_addons]/esx_cruisecontrol/fxmanifest.lua index 5e8fd1c2..50f83a38 100644 --- a/[esx_addons]/esx_cruisecontrol/fxmanifest.lua +++ b/[esx_addons]/esx_cruisecontrol/fxmanifest.lua @@ -4,13 +4,14 @@ game 'gta5' description 'CruiseControl System for ESX' -version '1.0.0' +version 'legacy' dependencies { 'es_extended' } client_scripts { + '@es_extended/imports.lua', '@es_extended/locale.lua', 'locales/fi.lua', 'locales/fr.lua', diff --git a/[esx_addons]/esx_datastore/fxmanifest.lua b/[esx_addons]/esx_datastore/fxmanifest.lua index 1b75cbf1..2aa55938 100644 --- a/[esx_addons]/esx_datastore/fxmanifest.lua +++ b/[esx_addons]/esx_datastore/fxmanifest.lua @@ -4,9 +4,10 @@ game 'gta5' description 'ESX Data Store' -version '1.0.2' +version 'legacy' server_scripts { + '@es_extended/imports.lua', '@mysql-async/lib/MySQL.lua', 'server/classes/datastore.lua', 'server/main.lua' diff --git a/[esx_addons]/esx_datastore/server/main.lua b/[esx_addons]/esx_datastore/server/main.lua index 1317420c..606d12b3 100644 --- a/[esx_addons]/esx_datastore/server/main.lua +++ b/[esx_addons]/esx_datastore/server/main.lua @@ -1,7 +1,4 @@ local DataStores, DataStoresIndex, SharedDataStores = {}, {}, {} -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) MySQL.ready(function() local result = MySQL.Sync.fetchAll('SELECT * FROM datastore') diff --git a/[esx_addons]/esx_dmvschool/client/main.lua b/[esx_addons]/esx_dmvschool/client/main.lua index 41e48b14..be6e2db1 100644 --- a/[esx_addons]/esx_dmvschool/client/main.lua +++ b/[esx_addons]/esx_dmvschool/client/main.lua @@ -1,4 +1,3 @@ -ESX = nil local CurrentAction = nil local CurrentActionMsg = nil local CurrentActionData = nil @@ -13,13 +12,6 @@ local CurrentZoneType = nil local IsAboveSpeedLimit = false local LastVehicleHealth = nil -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - function DrawMissionText(msg, time) ClearPrints() BeginTextCommandPrint('STRING') diff --git a/[esx_addons]/esx_dmvschool/fxmanifest.lua b/[esx_addons]/esx_dmvschool/fxmanifest.lua index fa363b87..5672f967 100644 --- a/[esx_addons]/esx_dmvschool/fxmanifest.lua +++ b/[esx_addons]/esx_dmvschool/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX DMV School' -version '1.0.4' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_dmvschool/server/main.lua b/[esx_addons]/esx_dmvschool/server/main.lua index 6eb493b1..181de5bf 100644 --- a/[esx_addons]/esx_dmvschool/server/main.lua +++ b/[esx_addons]/esx_dmvschool/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - ESX.RegisterServerCallback('esx_dmvschool:canYouPay', function(source, cb, type) local xPlayer = ESX.GetPlayerFromId(source) diff --git a/[esx_addons]/esx_drugs/client/main.lua b/[esx_addons]/esx_drugs/client/main.lua index c6ec9a38..085291d9 100644 --- a/[esx_addons]/esx_drugs/client/main.lua +++ b/[esx_addons]/esx_drugs/client/main.lua @@ -1,20 +1,6 @@ -ESX = nil local menuOpen = false local wasOpen = false -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(100) - end - - ESX.PlayerData = ESX.GetPlayerData() -end) - Citizen.CreateThread(function() while true do Citizen.Wait(0) diff --git a/[esx_addons]/esx_drugs/fxmanifest.lua b/[esx_addons]/esx_drugs/fxmanifest.lua index b6cd44d3..d3e3cbf6 100644 --- a/[esx_addons]/esx_drugs/fxmanifest.lua +++ b/[esx_addons]/esx_drugs/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Drugs' -version '2.0.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_drugs/server/main.lua b/[esx_addons]/esx_drugs/server/main.lua index 10730cf2..b9c6a058 100644 --- a/[esx_addons]/esx_drugs/server/main.lua +++ b/[esx_addons]/esx_drugs/server/main.lua @@ -1,10 +1,7 @@ -ESX = nil local playersProcessingCannabis = {} local outofbound = true local alive = true -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_drugs:sellDrug') AddEventHandler('esx_drugs:sellDrug', function(itemName, amount) local xPlayer = ESX.GetPlayerFromId(source) diff --git a/[esx_addons]/esx_garage/client/main.lua b/[esx_addons]/esx_garage/client/main.lua index 4f0cd4b0..a168ac59 100644 --- a/[esx_addons]/esx_garage/client/main.lua +++ b/[esx_addons]/esx_garage/client/main.lua @@ -1,13 +1,5 @@ -ESX = nil local LastGarage, LastPart, LastParking, thisGarage = nil, nil, nil, nil -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - TriggerEvent('instance:registerType', 'garage') RegisterNetEvent('instance:onCreate') @@ -232,7 +224,7 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) if part == 'Parking' then - local playerPed = PlayerPedId() + local playerPed = PlayerPedId() local garage = thisGarage local parkingPos = garage.Parkings[parking].Pos @@ -254,7 +246,7 @@ AddEventHandler('esx_property:hasExitedMarker', function(name, part, parking) if part == 'Parking' then - local playerPed = PlayerPedId() + local playerPed = PlayerPedId() local garage = thisGarage local parkingPos = garage.Parkings[parking].Pos @@ -289,25 +281,29 @@ Citizen.CreateThread(function() end) +local nearMarker = false -- Display markers Citizen.CreateThread(function() while true do + local sleep = 500 - Citizen.Wait(0) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) for k,v in pairs(Config.Garages) do + local garage = vector3(v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z) if v.IsClosed then - if(not v.disabled and GetDistanceBetweenCoords(coords, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, true) < Config.DrawDistance) then + if(not v.disabled and #(coords - garage) < Config.DrawDistance) then DrawMarker(Config.MarkerType, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + sleep = 0 end - if(not v.disabled and GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.DrawDistance) then + if(not v.disabled and #(coords - garage) < Config.DrawDistance) then DrawMarker(Config.MarkerType, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + sleep = 0 end end @@ -316,10 +312,11 @@ Citizen.CreateThread(function() for i=1, #v.Parkings, 1 do - local parking = v.Parkings[i] + local parking = vector3(v.Parkings[i].Pos.x, v.Parkings[i].Pos.y, v.Parkings[i].Pos.z) - if(not v.disabled and GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.DrawDistance) then + if(not v.disabled and #(coords - parking) < Config.DrawDistance) then DrawMarker(Config.MarkerType, parking.Pos.x, parking.Pos.y, parking.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ParkingMarkerSize.x, Config.ParkingMarkerSize.y, Config.ParkingMarkerSize.z, Config.ParkingMarkerColor.r, Config.ParkingMarkerColor.g, Config.ParkingMarkerColor.b, 100, false, true, 2, false, false, false, false) + sleep = 0 end end @@ -327,68 +324,70 @@ Citizen.CreateThread(function() end end - + if sleep == 0 then nearMarker = true else nearMarker = false end + Citizen.Wait(sleep) end end) -- Enter / Exit marker events Citizen.CreateThread(function() while true do - Citizen.Wait(1) + if nearMarker then + local playerPed = PlayerPedId() + local coords = GetEntityCoords(playerPed) + local isInMarker = false + local currentGarage = nil + local currentPart = nil + local currentParking = nil + + for k,v in pairs(Config.Garages) do + if v.IsClosed then - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - local isInMarker = false - local currentGarage = nil - local currentPart = nil - local currentParking = nil - - for k,v in pairs(Config.Garages) do - if v.IsClosed then + if (not v.disabled and GetDistanceBetweenCoords(coords, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, true) < Config.MarkerSize.x) then + isInMarker = true + currentGarage = k + currentPart = 'ExteriorEntryPoint' + end - if (not v.disabled and GetDistanceBetweenCoords(coords, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, true) < Config.MarkerSize.x) then - isInMarker = true - currentGarage = k - currentPart = 'ExteriorEntryPoint' - end + if (not v.disabled and GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.MarkerSize.x) then + isInMarker = true + currentGarage = k + currentPart = 'InteriorExitPoint' + end + + for i=1, #v.Parkings, 1 do + local parking = v.Parkings[i] - if (not v.disabled and GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.MarkerSize.x) then - isInMarker = true - currentGarage = k - currentPart = 'InteriorExitPoint' - end - - for i=1, #v.Parkings, 1 do - local parking = v.Parkings[i] - - if (not v.disabled and GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.ParkingMarkerSize.x) then - isInMarker = true - currentGarage = k - currentPart = 'Parking' - currentParking = i + if (not v.disabled and GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.ParkingMarkerSize.x) then + isInMarker = true + currentGarage = k + currentPart = 'Parking' + currentParking = i + end end end - end - end - - if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastGarage ~= currentGarage or LastPart ~= currentPart or LastParking ~= currentParking) ) then - - if LastGarage ~= currentGarage or LastPart ~= currentPart or LastParking ~= currentParking then - TriggerEvent('esx_property:hasExitedMarker', LastGarage, LastPart, LastParking) end - HasAlreadyEnteredMarker = true - LastGarage = currentGarage - LastPart = currentPart - LastParking = currentParking - - TriggerEvent('esx_garage:hasEnteredMarker', currentGarage, currentPart, currentParking) - end + if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastGarage ~= currentGarage or LastPart ~= currentPart or LastParking ~= currentParking) ) then + + if LastGarage ~= currentGarage or LastPart ~= currentPart or LastParking ~= currentParking then + TriggerEvent('esx_property:hasExitedMarker', LastGarage, LastPart, LastParking) + end - if not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false + HasAlreadyEnteredMarker = true + LastGarage = currentGarage + LastPart = currentPart + LastParking = currentParking + + TriggerEvent('esx_garage:hasEnteredMarker', currentGarage, currentPart, currentParking) + end - TriggerEvent('esx_property:hasExitedMarker', LastGarage, LastPart, LastParking) - end + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + + TriggerEvent('esx_property:hasExitedMarker', LastGarage, LastPart, LastParking) + end + Citizen.Wait(1) + else Citizen.Wait(500) end end end) diff --git a/[esx_addons]/esx_garage/fxmanifest.lua b/[esx_addons]/esx_garage/fxmanifest.lua index f26eec32..85e5e453 100644 --- a/[esx_addons]/esx_garage/fxmanifest.lua +++ b/[esx_addons]/esx_garage/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Garage' -version '1.0.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_garage/server/main.lua b/[esx_addons]/esx_garage/server/main.lua index 5b02e5f2..0cd7bff1 100644 --- a/[esx_addons]/esx_garage/server/main.lua +++ b/[esx_addons]/esx_garage/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_garage:setParking') AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) local _source = source diff --git a/[esx_addons]/esx_holdup/client/main.lua b/[esx_addons]/esx_holdup/client/main.lua index 600255d2..ac49e234 100644 --- a/[esx_addons]/esx_holdup/client/main.lua +++ b/[esx_addons]/esx_holdup/client/main.lua @@ -1,14 +1,6 @@ local holdingUp = false local store = "" local blipRobbery = nil -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) function drawTxt(x,y, width, height, scale, text, r,g,b,a, outline) SetTextFont(0) diff --git a/[esx_addons]/esx_holdup/fxmanifest.lua b/[esx_addons]/esx_holdup/fxmanifest.lua index 7a2f2c4c..89d69365 100644 --- a/[esx_addons]/esx_holdup/fxmanifest.lua +++ b/[esx_addons]/esx_holdup/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Holdup' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' client_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_holdup/server/main.lua b/[esx_addons]/esx_holdup/server/main.lua index 9d8f91c9..a3ff34e1 100644 --- a/[esx_addons]/esx_holdup/server/main.lua +++ b/[esx_addons]/esx_holdup/server/main.lua @@ -1,22 +1,13 @@ local rob = false local robbers = {} -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_holdup:tooFar') AddEventHandler('esx_holdup:tooFar', function(currentStore) local _source = source - local xPlayers = ESX.GetPlayers() rob = false - - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at', Stores[currentStore].nameOfStore)) - TriggerClientEvent('esx_holdup:killBlip', xPlayers[i]) - end + for _, xPlayer in pairs(ESX.GetExtendedPlayers('job', 'police')) do + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('robbery_cancelled_at', Stores[currentStore].nameOfStore)) + TriggerClientEvent('esx_holdup:killBlip', xPlayer.source) end if robbers[_source] then @@ -30,7 +21,6 @@ RegisterServerEvent('esx_holdup:robberyStarted') AddEventHandler('esx_holdup:robberyStarted', function(currentStore) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - local xPlayers = ESX.GetPlayers() if Stores[currentStore] then local store = Stores[currentStore] @@ -40,24 +30,14 @@ AddEventHandler('esx_holdup:robberyStarted', function(currentStore) return end - local cops = 0 - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - cops = cops + 1 - end - end - if not rob then - if cops >= Config.PoliceNumberRequired then + local xPlayers = ESX.GetExtendedPlayers('job', 'police') + if #xPlayers >= Config.PoliceNumberRequired then rob = true - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog', store.nameOfStore)) - TriggerClientEvent('esx_holdup:setBlip', xPlayers[i], Stores[currentStore].position) - end + for _, xPlayer in pairs(xPlayers) do + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('rob_in_prog', store.nameOfStore)) + TriggerClientEvent('esx_holdup:setBlip', xPlayer.source, Stores[currentStore].position) end TriggerClientEvent('esx:showNotification', _source, _U('started_to_rob', store.nameOfStore)) @@ -81,14 +61,10 @@ AddEventHandler('esx_holdup:robberyStarted', function(currentStore) xPlayer.addMoney(store.reward) end - local xPlayers, xPlayer = ESX.GetPlayers(), nil - for i=1, #xPlayers, 1 do - xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at', store.nameOfStore)) - TriggerClientEvent('esx_holdup:killBlip', xPlayers[i]) - end + local xPlayers = ESX.GetExtendedPlayers('job', 'police') + for _, xPlayer in pairs(xPlayers) do + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('robbery_complete_at', store.nameOfStore)) + TriggerClientEvent('esx_holdup:killBlip', xPlayer.source) end end end diff --git a/[esx_addons]/esx_joblisting/client/main.lua b/[esx_addons]/esx_joblisting/client/main.lua index af8971f3..995a6cfe 100644 --- a/[esx_addons]/esx_joblisting/client/main.lua +++ b/[esx_addons]/esx_joblisting/client/main.lua @@ -1,12 +1,4 @@ local menuIsShowed, hasAlreadyEnteredMarker, isInMarker = false, false, false -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) function ShowJobListingMenu() ESX.TriggerServerCallback('esx_joblisting:getJobsList', function(jobs) diff --git a/[esx_addons]/esx_joblisting/fxmanifest.lua b/[esx_addons]/esx_joblisting/fxmanifest.lua index c1068048..3351ec2a 100644 --- a/[esx_addons]/esx_joblisting/fxmanifest.lua +++ b/[esx_addons]/esx_joblisting/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Job Listing' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_joblisting/server/main.lua b/[esx_addons]/esx_joblisting/server/main.lua index 5ab094c3..1f1a3753 100644 --- a/[esx_addons]/esx_joblisting/server/main.lua +++ b/[esx_addons]/esx_joblisting/server/main.lua @@ -1,8 +1,5 @@ -ESX = nil local availableJobs = {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - MySQL.ready(function() MySQL.Async.fetchAll('SELECT name, label FROM jobs WHERE whitelisted = @whitelisted', { ['@whitelisted'] = false diff --git a/[esx_addons]/esx_jobs/client/main.lua b/[esx_addons]/esx_jobs/client/main.lua index 5816c6c3..7ea82e12 100644 --- a/[esx_addons]/esx_jobs/client/main.lua +++ b/[esx_addons]/esx_jobs/client/main.lua @@ -10,7 +10,6 @@ local Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -local PlayerData = {} local menuIsShowed = false local hintIsShowed = false local hasAlreadyEnteredMarker = false @@ -29,25 +28,9 @@ local vehicleInCaseofDrop = nil local vehicleMaxHealth = nil -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(10) - end - - PlayerData = ESX.GetPlayerData() - refreshBlips() -end) - RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) - PlayerData = xPlayer + ESX.PlayerData = xPlayer refreshBlips() end) @@ -103,7 +86,7 @@ AddEventHandler('esx_jobs:action', function(job, zone, zoneKey) local vehicle = nil for k,v in pairs(Config.Jobs) do - if PlayerData.job.name == k then + if ESX.PlayerData.job.name == k then for l,w in pairs(v.Zones) do if w.Type == "vehspawnpt" and w.Spawner == zone.Spawner then spawnPoint = w @@ -129,7 +112,7 @@ AddEventHandler('esx_jobs:action', function(job, zone, zoneKey) local looping = true for k,v in pairs(Config.Jobs) do - if PlayerData.job.name == k then + if ESX.PlayerData.job.name == k then for l,w in pairs(v.Zones) do if w.Type == "vehdelete" and w.Spawner == zone.Spawner then local playerPed = PlayerPedId() @@ -223,7 +206,7 @@ end) RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', function(job) - PlayerData.job = job + ESX.PlayerData.job = job onDuty = false myPlate = {} -- loosing vehicle caution in case player changes job. spawner = 0 @@ -244,10 +227,10 @@ function refreshBlips() local zones = {} local blipInfo = {} - if PlayerData.job ~= nil then + if ESX.PlayerData.job ~= nil then for jobKey,jobValues in pairs(Config.Jobs) do - if jobKey == PlayerData.job.name then + if jobKey == ESX.PlayerData.job.name then for zoneKey,zoneValues in pairs(jobValues.Zones) do if zoneValues.Blip then @@ -334,16 +317,16 @@ Citizen.CreateThread(function() Citizen.Wait(1) local zones = {} - if PlayerData.job ~= nil then + if ESX.PlayerData.job ~= nil then for k,v in pairs(Config.Jobs) do - if PlayerData.job.name == k then + if ESX.PlayerData.job.name == k then zones = v.Zones end end local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(zones) do - if onDuty or v.Type == "cloakroom" or PlayerData.job.name == "reporter" then + if onDuty or v.Type == "cloakroom" or ESX.PlayerData.job.name == "reporter" then if (v.Zone) then TriggerEvent("izone:getZoneCenter", v.Zone, function(center) if (not(center == nil)) then @@ -419,12 +402,12 @@ Citizen.CreateThread(function() Citizen.Wait(1) - if PlayerData.job ~= nil and PlayerData.job.name ~= 'unemployed' then + if ESX.PlayerData.job ~= nil and ESX.PlayerData.job.name ~= 'unemployed' then local zones = nil local job = nil for k,v in pairs(Config.Jobs) do - if PlayerData.job.name == k then + if ESX.PlayerData.job.name == k then job = v zones = v.Zones end @@ -468,7 +451,7 @@ Citizen.CreateThread(function() end if IsControlJustReleased(0, Keys['E']) and not menuIsShowed and isInMarker then - if onDuty or zone.Type == "cloakroom" or PlayerData.job.name == "reporter" then + if onDuty or zone.Type == "cloakroom" or ESX.PlayerData.job.name == "reporter" then TriggerEvent('esx_jobs:action', job, zone, currentZone) end end @@ -476,10 +459,10 @@ Citizen.CreateThread(function() -- hide or show top left zone hints if isInMarker and not menuIsShowed then hintIsShowed = true - if (onDuty or zone.Type == "cloakroom" or PlayerData.job.name == "reporter") and zone.Type ~= "vehdelete" then + if (onDuty or zone.Type == "cloakroom" or ESX.PlayerData.job.name == "reporter") and zone.Type ~= "vehdelete" then hintToDisplay = zone.Hint hintIsShowed = true - elseif zone.Type == "vehdelete" and (onDuty or PlayerData.job.name == "reporter") then + elseif zone.Type == "vehdelete" and (onDuty or ESX.PlayerData.job.name == "reporter") then local playerPed = PlayerPedId() if IsPedInAnyVehicle(playerPed, false) then @@ -540,3 +523,5 @@ Citizen.CreateThread(function() RequestIpl("id2_14_during_door") RequestIpl("id2_14_during1") end) + +if ESX.PlayerLoaded then refreshBlips() end \ No newline at end of file diff --git a/[esx_addons]/esx_jobs/fxmanifest.lua b/[esx_addons]/esx_jobs/fxmanifest.lua index 44b23a2c..09d5422e 100644 --- a/[esx_addons]/esx_jobs/fxmanifest.lua +++ b/[esx_addons]/esx_jobs/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Jobs' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_jobs/server/main.lua b/[esx_addons]/esx_jobs/server/main.lua index 18f465ef..8f1a68e6 100644 --- a/[esx_addons]/esx_jobs/server/main.lua +++ b/[esx_addons]/esx_jobs/server/main.lua @@ -1,9 +1,5 @@ local playersWorking = {} -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.CreateThread(function() while true do Citizen.Wait(1000) diff --git a/[esx_addons]/esx_license/fxmanifest.lua b/[esx_addons]/esx_license/fxmanifest.lua index 7f8b4beb..14d5e7ba 100644 --- a/[esx_addons]/esx_license/fxmanifest.lua +++ b/[esx_addons]/esx_license/fxmanifest.lua @@ -4,10 +4,11 @@ game 'gta5' description 'ESX License' -version '1.0.1' +version 'legacy' server_scripts { '@async/async.lua', + '@es_extended/imports.lua', '@mysql-async/lib/MySQL.lua', 'server/main.lua' } diff --git a/[esx_addons]/esx_license/server/main.lua b/[esx_addons]/esx_license/server/main.lua index 8d8a8303..65a75831 100644 --- a/[esx_addons]/esx_license/server/main.lua +++ b/[esx_addons]/esx_license/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - function AddLicense(target, type, cb) local xPlayer = ESX.GetPlayerFromId(target) diff --git a/[esx_addons]/esx_lscustom/client/main.lua b/[esx_addons]/esx_lscustom/client/main.lua index f90dbfc8..81cd2b67 100644 --- a/[esx_addons]/esx_lscustom/client/main.lua +++ b/[esx_addons]/esx_lscustom/client/main.lua @@ -1,26 +1,13 @@ -ESX = nil local Vehicles = {} -local PlayerData = {} local lsMenuIsShowed = false local isInLSMarker = false local myCar = {} -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(10) - end - - PlayerData = ESX.GetPlayerData() -end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) - PlayerData = xPlayer + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true ESX.TriggerServerCallback('esx_lscustom:getVehiclesPrices', function(vehicles) Vehicles = vehicles @@ -29,7 +16,7 @@ end) RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', function(job) - PlayerData.job = job + ESX.PlayerData.job = job end) RegisterNetEvent('esx_lscustom:installMod') @@ -398,7 +385,7 @@ Citizen.CreateThread(function() local coords = GetEntityCoords(PlayerPedId()) local currentZone, zone, lastZone - if (PlayerData.job and PlayerData.job.name == 'mechanic') or not Config.IsMechanicJobOnly then + if (ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic') or not Config.IsMechanicJobOnly then for k,v in pairs(Config.Zones) do if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x and not lsMenuIsShowed then isInLSMarker = true @@ -411,7 +398,7 @@ Citizen.CreateThread(function() end if IsControlJustReleased(0, 38) and not lsMenuIsShowed and isInLSMarker then - if (PlayerData.job and PlayerData.job.name == 'mechanic') or not Config.IsMechanicJobOnly then + if (ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic') or not Config.IsMechanicJobOnly then lsMenuIsShowed = true local vehicle = GetVehiclePedIsIn(playerPed, false) diff --git a/[esx_addons]/esx_lscustom/fxmanifest.lua b/[esx_addons]/esx_lscustom/fxmanifest.lua index ebdbf7df..acef71d4 100644 --- a/[esx_addons]/esx_lscustom/fxmanifest.lua +++ b/[esx_addons]/esx_lscustom/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX LS Customs' -version '2.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_lscustom/server/main.lua b/[esx_addons]/esx_lscustom/server/main.lua index 23432b8e..f17279e3 100644 --- a/[esx_addons]/esx_lscustom/server/main.lua +++ b/[esx_addons]/esx_lscustom/server/main.lua @@ -1,8 +1,5 @@ -ESX = nil local Vehicles -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) local _source = source diff --git a/[esx_addons]/esx_mechanicjob/client/main.lua b/[esx_addons]/esx_mechanicjob/client/main.lua index 2e5a50fd..6f8de273 100644 --- a/[esx_addons]/esx_mechanicjob/client/main.lua +++ b/[esx_addons]/esx_mechanicjob/client/main.lua @@ -3,20 +3,6 @@ local CurrentAction, CurrentActionMsg, CurrentActionData = nil, '', {} local CurrentlyTowedVehicle, Blips, NPCOnJob, NPCTargetTowable, NPCTargetTowableZone = nil, {}, false, nil, nil local NPCHasSpawnedTowable, NPCLastCancel, NPCHasBeenNextToTowable, NPCTargetDeleterZone = false, GetGameTimer() - 5 * 60000, false, false local isDead, isBusy = false, false -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(10) - end - - ESX.PlayerData = ESX.GetPlayerData() -end) function SelectRandomTowable() local index = GetRandomIntInRange(1, #Config.Towables) @@ -696,6 +682,7 @@ end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true end) RegisterNetEvent('esx:setJob') diff --git a/[esx_addons]/esx_mechanicjob/fxmanifest.lua b/[esx_addons]/esx_mechanicjob/fxmanifest.lua index c391db12..95992bdd 100644 --- a/[esx_addons]/esx_mechanicjob/fxmanifest.lua +++ b/[esx_addons]/esx_mechanicjob/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Mechanic Job' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' client_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_mechanicjob/server/main.lua b/[esx_addons]/esx_mechanicjob/server/main.lua index 604eb082..4a7333c5 100644 --- a/[esx_addons]/esx_mechanicjob/server/main.lua +++ b/[esx_addons]/esx_mechanicjob/server/main.lua @@ -1,12 +1,4 @@ -ESX = nil -PlayersHarvesting = {} -PlayersHarvesting2 = {} -PlayersHarvesting3 = {} -PlayersCrafting = {} -PlayersCrafting2 = {} -PlayersCrafting3 = {} - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) +local PlayersHarvesting, PlayersHarvesting2, PlayersHarvesting3, PlayersCrafting, PlayersCrafting2, PlayersCrafting3 = {}, {}, {}, {}, {}, {} if Config.MaxInService ~= -1 then TriggerEvent('esx_service:activateService', 'mechanic', Config.MaxInService) diff --git a/[esx_addons]/esx_multicharacter/LICENSE.md b/[esx_addons]/esx_multicharacter/LICENSE.md new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/[esx_addons]/esx_multicharacter/LICENSE.md @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/[esx_addons]/esx_multicharacter/client/main.lua b/[esx_addons]/esx_multicharacter/client/main.lua new file mode 100644 index 00000000..3d7aab44 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/client/main.lua @@ -0,0 +1,326 @@ +ESX = exports['es_extended']:getSharedObject() +if ESX.GetConfig().Multichar then + + Citizen.CreateThread(function() + while not ESX.PlayerLoaded do + Citizen.Wait(0) + if NetworkIsPlayerActive(PlayerId()) then + exports.spawnmanager:setAutoSpawn(false) + DoScreenFadeOut(0) + while not GetResourceState('esx_menu_default') == 'started' do + Citizen.Wait(0) + end + TriggerEvent("esx_multicharacter:SetupCharacters") + break + end + end + end) + + + local canRelog, cam, Spawned = true + local Characters = {} + + RegisterNetEvent('esx_multicharacter:SetupCharacters') + AddEventHandler('esx_multicharacter:SetupCharacters', function() + ESX.PlayerLoaded = false + ESX.PlayerData = {} + Spawned = false + cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", Config.Spawn.x, Config.Spawn.y+1.6, Config.Spawn.z+1.3, 0.0, 0.0, 180.0, 100.00, false, 0) + SetEntityCoords(PlayerPedId(), Config.Spawn.x, Config.Spawn.y, Config.Spawn.z, true, false, false, false) + SetEntityHeading(PlayerPedId(), Config.Spawn.w) + DoScreenFadeOut(0) + SetCamActive(cam, true) + RenderScriptCams(true, false, 1, true, true) + ESX.UI.HUD.SetDisplay(0.0) + StartLoop() + ShutdownLoadingScreen() + ShutdownLoadingScreenNui() + TriggerEvent('esx:loadingScreenOff') + Citizen.Wait(200) + TriggerServerEvent("esx_multicharacter:SetupCharacters") + end) + + StartLoop = function() + hidePlayers = true + MumbleSetVolumeOverride(PlayerId(), 0.0) + Citizen.CreateThread(function() + local keys = {18, 27, 172, 173, 174, 175, 176, 177, 187, 188, 191, 201, 108, 109} + while hidePlayers do + DisableAllControlActions(0) + for i=1, #keys do + EnableControlAction(0, keys[i], true) + end + SetEntityVisible(PlayerPedId(), 0, 0) + SetLocalPlayerVisibleLocally(1) + SetPlayerInvincible(PlayerId(), 1) + ThefeedHideThisFrame() + HideHudComponentThisFrame(11) + HideHudComponentThisFrame(12) + HideHudComponentThisFrame(21) + HideHudAndRadarThisFrame() + Citizen.Wait(3) + local vehicles = GetGamePool('CVehicle') + for i=1, #vehicles do + SetEntityLocallyInvisible(vehicles[i]) + end + end + local playerId, playerPed = PlayerId(), PlayerPedId() + MumbleSetVolumeOverride(playerId, -1.0) + SetEntityVisible(playerPed, 1, 0) + SetPlayerInvincible(playerId, 0) + FreezeEntityPosition(playerPed, false) + Citizen.Wait(10000) + canRelog = true + end) + Citizen.CreateThread(function() + local playerPool = {} + while hidePlayers do + local players = GetActivePlayers() + for i=1, #players do + local player = players[i] + if player ~= PlayerId() and not playerPool[player] then + playerPool[player] = true + NetworkConcealPlayer(players[player], true, true) + end + end + Citizen.Wait(500) + end + for i=1, #playerPool do + NetworkConcealPlayer(playerPool[i], false, false) + end + end) + end + + SetupCharacter = function(index) + if Spawned == false then + exports.spawnmanager:spawnPlayer({ + x = Config.Spawn.x, + y = Config.Spawn.y, + z = Config.Spawn.z, + heading = Config.Spawn.w, + model = Characters[index].model or `mp_m_freemode_01`, + skipFade = true + }, function() + canRelog = false + if Characters[index] then + local skin = Characters[index].skin or Config.Default + if not Characters[index].model then + if Characters[index].sex == _('female') then skin.sex = 1 else skin.sex = 0 end + end + TriggerEvent('skinchanger:loadSkin', skin) + end + DoScreenFadeIn(400) + while IsScreenFadedOut() do Citizen.Wait(100) end + end) + + elseif Characters[index] and Characters[index].skin then + if Characters[Spawned] and Characters[Spawned].model then + RequestModel(Characters[index].model) + while not HasModelLoaded(Characters[index].model) do + RequestModel(Characters[index].model) + Citizen.Wait(0) + end + SetPlayerModel(PlayerId(), Characters[index].model) + SetModelAsNoLongerNeeded(Characters[index].model) + end + TriggerEvent('skinchanger:loadSkin', Characters[index].skin) + end + Spawned = index + local playerPed = PlayerPedId() + FreezeEntityPosition(PlayerPedId(), true) + SetPedAoBlobRendering(playerPed, true) + SetEntityAlpha(playerPed, 255) + SendNUIMessage({ + action = "openui", + character = Characters[Spawned] + }) + end + + RegisterNetEvent('esx_multicharacter:SetupUI') + AddEventHandler('esx_multicharacter:SetupUI', function(data) + DoScreenFadeOut(0) + Characters = data + local elements = {} + local Character = next(Characters) + + if Character == nil then + SendNUIMessage({ + action = "closeui" + }) + exports.spawnmanager:spawnPlayer({ + x = Config.Spawn.x, + y = Config.Spawn.y, + z = Config.Spawn.z, + heading = Config.Spawn.w, + model = `mp_m_freemode_01`, + skipFade = true + }, function() + canRelog = false + DoScreenFadeIn(400) + Citizen.Wait(400) + local playerPed = PlayerPedId() + SetPedAoBlobRendering(playerPed, false) + SetEntityAlpha(playerPed, 0) + TriggerServerEvent('esx_multicharacter:CharacterChosen', 1, true) + TriggerEvent('esx_identity:showRegisterIdentity') + end) + else + for k,v in pairs(Characters) do + if not v.model and v.skin then + if v.skin.model then v.model = v.skin.model elseif v.skin.sex == 1 then v.model = `mp_f_freemode_01` else v.model = `mp_m_freemode_01` end + end + if Spawned == false then SetupCharacter(Character) end + local label = v.firstname..' '..v.lastname + elements[#elements+1] = {label = label, value = v.id} + end + if #elements < Config.Slots then + elements[#elements+1] = {label = _('create_char'), value = (#elements+1), new = true} + end + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'selectchar', { + title = _('select_char'), + align = 'top-left', + elements = elements + }, function(data, menu) + local elements = {} + if not data.current.new then + elements[1] = {label = _('char_play'), action = 'play', value = data.current.value} + elements[2] = {label = _('char_delete'), action = 'delete', value = data.current.value} + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'choosechar', { + title = _('select_char'), + align = 'top-left', + elements = elements + }, function(data, menu) + if data.current.action == 'play' then + ESX.UI.Menu.CloseAll() + SendNUIMessage({ + action = "closeui" + }) + TriggerServerEvent('esx_multicharacter:CharacterChosen', data.current.value, false) + else + local elements2 = {} + elements2[1] = {label = _('cancel')} + elements2[2] = {label = _('confirm'), value = data.current.value} + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'deletechar', { + title = _('delete_label', Characters[data.current.value].firstname, Characters[data.current.value].lastname), + align = 'center', + elements = elements2 + }, function(data, menu) + if data.current.value then + TriggerServerEvent('esx_multicharacter:DeleteCharacter', data.current.value) + Spawned = false + ESX.UI.Menu.CloseAll() + else + menu.close() + end + end, function(data, menu) + menu.close() + end) + end + end, function(data, menu) + menu.close() + end) + else + ESX.UI.Menu.CloseAll() + local GetSlot = function() + for i=1, Config.Slots do + if not Characters[i] then + return i + end + end + end + local slot = GetSlot() + TriggerServerEvent('esx_multicharacter:CharacterChosen', slot, true) + TriggerEvent('esx_identity:showRegisterIdentity') + end + end, function(data, menu) + menu.refresh() + end, function(data, menu) + if data.current.new then + local playerPed = PlayerPedId() + SetPedAoBlobRendering(playerPed, false) + SetEntityAlpha(playerPed, 0) + SendNUIMessage({ + action = "closeui" + }) + else + SetupCharacter(data.current.value) + local playerPed = PlayerPedId() + SetPedAoBlobRendering(playerPed, true) + ResetEntityAlpha(playerPed) + end + end) + end + end) + + RegisterNetEvent('esx:playerLoaded') + AddEventHandler('esx:playerLoaded', function(playerData, isNew, skin) + DoScreenFadeOut(100) + local spawn = playerData.coords + local playerPed = PlayerPedId() + FreezeEntityPosition(playerPed, true) + SetEntityCoords(playerPed, spawn.x, spawn.y, spawn.z-1.3, true, false, false, false) + SetEntityHeading(playerPed, spawn.heading) + Citizen.Wait(300) + SetCamActive(cam, false) + RenderScriptCams(0, 0) + DestroyAllCams(true) + DoScreenFadeIn(400) + Citizen.Wait(400) + + if isNew or not skin or #skin == 1 then + local sex = skin.sex or 0 + if sex == 0 then model = `mp_m_freemode_01` else model = `mp_f_freemode_01` end + RequestModel(model) + while not HasModelLoaded(model) do + RequestModel(model) + Citizen.Wait(0) + end + SetPlayerModel(PlayerId(), model) + SetModelAsNoLongerNeeded(model) + skin = Config.Default + skin.sex = sex + TriggerEvent('skinchanger:loadSkin', skin, function() + playerPed = PlayerPedId() + SetPedAoBlobRendering(playerPed, true) + ResetEntityAlpha(playerPed) + TriggerEvent('esx_skin:openSaveableMenu', function() + finished = true end, function() finished = true + end) + SetEntityHeading(playerPed, spawn.heading) + end) + while not finished do Citizen.Wait(200) end + else + local playerPed = PlayerPedId() + SetEntityHeading(playerPed, spawn.heading) + TriggerEvent('skinchanger:loadSkin', skin or Characters[Spawned].skin) + playerPed = PlayerPedId() + SetEntityVisible(playerPed, true, 0) + end + TriggerServerEvent('esx:onPlayerSpawn') + TriggerEvent('esx:onPlayerSpawn') + TriggerEvent('playerSpawned') + TriggerEvent('esx:restoreLoadout') + Characters, hidePlayers = {}, false + end) + + RegisterNetEvent('esx:onPlayerLogout') + AddEventHandler('esx:onPlayerLogout', function() + DoScreenFadeOut(0) + Spawned = false + TriggerEvent("esx_multicharacter:SetupCharacters") + TriggerEvent('esx_skin:resetFirstSpawn') + end) + + if Config.Relog then + RegisterCommand('relog', function(source, args, rawCommand) + if canRelog == true then + canRelog = false + TriggerServerEvent('esx_multicharacter:relog') + ESX.SetTimeout(10000, function() + canRelog = true + end) + end + end) + end + +end diff --git a/[esx_addons]/esx_multicharacter/config.lua b/[esx_addons]/esx_multicharacter/config.lua new file mode 100644 index 00000000..a444f660 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/config.lua @@ -0,0 +1,109 @@ +Config = {} +Config.Locale = 'en' + +Config.Slots = 4 +Config.Spawn = vector4(-113.7, 565.3, 195.2, 0) + +-------------------- +-- Do not use unless you are prepared to adjust your resources to correctly reset data +-- Information: https://github.com/thelindat/esx_multicharacter#relogging +Config.Relog = false +-------------------- + +Config.Default = { + mom = 21, + dad = 0, + face_md_weight = 50, + skin_md_weight = 50, + nose_1 = 0, + nose_2 = 0, + nose_3 = 0, + nose_4 = 0, + nose_5 = 0, + nose_6 = 0, + cheeks_1 = 0, + cheeks_2 = 0, + cheeks_3 = 0, + lip_thickness = 0, + jaw_1 = 0, + jaw_2 = 0, + chin_1 = 0, + chin_2 = 0, + chin_13 = 0, + chin_4 = 0, + neck_thickness = 0, + hair_1 = 0, + hair_2 = 0, + hair_color_1 = 0, + hair_color_2 = 0, + tshirt_1 = 0, + tshirt_2 = 0, + torso_1 = 0, + torso_2 = 0, + decals_1 = 0, + decals_2 = 0, + arms = 0, + arms_2 = 0, + pants_1 = 0, + pants_2 = 0, + shoes_1 = 0, + shoes_2 = 0, + mask_1 = 0, + mask_2 = 0, + bproof_1 = 0, + bproof_2 = 0, + chain_1 = 0, + chain_2 = 0, + helmet_1 = -1, + helmet_2 = 0, + glasses_1 = 0, + glasses_2 = 0, + watches_1 = -1, + watches_2 = 0, + bracelets_1 = -1, + bracelets_2 = 0, + bags_1 = 0, + bags_2 = 0, + eye_color = 0, + eye_squint = 0, + eyebrows_2 = 0, + eyebrows_1 = 0, + eyebrows_3 = 0, + eyebrows_4 = 0, + eyebrows_5 = 0, + eyebrows_6 = 0, + makeup_1 = 0, + makeup_2 = 0, + makeup_3 = 0, + makeup_4 = 0, + lipstick_1 = 0, + lipstick_2 = 0, + lipstick_3 = 0, + lipstick_4 = 0, + ears_1 = -1, + ears_2 = 0, + chest_1 = 0, + chest_2 = 0, + chest_3 = 0, + bodyb_1 = -1, + bodyb_2 = 0, + bodyb_3 = -1, + bodyb_4 = 0, + age_1 = 0, + age_2 = 0, + blemishes_1 = 0, + blemishes_2 = 0, + blush_1 = 0, + blush_2 = 0, + blush_3 = 0, + complexion_1 = 0, + complexion_2 = 0, + sun_1 = 0, + sun_2 = 0, + moles_1 = 0, + moles_2 = 0, + beard_1 = 0, + beard_2 = 0, + beard_3 = 0, + beard_4 = 0 +} diff --git a/[esx_addons]/esx_multicharacter/fxmanifest.lua b/[esx_addons]/esx_multicharacter/fxmanifest.lua new file mode 100644 index 00000000..57787aaa --- /dev/null +++ b/[esx_addons]/esx_multicharacter/fxmanifest.lua @@ -0,0 +1,38 @@ +fx_version 'adamant' +game 'gta5' +description 'https://github.com/thelindat/esx_multicharacter' +version '1.2.1' + +dependencies { + 'es_extended', + 'esx_menu_default', + 'esx_identity', + 'esx_skin' +} + +shared_scripts { + '@es_extended/locale.lua', + 'locales/*.lua', + 'config.lua' +} + +server_scripts { + '@es_extended/imports.lua', + '@mysql-async/lib/MySQL.lua', + 'server/*.lua' +} + +client_scripts { + 'client/*.lua' +} + +ui_page { + 'html/ui.html', +} + +files { + 'html/ui.html', + 'html/css/main.css', + 'html/js/app.js', + 'html/locales/*.js', +} diff --git a/[esx_addons]/esx_multicharacter/html/css/main.css b/[esx_addons]/esx_multicharacter/html/css/main.css new file mode 100644 index 00000000..60090d94 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/css/main.css @@ -0,0 +1,71 @@ +@import url('https://fonts.googleapis.com/css2?family=Raleway:wght@300;600&display=swap'); +* { + margin: 0; + padding: 0; + user-select: none; + color: rgb(255, 255, 255); + font-weight: 300; + font-size: 1.6vh; + font-family: Calibri, "Helvetica", san-serif; +} + +html { + overflow: hidden; +} + +p { + margin: 0 !important; +} + +body { + background: transparent; +} + +.main-container { + display:none; + position: absolute; + top: 50%; + right: 0; + transform: translate(0, -50%); + background: rgba(0,0,0,0.7); + margin-right: 1.5rem; +} + +.header { + position: absolute; + top: 5%; + left: 50%; + transform: translate(-50%); + font-size: 1.1rem; +} + +.footer { + position: absolute; + bottom: 5%; + left: 50%; + transform: translate(-50%); + font-size: 1.1rem; +} + +.character-box { + display: flex; + right: 0; + flex-direction: column; + justify-content: center; + align-items: center; + text-align: center; + line-height: 1.4rem; + height: calc(100vh - 6rem); + width: 20rem; + padding: 1rem; + border: 1px rgba(12,12,12,200) solid; + box-shadow: 0px 0px 4px 1px rgba(12,12,12,20); +} + +h1 { + font-family: 'Raleway', sans-serif; + padding-top: 2rem; + display: block; + font-size: 1.3rem; + font-weight: 600; +} diff --git a/[esx_addons]/esx_multicharacter/html/js/app.js b/[esx_addons]/esx_multicharacter/html/js/app.js new file mode 100644 index 00000000..22b5c92c --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/js/app.js @@ -0,0 +1,35 @@ +var money = Intl.NumberFormat('en-US', { + style: 'currency', + currency: 'USD', + minimumFractionDigits: 0 +}); + +(() => { + Kashacter = {}; + + Kashacter.ShowUI = function(data) { + $('body').css({"display":"block"}); + $('.main-container').css({"display":"block"}); + $('[data-charid=1]').html('

' + `${translate.name} ` + '

' + data.firstname +' '+ data.lastname +'

' + `${translate.job} ` + '

'+ data.job +' '+ data.job_grade +'

' + `${translate.money} ` + '

'+ money.format(data.money) +'

' + `${translate.bank} ` + '

'+ money.format(data.bank) +'

' + `${translate.dob} ` + '

'+ data.dateofbirth +'

' + `${translate.gender} ` + '

'+ data.sex +'

').attr("data-ischar", "true"); + }; + + Kashacter.CloseUI = function() { + $('body').css({"display":"none"}); + $('.main-container').css({"display":"none"}); + $('[data-charid=1]').html('

'); + }; + + window.onload = function(e) { + window.addEventListener('message', function(event) { + switch(event.data.action) { + case 'openui': + Kashacter.ShowUI(event.data.character); + break; + case 'closeui': + Kashacter.CloseUI(); + break; + } + }) + } + +})(); diff --git a/[esx_addons]/esx_multicharacter/html/locales/cs.js b/[esx_addons]/esx_multicharacter/html/locales/cs.js new file mode 100644 index 00000000..cc84dedc --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/locales/cs.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Jméno"; +translate.job = "Práce"; +translate.bank = "Banka"; +translate.money = "Peníze"; +translate.gender = "Pohlaví"; +translate.dob = "Datum narození"; diff --git a/[esx_addons]/esx_multicharacter/html/locales/de.js b/[esx_addons]/esx_multicharacter/html/locales/de.js new file mode 100644 index 00000000..efd17188 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/locales/de.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Name"; +translate.job = "Beruf"; +translate.bank = "Bankguthaben"; +translate.money = "Bargeld"; +translate.gender = "Geschlecht"; +translate.dob = "Geburtsdatum"; diff --git a/[esx_addons]/esx_multicharacter/html/locales/en.js b/[esx_addons]/esx_multicharacter/html/locales/en.js new file mode 100644 index 00000000..125dd3f0 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/locales/en.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Name"; +translate.job = "Job"; +translate.bank = "Bank"; +translate.money = "Cash"; +translate.gender = "Gender"; +translate.dob = "Date of birth"; diff --git a/[esx_addons]/esx_multicharacter/html/locales/fr.js b/[esx_addons]/esx_multicharacter/html/locales/fr.js new file mode 100644 index 00000000..597a217d --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/locales/fr.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Nom"; +translate.job = "Métier"; +translate.bank = "Banque"; +translate.money = "Argent"; +translate.gender = "Sexe"; +translate.dob = "Date de naissance"; diff --git a/[esx_addons]/esx_multicharacter/html/locales/pl.js b/[esx_addons]/esx_multicharacter/html/locales/pl.js new file mode 100644 index 00000000..07b27356 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/locales/pl.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "imię"; +translate.job = "Zajęcie"; +translate.bank = "Bank"; +translate.money = "Gotówka"; +translate.gender = "Seks"; +translate.dob = "Data urodzenia"; diff --git a/[esx_addons]/esx_multicharacter/html/locales/pt.js b/[esx_addons]/esx_multicharacter/html/locales/pt.js new file mode 100644 index 00000000..c8eca4f8 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/locales/pt.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Nome"; +translate.job = "Trabalho"; +translate.bank = "Banco"; +translate.money = "Dinheiro"; +translate.gender = "Género"; +translate.dob = "Data de Nascimento"; diff --git a/[esx_addons]/esx_multicharacter/html/locales/tr.js b/[esx_addons]/esx_multicharacter/html/locales/tr.js new file mode 100644 index 00000000..ab820732 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/locales/tr.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "İsim"; +translate.job = "Meslek"; +translate.bank = "Banka"; +translate.money = "Nakit"; +translate.gender = "Cinsiyet"; +translate.dob = "Doğum Tarihi"; diff --git a/[esx_addons]/esx_multicharacter/html/ui.html b/[esx_addons]/esx_multicharacter/html/ui.html new file mode 100644 index 00000000..7b59ac89 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/html/ui.html @@ -0,0 +1,24 @@ + + + + + + + + + + +
+
ESX Legacy
+
+

+
+
+
Multicharacter
+
+ + + + + + \ No newline at end of file diff --git a/[esx_addons]/esx_multicharacter/locales/cs.lua b/[esx_addons]/esx_multicharacter/locales/cs.lua new file mode 100644 index 00000000..a9734076 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/locales/cs.lua @@ -0,0 +1,11 @@ +Locales['cs'] = { + ['male'] = "Muž", + ['female'] = "Žena", + ['delete_label'] = "Vymazat %s %s?", + ['select_char'] = "Zvolit Postavu", + ['create_char'] = "Vytvořit novou postavu", + ['char_play'] = "Hrát za postavu", + ['char_delete'] = "Vymazat postavu", + ['cancel'] = "Zrušit", + ['confirm'] = "Potvrdit", +} diff --git a/[esx_addons]/esx_multicharacter/locales/de.lua b/[esx_addons]/esx_multicharacter/locales/de.lua new file mode 100644 index 00000000..654971af --- /dev/null +++ b/[esx_addons]/esx_multicharacter/locales/de.lua @@ -0,0 +1,11 @@ +Locales['de'] = { + ['male'] = "Männlich", + ['female'] = "Weiblich", + ['delete_label'] = "Lösche %s %s?", + ['select_char'] = "Charakter auswählen", + ['create_char'] = "Neuen Charakter erstellen", + ['char_play'] = "Diesen Charakter spielen", + ['char_delete'] = "Diesen Charakter löschen", + ['cancel'] = "Abbrechen", + ['confirm'] = "Bestätigen", +} diff --git a/[esx_addons]/esx_multicharacter/locales/en.lua b/[esx_addons]/esx_multicharacter/locales/en.lua new file mode 100644 index 00000000..f814d78a --- /dev/null +++ b/[esx_addons]/esx_multicharacter/locales/en.lua @@ -0,0 +1,11 @@ +Locales['en'] = { + ['male'] = "Male", + ['female'] = "Female", + ['delete_label'] = "Delete %s %s?", + ['select_char'] = "Select Character", + ['create_char'] = "Create new character", + ['char_play'] = "Play this character", + ['char_delete'] = "Delete this character", + ['cancel'] = "Cancel", + ['confirm'] = "Confirm", +} diff --git a/[esx_addons]/esx_multicharacter/locales/pt.lua b/[esx_addons]/esx_multicharacter/locales/pt.lua new file mode 100644 index 00000000..04b828a3 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/locales/pt.lua @@ -0,0 +1,11 @@ +Locales['pt'] = { + ['male'] = "Masculino", + ['female'] = "Feminino", + ['delete_label'] = "Eliminar %s %s?", + ['select_char'] = "Selecionar personagem", + ['create_char'] = "Criar novo personagem", + ['char_play'] = "Selecionar", + ['char_delete'] = "Eliminar personagem", + ['cancel'] = "Cancelar", + ['confirm'] = "Confirmar", +} diff --git a/[esx_addons]/esx_multicharacter/locales/tr.lua b/[esx_addons]/esx_multicharacter/locales/tr.lua new file mode 100644 index 00000000..8a3aa060 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/locales/tr.lua @@ -0,0 +1,11 @@ +Locales['tr'] = { + ['male'] = "Erkek", + ['female'] = "Kadın", + ['delete_label'] = "Sil %s %s?", + ['select_char'] = "Karakter Seç", + ['create_char'] = "Yeni Karakter Oluştur", + ['char_play'] = "Bu Karakterle Oyna", + ['char_delete'] = "Bu Karakteri Sil", + ['cancel'] = "İptal", + ['confirm'] = "Onayla", +} diff --git a/[esx_addons]/esx_multicharacter/readme.md b/[esx_addons]/esx_multicharacter/readme.md new file mode 100644 index 00000000..c4d591d3 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/readme.md @@ -0,0 +1,92 @@ +

Although this resource is included, a more updated version may be available.

+ + +### Requirements (ensure you are using the latest) +- [ESX Legacy](https://github.com/esx-framework/es_extended/tree/legacy) +- [MySQL Async 3.3.2](https://github.com/brouznouf/fivem-mysql-async/releases/tag/3.3.2) +- [ESX Identity](https://github.com/esx-framework/esx_identity) +- [ESX Skin](https://github.com/esx-framework/esx_skin) +- [Spawnmanager](https://github.com/citizenfx/cfx-server-data/tree/master/resources/%5Bmanagers%5D/spawnmanager) + +### Installation +- Modify your ESX config with `Config.Multichar = true` +- Set your database name for `Config.Database` in server/main.lua +- All owner and identifier columns should be set to `VARCHAR(60)` to ensure correct data entry +- Use the `varchar` command from the console to update your SQL tables +- Once you have used the command you should just remove it for sanity's sake + +### Conflicts +* The following resources should not be used with ESX Legacy and can result in errors + - **essentialsmode** + - basic-gamemode + - fivem-map-skater + - fivem-map-hipster + - default_spawnpoint + - cui_character (or other resources that modify spawn behaviour) + +### Common issues +#### Black screen / loading scripts + - Download and run all requirements + - Ensure none of the conflicting resources are enabled +#### mysql-async duplicate entry + - You have not increased the VARCHAR size of the table holding identifiers - usually `owner` or `identifier` + +#### The menu interface is esx_menu_default - you can use any version if you want a different appearance +![image](https://user-images.githubusercontent.com/65407488/119010385-592a8c80-b9d7-11eb-9aa1-eb7051004843.png) + +### Relogging +- Do not enable this setting if you do not intend to properly set up relog support +- Requires the latest update for ESX Status (prevents multiple status ticks from running) +- Add the following events to resources that require support for relogging, or +- Add them to [@esx/imports.lua](https://github.com/esx-framework/es_extended/blob/legacy/imports.lua) (and use the imports in your resources) +```lua +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function(xPlayer) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true +end) + +RegisterNetEvent('esx:onPlayerLogout') +AddEventHandler('esx:onPlayerLogout', function() + ESX.PlayerLoaded = false + ESX.PlayerData = {} +end) +``` +- Any threads using ESX.PlayerData in a loop should check if ESX.PlayerLoaded is true + - This ensures the resource does not error after relogging, or while on character selection + - Setup correctly you can break your loops and trigger them again after loading + - Refer to my [boilerplate](https://github.com/thelindat/esx_legacy_boilerplate) for more information and usage examples + +### Notes +- This resource is not compatible with ExtendedMode or previous versions of ESX +- Legacy, skin, and identity must be updated to at least the minimum commits specified above +- Characters are stored in the users table as `char#:license` - if you need to use a different identifier then you need to modify ESX itself +- Character deletion does not require manual entries for the tables to remove +- As characters are stored with unique identifiers, there is no excessive queries being executed + +### Kashacters +- This project is forked from the [kashacters multicharacter resource](https://github.com/FiveEYZ/esx_kashacter) +- Most of the code has been entirely rewritten +- KASH has given permission for this resource to use his code and the addition of a license +- The license obviously does not apply to previous versions and KASH has stated his resource is free to be used however + + + +## Notice +Copyright© 2021 Linden and KASH + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see https://www.gnu.org/licenses. + + +### Thanks to KASH, XxFri3ndlyxX, and all those who have contributed diff --git a/[esx_addons]/esx_multicharacter/server/functions.lua b/[esx_addons]/esx_multicharacter/server/functions.lua new file mode 100644 index 00000000..a1312e0a --- /dev/null +++ b/[esx_addons]/esx_multicharacter/server/functions.lua @@ -0,0 +1,8 @@ +GetJobs = function() + local jobs = {} + while next(jobs) == nil do + Citizen.Wait(250) + jobs = exports['es_extended']:getSharedObject().Jobs + end + return jobs +end \ No newline at end of file diff --git a/[esx_addons]/esx_multicharacter/server/main.lua b/[esx_addons]/esx_multicharacter/server/main.lua new file mode 100644 index 00000000..4a52cac9 --- /dev/null +++ b/[esx_addons]/esx_multicharacter/server/main.lua @@ -0,0 +1,125 @@ +if not ESX then + SetTimeout(3000, print('[^3WARNING^7] Unable to start Multicharacter - your version of ESX is not compatible ')) +elseif ESX.GetConfig().Multichar == true then + local IdentifierTables, Fetch = {}, -1 + + -- enter the name of your database here + Config.Database = 'es_extended' + + -- enter a prefix to prepend to all user identifiers (keep it short) + Config.Prefix = 'char' + + local SetupCharacters = function(playerId) + while Fetch == -1 do Citizen.Wait(500) end + local identifier = Config.Prefix..'%:'..ESX.GetIdentifier(playerId) + MySQL.Async.fetchAll(Fetch, { + identifier, + Config.Slots + }, function(result) + local characters = {} + for i=1, #result, 1 do + local job, grade = result[i].job or 'unemployed', tostring(result[i].job_grade) + if ESX.Jobs[job] and ESX.Jobs[job].grades[grade] then + if job ~= 'unemployed' then grade = ESX.Jobs[job].grades[grade].label else grade = '' end + job = ESX.Jobs[job].label + end + local accounts = json.decode(result[i].accounts) + local id = tonumber(string.sub(result[i].identifier, #Config.Prefix+1, string.find(result[i].identifier, ':')-1)) + characters[id] = { + id = id, + bank = accounts.bank, + money = accounts.money, + job = job, + job_grade = grade, + firstname = result[i].firstname, + lastname = result[i].lastname, + dateofbirth = result[i].dateofbirth, + skin = json.decode(result[i].skin) + } + if result[i].sex == 'm' then characters[id].sex = _('male') else characters[id].sex = _('female') end + end + TriggerClientEvent('esx_multicharacter:SetupUI', playerId, characters) + end) + end + + local DeleteCharacter = function(playerId, charid) + local identifier = Config.Prefix..charid..':'..ESX.GetIdentifier(playerId) + for k, v in pairs(IdentifierTables) do + MySQL.Async.execute("DELETE FROM "..v.table.." WHERE "..v.column.." = ?", { + identifier + }) + end + print(('[^2INFO^7] Player [%s] %s has deleted a character (%s)'):format(GetPlayerName(playerId), playerId, identifier)) + end + + MySQL.ready(function() + MySQL.Async.fetchAll('SELECT `TABLE_NAME`, `COLUMN_NAME`, `CHARACTER_MAXIMUM_LENGTH` FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = ? AND (COLUMN_NAME = ? OR COLUMN_NAME = ?) ', { + Config.Database, 'identifier', 'owner' + }, function(result) + if result then + local varchar, varsize = {}, 0 + for k, v in pairs(result) do + if v.CHARACTER_MAXIMUM_LENGTH and v.CHARACTER_MAXIMUM_LENGTH >= 40 and v.CHARACTER_MAXIMUM_LENGTH < 60 then varchar[v.TABLE_NAME] = v.COLUMN_NAME varsize = varsize+1 end + table.insert(IdentifierTables, {table = v.TABLE_NAME, column = v.COLUMN_NAME}) + end + if next(varchar) then + for k, v in pairs(varchar) do + MySQL.Sync.execute("ALTER TABLE "..k.." MODIFY COLUMN "..v.." VARCHAR(60)") + end + print(('[^2INFO^7] Attempted to update ^5%s^7 columns to use VARCHAR(60)'):format(varsize)) + end + if not next(ESX.Jobs) then ESX.Jobs = GetJobs() end + Fetch = MySQL.Sync.store("SELECT `identifier`, `accounts`, `job`, `job_grade`, `firstname`, `lastname`, `dateofbirth`, `sex`, `skin` FROM `users` WHERE identifier LIKE ? LIMIT ?") + end + end) + end) + + RegisterServerEvent("esx_multicharacter:SetupCharacters") + AddEventHandler('esx_multicharacter:SetupCharacters', function() + SetupCharacters(source) + end) + + local awaitingRegistration = {} + RegisterServerEvent("esx_multicharacter:CharacterChosen") + AddEventHandler('esx_multicharacter:CharacterChosen', function(charid, isNew) + local src = source + if type(charid) == 'number' and string.len(charid) <= 2 and type(isNew) == 'boolean' then + if isNew then + awaitingRegistration[src] = charid + else + TriggerEvent('esx:onPlayerJoined', src, Config.Prefix..charid) + end + end + end) + + AddEventHandler('esx_identity:completedRegistration', function(playerId, data) + TriggerEvent('esx:onPlayerJoined', playerId, Config.Prefix..awaitingRegistration[playerId], data) + awaitingRegistration[playerId] = nil + end) + + AddEventHandler('playerDropped', function(reason) + awaitingRegistration[source] = nil + end) + + RegisterServerEvent("esx_multicharacter:DeleteCharacter") + AddEventHandler('esx_multicharacter:DeleteCharacter', function(charid) + local src = source + if type(charid) == "number" and string.len(charid) <= 2 then + DeleteCharacter(src, charid) + SetupCharacters(src) + end + end) + + RegisterServerEvent("esx_multicharacter:relog") + AddEventHandler('esx_multicharacter:relog', function() + local src = source + TriggerEvent('esx:playerLogout', src) + end) + + RegisterCommand('forcelog', function(source, args, rawCommand) + TriggerEvent('esx:playerLogout', source) + end, true) + +else + SetTimeout(3000, print('[^3WARNING^7] Multicharacter is disabled - please check your ESX configuration')) +end diff --git a/[esx_addons]/esx_optionalneeds/client/main.lua b/[esx_addons]/esx_optionalneeds/client/main.lua index caf6da5c..07377b6c 100644 --- a/[esx_addons]/esx_optionalneeds/client/main.lua +++ b/[esx_addons]/esx_optionalneeds/client/main.lua @@ -1,19 +1,11 @@ -ESX = nil local IsAlreadyDrunk = false local DrunkLevel = -1 -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - function Drunk(level, start) Citizen.CreateThread(function() - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() if start then DoScreenFadeOut(800) @@ -68,7 +60,7 @@ function Reality() Citizen.CreateThread(function() - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() DoScreenFadeOut(800) Wait(1000) @@ -156,7 +148,7 @@ end) RegisterNetEvent('esx_optionalneeds:onDrink') AddEventHandler('esx_optionalneeds:onDrink', function() - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() TaskStartScenarioInPlace(playerPed, "WORLD_HUMAN_DRINKING", 0, 1) Citizen.Wait(1000) diff --git a/[esx_addons]/esx_optionalneeds/fxmanifest.lua b/[esx_addons]/esx_optionalneeds/fxmanifest.lua index a639171c..fd3ecbdb 100644 --- a/[esx_addons]/esx_optionalneeds/fxmanifest.lua +++ b/[esx_addons]/esx_optionalneeds/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Optional Needs' -version '1.0.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_optionalneeds/server/main.lua b/[esx_addons]/esx_optionalneeds/server/main.lua index 8ff48f3e..bb8925bb 100644 --- a/[esx_addons]/esx_optionalneeds/server/main.lua +++ b/[esx_addons]/esx_optionalneeds/server/main.lua @@ -1,9 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) - ESX = obj -end) - ESX.RegisterUsableItem('beer', function(source) local xPlayer = ESX.GetPlayerFromId(source) diff --git a/[esx_addons]/esx_phone/client/main.lua b/[esx_addons]/esx_phone/client/main.lua index dd69b91f..3b2abf17 100644 --- a/[esx_addons]/esx_phone/client/main.lua +++ b/[esx_addons]/esx_phone/client/main.lua @@ -3,16 +3,6 @@ local CurrentAction, CurrentActionMsg GUI.PhoneIsShowed = false GUI.MessagesIsShowed = false GUI.AddContactIsShowed = false -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - ESX.UI.Menu.RegisterType('phone', OpenPhone, ClosePhone) -end) function OpenPhone() local playerPed = PlayerPedId() @@ -60,6 +50,7 @@ AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) reloadPhone = true, phoneData = PhoneData }) + ESX.UI.Menu.RegisterType('phone', OpenPhone, ClosePhone) end) RegisterNetEvent('esx_phone:addContact') diff --git a/[esx_addons]/esx_phone/fxmanifest.lua b/[esx_addons]/esx_phone/fxmanifest.lua index 8e318256..09abf97f 100644 --- a/[esx_addons]/esx_phone/fxmanifest.lua +++ b/[esx_addons]/esx_phone/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Phone' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_phone/server/main.lua b/[esx_addons]/esx_phone/server/main.lua index ee6b4e37..9f2c1053 100644 --- a/[esx_addons]/esx_phone/server/main.lua +++ b/[esx_addons]/esx_phone/server/main.lua @@ -1,23 +1,23 @@ -ESX = nil + local DisptachRequestId, PhoneNumbers = 0, {} -TriggerEvent('esx:getSharedObject', function(obj) - ESX = obj +AddEventHandler('onResourceStart', function(resource) + if resource == GetCurrentResourceName() then + local xPlayers = ESX.GetExtendedPlayers() - local xPlayers = ESX.GetPlayers() - - for i=1, #xPlayers, 1 do - LoadPlayer(xPlayers[i]) + for k, v in pairs(xPlayers) do + LoadPlayer(v) + end end end) -function LoadPlayer(source) - local xPlayer = ESX.GetPlayerFromId(source) +function LoadPlayer(player) + local xPlayer = player for num,v in pairs(PhoneNumbers) do if tonumber(num) == num then -- if phonenumber is a player phone number for src,_ in pairs(v.sources) do - TriggerClientEvent('esx_phone:setPhoneNumberSource', source, num, tonumber(src)) + TriggerClientEvent('esx_phone:setPhoneNumberSource', xPlayer.source, num, tonumber(src)) end end end @@ -35,8 +35,7 @@ function LoadPlayer(source) ['@phone_number'] = phoneNumber }) end - - TriggerClientEvent('esx_phone:setPhoneNumberSource', -1, phoneNumber, source) + TriggerClientEvent('esx_phone:setPhoneNumberSource', -1, phoneNumber, xPlayer.source) PhoneNumbers[phoneNumber] = { type = 'player', @@ -44,14 +43,14 @@ function LoadPlayer(source) sharePos = false, hideNumber = false, hidePosIfAnon = false, - sources = {[source] = true} + sources = {[xPlayer.source] = true} } xPlayer.set('phoneNumber', phoneNumber) local contacts = {} if PhoneNumbers[xPlayer.job.name] then - TriggerEvent('esx_phone:addSource', xPlayer.job.name, source) + TriggerEvent('esx_phone:addSource', xPlayer.job.name, xPlayer.source) end MySQL.Async.fetchAll('SELECT * FROM user_contacts WHERE identifier = @identifier ORDER BY name ASC', { @@ -65,7 +64,7 @@ function LoadPlayer(source) end xPlayer.set('contacts', contacts) - TriggerClientEvent('esx_phone:loaded', source, phoneNumber, contacts) + TriggerClientEvent('esx_phone:loaded', xPlayer.source, phoneNumber, contacts) end) end) end @@ -107,8 +106,8 @@ AddEventHandler('esx_phone:getDistpatchRequestId', function(cb) cb(GetDistpatchRequestId()) end) -AddEventHandler('esx:playerLoaded', function(playerId) - LoadPlayer(playerId) +AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) + LoadPlayer(xPlayer) end) AddEventHandler('esx:playerDropped', function(source) diff --git a/[esx_addons]/esx_policejob/client/main.lua b/[esx_addons]/esx_policejob/client/main.lua index 4ae3bf3a..01874bef 100644 --- a/[esx_addons]/esx_policejob/client/main.lua +++ b/[esx_addons]/esx_policejob/client/main.lua @@ -2,20 +2,11 @@ local CurrentActionData, handcuffTimer, dragStatus, blipsCops, currentTask = {}, local HasAlreadyEnteredMarker, isDead, isHandcuffed, hasAlreadyJoined, playerInService = false, false, false, false, false local LastStation, LastPart, LastPartNum, LastEntity, CurrentAction, CurrentActionMsg dragStatus.isDragged, isInShopMenu = false, false -ESX = nil -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(10) - end - - ESX.PlayerData = ESX.GetPlayerData() -end) +if ESX.PlayerLoaded and ESX.PlayerData.job == 'police' then + Citizen.Wait(1000) + TriggerServerEvent('esx_policejob:forceBlip') +end function cleanPlayer(playerPed) SetPedArmour(playerPed, 0) @@ -124,7 +115,7 @@ function OpenCloakroomMenu() ESX.TriggerServerCallback('esx_service:isInService', function(isInService) if not isInService then - if Config.MaxInService == -1 then + if Config.MaxInService ~= -1 then ESX.TriggerServerCallback('esx_service:enableService', function(canTakeService, maxInService, inServiceCount) if not canTakeService then ESX.ShowNotification(_U('service_max', inServiceCount, maxInService)) @@ -931,9 +922,10 @@ end RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', function(job) ESX.PlayerData.job = job - - Citizen.Wait(5000) - TriggerServerEvent('esx_policejob:forceBlip') + if job.name == 'police' then + Citizen.Wait(1000) + TriggerServerEvent('esx_policejob:forceBlip') + end end) RegisterNetEvent('esx_phone:loaded') @@ -1122,25 +1114,21 @@ RegisterNetEvent('esx_policejob:putInVehicle') AddEventHandler('esx_policejob:putInVehicle', function() if isHandcuffed then local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) + local vehicle, distance = ESX.Game.GetClosestVehicle() - if IsAnyVehicleNearPoint(coords, 5.0) then - local vehicle = GetClosestVehicle(coords, 5.0, 0, 71) + if vehicle and distance < 5 then + local maxSeats, freeSeat = GetVehicleMaxNumberOfPassengers(vehicle) - if DoesEntityExist(vehicle) then - local maxSeats, freeSeat = GetVehicleMaxNumberOfPassengers(vehicle) - - for i=maxSeats - 1, 0, -1 do - if IsVehicleSeatFree(vehicle, i) then - freeSeat = i - break - end + for i=maxSeats - 1, 0, -1 do + if IsVehicleSeatFree(vehicle, i) then + freeSeat = i + break end + end - if freeSeat then - TaskWarpPedIntoVehicle(playerPed, vehicle, freeSeat) - dragStatus.isDragged = false - end + if freeSeat then + TaskWarpPedIntoVehicle(playerPed, vehicle, freeSeat) + dragStatus.isDragged = false end end end @@ -1521,7 +1509,7 @@ AddEventHandler('esx_policejob:updateBlip', function() end) -AddEventHandler('playerSpawned', function(spawn) +AddEventHandler('esx:onPlayerSpawn', function(spawn) isDead = false TriggerEvent('esx_policejob:unrestrain') diff --git a/[esx_addons]/esx_policejob/config.lua b/[esx_addons]/esx_policejob/config.lua index 7717309c..dfea1f88 100644 --- a/[esx_addons]/esx_policejob/config.lua +++ b/[esx_addons]/esx_policejob/config.lua @@ -5,9 +5,9 @@ Config.MarkerType = {Cloakrooms = 20, Armories = 21, BossActions Config.MarkerSize = {x = 1.5, y = 1.5, z = 0.5} Config.MarkerColor = {r = 50, g = 50, b = 204} -Config.EnablePlayerManagement = false -- Enable if you want society managing. +Config.EnablePlayerManagement = true -- Enable if you want society managing. Config.EnableArmoryManagement = false -Config.EnableESXIdentity = false -- Enable if you're using esx_identity. +Config.EnableESXIdentity = true -- Enable if you're using esx_identity. Config.EnableLicenses = false -- Enable if you're using esx_license. Config.EnableHandcuffTimer = true -- Enable handcuff timer? will unrestrain player after the time ends. @@ -17,7 +17,7 @@ Config.EnableJobBlip = false -- Enable blips for cops on duty, requ Config.EnableCustomPeds = false -- Enable custom peds in cloak room? See Config.CustomPeds below to customize peds. Config.EnableESXService = false -- Enable esx service? -Config.MaxInService = -1 -- How much people can be in service at once? +Config.MaxInService = -1 -- How many people can be in service at once? Set as -1 to have no limit Config.Locale = 'en' diff --git a/[esx_addons]/esx_policejob/fxmanifest.lua b/[esx_addons]/esx_policejob/fxmanifest.lua index 5f07436d..adc8de69 100644 --- a/[esx_addons]/esx_policejob/fxmanifest.lua +++ b/[esx_addons]/esx_policejob/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Police Job' -version '1.3.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_policejob/server/main.lua b/[esx_addons]/esx_policejob/server/main.lua index 509fb366..e2697099 100644 --- a/[esx_addons]/esx_policejob/server/main.lua +++ b/[esx_addons]/esx_policejob/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - if Config.EnableESXService then if Config.MaxInService ~= -1 then TriggerEvent('esx_service:activateService', 'police', Config.MaxInService) @@ -452,14 +448,9 @@ ESX.RegisterServerCallback('esx_policejob:getPlayerInventory', function(source, end) AddEventHandler('playerDropped', function() - -- Save the source in case we lose it (which happens a lot) local playerId = source - - -- Did the player ever join? if playerId then local xPlayer = ESX.GetPlayerFromId(playerId) - - -- Is it worth telling all clients to refresh? if xPlayer and xPlayer.job.name == 'police' then Citizen.Wait(5000) TriggerClientEvent('esx_policejob:updateBlip', -1) @@ -470,7 +461,6 @@ end) RegisterNetEvent('esx_policejob:spawned') AddEventHandler('esx_policejob:spawned', function() local xPlayer = ESX.GetPlayerFromId(playerId) - if xPlayer and xPlayer.job.name == 'police' then Citizen.Wait(5000) TriggerClientEvent('esx_policejob:updateBlip', -1) @@ -479,13 +469,17 @@ end) RegisterNetEvent('esx_policejob:forceBlip') AddEventHandler('esx_policejob:forceBlip', function() - TriggerClientEvent('esx_policejob:updateBlip', -1) + for _, xPlayer in pairs(ESX.GetExtendedPlayers('job', 'police')) do + TriggerClientEvent('esx_policejob:updateBlip', -1) + end end) AddEventHandler('onResourceStart', function(resource) if resource == GetCurrentResourceName() then Citizen.Wait(5000) - TriggerClientEvent('esx_policejob:updateBlip', -1) + for _, xPlayer in pairs(ESX.GetExtendedPlayers('job', 'police')) do + TriggerClientEvent('esx_policejob:updateBlip', xPlayer.source) + end end end) diff --git a/[esx_addons]/esx_property/client/main.lua b/[esx_addons]/esx_property/client/main.lua index 04e00eb6..bc3b2439 100644 --- a/[esx_addons]/esx_property/client/main.lua +++ b/[esx_addons]/esx_property/client/main.lua @@ -1,14 +1,6 @@ local OwnedProperties, Blips, CurrentActionData = {}, {}, {} local CurrentProperty, CurrentPropertyOwner, LastProperty, LastPart, CurrentAction, CurrentActionMsg local firstSpawn, hasChest, hasAlreadyEnteredMarker = true, false, false -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) diff --git a/[esx_addons]/esx_property/fxmanifest.lua b/[esx_addons]/esx_property/fxmanifest.lua index e97611c2..e2d73130 100644 --- a/[esx_addons]/esx_property/fxmanifest.lua +++ b/[esx_addons]/esx_property/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Property' -version '1.0.4' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@async/async.lua', diff --git a/[esx_addons]/esx_property/server/main.lua b/[esx_addons]/esx_property/server/main.lua index ab9e1b00..3308cfa5 100644 --- a/[esx_addons]/esx_property/server/main.lua +++ b/[esx_addons]/esx_property/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - function GetProperty(name) for i=1, #Config.Properties, 1 do if Config.Properties[i].name == name then diff --git a/[esx_addons]/esx_realestateagentjob/client/main.lua b/[esx_addons]/esx_realestateagentjob/client/main.lua index df27035e..7efe4c9f 100644 --- a/[esx_addons]/esx_realestateagentjob/client/main.lua +++ b/[esx_addons]/esx_realestateagentjob/client/main.lua @@ -1,25 +1,5 @@ local hasAlreadyEnteredMarker, CurrentActionData = false, {} local CurrentAction, CurrentActionMsg, LastZone -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(100) - end - - ESX.PlayerData = ESX.GetPlayerData() - - if ESX.PlayerData.job.name == 'realestateagent' then - Config.Zones.OfficeActions.Type = 1 - else - Config.Zones.OfficeActions.Type = -1 - end -end) function OpenRealestateAgentMenu() local elements = { @@ -185,6 +165,18 @@ function OpenCustomersMenu() end) end +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function(xPlayer) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true + + if ESX.PlayerData.job.name == 'realestateagent' then + Config.Zones.OfficeActions.Type = 1 + else + Config.Zones.OfficeActions.Type = -1 + end +end) + RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', function(job) ESX.PlayerData.job = job @@ -309,4 +301,10 @@ AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) } TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) \ No newline at end of file +end) + +if ESX.PlayerLoaded and ESX.PlayerData.job.name == 'realestateagent' then + Config.Zones.OfficeActions.Type = 1 +else + Config.Zones.OfficeActions.Type = -1 +end \ No newline at end of file diff --git a/[esx_addons]/esx_realestateagentjob/fxmanifest.lua b/[esx_addons]/esx_realestateagentjob/fxmanifest.lua index 4465e17a..fd09c077 100644 --- a/[esx_addons]/esx_realestateagentjob/fxmanifest.lua +++ b/[esx_addons]/esx_realestateagentjob/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Real Estate Job' -version '1.0.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_realestateagentjob/server/main.lua b/[esx_addons]/esx_realestateagentjob/server/main.lua index 4b6db0d9..93f6db2e 100644 --- a/[esx_addons]/esx_realestateagentjob/server/main.lua +++ b/[esx_addons]/esx_realestateagentjob/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - TriggerEvent('esx_phone:registerNumber', 'realestateagent', _U('clients'), false, false) TriggerEvent('esx_society:registerSociety', 'realestateagent', _U('realtors'), 'society_realestateagent', 'society_realestateagent', 'society_realestateagent', {type = 'private'}) @@ -47,12 +43,12 @@ end) ESX.RegisterServerCallback('esx_realestateagentjob:getCustomers', function(source, cb) TriggerEvent('esx_ownedproperty:getOwnedProperties', function(properties) - local xPlayers = ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() local customers = {} for i=1, #properties, 1 do for j=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[j]) + local xPlayer = xPlayers[j] if xPlayer.identifier == properties[i].owner then table.insert(customers, { diff --git a/[esx_addons]/esx_rpchat/fxmanifest.lua b/[esx_addons]/esx_rpchat/fxmanifest.lua index 003c4a22..b873ecb6 100644 --- a/[esx_addons]/esx_rpchat/fxmanifest.lua +++ b/[esx_addons]/esx_rpchat/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX RP Chat' -version '1.3.1' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_rpchat/server/main.lua b/[esx_addons]/esx_rpchat/server/main.lua index 9c779630..cbc20a99 100644 --- a/[esx_addons]/esx_rpchat/server/main.lua +++ b/[esx_addons]/esx_rpchat/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - AddEventHandler('chatMessage', function(playerId, playerName, message) if string.sub(message, 1, string.len('/')) ~= '/' then CancelEvent() diff --git a/[esx_addons]/esx_service/client/main.lua b/[esx_addons]/esx_service/client/main.lua index 87fa24a8..8c677006 100644 --- a/[esx_addons]/esx_service/client/main.lua +++ b/[esx_addons]/esx_service/client/main.lua @@ -1,12 +1,3 @@ -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - RegisterNetEvent('esx_service:notifyAllInService') AddEventHandler('esx_service:notifyAllInService', function(notification, target) target = GetPlayerFromServerId(target) diff --git a/[esx_addons]/esx_service/fxmanifest.lua b/[esx_addons]/esx_service/fxmanifest.lua index babecdef..4ec5fc70 100644 --- a/[esx_addons]/esx_service/fxmanifest.lua +++ b/[esx_addons]/esx_service/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Service' -version '1.0.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { 'server/main.lua' diff --git a/[esx_addons]/esx_service/server/main.lua b/[esx_addons]/esx_service/server/main.lua index a01aee93..ac0dcc87 100644 --- a/[esx_addons]/esx_service/server/main.lua +++ b/[esx_addons]/esx_service/server/main.lua @@ -1,9 +1,6 @@ -ESX = nil local InService = {} local MaxInService = {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - function GetInServiceCount(name) local count = 0 @@ -76,9 +73,7 @@ ESX.RegisterServerCallback('esx_service:getInServiceList', function(source, cb, cb(InService[name]) end) -AddEventHandler('playerDropped', function() - local _source = source - +AddEventHandler('esx:playerDropped', function(playerId, reason) for k,v in pairs(InService) do if v[_source] == true then v[_source] = nil diff --git a/[esx_addons]/esx_shops/client/main.lua b/[esx_addons]/esx_shops/client/main.lua index 64b2c98e..e730ea59 100644 --- a/[esx_addons]/esx_shops/client/main.lua +++ b/[esx_addons]/esx_shops/client/main.lua @@ -1,17 +1,6 @@ -ESX = nil local hasAlreadyEnteredMarker, lastZone local currentAction, currentActionMsg, currentActionData = nil, nil, {} -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - Citizen.Wait(5000) - -end) - function OpenShopMenu(zone) local elements = {} for i=1, #Config.Zones[zone].Items, 1 do diff --git a/[esx_addons]/esx_shops/fxmanifest.lua b/[esx_addons]/esx_shops/fxmanifest.lua index 3bb6d04d..9895b025 100644 --- a/[esx_addons]/esx_shops/fxmanifest.lua +++ b/[esx_addons]/esx_shops/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Shops' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' client_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_shops/server/main.lua b/[esx_addons]/esx_shops/server/main.lua index d003b4a6..fea81c55 100644 --- a/[esx_addons]/esx_shops/server/main.lua +++ b/[esx_addons]/esx_shops/server/main.lua @@ -1,8 +1,5 @@ -ESX = nil local ShopItems = {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterServerEvent('esx_shops:buyItem') AddEventHandler('esx_shops:buyItem', function(itemName, amount, zone) local _source = source diff --git a/[esx_addons]/esx_sit/client.lua b/[esx_addons]/esx_sit/client.lua index 46f7b23a..6a575cf8 100644 --- a/[esx_addons]/esx_sit/client.lua +++ b/[esx_addons]/esx_sit/client.lua @@ -1,15 +1,7 @@ -ESX = nil local debugProps, sitting, lastPos, currentSitCoords, currentScenario = {} local disableControls = false local currentObj = nil -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - if Config.Debug then Citizen.CreateThread(function() while true do @@ -87,7 +79,7 @@ end) function GetNearChair() local object, distance - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) for i=1, #Config.Interactables do object = GetClosestObjectOfType(coords, 3.0, GetHashKey(Config.Interactables[i]), false, false, false) distance = #(coords - GetEntityCoords(object)) @@ -100,10 +92,10 @@ end function wakeup() local playerPed = PlayerPedId() - local pos = GetEntityCoords(GetPlayerPed(-1)) + local pos = GetEntityCoords(PlayerPedId()) TaskStartScenarioAtPosition(playerPed, currentScenario, 0.0, 0.0, 0.0, 180.0, 2, true, false) - while IsPedUsingScenario(GetPlayerPed(-1), currentScenario) do + while IsPedUsingScenario(PlayerPedId(), currentScenario) do Wait(100) end ClearPedTasks(playerPed) @@ -119,7 +111,7 @@ end function sit(object, modelName, data) -- Fix for sit on chairs behind walls - if not HasEntityClearLosToEntity(GetPlayerPed(-1), object, 17) then + if not HasEntityClearLosToEntity(PlayerPedId(), object, 17) then return end disableControls = true @@ -128,7 +120,7 @@ function sit(object, modelName, data) PlaceObjectOnGroundProperly(object) local pos = GetEntityCoords(object) - local playerPos = GetEntityCoords(GetPlayerPed(-1)) + local playerPos = GetEntityCoords(PlayerPedId()) local objectCoords = pos.x .. pos.y .. pos.z ESX.TriggerServerCallback('esx_sit:getPlace', function(occupied) @@ -144,8 +136,8 @@ function sit(object, modelName, data) TaskStartScenarioAtPosition(playerPed, currentScenario, pos.x, pos.y, pos.z + (playerPos.z - pos.z)/2, GetEntityHeading(object) + 180.0, 0, true, false) Citizen.Wait(2500) - if GetEntitySpeed(GetPlayerPed(-1)) > 0 then - ClearPedTasks(GetPlayerPed(-1)) + if GetEntitySpeed(PlayerPedId()) > 0 then + ClearPedTasks(PlayerPedId()) TaskStartScenarioAtPosition(playerPed, currentScenario, pos.x, pos.y, pos.z + (playerPos.z - pos.z)/2, GetEntityHeading(object) + 180.0, 0, true, true) end diff --git a/[esx_addons]/esx_sit/fxmanifest.lua b/[esx_addons]/esx_sit/fxmanifest.lua index c91a36d5..d90ca471 100644 --- a/[esx_addons]/esx_sit/fxmanifest.lua +++ b/[esx_addons]/esx_sit/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Sit' -version '1.0.3' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { 'config.lua', diff --git a/[esx_addons]/esx_sit/server.lua b/[esx_addons]/esx_sit/server.lua index 98641f2e..fe2817b6 100644 --- a/[esx_addons]/esx_sit/server.lua +++ b/[esx_addons]/esx_sit/server.lua @@ -1,8 +1,5 @@ -ESX = nil local seatsTaken = {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - RegisterNetEvent('esx_sit:takePlace') AddEventHandler('esx_sit:takePlace', function(objectCoords) seatsTaken[objectCoords] = true diff --git a/[esx_addons]/esx_society/client/main.lua b/[esx_addons]/esx_society/client/main.lua index f5deb025..ea3bde60 100644 --- a/[esx_addons]/esx_society/client/main.lua +++ b/[esx_addons]/esx_society/client/main.lua @@ -1,28 +1,18 @@ -ESX = nil - local base64MoneyIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAABaCAMAAAAPdrEwAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAMAUExURQAAACmvPCmwPCuwPiywPi2wPy6xQC6xQS+yQTCxQTCyQTCyQjGyQzKyRDOzRTSzRTSzRjW0RjW0Rza0SDe0STi0STm1Sjq1Szq2Szu2TDy2TDy2TT22Tj63Tz+3UEC4UEG4UUG4UkK4U0O5VES5VEW6VUa6Vke6V0i7WEm7WUu8Wku8W0y8W028XE29XU++XlC9X1C+X1G+YFK+YVO/YlW/ZFXAZFfAZVfAZljBZlnBZ1rBaVvCaVvCalzDal7CbF/DbV/EbWHEbmLEb2LEcGTFcWfGdGjHdWrHd2vId2vIeGzIeW3JenHKfXLKfnPLf3TLgHXLgXXMgHXMgXbMgnjNg3nMhHrNhnrOhnzOiH7PiYLQjYPRjoTRjoTRj4XRkIXSkIfSkojSk4rUlYzUlo7VmJDWmpHWm5LXnJTXnZTXnpXYnpbYn5nZopzapJ3bpZ7bpp7bp6DcqKLcqqPcq6Tcq6TdrKberqjfr6jfsKnfsavgs6zgs6zgtK7hta/htrDit7LiuLLiubPjurTjurXju7bkvLbkvbnlv7rlwLrmwLzmwr3nw77nxMDnxcLox8PpyMTpycXpysXqysbqy8fqzMnrzcrrz8vsz8vs0Mzs0c3t0tHu1dHu1tPv19Tv2NXv2dXw2dbw2tfw29jw3Nnx3drx3t7z4d/z4uD04+H05OP15eP15uT15uT15+X16OX26Of26en36+r37Ov37er47Ov47ez47e347u347+758PD58fD68fD68vL69PT79fX79vb79/b89vb89/f8+Pj9+fn9+vr9+/v++/v+/Pz+/P3+/f3+/v7//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALfZHJgAAAEAdFJOU////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wBT9wclAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAGHRFWHRTb2Z0d2FyZQBwYWludC5uZXQgNC4xLjb9TgnoAAAGdUlEQVRoQ7WZ93sURRiAFZO76O1eklt215OgBwqJgmgCRhAhRrAAiogBK4gBJEFEgWAEYiGIYEGp1kjXQECkiF0OWyjJ/k34zcy3db7Zu8fHe3/KTXnzPbPT56orRTEYAhMLUFgNKkeiGH8BNaV1KWSPVXveU9s3LW9pvhdoblm+afspTHZi5Wo1BnzpaOfcnFmWSBv29YBtpBNlZm5u59FLPDsmdJUaxQeXNugZw5IwMnrD0oO8iFKuUHNx/+bGZLWNMgm7Otm4uZ/LsVIEUs3F+Y5a3USNAlOv7cgr5ZSamQffyOnKgH1sPdfFi2PVILKaReEcmKwVIWbY2uQDvApW95HULIb+Ng0rFoXWxppcCjyqZuZjk4oNWWBrk44R7oiamXdkC3w9GTO7Q3aH1cy8OkWFnHtitstM4j/bqdWSO6Rm5nYdS4e5FbKQwxlMC6G3Q1bIHVQz8+IKLBphJLdydlRjWpiKxZAXdAfUPOak4gOO4FZOdxWmhbGTkbh9NTOvoVsDuGmAaxkdlZgWRV8Dub7bV0PyzhQWkqk5z7WMdjpqILUTslEXUEPQJ7Lq7pz9WXiBZ4iZUGBnTwTCdtVgvjgxpj+b3vTvTEteq5KbEy/6blcNVZapR3cmdc9Z4QV6Pnxzdr1GF9aWQQFUohqCPqQc3ZV17X3C6tP31kyL+Jy2dsgLW6jBPDgVc6OkR3XxCV/i9IqRRFedylxc6qk30L3DNF7ikz1Jft0oLOaT2hBSg/l8jmwOo24/amimYzkfOwfdlLtdNT1YjIaf0EFzgGhuNnB8teNcqCWDvs3vzSSLqC9Ze0F0EqaGoDeSQWt7UaHgXA0WDKFvFGEzNRS6mxot6VZhUNJNdm7zbsgSagj6UAKTQ5hnhEHJffRISIi+LdRLyNn9cTSoOExP3FZmiat2nIF66t9Xb0GFz8Df+AenVTEF2vUwAzM1BN1LfsTkcVS4bJs+fnRj84z3joqf+eFYUELvZWFzdSfZHjeeEwqXl6/myWaZ0bSVDf3uJP9NkOn01HPISXIMTJAB/hiB6WBPN+xxBpvxl4wxR6ihll8pSL1QupwLLhR22YL9ysVGrKRcfZJeAu4QSo+1yWA3rla2NGCeZGpoj13lmBJm1F/odDm+fv68phorU0l+miDlu6BFmLqbHDCWdhqVQQb/zPesW1inqxdoRqIb1SvSmBJG+wR1BF+/NkmLWUnTK1DdQq+i5gvoIbn85QPqtdRoQfU0TIgy4h/UKOi+gZ5DgGmonqIoob2CDhXHblE0ij2lgNo2YMcSy7fkhF2E2rIm/IoOFV/Q+78i1JkJheJ+jOzjnlr1GRk18swa4iC9t3U/o6LzCVLTP4dlVM14LBfC63yKIYOYeuMqcRoneZFqEW/IKAY6Q8xumla3YP2+PNnNt1Jqb6Arpifg5kXuHjNTaVi1s5/eJs0r+6gFUkxP6kkV2mKBs8UMZSYMdmAJcpxqTTGpqpcCEO1znCMTwlPFNbuF0uUs1UVwKYAWoRcwGDHsbNS/algwu+J1bvToI9TuAgZqetm1roPVk/FDazbhjaryr0SiSw/R1oFll94sWNnfsLrzS1eTkawyjKrE6HcwyeVtIix3s6Dc4ljzsTbnx74P1na83+uf8ZBn5cb0tjgsbHJjlvoMa8dxWT4XBDZmoCa3k7eH9yE0u4l9jr+dZN2P2ASnVorK8TwoVwxsglnYxNY9852oHMseogMEt+4QtnzgGDoTa8eRH4ulA4QOHCxs6ZhUBdNAIS7NIjp1+JgEaulwZzwsnXCjDDxPzB+Rwx1zS0fSoVZb/Mp4/lFqQxk5kjI1cZDWa179HTUEe8eRW9XoQZq5qeN/5fCFigWmd14VNRXLx3/et8lLC7N8XNtH0VP6mXfvV+z4iEsLFrbqqkXXho2Z8dynwgo8NdZK0SXpqxbmjrsgquhCsXrhgOYgL4h4k8Rca5VvFV7gTkySUVxrsbBjLuOGfMy1jCZFa6gv47hbeYU4ZA/XMmbRy13MFaJwqy4+Ez1cy3iSVsddfGLcdJvo33Ato5VcSeOva4WbvmQ2v+daxkrqfqXQJbNwk1fj9kOPuNwlZxdxNS7c5IW+MdRFMhd3oS/cpXmG4EOnRI8nAAt8sKsETz4AK1yahyqAy0vxvAaU7lEQcJ8yj9BPmUf+81MmR8iB//kBllOyZ2NOqR67XUAVABNjuXLlX2rCcoFjOcGoAAAAAElFTkSuQmCC' -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(10) - end - - ESX.PlayerData = ESX.GetPlayerData() - - RefreshBussHUD() -end) - RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', function(job) ESX.PlayerData.job = job RefreshBussHUD() end) +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function(xPlayer) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true + RefreshBussHUD() +end) + function RefreshBussHUD() DisableSocietyMoneyHUDElement() @@ -359,3 +349,5 @@ end AddEventHandler('esx_society:openBossMenu', function(society, close, options) OpenBossMenu(society, close, options) end) + +if ESX.PlayerLoaded then RefreshBussHUD() end \ No newline at end of file diff --git a/[esx_addons]/esx_society/config.lua b/[esx_addons]/esx_society/config.lua index e5c831b1..b81490cb 100644 --- a/[esx_addons]/esx_society/config.lua +++ b/[esx_addons]/esx_society/config.lua @@ -1,5 +1,5 @@ Config = {} Config.Locale = 'en' -Config.EnableESXIdentity = false +Config.EnableESXIdentity = true Config.MaxSalary = 3500 diff --git a/[esx_addons]/esx_society/fxmanifest.lua b/[esx_addons]/esx_society/fxmanifest.lua index 57346a16..a9434ca5 100644 --- a/[esx_addons]/esx_society/fxmanifest.lua +++ b/[esx_addons]/esx_society/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Society' -version '1.0.4' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_society/server/main.lua b/[esx_addons]/esx_society/server/main.lua index 7a8bb583..08e0dc0e 100644 --- a/[esx_addons]/esx_society/server/main.lua +++ b/[esx_addons]/esx_society/server/main.lua @@ -1,10 +1,6 @@ -ESX = nil local Jobs = {} local RegisteredSocieties = {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -local isLegacy = not not ESX.GetExtendedPlayers - function GetSociety(name) for i=1, #RegisteredSocieties, 1 do if RegisteredSocieties[i].name == name then @@ -171,28 +167,25 @@ end) ESX.RegisterServerCallback('esx_society:getEmployees', function(source, cb, society) local employees = {} - local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() - for k,v in pairs(xPlayers) do - local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) + local xPlayers = ESX.GetExtendedPlayers('job', society) + for _, xPlayer in pairs(xPlayers) do - local name = GetPlayerName(xPlayer.source) - if Config.EnableESXIdentity then + local name = xPlayer.name + if Config.EnableESXIdentity and name == GetPlayerName(xPlayer.source) then name = xPlayer.get('firstName') .. ' ' .. xPlayer.get('lastName') end - if xPlayer.getJob().name == society then - table.insert(employees, { - name = name, - identifier = xPlayer.identifier, - job = { - name = society, - label = xPlayer.getJob().label, - grade = xPlayer.getJob().grade, - grade_name = xPlayer.getJob().grade_name, - grade_label = xPlayer.getJob().grade_label - } - }) - end + table.insert(employees, { + name = name, + identifier = xPlayer.identifier, + job = { + name = society, + label = xPlayer.job.label, + grade = xPlayer.job.grade, + grade_name = xPlayer.job.grade_name, + grade_label = xPlayer.job.grade_label + } + }) end local query = "SELECT identifier, job_grade FROM `users` WHERE `job`=@job ORDER BY job_grade DESC" @@ -219,7 +212,7 @@ ESX.RegisterServerCallback('esx_society:getEmployees', function(source, cb, soci if Config.EnableESXIdentity then name = row.firstname .. ' ' .. row.lastname - end + end table.insert(employees, { name = name, @@ -303,11 +296,10 @@ ESX.RegisterServerCallback('esx_society:setJobSalary', function(source, cb, job, }, function(rowsChanged) Jobs[job].grades[tostring(grade)].salary = salary - local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() - for k,v in pairs(xPlayers) do - local xTarget = type(v) == 'table' and v or ESX.GetPlayerFromId(v) + local xPlayers = ESX.GetExtendedPlayers('job', job) + for _, xTarget in pairs(xPlayers) do - if xTarget.job.name == job and xTarget.job.grade == grade then + if xTarget.job.grade == grade then xTarget.setJob(job, grade) end end @@ -324,17 +316,13 @@ ESX.RegisterServerCallback('esx_society:setJobSalary', function(source, cb, job, end end) -local getOnlinePlayers = false -local onlinePlayers = {} - +local getOnlinePlayers, onlinePlayers = false, nil ESX.RegisterServerCallback('esx_society:getOnlinePlayers', function(source, cb) - if getOnlinePlayers == false and next(onlinePlayers) == nil then -- Prevent multiple xPlayer loops from running in quick succession + if getOnlinePlayers ~= true then -- Prevent multiple xPlayer loops from running in quick succession getOnlinePlayers, onlinePlayers = true, {} - local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() - for k,v in pairs(xPlayers) do - local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) - + local xPlayers = ESX.GetExtendedPlayers() + for _, xPlayer in pairs(xPlayers) do table.insert(onlinePlayers, { source = xPlayer.source, identifier = xPlayer.identifier, @@ -344,7 +332,7 @@ ESX.RegisterServerCallback('esx_society:getOnlinePlayers', function(source, cb) end getOnlinePlayers = false end - while getOnlinePlayers do Citizen.Wait(50) end -- Wait for the xPlayer loop to finish + while getOnlinePlayers do Citizen.Wait(100) end -- Wait for the xPlayer loop to finish cb(onlinePlayers) end) diff --git a/[esx_addons]/esx_status/client/main.lua b/[esx_addons]/esx_status/client/main.lua index d9beefd7..c29eca4d 100644 --- a/[esx_addons]/esx_status/client/main.lua +++ b/[esx_addons]/esx_status/client/main.lua @@ -1,13 +1,5 @@ -ESX = nil local Status, isPaused = {}, false -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - function GetStatusData(minimal) local status = {} @@ -48,6 +40,7 @@ end) RegisterNetEvent('esx:onPlayerLogout') AddEventHandler('esx:onPlayerLogout', function() + ESX.PlayerLoaded = false Status = {} if Config.Display then SendNUIMessage({ @@ -59,6 +52,7 @@ end) RegisterNetEvent('esx_status:load') AddEventHandler('esx_status:load', function(status) + ESX.PlayerLoaded = true TriggerEvent('esx_status:loaded') for i=1, #Status, 1 do for j=1, #status, 1 do @@ -71,7 +65,7 @@ AddEventHandler('esx_status:load', function(status) if Config.Display then TriggerEvent('esx_status:setDisplay', 0.5) end Citizen.CreateThread(function() - while #Status > 0 do + while ESX.PlayerLoaded do for i=1, #Status, 1 do Status[i].onTick() end @@ -187,7 +181,6 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(Config.UpdateInterval) - - TriggerServerEvent('esx_status:update', GetStatusData(true)) + if ESX.PlayerLoaded then TriggerServerEvent('esx_status:update', GetStatusData(true)) end end end) diff --git a/[esx_addons]/esx_status/config.lua b/[esx_addons]/esx_status/config.lua index 9eb09cb2..7f86d835 100644 --- a/[esx_addons]/esx_status/config.lua +++ b/[esx_addons]/esx_status/config.lua @@ -2,5 +2,5 @@ Config = {} Config.StatusMax = 1000000 Config.TickTime = 1000 -Config.UpdateInterval = 10000 +Config.UpdateInterval = 30000 Config.Display = true -- Enable the esx_status bars (disable if you are using another HUD) diff --git a/[esx_addons]/esx_status/fxmanifest.lua b/[esx_addons]/esx_status/fxmanifest.lua index fa08f8d4..ac962a5c 100644 --- a/[esx_addons]/esx_status/fxmanifest.lua +++ b/[esx_addons]/esx_status/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Status' -version '1.0.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_status/server/main.lua b/[esx_addons]/esx_status/server/main.lua index 0d80cc83..2eea220b 100644 --- a/[esx_addons]/esx_status/server/main.lua +++ b/[esx_addons]/esx_status/server/main.lua @@ -1,29 +1,27 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -local isLegacy = not not ESX.GetExtendedPlayers - AddEventHandler('onResourceStart', function(resourceName) if (GetCurrentResourceName() ~= resourceName) then return end - - local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() - for k,v in pairs(xPlayers) do - local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local data = {} - - if result[1].status then - data = json.decode(result[1].status) - end + for _, xPlayer in pairs(ESX.Players) do + local status = xPlayer.get('status') + if status then + ESX.Players[xPlayer.source] = status + else + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + local data = {} - xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', k, data) - end) + if result[1].status then + data = json.decode(result[1].status) + end + + xPlayer.set('status', data) -- save to xPlayer for compatibility + ESX.Players[xPlayer.source] = data -- save locally for performance + end) + end + TriggerClientEvent('esx_status:load', xPlayer.source, data) end end) @@ -38,25 +36,25 @@ AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) end xPlayer.set('status', data) + ESX.Players[xPlayer.source] = data TriggerClientEvent('esx_status:load', playerId, data) end) end) AddEventHandler('esx:playerDropped', function(playerId, reason) local xPlayer = ESX.GetPlayerFromId(playerId) - local status = xPlayer.get('status') + local status = ESX.Players[xPlayer.source] MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { ['@status'] = json.encode(status), ['@identifier'] = xPlayer.identifier - }) + }, function(result) + ESX.Players[xPlayer.source] = nil + end) end) AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) - local xPlayer = ESX.GetPlayerFromId(playerId) - local status = xPlayer.get('status') - - for i=1, #status, 1 do + for i=1, #ESX.Players, 1 do if status[i].name == statusName then cb(status[i]) break @@ -67,9 +65,9 @@ end) RegisterServerEvent('esx_status:update') AddEventHandler('esx_status:update', function(status) local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer then - xPlayer.set('status', status) + xPlayer.set('status', status) -- save to xPlayer for compatibility + ESX.Players[xPlayer.source] = status -- save locally for performance end end) @@ -100,11 +98,10 @@ function SaveData() local firstItem = true local playerCount = 0 - local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() - for k,v in pairs(xPlayers) do - local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) - local status = xPlayer.get('status') + for _, xPlayer in pairs(xPlayers) do + local status = ESX.Players[xPlayer.source] whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) diff --git a/[esx_addons]/esx_taxijob/client/main.lua b/[esx_addons]/esx_taxijob/client/main.lua index 6dce9572..67ccc56d 100644 --- a/[esx_addons]/esx_taxijob/client/main.lua +++ b/[esx_addons]/esx_taxijob/client/main.lua @@ -1,21 +1,6 @@ local HasAlreadyEnteredMarker, OnJob, IsNearCustomer, CustomerIsEnteringVehicle, CustomerEnteredVehicle, IsDead, CurrentActionData = false, false, false, false, false, false, {} local CurrentCustomer, CurrentCustomerBlip, DestinationBlip, targetCoords, LastZone, CurrentAction, CurrentActionMsg -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - while ESX.GetPlayerData().job == nil do - Citizen.Wait(10) - end - - ESX.PlayerData = ESX.GetPlayerData() -end) - function DrawSub(msg, time) ClearPrints() BeginTextCommandPrint('STRING') diff --git a/[esx_addons]/esx_taxijob/fxmanifest.lua b/[esx_addons]/esx_taxijob/fxmanifest.lua index 4ca75e7c..9f85f3d3 100644 --- a/[esx_addons]/esx_taxijob/fxmanifest.lua +++ b/[esx_addons]/esx_taxijob/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Taxi Job' -version '1.0.2' +version 'legacy' + +shared_script '@es_extended/imports.lua' client_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_taxijob/server/main.lua b/[esx_addons]/esx_taxijob/server/main.lua index 932e1b32..b7869839 100644 --- a/[esx_addons]/esx_taxijob/server/main.lua +++ b/[esx_addons]/esx_taxijob/server/main.lua @@ -1,8 +1,5 @@ -ESX = nil local lastPlayerSuccess = {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - if Config.MaxInService ~= -1 then TriggerEvent('esx_service:activateService', 'taxi', Config.MaxInService) end diff --git a/[esx_addons]/esx_vehicleshop/client/main.lua b/[esx_addons]/esx_vehicleshop/client/main.lua index a63bcdb9..db7c6264 100644 --- a/[esx_addons]/esx_vehicleshop/client/main.lua +++ b/[esx_addons]/esx_vehicleshop/client/main.lua @@ -2,17 +2,6 @@ local HasAlreadyEnteredMarker, IsInShopMenu = false, false local CurrentAction, CurrentActionMsg, LastZone, currentDisplayVehicle, CurrentVehicleData local CurrentActionData, Vehicles, Categories = {}, {}, {} -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end - - PlayerManagement() -end) - function getVehicleLabelFromModel(model) for k,v in ipairs(Vehicles) do if v.model == model then @@ -864,3 +853,5 @@ Citizen.CreateThread(function() EnableInteriorProp(interiorID, 'csr_beforeMission') -- Load large window RefreshInterior(interiorID) end) + +if ESX.PlayerLoaded then PlayerManagement() end \ No newline at end of file diff --git a/[esx_addons]/esx_vehicleshop/fxmanifest.lua b/[esx_addons]/esx_vehicleshop/fxmanifest.lua index 5f171a6d..0fbc8c70 100644 --- a/[esx_addons]/esx_vehicleshop/fxmanifest.lua +++ b/[esx_addons]/esx_vehicleshop/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Vehicle Shop' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@async/async.lua', diff --git a/[esx_addons]/esx_vehicleshop/server/main.lua b/[esx_addons]/esx_vehicleshop/server/main.lua index 1b9d5e3e..78622caa 100644 --- a/[esx_addons]/esx_vehicleshop/server/main.lua +++ b/[esx_addons]/esx_vehicleshop/server/main.lua @@ -1,8 +1,5 @@ -ESX = nil local categories, vehicles = {}, {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - TriggerEvent('esx_phone:registerNumber', 'cardealer', _U('dealer_customers'), false, false) TriggerEvent('esx_society:registerSociety', 'cardealer', _U('car_dealer'), 'society_cardealer', 'society_cardealer', 'society_cardealer', {type = 'private'}) diff --git a/[esx_addons]/esx_voice/client/main.lua b/[esx_addons]/esx_voice/client/main.lua index a235d995..42362368 100644 --- a/[esx_addons]/esx_voice/client/main.lua +++ b/[esx_addons]/esx_voice/client/main.lua @@ -37,7 +37,7 @@ AddEventHandler('onClientMapStart', function() end end) -AddEventHandler('playerSpawned', function() +AddEventHandler('esx:onPlayerSpawn', function() NetworkSetTalkerProximity(voice.default) end) diff --git a/[esx_addons]/esx_voice/fxmanifest.lua b/[esx_addons]/esx_voice/fxmanifest.lua index 621dabd1..22f49337 100644 --- a/[esx_addons]/esx_voice/fxmanifest.lua +++ b/[esx_addons]/esx_voice/fxmanifest.lua @@ -4,9 +4,10 @@ game 'gta5' description 'ESX Voice Controller' -version '1.1.0' +version 'legacy' client_scripts { + '@es_extended/imports.lua', '@es_extended/locale.lua', 'locales/br.lua', 'locales/en.lua', diff --git a/[esx_addons]/esx_weaponshop/client/main.lua b/[esx_addons]/esx_weaponshop/client/main.lua index b213fe8b..7abb482f 100644 --- a/[esx_addons]/esx_weaponshop/client/main.lua +++ b/[esx_addons]/esx_weaponshop/client/main.lua @@ -1,4 +1,3 @@ -ESX = nil local HasAlreadyEnteredMarker = false local LastZone = nil local CurrentAction = nil @@ -6,17 +5,10 @@ local CurrentActionMsg = '' local CurrentActionData = {} local ShopOpen = false -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) +ESX.TriggerServerCallback('esx_weaponshop:getShop', function(shopItems) + for k,v in pairs(shopItems) do + Config.Zones[k].Items = v end - - ESX.TriggerServerCallback('esx_weaponshop:getShop', function(shopItems) - for k,v in pairs(shopItems) do - Config.Zones[k].Items = v - end - end) end) RegisterNetEvent('esx_weaponshop:sendShop') diff --git a/[esx_addons]/esx_weaponshop/fxmanifest.lua b/[esx_addons]/esx_weaponshop/fxmanifest.lua index ecee11cf..fbec4264 100644 --- a/[esx_addons]/esx_weaponshop/fxmanifest.lua +++ b/[esx_addons]/esx_weaponshop/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'ESX Weapon Shop' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/[esx_addons]/esx_weaponshop/server/main.lua b/[esx_addons]/esx_weaponshop/server/main.lua index dc403f25..8d9a4ac3 100644 --- a/[esx_addons]/esx_weaponshop/server/main.lua +++ b/[esx_addons]/esx_weaponshop/server/main.lua @@ -1,8 +1,5 @@ -ESX = nil local shopItems = {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - MySQL.ready(function() MySQL.Async.fetchAll('SELECT * FROM weashops', {}, function(result) diff --git a/[esx_addons]/esx_whitelist/config.lua b/[esx_addons]/esx_whitelist/config.lua index c6f51a26..0f0c9629 100644 --- a/[esx_addons]/esx_whitelist/config.lua +++ b/[esx_addons]/esx_whitelist/config.lua @@ -1,4 +1,4 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' Config.MinPlayer = 0 --Set how many players need to be connect before whitelist start, 0-32 diff --git a/[esx_addons]/esx_whitelist/fxmanifest.lua b/[esx_addons]/esx_whitelist/fxmanifest.lua index f3754627..943209ed 100644 --- a/[esx_addons]/esx_whitelist/fxmanifest.lua +++ b/[esx_addons]/esx_whitelist/fxmanifest.lua @@ -4,9 +4,10 @@ game 'gta5' description 'ESX Whitelist' -version '1.1.0' +version 'legacy' server_scripts { + '@es_extended/imports.lua', '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'config.lua', diff --git a/[esx_addons]/esx_whitelist/server/main.lua b/[esx_addons]/esx_whitelist/server/main.lua index c7b8bda8..e82b6483 100644 --- a/[esx_addons]/esx_whitelist/server/main.lua +++ b/[esx_addons]/esx_whitelist/server/main.lua @@ -1,7 +1,4 @@ -ESX, WhiteList = nil, {} - - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) +WhiteList = {} function loadWhiteList(cb) Whitelist = {} @@ -27,7 +24,7 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) -- Mark this connection as deferred, this is to prevent problems while checking player identifiers. deferrals.defer() - local playerId, kickReason, identifier = source + local playerId, kickReason = source -- Letting the user know what's going on. deferrals.update(_U('whitelist_check')) @@ -35,12 +32,7 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) -- Needed, not sure why. Citizen.Wait(100) - for k,v in ipairs(GetPlayerIdentifiers(playerId)) do - if string.match(v, 'license:') then - identifier = string.sub(v, 9) - break - end - end + local identifier = ESX.GetIdentifier(playerId) if ESX.Table.SizeOf(WhiteList) == 0 then kickReason = _U('whitelist_empty') diff --git a/[esx_addons]/instance/client/main.lua b/[esx_addons]/instance/client/main.lua index 94f0404b..12defefd 100644 --- a/[esx_addons]/instance/client/main.lua +++ b/[esx_addons]/instance/client/main.lua @@ -1,14 +1,5 @@ local instance, instancedPlayers, registeredInstanceTypes, playersToHide = {}, {}, {}, {} local instanceInvite, insideInstance -ESX = nil - - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) function GetInstance() return instance diff --git a/[esx_addons]/instance/fxmanifest.lua b/[esx_addons]/instance/fxmanifest.lua index 6b03126e..2fcd3cc9 100644 --- a/[esx_addons]/instance/fxmanifest.lua +++ b/[esx_addons]/instance/fxmanifest.lua @@ -4,7 +4,9 @@ game 'gta5' description 'Instance' -version '1.1.0' +version 'legacy' + +shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', diff --git a/[esx_addons]/esx_boilerplate/LICENSE b/esx_example/LICENSE similarity index 100% rename from [esx_addons]/esx_boilerplate/LICENSE rename to esx_example/LICENSE diff --git a/[esx_addons]/esx_boilerplate/README.md b/esx_example/README.md similarity index 100% rename from [esx_addons]/esx_boilerplate/README.md rename to esx_example/README.md diff --git a/[esx_addons]/esx_boilerplate/fxmanifest.lua b/esx_example/fxmanifest.lua similarity index 77% rename from [esx_addons]/esx_boilerplate/fxmanifest.lua rename to esx_example/fxmanifest.lua index b2389969..be55f747 100644 --- a/[esx_addons]/esx_boilerplate/fxmanifest.lua +++ b/esx_example/fxmanifest.lua @@ -4,6 +4,8 @@ game 'gta5' description 'ESX Boilerplate' +shared_script '@es_extended/imports.lua' + server_scripts { 'server/main.lua' } diff --git a/server.cfg b/server.cfg index 5cec197e..c9875b0c 100644 --- a/server.cfg +++ b/server.cfg @@ -22,7 +22,7 @@ sv_maxclients 10 # Allow access to features usually locked behind a FiveM patreo sets sv_projectName "ESX Legacy" sets sv_projectDesc "" sets locale "root-AQ" -sets tags "default, esx," +sets tags "default, esx" set onesync legacy # Not recommended to use Infinity with ESX set mysql_connection_string "mysql://user:password@localhost/es_extended?waitForConnections=true&charset=utf8mb4" @@ -45,7 +45,6 @@ add_ace resource.es_extended command.stop allow ## ESX Legacy ensure mysql-async ensure cron -ensure instance ensure skinchanger ensure es_extended ensure esx_menu_default