mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-08-30 17:58:54 +00:00
Update for es_extended
Merged Config option into normal code due to it not affecting any compatibility anywhere
This commit is contained in:
+8
-1
@@ -71,12 +71,15 @@ AddEventHandler('esx:playerLoaded', function(playerData)
|
||||
TriggerEvent('playerSpawned') -- compatibility with old scripts, will be removed soon
|
||||
TriggerEvent('esx:restoreLoadout')
|
||||
|
||||
Citizen.Wait(3000)
|
||||
Citizen.Wait(4000)
|
||||
ShutdownLoadingScreen()
|
||||
ShutdownLoadingScreenNui()
|
||||
FreezeEntityPosition(PlayerPedId(), false)
|
||||
DoScreenFadeIn(10000)
|
||||
StartServerSyncLoops()
|
||||
end)
|
||||
|
||||
TriggerEvent('esx:loadingScreenOff')
|
||||
end)
|
||||
|
||||
RegisterNetEvent('esx:setMaxWeight')
|
||||
@@ -379,6 +382,10 @@ if Config.EnableHud then
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
AddEventHandler('esx:loadingScreenOff', function()
|
||||
ESX.UI.HUD.SetDisplay(1.0)
|
||||
end)
|
||||
end
|
||||
|
||||
function StartServerSyncLoops()
|
||||
|
||||
+1
-13
@@ -15,16 +15,4 @@ Config.MaxWeight = 24 -- the max inventory weight without backpack
|
||||
Config.PaycheckInterval = 7 * 60000 -- how often to recieve pay checks in milliseconds
|
||||
Config.EnableDebug = false
|
||||
|
||||
Config.IncompatibleResourcesToStop = {
|
||||
['essentialmode'] = 'ES for short, the performance heavy RP framework no one uses - and source for the random unwanted ZAP ads you\'re seeing',
|
||||
['es_admin2'] = 'Adminstration tool for the ancient ES framework that wont work with ESX',
|
||||
['esplugin_mysql'] = 'MySQL "plugin" for the ancient ES framework that has a SQL injection vulnerability',
|
||||
['es_ui'] = 'Money HUD for ES',
|
||||
['spawnmanager'] = 'Default resource that takes care of spawning players, ESX does this already',
|
||||
['mapmanager'] = 'Default resource that was required by spawnmanager, but neither are used',
|
||||
['basic-gamemode'] = 'Resource that is solely for choosing the default game type',
|
||||
['fivem'] = 'Resource that is solely for choosing the default game type',
|
||||
['fivem-map-hipster'] = 'Default spawn locations for mapmanager',
|
||||
['fivem-map-skater'] = 'Default spawn locations for mapmanager',
|
||||
['baseevents'] = 'Default resource for handling death events, ESX does this already'
|
||||
}
|
||||
Config.IncompatibleResourcesToStop = {}
|
||||
|
||||
@@ -13,6 +13,7 @@ html {
|
||||
}
|
||||
|
||||
#hud {
|
||||
opacity: 0.0;
|
||||
position: absolute;
|
||||
font-family: 'Pricedown';
|
||||
font-size: 35px;
|
||||
|
||||
Reference in New Issue
Block a user