Merge pull request #1368 from esx-framework/dev

Main -> Dev
esx-framework · Jun 16, 2024 · 0bc2321 · 0bc2321
2 parents f3c5424 + 5504745
commit 0bc2321
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/[core]/es_extended/common/object.lua → [core]/es_extended/client/common.lua b/[core]/es_extended/common/object.lua → [core]/es_extended/client/common.lua
@@ -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)
diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
@@ -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',

diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
@@ -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")