diff --git a/fxmanifest.lua b/fxmanifest.lua index af94253..67ff777 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -4,7 +4,7 @@ lua54 'yes' use_experimental_fxv2_oal 'yes' author 'The Order of the Sacred Framework' description 'A bridge made for the community to use as a base for their own projects. This bridge will allow a single format to work with nearly all commonly used systems while still offering expandability.' -version '0.1.5' +version '0.1.6' shared_scripts { '@ox_lib/init.lua', diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua index 3d38e92..54d5857 100644 --- a/modules/framework/nd_core/server.lua +++ b/modules/framework/nd_core/server.lua @@ -1,4 +1,5 @@ --local NDCore = exports["ND_Core"]:GetCoreObject() +if GetResourceState('ND_Core') ~= 'started' then return end local NDCore = exports["ND_Core"] Framework = {} diff --git a/modules/inventory/_default/server.lua b/modules/inventory/_default/server.lua index 67930d1..1528f67 100644 --- a/modules/inventory/_default/server.lua +++ b/modules/inventory/_default/server.lua @@ -1,6 +1,6 @@ Inventory = Inventory or {} -Inventory.AddItem = function(src, item, count, slot, metadata) +Inventory.AddItem = function(src, item, count, slot, metadata) return Framework.AddItem(src, item, count, slot, metadata) end