starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 01:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1368 from esx-framework/dev

Browse Source 
Main -> Dev
This commit is contained in:
Gellipapa
2024-06-16 17:03:43 +02:00
committed by GitHub
parent f3c5424093 550474539d
commit 0bc232185a
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/common/object.lua → [core]/es_extended/client/common.lua
+8 -8
View File
@@ -1,8 +1,8 @@
exports("getSharedObject", function()
return ESX
end)
AddEventHandler("esx:getSharedObject", function()
local Invoke = GetInvokingResource()
print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
end)
exports("getSharedObject", function()
return ESX
end)
AddEventHandler("esx:getSharedObject", function()
local Invoke = GetInvokingResource()
print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
end)
[core]/es_extended/fxmanifest.lua
+5 -3
View File
@@ -11,9 +11,6 @@ shared_scripts {
'config.lua',
'config.weapons.lua',
'common/modules/*.lua',
'common/*.lua',
}
server_scripts {
@@ -30,6 +27,8 @@ server_scripts {
'server/main.lua',
'server/commands.lua',
'common/modules/*.lua',
'common/functions.lua',
'server/modules/actions.lua',
'server/modules/npwd.lua',
'server/modules/createJob.lua'
@@ -43,6 +42,9 @@ client_scripts {
'client/main.lua',
'common/modules/*.lua',
'common/functions.lua',
'common/functions.lua',
'client/modules/actions.lua',
'client/modules/death.lua',
[core]/es_extended/server/common.lua
+9
View File
@@ -18,6 +18,15 @@ RegisterNetEvent("esx:onPlayerSpawn", function()
ESX.Players[source].spawned = true
end)
AddEventHandler("esx:getSharedObject", function()
local Invoke = GetInvokingResource()
print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
end)
exports("getSharedObject", function()
return ESX
end)
if Config.OxInventory then
Config.PlayerFunctionOverride = "OxInventory"
SetConvarReplicated("inventory:framework", "esx")