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/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 cebb66da..330b3e30 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() 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/main.lua b/[esx_addons]/esx_ambulancejob/client/main.lua index 9420f855..5cbeb4c2 100644 --- a/[esx_addons]/esx_ambulancejob/client/main.lua +++ b/[esx_addons]/esx_ambulancejob/client/main.lua @@ -1,7 +1,6 @@ -local firstSpawn, PlayerLoaded = true, false +local firstSpawn = true isDead, isSearched, medic = false, false, 0 -ESX = nil AddEventHandler("onClientMapStart", function() exports.spawnmanager:spawnPlayer() @@ -9,24 +8,17 @@ AddEventHandler("onClientMapStart", function() 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 +33,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 68b19fe0..3e2b27f2 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'}) 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/client/main.lua b/[esx_addons]/esx_boilerplate/client/main.lua index c7f146b4..25499905 100644 --- a/[esx_addons]/esx_boilerplate/client/main.lua +++ b/[esx_addons]/esx_boilerplate/client/main.lua @@ -1,19 +1,16 @@ -ESX = nil -local PlayerData = {} - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function(xPlayer, isNew) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true end) -RegisterNetEvent('esx:playerLoaded') -AddEventHandler('esx:playerLoaded', function(xPlayer) - PlayerData = xPlayer +RegisterNetEvent('esx:playerLogout') +AddEventHandler('esx:playerLogout', function(xPlayer, isNew) + ESX.PlayerLoaded = false + ESX.PlayerData = {} end) RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', function(job) - PlayerData.job = job + ESX.PlayerData.job = job end) diff --git a/[esx_addons]/esx_boilerplate/fxmanifest.lua b/[esx_addons]/esx_boilerplate/fxmanifest.lua index b2389969..be55f747 100644 --- a/[esx_addons]/esx_boilerplate/fxmanifest.lua +++ b/[esx_addons]/esx_boilerplate/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/[esx_addons]/esx_boilerplate/server/main.lua b/[esx_addons]/esx_boilerplate/server/main.lua index 6927089b..e69de29b 100644 --- a/[esx_addons]/esx_boilerplate/server/main.lua +++ b/[esx_addons]/esx_boilerplate/server/main.lua @@ -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 8e9dabf4..d5743272 100644 --- a/[esx_addons]/esx_holdup/server/main.lua +++ b/[esx_addons]/esx_holdup/server/main.lua @@ -1,8 +1,5 @@ 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) 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_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 8b0a031e..f0f726f2 100644 --- a/[esx_addons]/esx_phone/server/main.lua +++ b/[esx_addons]/esx_phone/server/main.lua @@ -1,13 +1,13 @@ -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.GetExtendedPlayers() - - for i=1, #xPlayers, 1 do - LoadPlayer(xPlayers[i]) + for i=1, #xPlayers, 1 do + LoadPlayer(xPlayers[i]) + end end end) @@ -17,7 +17,7 @@ function LoadPlayer(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(player) ['@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(player) 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(player) end xPlayer.set('contacts', contacts) - TriggerClientEvent('esx_phone:loaded', source, phoneNumber, contacts) + TriggerClientEvent('esx_phone:loaded', xPlayer.source, phoneNumber, contacts) end) end) end diff --git a/[esx_addons]/esx_policejob/client/main.lua b/[esx_addons]/esx_policejob/client/main.lua index 4ae3bf3a..88b63bf3 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) @@ -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') @@ -1508,6 +1500,7 @@ AddEventHandler('esx_policejob:updateBlip', function() -- Is the player a cop? In that case show all the blips for other cops if ESX.PlayerData.job and ESX.PlayerData.job.name == 'police' then ESX.TriggerServerCallback('esx_society:getOnlinePlayers', function(players) + print(ESX.DumpTable(players)) for i=1, #players, 1 do if players[i].job.name == 'police' then local id = GetPlayerFromServerId(players[i].source) 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..21b56964 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) 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..2d23983a 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,11 @@ AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) } TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) +end) + +if ESX.PlayerLoaded and ESX.PlayerData.job.name == 'realestateagent' then + Config.Zones.OfficeActions.Type = 1 + else + Config.Zones.OfficeActions.Type = -1 + end 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 e699391e..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'}) 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..9fe15946 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 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/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 c85d7d8b..5c575d01 100644 --- a/[esx_addons]/esx_society/server/main.lua +++ b/[esx_addons]/esx_society/server/main.lua @@ -1,9 +1,6 @@ -ESX = nil local Jobs = {} local RegisteredSocieties = {} -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - function GetSociety(name) for i=1, #RegisteredSocieties, 1 do if RegisteredSocieties[i].name == name then 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 556c534d..e229829e 100644 --- a/[esx_addons]/esx_status/server/main.lua +++ b/[esx_addons]/esx_status/server/main.lua @@ -1,7 +1,3 @@ -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - AddEventHandler('onResourceStart', function(resourceName) if (GetCurrentResourceName() ~= resourceName) then return 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/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 34564eb3..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 = {} @@ -22,7 +19,7 @@ MySQL.ready(function() end) AddEventHandler('playerConnecting', function(name, setCallback, deferrals) - local xPlayers = ESX.GetExtendedPlayers() + local xPlayers = ESX.GetPlayers() -- Mark this connection as deferred, this is to prevent problems while checking player identifiers. deferrals.defer() 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/server.cfg b/server.cfg index 44fa633e..8ad6c667 100644 --- a/server.cfg +++ b/server.cfg @@ -21,7 +21,7 @@ sv_maxclients 8 # Allow access to features usually locked behind a FiveM patreon 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"