mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-08-29 01:08:54 +00:00
Merge pull request #1780 from FabianTerhorst/main
fix: mysql.ready called before functions.lua is loaded
This commit is contained in:
@@ -21,12 +21,13 @@ server_scripts {
|
|||||||
'@oxmysql/lib/MySQL.lua',
|
'@oxmysql/lib/MySQL.lua',
|
||||||
'shared/config/logs.lua',
|
'shared/config/logs.lua',
|
||||||
|
|
||||||
|
'server/core.lua',
|
||||||
|
'server/functions.lua',
|
||||||
'server/common.lua',
|
'server/common.lua',
|
||||||
'server/modules/callback.lua',
|
'server/modules/callback.lua',
|
||||||
'server/classes/player.lua',
|
'server/classes/player.lua',
|
||||||
'server/classes/vehicle.lua',
|
'server/classes/vehicle.lua',
|
||||||
'server/classes/overrides/*.lua',
|
'server/classes/overrides/*.lua',
|
||||||
'server/functions.lua',
|
|
||||||
'server/modules/onesync.lua',
|
'server/modules/onesync.lua',
|
||||||
'server/modules/paycheck.lua',
|
'server/modules/paycheck.lua',
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
ESX.Players = {}
|
ESX.Players = {}
|
||||||
ESX.Jobs = {}
|
ESX.Jobs = {}
|
||||||
ESX.Items = {}
|
ESX.Items = {}
|
||||||
Core = {}
|
|
||||||
Core.JobsPlayerCount = {}
|
|
||||||
Core.UsableItemsCallbacks = {}
|
|
||||||
Core.RegisteredCommands = {}
|
|
||||||
Core.Pickups = {}
|
|
||||||
Core.PickupId = 0
|
|
||||||
Core.PlayerFunctionOverrides = {}
|
|
||||||
Core.DatabaseConnected = false
|
|
||||||
Core.playersByIdentifier = {}
|
|
||||||
Core.JobsLoaded = false
|
|
||||||
|
|
||||||
---@type table<string, CVehicleData>
|
|
||||||
Core.vehicles = {}
|
|
||||||
Core.vehicleTypesByModel = {}
|
|
||||||
|
|
||||||
RegisterNetEvent("esx:onPlayerSpawn", function()
|
RegisterNetEvent("esx:onPlayerSpawn", function()
|
||||||
ESX.Players[source].spawned = true
|
ESX.Players[source].spawned = true
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
Core = {}
|
||||||
|
Core.JobsPlayerCount = {}
|
||||||
|
Core.UsableItemsCallbacks = {}
|
||||||
|
Core.RegisteredCommands = {}
|
||||||
|
Core.Pickups = {}
|
||||||
|
Core.PickupId = 0
|
||||||
|
Core.PlayerFunctionOverrides = {}
|
||||||
|
Core.DatabaseConnected = false
|
||||||
|
Core.playersByIdentifier = {}
|
||||||
|
Core.JobsLoaded = false
|
||||||
|
|
||||||
|
---@type table<string, CVehicleData>
|
||||||
|
Core.vehicles = {}
|
||||||
|
Core.vehicleTypesByModel = {}
|
||||||
Reference in New Issue
Block a user