hotfixes

[core]/es_extended/client/compat.lua

@@ -5,7 +5,4 @@ ESX.Streaming.RequestStreamedTextureDict = xLib.streaming.requestStreamedTexture
 ESX.Streaming.RequestNamedPtfxAsset = xLib.streaming.requestNamedPtfxAsset
 ESX.Streaming.RequestAnimSet = xLib.streaming.requestAnimSet
 ESX.Streaming.RequestAnimDict = xLib.streaming.requestAnimDict
-ESX.Streaming.RequestWeaponAsset = xLib.streaming.requestWeaponAsset
-ESX.SetTimeout = xLib.timeout.setTimeout
-ESX.ClearTimeout = xLib.timeout.clearTimeout
-ESX.Await = xLib.waitFor
+ESX.Streaming.RequestWeaponAsset = xLib.streaming.requestWeaponAsset

[core]/es_extended/fxmanifest.lua

@@ -15,6 +15,7 @@ shared_scripts {
     'shared/main.lua',
     'shared/functions.lua',
     'shared/modules/*.lua',
+	'shared/compat.lua'
 }
 
 server_scripts {
@@ -35,7 +36,9 @@ server_scripts {
 
 	'server/bridge/**/*.lua',
 	'server/modules/npwd.lua',
-	'server/modules/createJob.lua'
+	'server/modules/createJob.lua',
+
+	'server/compat.lua'
 }
 
 client_scripts {
@@ -54,6 +57,8 @@ client_scripts {
     'client/modules/interactions.lua',
 	'client/modules/scaleform.lua',
 	'client/modules/streaming.lua',
+
+	'shared/compat.lua'
 }
 
 ui_page {

[core]/es_extended/server/compat.lua

@@ -1,6 +1,2 @@
 --[[ All server-side functions outsourced from the Core to the lib will be stored here for compatability, e.g:
---]]
-
-ESX.SetTimeout = xLib.timeout.setTimeout
-ESX.ClearTimeout = xLib.timeout.clearTimeout
-ESX.Await = xLib.waitFor
+--]]

[core]/es_extended/shared/compat.lua

@@ -0,0 +1,5 @@
+--All shared functions outsourced from the Core to the lib will be stored here for compatability, e.g:
+
+ESX.SetTimeout = xLib.timeout.setTimeout
+ESX.ClearTimeout = xLib.timeout.clearTimeout
+ESX.Await = xLib.waitFor

[core]/esx_lib/imports.lua

@@ -82,7 +82,7 @@ local function call(self, index, ...)
 
         if not module then
             local function method(...) 
-               return exports[index](nil, ...)
+               return exports[LIB_NAME][index](nil, ...)
             end
                 
             if not ... then
@@ -115,4 +115,4 @@ local xLib = setmetatable({
 
 -- Allows to xLib to be accessible in resource that imports a lib
 _ENV.xLib = xLib
-_ENV.require = xLib.require
+_ENV.require = xLib.require