diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index 2d272aee..38454694 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -692,23 +692,6 @@ ESX.RegisterClientCallback("esx:GetVehicleType", function(cb, model) cb(ESX.GetVehicleType(model)) end) -local DoNotUse = { - 'essentialmode', - 'es_admin2', - 'basic-gamemode', - 'mapmanager', - 'fivem-map-skater', - 'fivem-map-hipster', - 'qb-core', - 'default_spawnpoint', -} - -for i = 1, #DoNotUse do - if GetResourceState(DoNotUse[i]) == 'started' or GetResourceState(DoNotUse[i]) == 'starting' then - print("[^1ERROR^7] YOU ARE USING A RESOURCE THAT WILL BREAK ^1ESX^7, PLEASE REMOVE ^5" .. DoNotUse[i] .. "^7") - end -end - AddStateBagChangeHandler('metadata', 'player:' .. tostring(GetPlayerServerId(PlayerId())), function(_, key, val) ESX.SetPlayerData(key, val) end) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index 445a27d5..d1605f13 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -701,3 +701,28 @@ end) AddEventHandler('txAdmin:events:serverShuttingDown', function() Core.SavePlayers() end) + +local DoNotUse = { + ['essentialmode'] = true, + ['es_admin2'] = true, + ['basic-gamemode'] = true, + ['mapmanager'] = true, + ['fivem-map-skater'] = true, + ['fivem-map-hipster'] = true, + ['qb-core'] = true, + ['default_spawnpoint'] = true, +} + +for key in pairs(DoNotUse) do + if GetResourceState(key) == 'started' or GetResourceState(key) == 'starting' then + StopResource(key) + print(("[^1ERROR^7] WE STOPPED A RESOURCE THAT WILL BREAK ^1ESX^7, PLEASE REMOVE ^5%s^7"):format(key)) + end +end + +AddEventHandler('onResourceStart', function(key) + if DoNotUse[string.lower(key)] then + StopResource(key) + print(("[^1ERROR^7] WE STOPPED A RESOURCE THAT WILL BREAK ^1ESX^7, PLEASE REMOVE ^5%s^7"):format(key)) + end +end